diff --git a/web/src/components/settings/MotionTuner.tsx b/web/src/components/settings/MotionTuner.tsx
index d7af8aac6..aa082092f 100644
--- a/web/src/components/settings/MotionTuner.tsx
+++ b/web/src/components/settings/MotionTuner.tsx
@@ -45,16 +45,6 @@ export default function MotionTuner({ selectedCamera }: MotionTunerProps) {
   const [isLoading, setIsLoading] = useState(false);
   const [confirmationDialogOpen, setConfirmationDialogOpen] = useState(false);
 
-  const cameras = useMemo(() => {
-    if (!config) {
-      return [];
-    }
-
-    return Object.values(config.cameras)
-      .filter((conf) => conf.ui.dashboard && conf.enabled)
-      .sort((aConf, bConf) => aConf.ui.order - bConf.ui.order);
-  }, [config]);
-
   // const [selectedCamera, setSelectedCamera] = useState(cameras[0]?.name);
   const [nextSelectedCamera, setNextSelectedCamera] = useState("");
 
@@ -132,7 +122,9 @@ export default function MotionTuner({ selectedCamera }: MotionTunerProps) {
       )
       .then((res) => {
         if (res.status === 200) {
-          toast.success("Motion settings saved.", { position: "top-center" });
+          toast.success("Motion settings have been saved.", {
+            position: "top-center",
+          });
           setChangedValue(false);
           updateConfig();
         } else {
@@ -158,18 +150,7 @@ export default function MotionTuner({ selectedCamera }: MotionTunerProps) {
     selectedCamera,
   ]);
 
-  const handleSelectedCameraChange = useCallback(
-    (camera: string) => {
-      if (changedValue) {
-        setNextSelectedCamera(camera);
-        setConfirmationDialogOpen(true);
-      } else {
-        // setSelectedCamera(camera);
-        setNextSelectedCamera("");
-      }
-    },
-    [changedValue],
-  );
+  const onCancel = useCallback(() => {}, []);
 
   const handleDialog = useCallback(
     (save: boolean) => {
@@ -242,15 +223,34 @@ export default function MotionTuner({ selectedCamera }: MotionTunerProps) {
             />
             <Label htmlFor="improve-contrast">Improve Contrast</Label>
           </div>
+          <div className="flex flex-row items-center justify-between rounded-lg border p-4">
+            <div className="space-y-0.5">
+              <div className="text-base">Improve Contrast</div>
+              <div>Improve contrast for darker scenes.</div>
+            </div>
+            <div>
+              <div checked={field.value} onCheckedChange={field.onChange} />
+            </div>
+          </div>
 
-          <div className="flex">
+          <div className="flex flex-row gap-2 pt-5">
+            <Button className="flex flex-1" onClick={onCancel}>
+              Cancel
+            </Button>
             <Button
-              size="sm"
-              variant={isLoading ? "ghost" : "select"}
-              disabled={!changedValue || isLoading}
-              onClick={saveToConfig}
+              variant="select"
+              disabled={isLoading}
+              className="flex flex-1"
+              type="submit"
             >
-              {isLoading ? "Saving..." : "Save to Config"}
+              {isLoading ? (
+                <div className="flex flex-row items-center gap-2">
+                  <ActivityIndicator />
+                  <span>Saving...</span>
+                </div>
+              ) : (
+                "Save"
+              )}
             </Button>
           </div>
         </div>
diff --git a/web/src/pages/Settings.tsx b/web/src/pages/Settings.tsx
index 7970f3e73..f02559064 100644
--- a/web/src/pages/Settings.tsx
+++ b/web/src/pages/Settings.tsx
@@ -19,7 +19,7 @@ import { FaVideo } from "react-icons/fa";
 import { CameraConfig, FrigateConfig } from "@/types/frigateConfig";
 import useSWR from "swr";
 import General from "@/components/settings/General";
-import FilterCheckBox from "@/components/filter/FilterCheckBox";
+import FilterSwitch from "@/components/filter/FilterSwitch";
 import { ZoneMaskFilterButton } from "@/components/filter/ZoneMaskFilter";
 import { PolygonType } from "@/types/canvas";
 
@@ -162,20 +162,22 @@ function CameraSelectButton({
           <DropdownMenuSeparator />
         </>
       )}
-      <div className="h-auto overflow-y-auto overflow-x-hidden pb-4 md:pb-0">
-        {allCameras.map((item) => (
-          <FilterCheckBox
-            key={item.name}
-            isChecked={item.name === selectedCamera}
-            label={item.name}
-            onCheckedChange={(isChecked) => {
-              if (isChecked) {
-                setSelectedCamera(item.name);
-                setOpen(false);
-              }
-            }}
-          />
-        ))}
+      <div className="h-auto pt-2 overflow-y-auto overflow-x-hidden">
+        <div className="flex flex-col gap-2.5">
+          {allCameras.map((item) => (
+            <FilterSwitch
+              key={item.name}
+              isChecked={item.name === selectedCamera}
+              label={item.name}
+              onCheckedChange={(isChecked) => {
+                if (isChecked) {
+                  setSelectedCamera(item.name);
+                  setOpen(false);
+                }
+              }}
+            />
+          ))}
+        </div>
       </div>
     </>
   );