OK I'm willing to give it one more shot if you are. Yes the layout was good and the email worked just fine prior to modifying the form with form builder. At this point, I would prefer you just concentrate on fixing the re-direct to the thankyou page and the email. I hope the zip attachment has all you need but let me know if not. Thanks.
p.s. Forgot to mention the file upload feature earlier. Would also like that to be working.