diff --git a/app/src/components/layout/sidebarRight/mechanics/VehicleMechanics.tsx b/app/src/components/layout/sidebarRight/mechanics/VehicleMechanics.tsx
index 39773ab..a81ce15 100644
--- a/app/src/components/layout/sidebarRight/mechanics/VehicleMechanics.tsx
+++ b/app/src/components/layout/sidebarRight/mechanics/VehicleMechanics.tsx
@@ -45,11 +45,11 @@ const VehicleMechanics: React.FC = () => {
         setSimulationPaths(updatedPaths);
     }, [selectedActionSphere?.point?.uuid, simulationPaths, setSimulationPaths]);
 
-    const handleStartPositionChange = React.useCallback((position: string) => {
+    const handleStartPointChange = React.useCallback((position: string) => {
         handleActionUpdate({ start: position });
     }, [handleActionUpdate]);
 
-    const handleEndPositionChange = React.useCallback((position: string) => {
+    const handleEndPointChange = React.useCallback((position: string) => {
         handleActionUpdate({ end: position });
     }, [handleActionUpdate]);
 
@@ -94,16 +94,16 @@ const VehicleMechanics: React.FC = () => {
                         <>
                             <EyeDropInput
                                 key={`start-${selectedPoint.uuid}`}
-                                label="Start Position"
+                                label="Start Point"
                                 value={selectedPoint.actions.start}
-                                onChange={handleStartPositionChange}
+                                onChange={handleStartPointChange}
                             />
 
                             <EyeDropInput
                                 key={`end-${selectedPoint.uuid}`}
-                                label="End Position"
+                                label="End Point"
                                 value={selectedPoint.actions.end}
-                                onChange={handleEndPositionChange}
+                                onChange={handleEndPointChange}
                             />
 
                             <InputWithDropDown
diff --git a/app/src/components/ui/ModuleToggle.tsx b/app/src/components/ui/ModuleToggle.tsx
index e364f52..b81ddf8 100644
--- a/app/src/components/ui/ModuleToggle.tsx
+++ b/app/src/components/ui/ModuleToggle.tsx
@@ -18,7 +18,7 @@ const ModuleToggle: React.FC = () => {
         className={`module-list ${activeModule === "builder" && "active"}`}
         onClick={() => {
           setActiveModule("builder");
-          setToggleUI(true);
+          setToggleUI(localStorage.getItem('navBarUi') ? localStorage.getItem('navBarUi') === 'true' : true)
         }}
       >
         <div className="icon">
@@ -30,7 +30,7 @@ const ModuleToggle: React.FC = () => {
         className={`module-list ${activeModule === "simulation" && "active"}`}
         onClick={() => {
           setActiveModule("simulation");
-          setToggleUI(true);
+          setToggleUI(localStorage.getItem('navBarUi') ? localStorage.getItem('navBarUi') === 'true' : true)
         }}
       >
         <div className="icon">
@@ -39,12 +39,11 @@ const ModuleToggle: React.FC = () => {
         <div className="module">Simulation</div>
       </div>
       <div
-        className={`module-list ${
-          activeModule === "visualization" && "active"
-        }`}
+        className={`module-list ${activeModule === "visualization" && "active"
+          }`}
         onClick={() => {
           setActiveModule("visualization");
-          setToggleUI(true);
+          setToggleUI(localStorage.getItem('navBarUi') ? localStorage.getItem('navBarUi') === 'true' : true)
         }}
       >
         <div className="icon">
diff --git a/app/src/components/ui/Tools.tsx b/app/src/components/ui/Tools.tsx
index 77e4429..fc85909 100644
--- a/app/src/components/ui/Tools.tsx
+++ b/app/src/components/ui/Tools.tsx
@@ -62,11 +62,7 @@ const Tools: React.FC = () => {
 
   // Reset activeTool whenever activeModule changes
   useEffect(() => {
-    const storedNavBar: any = localStorage.getItem("navBarUi");
-    if (storedNavBar) {
-      const parsedNavBar = JSON.parse(storedNavBar);
-      setToggleUI(parsedNavBar);
-    }
+    setToggleUI(localStorage.getItem('navBarUi') ? localStorage.getItem('navBarUi') === 'true' : true)
   }, []);
 
   useEffect(() => {
@@ -228,9 +224,8 @@ const Tools: React.FC = () => {
                 )}
                 {activeSubTool == "delete" && (
                   <div
-                    className={`tool-button ${
-                      activeTool === "delete" ? "active" : ""
-                    }`}
+                    className={`tool-button ${activeTool === "delete" ? "active" : ""
+                      }`}
                     onClick={() => {
                       setActiveTool("delete");
                     }}
@@ -349,9 +344,8 @@ const Tools: React.FC = () => {
                 <div className="split"></div>
                 <div className="draw-tools">
                   <div
-                    className={`tool-button ${
-                      activeTool === "measure" ? "active" : ""
-                    }`}
+                    className={`tool-button ${activeTool === "measure" ? "active" : ""
+                      }`}
                     onClick={() => {
                       setActiveTool("measure");
                     }}
@@ -410,9 +404,8 @@ const Tools: React.FC = () => {
               </div>
               {toggleThreeD && (
                 <div
-                  className={`tool-button ${
-                    activeTool === "play" ? "active" : ""
-                  }`}
+                  className={`tool-button ${activeTool === "play" ? "active" : ""
+                    }`}
                   onClick={() => {
                     setIsPlaying(!isPlaying);
                   }}