Fix UI for switche and checkboxes