Have checkboxes and buttons

[chreden]

At the moment buttons are all toggle buttons. They should be either buttons (return to the up state after being clicked) or toggle buttons (one state change per click).

[chreden]

Changing this to be checkboxes and buttons - because that's how the toggle buttons are currently working.