fixes to form labels