Reverted to old checkboxes and radios