improved form macro templates