Improved form functionality for forms