Should fix \#314 - checkboxes on 2 columns