Improved form buttons and labels