Adding some enhancements on the labels to match the generated form field.