Updating labels for accessibility

Form labels were not properly associated with input elements. Fixed.