fixup! Change boolean toggles to checkbuttons