improve labels on form fields