diff --git a/client/src/components/layout/Canvas/views/DashboardCanvas.jsx b/client/src/components/layout/Canvas/views/DashboardCanvas.jsx
index 70386aa..25effed 100644
--- a/client/src/components/layout/Canvas/views/DashboardCanvas.jsx
+++ b/client/src/components/layout/Canvas/views/DashboardCanvas.jsx
@@ -83,11 +83,9 @@ export function DashboardCanvas({ view, setView, layout, setLayout, onLayoutChan
     /* HEADER */
     <Tabs.Root 
       lazyMount 
-      // defaultValue="widget"
       value={ view }
-      // onValueChange={ setView }
-      // onValueChange={(value) => setView(value)}
-      // onValueChange={(e) => setView(e.value)}  
+
+      // Prevent navigation away from 'My Dashboard' while in Edit mode
       onValueChange={(e) => {
         const nextView = e.value;
 
diff --git a/client/src/components/layout/Sidebar/Sidebar.jsx b/client/src/components/layout/Sidebar/Sidebar.jsx
index 3ff8794..f527395 100644
--- a/client/src/components/layout/Sidebar/Sidebar.jsx
+++ b/client/src/components/layout/Sidebar/Sidebar.jsx
@@ -70,10 +70,10 @@ export default function Sidebar({ view, onChangeView }) {
         const Icon = button.icon;
         const buttonElement = (
           <Button 
-                  // key={idx} 
+                  key={idx} 
                   css={styles.buttons} 
                   onClick={() => {
-                    // setActiveButton(idx);
+                    setActiveButton(idx);
                     onChangeView(button.view); // Trigger state change in Dashboard
                   }} 
                   bg={activeButton === idx ? "primary":undefined} 
@@ -94,7 +94,6 @@ export default function Sidebar({ view, onChangeView }) {
               </span>
           </Button>
         );
-        // console.log("buttonElement is:", buttonElement)
         console.log("Returning:", !isOpen ? "Tooltip" : "Button", buttonElement);
         return !isOpen ? (
           <Tooltip key={ idx } content={ button.name } placement="right" hasArrow>