Lots of little changes to get the checkboxes to line up...