diff --git a/client/src/components/layout/Canvas/Canvas.jsx b/client/src/components/layout/Canvas/Canvas.jsx
index 4e0df5f..a8789f5 100644
--- a/client/src/components/layout/Canvas/Canvas.jsx
+++ b/client/src/components/layout/Canvas/Canvas.jsx
@@ -11,10 +11,10 @@ import { DASHBOARD_VIEWS } from "@/constants/viewKeys";
 export default function Canvas({...props}) {
   const { view } = props;
     return (
-        <Box height="100%" width="100%">
+        <>
             {/* Check if view is a tab inside the Canvas Header */}
             { DASHBOARD_VIEWS.includes(view) && (
-                <HomeCanvas {...props}/>
+                <HomeCanvas width="100%" height="100%" {...props}/>
             )}
             {view === "global" && <GlobalMapCanvas />}
             {view === "regional" && <RegionalMapCanvas />}
@@ -22,6 +22,6 @@ export default function Canvas({...props}) {
             {view === "admin" && <AdminCanvas />}
             {view === "account" && <AccountCanvas />}
             {view === "settings" && <SettingsCanvas />}
-        </Box>
+        </>
     );
 }
\ No newline at end of file
diff --git a/client/src/components/layout/Canvas/views/HomeCanvas.jsx b/client/src/components/layout/Canvas/views/HomeCanvas.jsx
index d290845..a562bb6 100644
--- a/client/src/components/layout/Canvas/views/HomeCanvas.jsx
+++ b/client/src/components/layout/Canvas/views/HomeCanvas.jsx
@@ -13,7 +13,7 @@ import DeleteAllButton from "../components/DeleteAllButton";
 
 export function HomeCanvas({...props}) {
   // deconstructing props
-  const { view, layout, setLayout, setOriginalLayout, onLayoutChange, onChangeView, onCancel, 
+  const { width, height, view, layout, setLayout, setOriginalLayout, onLayoutChange, onChangeView, onCancel, 
     isDelete, setIsDelete, isEditable, setIsEditable, widgetArray, setWidgetArray } = props;
 
   const onAddWidget = (ID) => {
@@ -90,6 +90,8 @@ export function HomeCanvas({...props}) {
   return (
     /* HEADER */
     <Tabs.Root 
+      width={width}
+      height={height}
       lazyMount 
       value={ view }
       variant="line"
diff --git a/client/src/components/layout/Dashboard.jsx b/client/src/components/layout/Dashboard.jsx
index 73f7e7f..8541872 100644
--- a/client/src/components/layout/Dashboard.jsx
+++ b/client/src/components/layout/Dashboard.jsx
@@ -51,7 +51,6 @@ export default function Dashboard() {
   const headerProps = { onChangeView: handleViewChange };
   
   return (
-    <>
       <Grid css={styles}
         templateRows="1fr 11fr"
         // templateColumns="1fr 20fr"
@@ -69,6 +68,5 @@ export default function Dashboard() {
           <Canvas {...canvasProps}/>
         </GridItem>
       </Grid>
-    </>
   );
 }
\ No newline at end of file