WP-3433: Switch order of checkboxes to see if they get the right values. Set required in the right place. Fix indentaiton.