improved form layout