Fix checkboxes

Functionality restored (did it even work at all before??)
Simplified (no more hidden checkbox form fields, simpler view code)
Layout fixed