diff --git a/README.md b/README.md
index 0ca3a05e..5d791fee 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Discord][discord-image]][discord-url]
 [![Developed at Klarna][klarna-image]][klarna-url]
 
-Gram is Klarna's own [threat model][owasp-tm] diagramming tool developed internally by Klarna's Secure Development team. It is a webapp for engineers to collaboratively create threat models for their systems, providing a easy-to-understand way to document a system as a dataflow diagram with threats/controls attached.
+Gram is Klarna's own [threat model][owasp-tm] diagramming tool developed internally by Klarna's Secure Development team. It is a web app for engineers to collaboratively create threat models for their systems, providing a easy-to-understand way to document a system as a dataflow diagram with threats/controls attached.
 
 ![Screenshot](screenshot.png)
 
diff --git a/app/src/App.js b/app/src/App.js
index e96a78ab..5278b543 100644
--- a/app/src/App.js
+++ b/app/src/App.js
@@ -95,8 +95,8 @@ export default function App() {
             sx={{
               display: "flex",
               flexDirection: "column",
-              height: "calc(100% - 64px)", // 64px is the height of Navbar
-              maxHeight: "calc(100% - 64px)",
+              height: isFramed ? "100%" : "calc(100% - 64px)", // 64px is the height of Navbar
+              maxHeight: isFramed ? "100%" : "calc(100% - 64px)", // 64px is the height of Navbar
               width: "100%",
             }}
           >
diff --git a/app/src/components/admin/AdminPage.css b/app/src/components/admin/AdminPage.css
deleted file mode 100644
index 7d294201..00000000
--- a/app/src/components/admin/AdminPage.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.row {
-  display: flex;
-  justify-content: space-between;
-  gap: 15px;
-}
-
-.column {
-  flex: auto;
-}
-
-#intro {
-  margin-bottom: 30px;
-}
diff --git a/app/src/components/admin/AdminPage.js b/app/src/components/admin/AdminPage.js
index 9b4eaa7c..194ddc25 100644
--- a/app/src/components/admin/AdminPage.js
+++ b/app/src/components/admin/AdminPage.js
@@ -1,10 +1,18 @@
-import { Button } from "@mui/material";
+import {
+  Button,
+  Typography,
+  ButtonGroup,
+  List,
+  Link,
+  ListItemText,
+  ListItem,
+} from "@mui/material";
 import React from "react";
 import { useSetRolesMutation } from "../../api/gram/admin";
 import { useGetUserQuery } from "../../api/gram/user";
 import { useGetTemplatesQuery } from "../../api/gram/model";
-import "./AdminPage.css";
 import { CenteredPage } from "../elements/CenteredPage";
+import Grid from "@mui/material/Grid2";
 
 export default function AdminPage() {
   const { data: user } = useGetUserQuery();
@@ -14,52 +22,53 @@ export default function AdminPage() {
 
   return (
     <CenteredPage>
-      <h1 id="intro" className="with-bottom-padding">
-        Admin{" "}
-        {user?.roles.includes("admin")
-          ? ""
-          : "(You are not admin, some of the functions here won't work)"}
-      </h1>
+      <Grid container spacing={2} size={12}>
+        <Typography variant="h5">Admin</Typography>
+        <Typography variant="subtitle1">
+          {user?.roles.includes("admin")
+            ? ""
+            : "(You are not admin, some of the functions here won't work)"}
+        </Typography>
+        <Typography variant="body" sx={{ color: "#aaa" }}>
+          This page contains some admin widgets to help with day-to-day
+          operations of Gram. By design, these <b>shouldn't</b> be anything too
+          sensitive, just stuff to help debug / maintain the application.
+        </Typography>
+      </Grid>
+      <Grid container spacing={2} size={6}>
+        <Typography variant="h5">Change Role</Typography>
+        <Typography variant="body" sx={{ color: "#aaa" }}>
+          Useful if you need to debug authz. Use the below form to set your new
+          roles. Login again to get back your admin role.
+        </Typography>
 
-      <p className="dimmed">
-        This page contains some admin widgets to help with day-to-day operations
-        of Gram. By design, these <b>shouldn't</b> be anyhing too sensitive,
-        just stuff to help debug / maintain the application.
-      </p>
-
-      <div className="row">
-        <div className="column">
-          <h2>Change Role</h2>
-          <div className="spacer"></div>
-          <p className="dimmed">
-            Useful if you need to debug authz. Use the below form to set your
-            new roles. Login again to get back your admin role.
-          </p>
-          <div>
-            <Button onClick={() => setRoles({ roles: ["user"] })}>
-              Become User Role
-            </Button>
-            <Button onClick={() => setRoles({ roles: ["user", "reviewer"] })}>
-              Become Reviewer + User Role
-            </Button>
-          </div>
-        </div>
-        <div className="column">
-          <h2>Templates</h2>
-          <div className="spacer"></div>
-          <p className="dimmed">Models listed as templates.</p>
-          <div>
-            <ul>
-              {templates &&
-                templates.map((template) => (
-                  <li>
-                    <a href={`/model/${template.id}`}> {template.version}</a>
-                  </li>
-                ))}
-            </ul>
-          </div>
-        </div>
-      </div>
+        <ButtonGroup
+          variant="contained"
+          aria-label="contained primary button group"
+        >
+          <Button onClick={() => setRoles({ roles: ["user"] })}>
+            Become User Role
+          </Button>
+          <Button onClick={() => setRoles({ roles: ["user", "reviewer"] })}>
+            Become Reviewer + User Role
+          </Button>
+        </ButtonGroup>
+      </Grid>
+      <Grid>
+        <Typography variant="h5">Templates</Typography>
+        <Typography variant="body" sx={{ color: "#aaa" }}>
+          Models listed as templates.
+        </Typography>
+        <List>
+          {templates?.map((template) => (
+            <ListItem key={template.id}>
+              <Link href={`/model/${template.id}`}>
+                <ListItemText primary={template.version} />
+              </Link>
+            </ListItem>
+          ))}
+        </List>
+      </Grid>
     </CenteredPage>
   );
 }
diff --git a/app/src/components/elements/CenteredPage.js b/app/src/components/elements/CenteredPage.js
index 58f178f6..a33930d9 100644
--- a/app/src/components/elements/CenteredPage.js
+++ b/app/src/components/elements/CenteredPage.js
@@ -1,20 +1,18 @@
 import React from "react";
-import { useIsFramed } from "../../hooks/useIsFramed";
 import Grid from "@mui/material/Grid2";
 
-export function CenteredPage({ children }) {
-  const isFramed = useIsFramed();
+export function CenteredPage({ children, marginTop = true }) {
   return (
     <Grid
       container
-      spacing={0}
+      columns={12}
+      spacing={2}
       direction="row"
-      alignItems="center"
-      justifyContent="center"
+      marginTop={marginTop ? "20px" : ""}
+      marginX={"auto"}
+      maxWidth={"80%"}
     >
-      <Grid width={"80%"} marginTop={isFramed ? "" : "84px"}>
-        {children}
-      </Grid>
+      {children}
     </Grid>
   );
 }
diff --git a/app/src/components/home/Home.js b/app/src/components/home/Home.js
index e710dd0c..0f49031b 100644
--- a/app/src/components/home/Home.js
+++ b/app/src/components/home/Home.js
@@ -21,58 +21,52 @@ export default function Home() {
 
   return (
     <CenteredPage>
-      <Grid container spacing={2} columns={12}>
+      <Grid
+        size={6}
+        maxHeight="88vh"
+        sx={{ display: "flex", flexFlow: "column" }}
+      >
+        <Typography variant="h5">Recent Threat Models</Typography>
+        <Typography className="dimmed">
+          Threat models you recently interacted with
+        </Typography>
+        <ModelList models={recentModels} error={isError} pending={isLoading} />
+      </Grid>
+      {user?.teams?.length > 0 && (
         <Grid
           size={6}
+          columns={1}
           maxHeight="88vh"
           sx={{ display: "flex", flexFlow: "column" }}
         >
-          <Typography variant="h5">Recent Threat Models</Typography>
+          <Typography variant="h5">Team Systems</Typography>
           <Typography className="dimmed">
-            Threat models you recently interacted with
+            Systems owned by the accountable teams you're in
           </Typography>
-          <ModelList
-            models={recentModels}
-            error={isError}
-            pending={isLoading}
-          />
-        </Grid>
-        {user?.teams?.length > 0 && (
-          <Grid
+          <Box
             size={6}
-            columns={1}
-            maxHeight="88vh"
-            sx={{ display: "flex", flexFlow: "column" }}
+            sx={{
+              overflow: "auto",
+              marginTop: "25px",
+              display: "flex",
+              flexDirection: "column",
+            }}
           >
-            <Typography variant="h5">Team Systems</Typography>
-            <Typography className="dimmed">
-              Systems owned by the accountable teams you're in
-            </Typography>
-            <Box
-              size={6}
-              sx={{
-                overflow: "auto",
-                marginTop: "25px",
-                display: "flex",
-                flexDirection: "column",
-              }}
-            >
-              <Grid container spacing={2} columns={1} style={{ flex: "2" }}>
-                {user?.teams &&
-                  user.teams.map((team, i) => (
-                    <Grid size={1}>
-                      <TeamSystemsPageList
-                        key={team.id}
-                        teamId={team.id}
-                        pagesize={user?.teams.length > 1 ? 5 : 10}
-                      />
-                    </Grid>
-                  ))}
-              </Grid>
-            </Box>
-          </Grid>
-        )}
-      </Grid>
+            <Grid container spacing={2} columns={1} style={{ flex: "2" }}>
+              {user?.teams &&
+                user.teams.map((team, i) => (
+                  <Grid size={1}>
+                    <TeamSystemsPageList
+                      key={team.id}
+                      teamId={team.id}
+                      pagesize={user?.teams.length > 1 ? 5 : 10}
+                    />
+                  </Grid>
+                ))}
+            </Grid>
+          </Box>
+        </Grid>
+      )}
     </CenteredPage>
   );
 }
diff --git a/app/src/components/home/__snapshots__/Home.spec.js.snap b/app/src/components/home/__snapshots__/Home.spec.js.snap
index 54b203fe..2d799d28 100644
--- a/app/src/components/home/__snapshots__/Home.spec.js.snap
+++ b/app/src/components/home/__snapshots__/Home.spec.js.snap
@@ -6,49 +6,41 @@ exports[`Home renders Home 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row css-1fn4916-MuiGrid2-root"
+        class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-imdfze-MuiGrid2-root"
       >
         <div
-          class="MuiGrid2-root MuiGrid2-direction-xs-row css-1lqpupi-MuiGrid2-root"
+          class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-105iddl-MuiGrid2-root"
         >
+          <h5
+            class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
+          >
+            Recent Threat Models
+          </h5>
+          <p
+            class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
+          >
+            Threat models you recently interacted with
+          </p>
           <div
-            class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-ubb9a5-MuiGrid2-root"
+            class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
+            style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
           >
             <div
-              class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-105iddl-MuiGrid2-root"
+              class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
             >
-              <h5
-                class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
-              >
-                Recent Threat Models
-              </h5>
-              <p
-                class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
-              >
-                Threat models you recently interacted with
-              </p>
-              <div
-                class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
-                style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
+              <ul
+                class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
               >
                 <div
-                  class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
+                  class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
                 >
-                  <ul
-                    class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
+                  <span
+                    class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
                   >
-                    <div
-                      class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
-                    >
-                      <span
-                        class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
-                      >
-                        No models exist
-                      </span>
-                    </div>
-                  </ul>
+                    No models exist
+                  </span>
                 </div>
-              </div>
+              </ul>
             </div>
           </div>
         </div>
@@ -57,49 +49,41 @@ exports[`Home renders Home 1`] = `
   </body>,
   "container": <div>
     <div
-      class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row css-1fn4916-MuiGrid2-root"
+      class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-imdfze-MuiGrid2-root"
     >
       <div
-        class="MuiGrid2-root MuiGrid2-direction-xs-row css-1lqpupi-MuiGrid2-root"
+        class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-105iddl-MuiGrid2-root"
       >
+        <h5
+          class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
+        >
+          Recent Threat Models
+        </h5>
+        <p
+          class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
+        >
+          Threat models you recently interacted with
+        </p>
         <div
-          class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-ubb9a5-MuiGrid2-root"
+          class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
+          style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
         >
           <div
-            class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-105iddl-MuiGrid2-root"
+            class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
           >
-            <h5
-              class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
-            >
-              Recent Threat Models
-            </h5>
-            <p
-              class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
-            >
-              Threat models you recently interacted with
-            </p>
-            <div
-              class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
-              style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
+            <ul
+              class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
             >
               <div
-                class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
+                class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
               >
-                <ul
-                  class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
+                <span
+                  class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
                 >
-                  <div
-                    class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
-                    >
-                      No models exist
-                    </span>
-                  </div>
-                </ul>
+                  No models exist
+                </span>
               </div>
-            </div>
+            </ul>
           </div>
         </div>
       </div>
diff --git a/app/src/components/model/Model.js b/app/src/components/model/Model.js
index 08d29226..4018f2f9 100644
--- a/app/src/components/model/Model.js
+++ b/app/src/components/model/Model.js
@@ -27,8 +27,12 @@ import { useSelector } from "react-redux";
 function setGridArea(
   leftPanelCollapsed,
   rightPanelCollapsed,
-  bottomPanelCollapsed
+  bottomPanelCollapsed,
+  isFramed
 ) {
+  if (isFramed) {
+    return `'board board board' 'board board board'`;
+  }
   // Add first row
   let firstRow = `'${leftPanelCollapsed ? "board" : "left"} board ${
     rightPanelCollapsed ? "board" : "right"
@@ -139,7 +143,8 @@ export function Model() {
           gridTemplateAreas: setGridArea(
             leftPanelCollapsed,
             rightPanelCollapsed,
-            bottomPanelCollapsed
+            bottomPanelCollapsed,
+            isFramed
           ),
         }}
       >
diff --git a/app/src/components/model/ModelPreview.js b/app/src/components/model/ModelPreview.js
index e120b0d1..da67c888 100644
--- a/app/src/components/model/ModelPreview.js
+++ b/app/src/components/model/ModelPreview.js
@@ -1,9 +1,13 @@
+import { Box } from "@mui/material";
+
 export function ModelPreview({ modelId, ...props }) {
   return (
-    <iframe
-      title="Model Preview"
-      {...props}
-      src={document.location.origin + "/model/" + modelId}
-    ></iframe>
+    <Box>
+      <iframe
+        title="Model Preview"
+        {...props}
+        src={document.location.origin + "/model/" + modelId}
+      ></iframe>
+    </Box>
   );
 }
diff --git a/app/src/components/model/New.js b/app/src/components/model/New.js
index c3f77b06..0267f730 100644
--- a/app/src/components/model/New.js
+++ b/app/src/components/model/New.js
@@ -7,7 +7,7 @@ import InputLabel from "@mui/material/InputLabel";
 import MenuItem from "@mui/material/MenuItem";
 import Select from "@mui/material/Select";
 import TextField from "@mui/material/TextField";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import {
   useCreateModelMutation,
@@ -92,115 +92,125 @@ export function NewWizard() {
   // Renders
   // -----------------------------------------------------------------------
 
+  const refContainer = useRef();
+  const [dimensions, setDimensions] = useState({
+    width: 0,
+    height: 0,
+  });
+  useEffect(() => {
+    if (refContainer.current) {
+      setDimensions({
+        width: refContainer.current.offsetWidth,
+        height: refContainer.current.offsetHeight,
+      });
+    }
+  }, [refContainer]);
+  console.log({ dimensions });
   return (
     <CenteredPage>
-      <Grid container>
-        <Grid size={3} id="new-wizard">
-          {result && result.error && (
-            <ErrorLine message="Something went wrong while trying to create the model" />
-          )}
-
-          <h1 className="title">New Threat Model</h1>
-          {system && system.system && systemId && (
-            <h2 className="subtitle">{system.system.displayName}</h2>
-          )}
-          {(models?.length > 0 || templates?.length > 0) && (
-            <h3>Import from another Gram model (optional)</h3>
-          )}
-          {templates?.length > 0 && (
-            <FormControl disabled={!!sourceModelId}>
-              <InputLabel id="template-import">
-                Import from a template
-              </InputLabel>
-              <Select
-                labelId="template-import"
-                id="template-import"
-                label="Import from a template"
-                onChange={onChangeTemplate}
-                defaultValue=""
-                value={sourceTemplateId}
-              >
-                <MenuItem sx={{ minWidth: "100%" }} value="">
-                  Do not import
+      <Grid size={6} id="new-wizard">
+        {result && result.error && (
+          <ErrorLine message="Something went wrong while trying to create the model" />
+        )}
+
+        <h1 className="title">New Threat Model</h1>
+        {system && system.system && systemId && (
+          <h2 className="subtitle">{system.system.displayName}</h2>
+        )}
+        {(models?.length > 0 || templates?.length > 0) && (
+          <h3>Import from another Gram model (optional)</h3>
+        )}
+        {templates?.length > 0 && (
+          <FormControl disabled={!!sourceModelId}>
+            <InputLabel id="template-import">Import from a template</InputLabel>
+            <Select
+              labelId="template-import"
+              id="template-import"
+              label="Import from a template"
+              onChange={onChangeTemplate}
+              defaultValue=""
+              value={sourceTemplateId}
+            >
+              <MenuItem sx={{ minWidth: "100%" }} value="">
+                Do not import
+              </MenuItem>
+              {templates.map((template) => (
+                <MenuItem key={template.id} value={template.id}>
+                  {template.version}
                 </MenuItem>
-                {templates.map((template) => (
-                  <MenuItem key={template.id} value={template.id}>
-                    {template.version}
-                  </MenuItem>
-                ))}
-              </Select>
-              {!!sourceModelId && (
-                <FormHelperText>
-                  Disabled because you selected previous model
-                </FormHelperText>
-              )}
-            </FormControl>
-          )}
-          {system && system.pending && <Loading />}
-          {systemId && (
-            <>
-              {templates?.length > 0 && models?.length ? (
-                <Divider>OR</Divider>
-              ) : (
-                <></>
-              )}
-              {models?.length > 0 && (
-                <FormControl disabled={!!sourceTemplateId}>
-                  <InputLabel id="modelImport">
-                    Import from a previous threat model for this system
-                  </InputLabel>
-                  <Select
-                    labelId="modelImport"
-                    id="modelImport"
-                    label="Import from a previous threat model for this system"
-                    onChange={onChangeImport}
-                    defaultValue=""
-                  >
-                    <MenuItem value="">Do not import</MenuItem>
-                    {models &&
-                      models.map((model) => (
-                        <MenuItem key={model.id} value={model.id}>
-                          {model.version}
-                        </MenuItem>
-                      ))}
-                  </Select>
-                  {!!sourceTemplateId && (
-                    <FormHelperText>
-                      Disabled because you selected a template.
-                    </FormHelperText>
-                  )}
-                </FormControl>
-              )}
-            </>
-          )}
-
-          <h3>Provide a version name to identify this threat model by.</h3>
-          <TextField
-            onChange={onChangeVersion}
-            required
-            label="Enter Version Name"
-            inputProps={{ maxLength: 32, spellCheck: "false" }}
-            type="text"
-            placeholder={`eg. ${version}`}
-            defaultValue={version}
+              ))}
+            </Select>
+            {!!sourceModelId && (
+              <FormHelperText>
+                Disabled because you selected previous model
+              </FormHelperText>
+            )}
+          </FormControl>
+        )}
+        {system && system.pending && <Loading />}
+        {systemId && (
+          <>
+            {templates?.length > 0 && models?.length ? (
+              <Divider>OR</Divider>
+            ) : (
+              <></>
+            )}
+            {models?.length > 0 && (
+              <FormControl disabled={!!sourceTemplateId}>
+                <InputLabel id="modelImport">
+                  Import from a previous threat model for this system
+                </InputLabel>
+                <Select
+                  labelId="modelImport"
+                  id="modelImport"
+                  label="Import from a previous threat model for this system"
+                  onChange={onChangeImport}
+                  defaultValue=""
+                >
+                  <MenuItem value="">Do not import</MenuItem>
+                  {models &&
+                    models.map((model) => (
+                      <MenuItem key={model.id} value={model.id}>
+                        {model.version}
+                      </MenuItem>
+                    ))}
+                </Select>
+                {!!sourceTemplateId && (
+                  <FormHelperText>
+                    Disabled because you selected a template.
+                  </FormHelperText>
+                )}
+              </FormControl>
+            )}
+          </>
+        )}
+
+        <h3>Provide a version name to identify this threat model by.</h3>
+        <TextField
+          onChange={onChangeVersion}
+          required
+          label="Enter Version Name"
+          inputProps={{ maxLength: 32, spellCheck: "false" }}
+          type="text"
+          placeholder={`eg. ${version}`}
+          defaultValue={version}
+        />
+        <Button
+          onClick={onClickFinish}
+          disabled={!version}
+          variant="contained"
+          size="large"
+        >
+          {buttonText}
+        </Button>
+      </Grid>
+      <Grid size={6} ref={refContainer}>
+        {(sourceModelId || sourceTemplateId) && (
+          <ModelPreview
+            modelId={sourceModelId || sourceTemplateId}
+            style={{ width: "100%", height: dimensions.height, border: "0" }}
           />
-          <Button
-            onClick={onClickFinish}
-            disabled={!version}
-            variant="contained"
-            size="large"
-          >
-            {buttonText}
-          </Button>
-        </Grid>
-        <Grid size={9}>
-          {(sourceModelId || sourceTemplateId) && (
-            <ModelPreview
-              modelId={sourceModelId || sourceTemplateId}
-              style={{ width: "100%", height: "100%", border: "0" }}
-            />
-          )}
-        </Grid>
+        )}
       </Grid>
     </CenteredPage>
   );
diff --git a/app/src/components/model/board/Board.js b/app/src/components/model/board/Board.js
index 17de1013..b1d40fa4 100644
--- a/app/src/components/model/board/Board.js
+++ b/app/src/components/model/board/Board.js
@@ -783,7 +783,7 @@ export default function Board() {
                   )}
                 </Layer>
 
-                <SelectionRectangle {...selectionRectangle} />
+                {!isFramed && <SelectionRectangle {...selectionRectangle} />}
               </Provider>
             </Stage>
           )}
diff --git a/app/src/components/model/board/components/ControlsToolBar.js b/app/src/components/model/board/components/ControlsToolBar.js
index d0310223..3758f2b0 100644
--- a/app/src/components/model/board/components/ControlsToolBar.js
+++ b/app/src/components/model/board/components/ControlsToolBar.js
@@ -80,16 +80,18 @@ export function ControlsToolBar({ zoomInCenter, onAddComponent }) {
           <ZoomOutIcon />
         </ToggleButton>
         <DownloadImageButton />
-        <ToggleButton
-          value="validate-model"
-          onClick={() => {
-            dispatch(togglePanel(TOGGLE_BOTTOM_PANEL, !bottomPanelCollapsed));
-          }}
-        >
-          <Tooltip title={"Check the quality of your model"}>
-            <FactCheckIcon />
-          </Tooltip>
-        </ToggleButton>
+        {!isFramed && (
+          <ToggleButton
+            value="validate-model"
+            onClick={() => {
+              dispatch(togglePanel(TOGGLE_BOTTOM_PANEL, !bottomPanelCollapsed));
+            }}
+          >
+            <Tooltip title={"Check the quality of your model"}>
+              <FactCheckIcon />
+            </Tooltip>
+          </ToggleButton>
+        )}
 
         {!readOnly && <AddComponentButton onAddComponent={onAddComponent} />}
       </ToggleButtonGroup>
diff --git a/app/src/components/reviews/Reviews.js b/app/src/components/reviews/Reviews.js
index 9fe8a2a9..c0bc70a6 100644
--- a/app/src/components/reviews/Reviews.js
+++ b/app/src/components/reviews/Reviews.js
@@ -17,6 +17,7 @@ import { TablePaginationActions } from "./TablePaginationActions";
 import { TableRow } from "./TableRow";
 import { TableToolbar } from "./TableToolbar";
 import { CenteredPage } from "../elements/CenteredPage";
+import Grid from "@mui/material/Grid2";
 
 export function Reviews() {
   useTitle("Reviews");
@@ -121,41 +122,43 @@ export function Reviews() {
 
   return (
     <CenteredPage>
-      <Paper>
-        <TableToolbar
-          selectedStatuses={selectedStatuses}
-          selectedProperties={selectedProperties}
-          onStatusFilterChange={handleStatusFilterChange}
-          onPropertyFilterChange={handlePropertyFilterChange}
-          onReviewerSelected={handleReviewerSelected}
-          reviewedBy={reviewedBy}
-        />
-        <LoadingPage isLoading={reviewsIsFetching} />
-        <TableContainer>
-          <Table size={"small"}>
-            <TableHeader order={order} toggleOrder={handleToggleOrder} />
-            <TableBody>
-              {reviews?.total === 0 && <EmptyTableRow />}
-              {reviews?.items.map((review) => (
-                <TableRow key={review.modelId} review={review} />
-              ))}
-            </TableBody>
-            <TableFooter>
-              <MuiTableRow style={{ borderBottom: "none" }}>
-                <TablePagination
-                  style={{ borderBottom: "none" }}
-                  rowsPerPageOptions={[rowsPerPage]}
-                  count={reviews?.total || 0}
-                  rowsPerPage={rowsPerPage}
-                  page={page - 1}
-                  onPageChange={handleChangePage}
-                  ActionsComponent={TablePaginationActions}
-                />
-              </MuiTableRow>
-            </TableFooter>
-          </Table>
-        </TableContainer>
-      </Paper>
+      <Grid size={12}>
+        <Paper>
+          <TableToolbar
+            selectedStatuses={selectedStatuses}
+            selectedProperties={selectedProperties}
+            onStatusFilterChange={handleStatusFilterChange}
+            onPropertyFilterChange={handlePropertyFilterChange}
+            onReviewerSelected={handleReviewerSelected}
+            reviewedBy={reviewedBy}
+          />
+          <LoadingPage isLoading={reviewsIsFetching} />
+          <TableContainer>
+            <Table size={"small"}>
+              <TableHeader order={order} toggleOrder={handleToggleOrder} />
+              <TableBody>
+                {reviews?.total === 0 && <EmptyTableRow />}
+                {reviews?.items.map((review) => (
+                  <TableRow key={review.modelId} review={review} />
+                ))}
+              </TableBody>
+              <TableFooter>
+                <MuiTableRow style={{ borderBottom: "none" }}>
+                  <TablePagination
+                    style={{ borderBottom: "none" }}
+                    rowsPerPageOptions={[rowsPerPage]}
+                    count={reviews?.total || 0}
+                    rowsPerPage={rowsPerPage}
+                    page={page - 1}
+                    onPageChange={handleChangePage}
+                    ActionsComponent={TablePaginationActions}
+                  />
+                </MuiTableRow>
+              </TableFooter>
+            </Table>
+          </TableContainer>
+        </Paper>
+      </Grid>
     </CenteredPage>
   );
 }
diff --git a/app/src/components/search/__snapshots__/SearchPage.spec.js.snap b/app/src/components/search/__snapshots__/SearchPage.spec.js.snap
index dbe9ba33..72859f6c 100644
--- a/app/src/components/search/__snapshots__/SearchPage.spec.js.snap
+++ b/app/src/components/search/__snapshots__/SearchPage.spec.js.snap
@@ -6,50 +6,7 @@ exports[`Search renders Search 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row css-1fn4916-MuiGrid2-root"
-      >
-        <div
-          class="MuiGrid2-root MuiGrid2-direction-xs-row css-1lqpupi-MuiGrid2-root"
-        >
-          <div
-            class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-ckzihm-MuiPaper-root-MuiCard-root"
-            style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
-          >
-            <div
-              class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
-            >
-              <h5
-                class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
-              >
-                Search results for "
-                
-                "
-              </h5>
-            </div>
-          </div>
-          <br />
-          <hr
-            class="MuiDivider-root MuiDivider-fullWidth css-1jpc804-MuiDivider-root"
-          />
-          <br />
-          <div
-            class="loading"
-          >
-            <div />
-            <div />
-            <div />
-            <div />
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row css-1fn4916-MuiGrid2-root"
-    >
-      <div
-        class="MuiGrid2-root MuiGrid2-direction-xs-row css-1lqpupi-MuiGrid2-root"
+        class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-imdfze-MuiGrid2-root"
       >
         <div
           class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-ckzihm-MuiPaper-root-MuiCard-root"
@@ -82,6 +39,41 @@ exports[`Search renders Search 1`] = `
         </div>
       </div>
     </div>
+  </body>,
+  "container": <div>
+    <div
+      class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-imdfze-MuiGrid2-root"
+    >
+      <div
+        class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-ckzihm-MuiPaper-root-MuiCard-root"
+        style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
+      >
+        <div
+          class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
+        >
+          <h5
+            class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
+          >
+            Search results for "
+            
+            "
+          </h5>
+        </div>
+      </div>
+      <br />
+      <hr
+        class="MuiDivider-root MuiDivider-fullWidth css-1jpc804-MuiDivider-root"
+      />
+      <br />
+      <div
+        class="loading"
+      >
+        <div />
+        <div />
+        <div />
+        <div />
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/app/src/components/system/System.js b/app/src/components/system/System.js
index 071c669c..3cea66e0 100644
--- a/app/src/components/system/System.js
+++ b/app/src/components/system/System.js
@@ -55,41 +55,39 @@ export function System() {
 
   return (
     <CenteredPage>
-      <Grid container spacing={0} columns={12}>
-        <Grid size={6}>
-          <Typography variant={"h5"}>
-            {system.displayName}{" "}
-            <span className="dimmed">&mdash; {system.shortName}</span>
-          </Typography>
+      <Grid size={6}>
+        <Typography variant={"h5"}>
+          {system.displayName}{" "}
+          <span className="dimmed">&mdash; {system.shortName}</span>
+        </Typography>
 
-          <Typography className="dimmed">
-            {system.owners?.map((owner) => (
-              <Link className="dimmed" to={`/team/${owner.id}`}>
-                {owner.name}
-              </Link>
-            ))}{" "}
-            &mdash;{" "}
-            <span className="description">
-              {system.description || "(system has no description)"}
-            </span>
-          </Typography>
+        <Typography className="dimmed">
+          {system.owners?.map((owner) => (
+            <Link className="dimmed" to={`/team/${owner.id}`}>
+              {owner.name}
+            </Link>
+          ))}{" "}
+          &mdash;{" "}
+          <span className="description">
+            {system.description || "(system has no description)"}
+          </span>
+        </Typography>
 
-          {permissions.includes(PERMISSIONS.WRITE) && (
-            <Box sx={{ marginTop: "25px", marginBottom: "25px" }}>
-              <Link to={`/model/new?system_id=${system.id}`}>
-                <Button variant="outlined">Create New Threat Model</Button>
-              </Link>
-            </Box>
-          )}
+        {permissions.includes(PERMISSIONS.WRITE) && (
+          <Box sx={{ marginTop: "25px", marginBottom: "25px" }}>
+            <Link to={`/model/new?system_id=${system.id}`}>
+              <Button variant="outlined">Create New Threat Model</Button>
+            </Link>
+          </Box>
+        )}
 
-          <Typography variant="h6">Threat Models</Typography>
+        <Typography variant="h6">Threat Models</Typography>
 
-          <ModelList
-            models={models}
-            isLoading={isLoadingModels}
-            listHeight="100%"
-          />
-        </Grid>
+        <ModelList
+          models={models}
+          isLoading={isLoadingModels}
+          listHeight="100%"
+        />
       </Grid>
     </CenteredPage>
   );
diff --git a/app/src/components/systems/TeamSystems/TeamSystemPage.js b/app/src/components/systems/TeamSystems/TeamSystemPage.js
index df0c1355..74fdc5f4 100644
--- a/app/src/components/systems/TeamSystems/TeamSystemPage.js
+++ b/app/src/components/systems/TeamSystems/TeamSystemPage.js
@@ -22,24 +22,25 @@ export function TeamSystemsPage() {
   useTitle("Team");
 
   return (
-    <CenteredPage>
-      {!teamId ? (
-        <>
-          <Typography variant={"h5"}>Your Team Systems</Typography>
-          <Typography className="dimmed">
-            Systems belonging to your team{teams.length > 1 ? "s" : ""}
-          </Typography>
-        </>
-      ) : (
-        <TeamHeader teamId={teamId} />
-      )}
+    <CenteredPage justifyContent="baseline">
+      <Grid container size={12}>
+        {!teamId ? (
+          <Grid size={12}>
+            <Typography variant={"h5"}>Your Team Systems</Typography>
+            <Typography className="dimmed">
+              Systems belonging to your team{teams.length > 1 ? "s" : ""}
+            </Typography>
+          </Grid>
+        ) : (
+          <Grid size={12}>
+            <TeamHeader teamId={teamId} />
+          </Grid>
+        )}
 
-      <Grid container spacing={2} columns={12} sx={{ marginTop: "9px" }}>
         {/* Some employees have more than one team */}
         {teams.map((tid) => (
           <Grid
             key={`team-grid-${tid}`}
-            item
             size={6}
             sx={{ display: "flex", flexDirection: "column" }}
           >
diff --git a/app/src/components/user-models/UserModels/UserModels.js b/app/src/components/user-models/UserModels/UserModels.js
index fc6f2c26..ebdcd738 100644
--- a/app/src/components/user-models/UserModels/UserModels.js
+++ b/app/src/components/user-models/UserModels/UserModels.js
@@ -18,33 +18,31 @@ export default function UserModels() {
 
   return (
     <CenteredPage>
-      <Grid container spacing={2} columns={12}>
-        <Grid size={6}>
-          <Typography variant={"h5"}>Your Models</Typography>
-          <Typography className={"dimmed"}>
-            These models are bound to your account and not bound to a specific
-            system.
-          </Typography>
-
-          <br />
-
-          <Box>
-            <Link to={`/model/new`}>
-              <Button variant="outlined">Create New Model</Button>
-            </Link>
-          </Box>
-
-          <br />
-
-          <Divider />
-
-          <ModelList
-            models={models}
-            error={error}
-            isLoading={isLoading}
-            listHeight={900}
-          />
-        </Grid>
+      <Grid size={6}>
+        <Typography variant={"h5"}>Your Models</Typography>
+        <Typography className={"dimmed"}>
+          These models are bound to your account and not bound to a specific
+          system.
+        </Typography>
+
+        <br />
+
+        <Box>
+          <Link to={`/model/new`}>
+            <Button variant="outlined">Create New Model</Button>
+          </Link>
+        </Box>
+
+        <br />
+
+        <Divider />
+
+        <ModelList
+          models={models}
+          error={error}
+          isLoading={isLoading}
+          listHeight={900}
+        />
       </Grid>
     </CenteredPage>
   );
diff --git a/app/src/components/user-models/UserModels/__snapshots__/UserModels.spec.js.snap b/app/src/components/user-models/UserModels/__snapshots__/UserModels.spec.js.snap
index 2a5b6213..b496e103 100644
--- a/app/src/components/user-models/UserModels/__snapshots__/UserModels.spec.js.snap
+++ b/app/src/components/user-models/UserModels/__snapshots__/UserModels.spec.js.snap
@@ -6,77 +6,69 @@ exports[`UserModels renders 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row css-1fn4916-MuiGrid2-root"
+        class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-imdfze-MuiGrid2-root"
       >
         <div
-          class="MuiGrid2-root MuiGrid2-direction-xs-row css-1lqpupi-MuiGrid2-root"
+          class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-ticvdu-MuiGrid2-root"
         >
+          <h5
+            class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
+          >
+            Your Models
+          </h5>
+          <p
+            class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
+          >
+            These models are bound to your account and not bound to a specific system.
+          </p>
+          <br />
           <div
-            class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-ubb9a5-MuiGrid2-root"
+            class="MuiBox-root css-0"
           >
-            <div
-              class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-ticvdu-MuiGrid2-root"
+            <a
+              href="/model/new"
             >
-              <h5
-                class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
-              >
-                Your Models
-              </h5>
-              <p
-                class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
+              <button
+                class="MuiButtonBase-root MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary css-1btmbba-MuiButtonBase-root-MuiButton-root"
+                tabindex="0"
+                type="button"
               >
-                These models are bound to your account and not bound to a specific system.
-              </p>
-              <br />
+                Create New Model
+              </button>
+            </a>
+          </div>
+          <br />
+          <hr
+            class="MuiDivider-root MuiDivider-fullWidth css-1jpc804-MuiDivider-root"
+          />
+          <div
+            class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
+            style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
+          >
+            <div
+              class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
+            >
               <div
-                class="MuiBox-root css-0"
+                class="loading"
               >
-                <a
-                  href="/model/new"
-                >
-                  <button
-                    class="MuiButtonBase-root MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary css-1btmbba-MuiButtonBase-root-MuiButton-root"
-                    tabindex="0"
-                    type="button"
-                  >
-                    Create New Model
-                  </button>
-                </a>
+                <div />
+                <div />
+                <div />
+                <div />
               </div>
-              <br />
-              <hr
-                class="MuiDivider-root MuiDivider-fullWidth css-1jpc804-MuiDivider-root"
-              />
-              <div
-                class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
-                style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
+              <ul
+                class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
               >
                 <div
-                  class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
+                  class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
                 >
-                  <div
-                    class="loading"
+                  <span
+                    class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
                   >
-                    <div />
-                    <div />
-                    <div />
-                    <div />
-                  </div>
-                  <ul
-                    class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
-                  >
-                    <div
-                      class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
-                    >
-                      <span
-                        class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
-                      >
-                        No models exist
-                      </span>
-                    </div>
-                  </ul>
+                    No models exist
+                  </span>
                 </div>
-              </div>
+              </ul>
             </div>
           </div>
         </div>
@@ -85,77 +77,69 @@ exports[`UserModels renders 1`] = `
   </body>,
   "container": <div>
     <div
-      class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row css-1fn4916-MuiGrid2-root"
+      class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-imdfze-MuiGrid2-root"
     >
       <div
-        class="MuiGrid2-root MuiGrid2-direction-xs-row css-1lqpupi-MuiGrid2-root"
+        class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-ticvdu-MuiGrid2-root"
       >
+        <h5
+          class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
+        >
+          Your Models
+        </h5>
+        <p
+          class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
+        >
+          These models are bound to your account and not bound to a specific system.
+        </p>
+        <br />
         <div
-          class="MuiGrid2-root MuiGrid2-container MuiGrid2-direction-xs-row MuiGrid2-spacing-xs-2 css-ubb9a5-MuiGrid2-root"
+          class="MuiBox-root css-0"
         >
-          <div
-            class="MuiGrid2-root MuiGrid2-direction-xs-row MuiGrid2-grid-xs-6 css-ticvdu-MuiGrid2-root"
+          <a
+            href="/model/new"
           >
-            <h5
-              class="MuiTypography-root MuiTypography-h5 css-16xl4zq-MuiTypography-root"
-            >
-              Your Models
-            </h5>
-            <p
-              class="MuiTypography-root MuiTypography-body1 dimmed css-rizt0-MuiTypography-root"
+            <button
+              class="MuiButtonBase-root MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary css-1btmbba-MuiButtonBase-root-MuiButton-root"
+              tabindex="0"
+              type="button"
             >
-              These models are bound to your account and not bound to a specific system.
-            </p>
-            <br />
+              Create New Model
+            </button>
+          </a>
+        </div>
+        <br />
+        <hr
+          class="MuiDivider-root MuiDivider-fullWidth css-1jpc804-MuiDivider-root"
+        />
+        <div
+          class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
+          style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
+        >
+          <div
+            class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
+          >
             <div
-              class="MuiBox-root css-0"
+              class="loading"
             >
-              <a
-                href="/model/new"
-              >
-                <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-outlined MuiButton-outlinedPrimary MuiButton-sizeMedium MuiButton-outlinedSizeMedium MuiButton-colorPrimary css-1btmbba-MuiButtonBase-root-MuiButton-root"
-                  tabindex="0"
-                  type="button"
-                >
-                  Create New Model
-                </button>
-              </a>
+              <div />
+              <div />
+              <div />
+              <div />
             </div>
-            <br />
-            <hr
-              class="MuiDivider-root MuiDivider-fullWidth css-1jpc804-MuiDivider-root"
-            />
-            <div
-              class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 MuiCard-root css-1eg0ry7-MuiPaper-root-MuiCard-root"
-              style="--Paper-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);"
+            <ul
+              class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
             >
               <div
-                class="MuiCardContent-root css-1lt5qva-MuiCardContent-root"
+                class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
               >
-                <div
-                  class="loading"
+                <span
+                  class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
                 >
-                  <div />
-                  <div />
-                  <div />
-                  <div />
-                </div>
-                <ul
-                  class="MuiList-root MuiList-padding css-b7dj7n-MuiList-root"
-                >
-                  <div
-                    class="MuiListItemText-root css-cfq8qh-MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-rizt0-MuiTypography-root"
-                    >
-                      No models exist
-                    </span>
-                  </div>
-                </ul>
+                  No models exist
+                </span>
               </div>
-            </div>
+            </ul>
           </div>
         </div>
       </div>