Changed checkboxes structure