updated required fields and validation, updated labels to be consistent with upper/lower case