diff --git a/src/components/PermanentDrawer.tsx b/src/components/PermanentDrawer.tsx
index 83e951b..322059e 100644
--- a/src/components/PermanentDrawer.tsx
+++ b/src/components/PermanentDrawer.tsx
@@ -11,6 +11,7 @@ import * as React from 'react';
 import config from '../etc/config.json';
 
 const drawerWidth = 340;
+const toolbarHeight = 64; // TODO Will this work everywhere?
 
 type Props = {
   menu?: React.ReactNode;
@@ -51,9 +52,17 @@ export default function PermanentDrawer({ menu, title, children }: Props) {
           <Box sx={{ overflow: 'auto' }}>{menu}</Box>
         </Drawer>
       )}
-      <Box component="main" sx={{ flexGrow: 1, p: 3 }}>
+      <Box component="main" sx={{ flexGrow: 1, pt: 0 }}>
         <Toolbar />
-        {children}
+        <Box
+          sx={{
+            width: `calc(100vw - ${menu ? drawerWidth : 0}px)`,
+            height: `calc(100vh - ${toolbarHeight}px)`,
+            overflow: 'auto',
+          }}
+        >
+          {children}
+        </Box>
       </Box>
     </Box>
   );
diff --git a/src/components/threeJs/Canvas.tsx b/src/components/threeJs/Canvas.tsx
index 6de3a78..e4c8668 100644
--- a/src/components/threeJs/Canvas.tsx
+++ b/src/components/threeJs/Canvas.tsx
@@ -18,33 +18,31 @@ type Props = JSX.IntrinsicElements['group'] & {
 
 export default function ThreeJsCanvas({ geometry, onSelect }: Props) {
   return (
-    <div style={{ height: '80vh' }}>
-      <Canvas
-        shadows
-        camera={{
-          fov: 35,
-          zoom: 1.3,
-          near: 0.1,
-          far: 1000,
-          position: [6, 6, 6],
-        }}
-      >
-        <ContactShadows frames={1} />
-        <CameraControls />
-        <Environment />
-        <Center>
-          <Model
-            geometry={geometry}
-            onClick={(e) => {
-              onSelect(e);
-              e.stopPropagation();
-            }}
-          />
-        </Center>
-        <GizmoHelper alignment="bottom-right" margin={[80, 80]}>
-          <GizmoViewcube />
-        </GizmoHelper>
-      </Canvas>
-    </div>
+    <Canvas
+      shadows
+      camera={{
+        fov: 35,
+        zoom: 1.3,
+        near: 0.1,
+        far: 1000,
+        position: [6, 6, 6],
+      }}
+    >
+      <ContactShadows frames={1} />
+      <CameraControls />
+      <Environment />
+      <Center>
+        <Model
+          geometry={geometry}
+          onClick={(e) => {
+            onSelect(e);
+            e.stopPropagation();
+          }}
+        />
+      </Center>
+      <GizmoHelper alignment="bottom-right" margin={[80, 80]}>
+        <GizmoViewcube />
+      </GizmoHelper>
+    </Canvas>
   );
 }