#2 - Clean up radio buttons.
#2 - Add radio button values. Fix misplaced 'required's.