Started tweaking the checkboxes