diff --git a/app/src/modules/simulation/roboticArm/instances/animator/roboticArmAnimator.tsx b/app/src/modules/simulation/roboticArm/instances/animator/roboticArmAnimator.tsx
index 1ad53de..a9681d6 100644
--- a/app/src/modules/simulation/roboticArm/instances/animator/roboticArmAnimator.tsx
+++ b/app/src/modules/simulation/roboticArm/instances/animator/roboticArmAnimator.tsx
@@ -259,10 +259,9 @@ function RoboticArmAnimator({ HandleCallback, restPosition, ikSolver, targetBone
         }
     });
 
-    //Helper to Visible the Circle and Curve
     return (
         <>
-            {customCurvePoints && customCurvePoints?.length >= 2 && currentPath && isPlaying && (
+            {/* {customCurvePoints && customCurvePoints?.length >= 2 && currentPath && isPlaying && (
                 <mesh rotation={armBot.rotation} position={armBot.position} visible={false}>
                     <Line
                         points={customCurvePoints.map((p) => [p.x, p.y, p.z] as [number, number, number])}
@@ -277,19 +276,16 @@ function RoboticArmAnimator({ HandleCallback, restPosition, ikSolver, targetBone
                 rotation={[armBot.rotation[0], armBot.rotation[1], armBot.rotation[2]]}
                 visible={false}
             >
-                {/* Green ring */}
                 <mesh rotation={[-Math.PI / 2, 0, 0]} visible={false}>
                     <ringGeometry args={[CIRCLE_RADIUS, CIRCLE_RADIUS + 0.02, 64]} />
                     <meshBasicMaterial color="green" side={THREE.DoubleSide} />
                 </mesh>
 
-                {/* Markers at 90°, 180°, 270°, 360° */}
                 {[90, 180, 270, 360].map((degree, index) => {
                     const rad = ((degree) * Math.PI) / 180;
                     const x = CIRCLE_RADIUS * Math.cos(rad);
                     const z = CIRCLE_RADIUS * Math.sin(rad);
-                    const y = 0; // same plane as the ring (Y axis)
-
+                    const y = 0;
                     return (
                         <mesh key={index} position={[x, y, z]}>
                             <sphereGeometry args={[0.05, 16, 16]} />
@@ -302,7 +298,7 @@ function RoboticArmAnimator({ HandleCallback, restPosition, ikSolver, targetBone
                     const rad = ((degree) * Math.PI) / 180;
                     const x = CIRCLE_RADIUS * Math.cos(rad);
                     const z = CIRCLE_RADIUS * Math.sin(rad);
-                    const y = 0.15; // lift the text slightly above the ring
+                    const y = 0.15;
 
                     return (
                         <Text
@@ -317,9 +313,7 @@ function RoboticArmAnimator({ HandleCallback, restPosition, ikSolver, targetBone
                         </Text>
                     );
                 })}
-
-
-            </group>
+            </group> */}
 
         </>
     );
diff --git a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
index f773b7c..51f044d 100644
--- a/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
+++ b/app/src/modules/simulation/roboticArm/instances/armInstance/roboticArmInstance.tsx
@@ -10,6 +10,7 @@ import { useProductStore } from '../../../../../store/simulation/useProductStore
 import { useTriggerHandler } from '../../../triggers/triggerHandler/useTriggerHandler';
 import { useSceneContext } from '../../../../scene/sceneContext';
 import { useProductContext } from '../../../products/productContext';
+import { Preload } from '@react-three/drei';
 
 function RoboticArmInstance({ armBot }: { readonly armBot: ArmBotStatus }) {
 
@@ -392,7 +393,7 @@ function RoboticArmInstance({ armBot }: { readonly armBot: ArmBotStatus }) {
         <>
             {!isReset && isPlaying && (
                 <>
-                    <IKInstance modelUrl={armModel} setIkSolver={setIkSolver} ikSolver={ikSolver} armBot={armBot} groupRef={groupRef} />
+                    <IKInstance modelUrl={armModel} setIkSolver={setIkSolver} armBot={armBot} groupRef={groupRef} />
                     <RoboticArmAnimator
                         HandleCallback={HandleCallback}
                         restPosition={restPosition}
diff --git a/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx b/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx
index f448baf..3d4e956 100644
--- a/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx
+++ b/app/src/modules/simulation/roboticArm/instances/ikInstance/ikInstance.tsx
@@ -1,21 +1,19 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useMemo } from 'react'
 import * as THREE from "three";
 import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader";
 import { clone } from "three/examples/jsm/utils/SkeletonUtils";
-import { useLoader, useThree } from "@react-three/fiber";
-import { CCDIKSolver, CCDIKHelper, } from "three/examples/jsm/animation/CCDIKSolver";
-import { TransformControls } from '@react-three/drei';
+import { useLoader } from "@react-three/fiber";
+import { CCDIKSolver, CCDIKHelper } from "three/examples/jsm/animation/CCDIKSolver";
 
 type IKInstanceProps = {
     modelUrl: string;
-    ikSolver: any;
     setIkSolver: any
     armBot: ArmBotStatus;
     groupRef: any;
 };
-function IKInstance({ modelUrl, setIkSolver, ikSolver, armBot, groupRef }: IKInstanceProps) {
-    const { scene } = useThree()
+
+function IKInstance({ modelUrl, setIkSolver, armBot, groupRef }: IKInstanceProps) {
     const gltf = useLoader(GLTFLoader, modelUrl, (loader) => {
         const draco = new DRACOLoader();
         draco.setDecoderPath("https://cdn.jsdelivr.net/npm/three@0.160.0/examples/jsm/libs/draco/");
@@ -24,7 +22,6 @@ function IKInstance({ modelUrl, setIkSolver, ikSolver, armBot, groupRef }: IKIns
     const cloned = useMemo(() => clone(gltf?.scene), [gltf]);
     const targetBoneName = "Target";
     const skinnedMeshName = "link_0";
-    const [selectedArm, setSelectedArm] = useState<THREE.Group>();
 
     useEffect(() => {
         if (!gltf) return;
@@ -66,28 +63,21 @@ function IKInstance({ modelUrl, setIkSolver, ikSolver, armBot, groupRef }: IKIns
         const solver = new CCDIKSolver(OOI.Skinned_Mesh, iks);
         setIkSolver(solver);
 
-        const helper = new CCDIKHelper(OOI.Skinned_Mesh, iks, 0.05)
-
-        setSelectedArm(OOI.Target_Bone);
+        // const helper = new CCDIKHelper(OOI.Skinned_Mesh, iks, 0.05)
 
         // scene.add(helper);
 
-    }, [cloned, gltf, setIkSolver]);
+    }, [cloned, gltf]);
 
     return (
-        <>
-            <group ref={groupRef} position={armBot.position} rotation={armBot.rotation} onClick={() => {
-                setSelectedArm(groupRef.current?.getObjectByName(targetBoneName))
-            }}>
-                <primitive
-                    uuid={`${armBot.modelUuid}_IK`}
-                    object={cloned}
-                    scale={[1, 1, 1]}
-                    name={armBot.modelName}
-                />
-            </group>
-            {/* {selectedArm && <TransformControls object={selectedArm} />} */}
-        </>
+        <group ref={groupRef} position={armBot.position} rotation={armBot.rotation}>
+            <primitive
+                uuid={`${armBot.modelUuid}_IK`}
+                object={cloned}
+                scale={[1, 1, 1]}
+                name={armBot.modelName}
+            />
+        </group>
     )
 }
 
diff --git a/app/src/modules/simulation/roboticArm/instances/roboticArmInstances.tsx b/app/src/modules/simulation/roboticArm/instances/roboticArmInstances.tsx
index b1295a3..f0958b3 100644
--- a/app/src/modules/simulation/roboticArm/instances/roboticArmInstances.tsx
+++ b/app/src/modules/simulation/roboticArm/instances/roboticArmInstances.tsx
@@ -1,18 +1,20 @@
+import { useViewSceneStore } from "../../../../store/builder/store";
 import { useSceneContext } from "../../../scene/sceneContext";
 import RoboticArmInstance from "./armInstance/roboticArmInstance";
-// import RoboticArmContentUi from "../../ui3d/RoboticArmContentUi";
+import RoboticArmContentUi from "../../ui3d/RoboticArmContentUi";
 import React from "react";
 
 function RoboticArmInstances() {
-    const {armBotStore} = useSceneContext();
+    const { armBotStore } = useSceneContext();
     const { armBots } = armBotStore();
+    const { viewSceneLabels } = useViewSceneStore();
 
     return (
         <>
             {armBots?.map((robot: ArmBotStatus) => (
                 <React.Fragment key={robot.modelUuid}>
                     <RoboticArmInstance armBot={robot} />
-                    {/* <RoboticArmContentUi roboticArm={robot} /> */}
+                    {viewSceneLabels && <RoboticArmContentUi roboticArm={robot} />}
                 </React.Fragment>
             ))}
         </>
diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx
index cc984af..428930f 100644
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -34,6 +34,7 @@ import { setFloorItemApi } from "../services/factoryBuilder/assest/floorAsset/se
 import { useAssetsStore } from "../store/builder/useAssetStore";
 import ComparisonSceneProvider from "../components/layout/scenes/ComparisonSceneProvider";
 import MainSceneProvider from "../components/layout/scenes/MainSceneProvider";
+import { useEventsStore } from "../store/simulation/useEventsStore";
 
 const Project: React.FC = () => {
   let navigate = useNavigate();
@@ -46,7 +47,8 @@ const Project: React.FC = () => {
   const { setWallItems } = useWallItems();
   const { setZones } = useZones();
   const { isVersionSaved } = useSaveVersion();
-  const { setProducts } = useProductStore();
+  const { setProducts, clearProducts } = useProductStore();
+  const { clearEvents } = useEventsStore();
   const { projectId } = useParams();
   const { setProjectName } = useProjectName();
 
@@ -105,6 +107,8 @@ const Project: React.FC = () => {
     setWallItems([]);
     setZones([]);
     setProducts([]);
+    clearProducts();
+    clearEvents();
     setActiveModule("builder");
     const email = localStorage.getItem("email");
     if (email) {
diff --git a/app/src/store/simulation/useEventsStore.ts b/app/src/store/simulation/useEventsStore.ts
index dbba722..105b0b5 100644
--- a/app/src/store/simulation/useEventsStore.ts
+++ b/app/src/store/simulation/useEventsStore.ts
@@ -7,6 +7,7 @@ type EventsStore = {
     // Event-level actions
     addEvent: (event: EventsSchema) => void;
     removeEvent: (modelUuid: string) => void;
+    clearEvents: () => void;
     updateEvent: (modelUuid: string, updates: Partial<EventsSchema>) => EventsSchema | undefined;
 
     // Point-level actions
@@ -61,6 +62,12 @@ export const useEventsStore = create<EventsStore>()(
             });
         },
 
+        clearEvents: () => {
+            set((state) => {
+                state.events = [];
+            });
+        },
+
         updateEvent: (modelUuid, updates) => {
             let updatedEvent: EventsSchema | undefined;
             set((state) => {
diff --git a/app/src/store/simulation/useProductStore.ts b/app/src/store/simulation/useProductStore.ts
index ec80d50..7270233 100644
--- a/app/src/store/simulation/useProductStore.ts
+++ b/app/src/store/simulation/useProductStore.ts
@@ -7,6 +7,7 @@ type ProductsStore = {
     // Product-level actions
     addProduct: (productName: string, productUuid: string) => void;
     setProducts: (products: productsSchema) => void;
+    clearProducts: () => void;
     removeProduct: (productUuid: string) => void;
     updateProduct: (productUuid: string, updates: Partial<{ productName: string; eventDatas: EventsSchema[] }>) => void;
 
@@ -99,6 +100,12 @@ export const useProductStore = create<ProductsStore>()(
             });
         },
 
+        clearProducts: () => {
+            set((state) => {
+                state.products = [];
+            });
+        },
+
         removeProduct: (productUuid) => {
             set((state) => {
                 state.products = state.products.filter(p => p.productUuid !== productUuid);