Improved form layout