Improved form steps