diff --git a/web/src/app/admin/assistants/AssistantEditor.tsx b/web/src/app/admin/assistants/AssistantEditor.tsx
index 22bd532f5b8..4513d8b1835 100644
--- a/web/src/app/admin/assistants/AssistantEditor.tsx
+++ b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -144,8 +144,6 @@ export function AssistantEditor({
     "#6FFFFF",
   ];
 
-  const [showSearchTool, setShowSearchTool] = useState(false);
-
   const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
 
   // state to persist across formik reformatting
@@ -787,14 +785,8 @@ export function AssistantEditor({
                                       }`}
                                     >
                                       <Switch
-                                        checked={
-                                          values.enabled_tools_map[
-                                            searchTool.id
-                                          ]
-                                        }
                                         size="sm"
                                         onCheckedChange={(checked) => {
-                                          setShowSearchTool(checked);
                                           setFieldValue("num_chunks", null);
                                           toggleToolInValues(searchTool.id);
                                         }}
@@ -828,7 +820,7 @@ export function AssistantEditor({
                   )}
                   {ccPairs.length > 0 &&
                     searchTool &&
-                    showSearchTool &&
+                    values.enabled_tools_map[searchTool.id] &&
                     !(user?.role != "admin" && documentSets.length === 0) && (
                       <CollapsibleSection>
                         <div className="mt-2">
@@ -979,6 +971,7 @@ export function AssistantEditor({
                             onCheckedChange={() => {
                               toggleToolInValues(internetSearchTool.id);
                             }}
+                            name={`enabled_tools_map.${internetSearchTool.id}`}
                           />
                           <div className="flex flex-col ml-2">
                             <span className="text-sm">
@@ -1072,6 +1065,7 @@ export function AssistantEditor({
                     <div className="min-h-[100px]">
                       <div className="flex items-center mb-2">
                         <Switch
+                          name="is_public"
                           size="md"
                           checked={values.is_public}
                           onCheckedChange={(checked) => {
diff --git a/web/src/components/Modal.tsx b/web/src/components/Modal.tsx
index b4c298ff2cd..f76e10dc8f1 100644
--- a/web/src/components/Modal.tsx
+++ b/web/src/components/Modal.tsx
@@ -22,6 +22,7 @@ interface ModalProps {
   noScroll?: boolean;
   heightOverride?: string;
   removeBottomPadding?: boolean;
+  removePadding?: boolean;
 }
 
 export function Modal({
@@ -39,6 +40,7 @@ export function Modal({
   noScroll,
   heightOverride,
   removeBottomPadding,
+  removePadding,
 }: ModalProps) {
   const modalRef = useRef<HTMLDivElement>(null);
   const [isMounted, setIsMounted] = useState(false);
@@ -114,7 +116,9 @@ export function Modal({
                   {icon && icon({ size: 30 })}
                 </h2>
               </div>
-              {!hideDividerForTitle && <Separator className="mb-0" />}
+              {!hideDividerForTitle && (
+                <Separator className={` ${!removePadding ? "mb-0" : ""}`} />
+              )}
             </>
           )}
         </div>
diff --git a/web/src/components/ui/checkbox.tsx b/web/src/components/ui/checkbox.tsx
index ddfb542a5e0..96103c0bfea 100644
--- a/web/src/components/ui/checkbox.tsx
+++ b/web/src/components/ui/checkbox.tsx
@@ -3,6 +3,7 @@
 import * as React from "react";
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
 import { Check } from "lucide-react";
+import { useField, FieldInputProps } from "formik";
 
 import { cn } from "@/lib/utils";
 
@@ -10,14 +11,24 @@ const Checkbox = React.forwardRef<
   React.ElementRef<typeof CheckboxPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root> & {
     size?: "sm" | "md" | "lg";
+    name?: string;
   }
->(({ className, size = "md", type = "button", ...props }, ref) => {
+>(({ className, size = "md", type = "button", name, ...props }, ref) => {
   const sizeClasses = {
     sm: "h-3 w-3",
     md: "h-4 w-4",
     lg: "h-5 w-5",
   };
 
+  const [field] = name
+    ? useField({ name, type: "checkbox" })
+    : [
+        {
+          value: props.checked,
+          onChange: props.onCheckedChange,
+        } as FieldInputProps<boolean>,
+      ];
+
   return (
     <CheckboxPrimitive.Root
       ref={ref}
@@ -28,6 +39,11 @@ const Checkbox = React.forwardRef<
         className
       )}
       {...props}
+      checked={field.value}
+      onCheckedChange={(checked) => {
+        field.onChange({ target: { name, checked } });
+        props.onCheckedChange?.(checked);
+      }}
     >
       <CheckboxPrimitive.Indicator
         className={cn("flex items-center justify-center text-current")}
diff --git a/web/src/components/ui/switch.tsx b/web/src/components/ui/switch.tsx
index cd7e133903a..0bcf648208c 100644
--- a/web/src/components/ui/switch.tsx
+++ b/web/src/components/ui/switch.tsx
@@ -2,6 +2,7 @@
 
 import * as React from "react";
 import * as SwitchPrimitives from "@radix-ui/react-switch";
+import { useField, FieldInputProps } from "formik";
 
 import { cn } from "@/lib/utils";
 
@@ -10,8 +11,9 @@ const Switch = React.forwardRef<
   React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root> & {
     circleClassName?: string;
     size?: "sm" | "md" | "lg";
+    name?: string;
   }
->(({ circleClassName, className, size = "md", ...props }, ref) => {
+>(({ circleClassName, className, size = "md", name, ...props }, ref) => {
   const sizeClasses = {
     sm: "h-4 w-8",
     md: "h-5 w-10",
@@ -30,6 +32,15 @@ const Switch = React.forwardRef<
     lg: "data-[state=checked]:translate-x-6",
   };
 
+  const [field] = name
+    ? useField({ name, type: "checkbox" })
+    : [
+        {
+          value: props.checked,
+          onChange: props.onCheckedChange,
+        } as FieldInputProps<boolean>,
+      ];
+
   return (
     <SwitchPrimitives.Root
       className={cn(
@@ -38,6 +49,11 @@ const Switch = React.forwardRef<
         className
       )}
       {...props}
+      checked={field.value}
+      onCheckedChange={(checked) => {
+        field.onChange({ target: { name, checked } });
+        props.onCheckedChange?.(checked);
+      }}
       ref={ref}
     >
       <SwitchPrimitives.Thumb