Improved form builder.