improved form markup