fix labels
form cleanup