Improved form management