diff --git a/app/src/components/ui/Tools.tsx b/app/src/components/ui/Tools.tsx
index ede444a..82328fa 100644
--- a/app/src/components/ui/Tools.tsx
+++ b/app/src/components/ui/Tools.tsx
@@ -6,7 +6,7 @@ import { handleSaveTemplate } from "../../modules/visualization/functions/handle
 import { usePlayButtonStore } from "../../store/ui/usePlayButtonStore";
 import useTemplateStore from "../../store/ui/useTemplateStore";
 import { useSelectedZoneStore } from "../../store/visualization/useZoneStore";
-import { useActiveTool, useAddAction, useSocketStore, useToggleView, useToolMode, useActiveSubTool, useShortcutStore } from "../../store/builder/store";
+import { useActiveTool, useSocketStore, useToggleView, useToolMode, useActiveSubTool, useShortcutStore } from "../../store/builder/store";
 import { useToggleStore } from "../../store/ui/useUIToggleStore";
 import { use3DWidget, useFloatingWidget } from "../../store/visualization/useDroppedObjectsStore";
 import { useParams } from "react-router-dom";
@@ -34,7 +34,7 @@ const Tools: React.FC = () => {
     const { toggleThreeD, setToggleThreeD } = useThreeDStore();
     const { isPlaying, setIsPlaying } = usePlayButtonStore();
     const { showShortcuts } = useShortcutStore();
-    const { activeTool, setActiveTool, setToolMode, setAddAction } = useStoreHooks();
+    const { activeTool, setActiveTool, setToolMode } = useStoreHooks();
     const { setSelectedWallAsset } = useBuilderStore();
     const { setActiveSubTool, activeSubTool } = useActiveSubTool();
     const { setToggleUI } = useToggleStore();
@@ -86,7 +86,6 @@ const Tools: React.FC = () => {
 
     const resetTools = () => {
         setToolMode(null);
-        setAddAction(null);
     };
 
     const updateToolBehavior = (tool: string, is2D: boolean) => {
@@ -116,7 +115,7 @@ const Tools: React.FC = () => {
                 setToolMode("MeasurementScale");
                 break;
             case "Add pillar":
-                if (!is2D) setAddAction("Pillar");
+                if (!is2D) setToolMode("Pillar");
                 break;
             case "delete":
                 is2D ? setToolMode("2D-Delete") : setToolMode("3D-Delete");
@@ -131,7 +130,6 @@ const Tools: React.FC = () => {
         setToggleUI(toggleTo2D, toggleTo2D);
         if (toggleTo2D) {
             setSelectedWallAsset(null);
-            setAddAction(null);
         }
         setActiveTool("cursor");
         setActiveSubTool("cursor");
@@ -242,7 +240,19 @@ const Tools: React.FC = () => {
         <div className={`tools-container ${showShortcuts ? "visible" : ""}`}>
             <div className="activeDropicon">
                 {/* Tool Picker (cursor, delete, etc.) */}
-                {["cursor", "free-hand", "delete"].map((tool) => activeSubTool === tool && <ToolButton key={tool} toolId={tool} icon={getIconByTool(tool)} tooltip={`${tool} (${getTooltipShortcut(tool)})`} active={activeTool === tool} onClick={() => setActiveTool(tool)} />)}
+                {["cursor", "free-hand", "delete"].map(
+                    (tool) =>
+                        activeSubTool === tool && (
+                            <ToolButton
+                                key={tool}
+                                toolId={tool}
+                                icon={getIconByTool(tool)}
+                                tooltip={`${tool} (${getTooltipShortcut(tool)})`}
+                                active={activeTool === tool}
+                                onClick={() => setActiveTool(tool)}
+                            />
+                        )
+                )}
                 {/* Dropdown Menu */}
                 {activeModule !== "visualization" && (
                     <button id="drop-down-button" title="drop-down" className="drop-down-option-button" ref={dropdownRef} onClick={() => setOpenDrop(!openDrop)}>
@@ -308,7 +318,6 @@ const useStoreHooks = () => {
     return {
         ...useActiveTool(),
         ...useToolMode(),
-        ...useAddAction(),
     };
 };
 
diff --git a/app/src/store/builder/store.ts b/app/src/store/builder/store.ts
index 8d0a3f2..7102d40 100644
--- a/app/src/store/builder/store.ts
+++ b/app/src/store/builder/store.ts
@@ -61,11 +61,6 @@ export const useLoadingProgress = create<{
     setLoadingProgress: (x: number) => set({ loadingProgress: x }),
 }));
 
-export const useOrganization = create<any>((set: any) => ({
-    organization: "",
-    setOrganization: (x: any) => set(() => ({ organization: x })),
-}));
-
 export const useToggleView = create<any>((set: any) => ({
     toggleView: false,
     setToggleView: (x: any) => set(() => ({ toggleView: x })),
@@ -102,11 +97,6 @@ export const useNavMesh = create<any>((set: any) => ({
     setNavMesh: (x: any) => set({ navMesh: x }),
 }));
 
-export const useLayers = create<any>((set: any) => ({
-    Layers: 1,
-    setLayers: (x: any) => set(() => ({ Layers: x })),
-}));
-
 export const useCamPosition = create<any>((set: any) => ({
     camPosition: { x: undefined, y: undefined, z: undefined },
     setCamPosition: (newCamPosition: any) => set({ camPosition: newCamPosition }),
@@ -172,11 +162,6 @@ export const useResetCamera = create<any>((set: any) => ({
     setResetCamera: (x: any) => set({ resetCamera: x }),
 }));
 
-export const useAddAction = create<any>((set: any) => ({
-    addAction: null,
-    setAddAction: (x: any) => set({ addAction: x }),
-}));
-
 export const useActiveTool = create<any>((set: any) => ({
     activeTool: "cursor",
     setActiveTool: (x: any) => set({ activeTool: x }),
diff --git a/app/src/utils/shortcutkeys/handleShortcutKeys.ts b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
index a8556eb..0325868 100644
--- a/app/src/utils/shortcutkeys/handleShortcutKeys.ts
+++ b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
@@ -4,7 +4,6 @@ import { usePlayerStore, useToggleStore } from "../../store/ui/useUIToggleStore"
 import {
     useActiveSubTool,
     useActiveTool,
-    useAddAction,
     useDfxUpload,
     useRenameModeStore,
     useIsComparing,
@@ -34,7 +33,6 @@ const KeyPressListener: React.FC = () => {
     const { setToolMode } = useToolMode();
     const { isPlaying, setIsPlaying } = usePlayButtonStore();
     const { toggleView, setToggleView } = useToggleView();
-    const { setAddAction } = useAddAction();
     const { setActiveTool } = useActiveTool();
     const { clearSelectedZone } = useSelectedZoneStore();
     const { showShortcuts, setShowShortcuts } = useShortcutStore();
@@ -88,7 +86,6 @@ const KeyPressListener: React.FC = () => {
             setToggleThreeD(toggleTo2D);
             if (toggleTo2D) {
                 setSelectedWallAsset(null);
-                setAddAction(null);
                 setToggleUI(localStorage.getItem("navBarUiLeft") !== "false", localStorage.getItem("navBarUiRight") !== "false");
             } else {
                 setToggleUI(false, false);