improved form, upload to see if ok for mobile