Improved form generation.