Improved form controller