AUTHOR-5805 Edits to Radio Buttons and Checkboxes