Improved form and required fields