Enable checkboxes

And add additional checkboxes