Improved form rendering