Cleaning up form and getting file upload to work.