Fixed up the checkboxes to use a slightly more sane approach to handling the tick mark additions