Fixing checkboxes.
Adding switches.