Checkbox system reworked