diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js
index 44c1aba..b1e5178 100644
--- a/src/components/App/App.test.js
+++ b/src/components/App/App.test.js
@@ -5,6 +5,7 @@ jest.mock("../Contexts/UserContext");
 jest.mock("../Contexts/ManifestsContext");
 jest.mock("../Contexts/CarUpdatesContext");
 jest.mock("../../services/monitoring");
+jest.mock("../../services/grafana");
 
 import { render, screen, cleanup, waitFor, waitForElementToBeRemoved } from "@testing-library/react";
 import { setToken } from "../Contexts/UserContext";
@@ -57,11 +58,11 @@ describe("App", () => {
   });
 
   it("Route / unauthenticated", async () => {
-    await check("/", "span.MuiButton-label", "Sign In");
+    await sleepAndCheck("/", "span.MuiButton-label", "Sign In");
   });
 
   it("Route /home unauthenticated", async () => {
-    await check("/home", "span.MuiButton-label", "Sign In");
+    await sleepAndCheck("/home", "span.MuiButton-label", "Sign In");
   });
 
   it("Route /vehicle-add unauthenticated", async () => {
@@ -85,7 +86,7 @@ describe("App", () => {
   });
 
   it("Route /datascope unauthenticated", async () => {
-    await check("/datascope", "span.MuiButton-label", "Sign In");
+    await sleepAndCheck("/datascope", "span.MuiButton-label", "Sign In");
   });
 
   it("Route /datascope/battery unauthenticated", async () => {
@@ -110,12 +111,12 @@ describe("App", () => {
 
   it("Route / authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
-    await sleepAndCheck("/", "h1", "Welcome John!");
+    await sleepAndCheck("/", "h6", "Home");
   });
 
   it("Route /home authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
-    await sleepAndCheck("/home", "h1", "Welcome John!");
+    await sleepAndCheck("/home", "h6", "Home");
   });
 
   it("Route /vehicle-add authenticated", async () => {
@@ -154,7 +155,7 @@ describe("App", () => {
 
   it("Route /datascope authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
-    await check("/datascope", "h6", "Datascope");
+    await sleepAndCheck("/datascope", "h6", "Datascope");
   });
 
   it("Route /datascope/battery authenticated", async () => {
diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index a11d353..3def351 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -6,10 +6,10 @@ exports[`App Route / authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-612"
+      class="makeStyles-root-729"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-613 makeStyles-appBarShift-614 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-730 makeStyles-appBarShift-731 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -22,7 +22,7 @@ exports[`App Route / authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-622"
+            class="makeStyles-rightToolbar-740"
             color="inherit"
           >
             <button
@@ -45,17 +45,17 @@ exports[`App Route / authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-617"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-734"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-618 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-735 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-619"
+            class="makeStyles-drawerHeader-736 makeStyles-drawerHeaderLogo-737"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-628"
+              class="makeStyles-logo-746"
               src="fisker-badge.svg"
             />
           </div>
@@ -239,11 +239,10 @@ exports[`App Route / authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-768 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -266,24 +265,17 @@ exports[`App Route / authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-620 makeStyles-contentShift-621"
+        class="makeStyles-content-738 makeStyles-contentShift-739"
       >
         <div
-          class="makeStyles-drawerHeader-619"
+          class="makeStyles-drawerHeader-736"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-601"
+            class="makeStyles-paper-718"
           >
-            <h1
-              class="MuiTypography-root makeStyles-homePageTitle-632 MuiTypography-h5"
-            >
-              Welcome 
-              John
-              !
-            </h1>
             <div
               data-testid="mocked-vehicleprovider"
             >
@@ -422,7 +414,7 @@ exports[`App Route / unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-22"
+        class="makeStyles-content-23"
       >
         <div
           class="makeStyles-drawerHeader-21"
@@ -431,8 +423,7 @@ exports[`App Route / unauthenticated 1`] = `
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-3"
-            style="justify-content: center;"
+            class="makeStyles-paper-3 makeStyles-textJustifyAlign-48"
           >
             <a
               aria-disabled="false"
@@ -463,10 +454,10 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-992"
+      class="makeStyles-root-1181"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-993 makeStyles-appBarShift-994 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1182 makeStyles-appBarShift-1183 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -479,7 +470,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-1002"
+            class="makeStyles-rightToolbar-1192"
             color="inherit"
           >
             <button
@@ -502,17 +493,17 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-997"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1186"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-998 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1187 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-999"
+            class="makeStyles-drawerHeader-1188 makeStyles-drawerHeaderLogo-1189"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1008"
+              class="makeStyles-logo-1198"
               src="fisker-badge.svg"
             />
           </div>
@@ -696,11 +687,10 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1220 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -723,10 +713,10 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1000 makeStyles-contentShift-1001"
+        class="makeStyles-content-1190 makeStyles-contentShift-1191"
       >
         <div
-          class="makeStyles-drawerHeader-999"
+          class="makeStyles-drawerHeader-1188"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -738,11 +728,11 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
               data-testid="mocked-updatesprovider"
             >
               <div
-                class="makeStyles-paper-981"
+                class="makeStyles-paper-1170"
               >
                 <form
                   action="{onSubmit}"
-                  class="makeStyles-form-983"
+                  class="makeStyles-form-1172"
                   novalidate=""
                 >
                   <p
@@ -754,13 +744,13 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                     Description
                   </p>
                   <div
-                    class="MuiGrid-root makeStyles-root-992 MuiGrid-container MuiGrid-spacing-xs-2"
+                    class="MuiGrid-root makeStyles-root-1181 MuiGrid-container MuiGrid-spacing-xs-2"
                   >
                     <div
                       class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-10"
                     >
                       <div
-                        class="MuiFormControl-root makeStyles-margin-1005 makeStyles-textField-1006"
+                        class="MuiFormControl-root makeStyles-margin-1195 makeStyles-textField-1196"
                       >
                         <label
                           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -810,7 +800,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                         </div>
                       </div>
                       <div
-                        class="makeStyles-labelInline-987"
+                        class="makeStyles-labelInline-1176"
                       >
                         0 Selected
                       </div>
@@ -820,7 +810,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                       style="text-align: right;"
                     >
                       <button
-                        class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-985 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
+                        class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1174 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
                         disabled=""
                         tabindex="-1"
                         type="submit"
@@ -834,8 +824,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                     </div>
                   </div>
                   <div
-                    class="makeStyles-paper-981"
-                    style="height: 700px; width: 100%;"
+                    class="makeStyles-paper-1170 makeStyles-tableSize-1221"
                   >
                     <table
                       class="MuiTable-root"
@@ -852,14 +841,14 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                           >
                             <span
                               aria-disabled="false"
-                              class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1025 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                              class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1223 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                             >
                               <span
                                 class="MuiIconButton-label"
                               >
                                 <input
                                   aria-label="select all desserts"
-                                  class="PrivateSwitchBase-input-1028"
+                                  class="PrivateSwitchBase-input-1226"
                                   data-indeterminate="false"
                                   type="checkbox"
                                   value=""
@@ -893,7 +882,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                             >
                               VIN
                               <span
-                                class="makeStyles-hiddenSortSpan-1004"
+                                class="makeStyles-hiddenSortSpan-1194"
                               >
                                 sorted ascending
                               </span>
@@ -1173,10 +1162,10 @@ exports[`App Route /carupdate-deploy unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-152"
+      class="makeStyles-root-179"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-153 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-180 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1189,21 +1178,20 @@ exports[`App Route /carupdate-deploy unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-160"
+        class="makeStyles-content-188"
       >
         <div
-          class="makeStyles-drawerHeader-159"
+          class="makeStyles-drawerHeader-186"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-141"
-            style="justify-content: center;"
+            class="makeStyles-paper-168 makeStyles-textJustifyAlign-213"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-144 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-171 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1230,10 +1218,10 @@ exports[`App Route /carupdate-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-754"
+      class="makeStyles-root-898"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-755 makeStyles-appBarShift-756 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-899 makeStyles-appBarShift-900 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1246,7 +1234,7 @@ exports[`App Route /carupdate-status authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-764"
+            class="makeStyles-rightToolbar-909"
             color="inherit"
           >
             <button
@@ -1269,17 +1257,17 @@ exports[`App Route /carupdate-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-759"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-903"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-760 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-904 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-761"
+            class="makeStyles-drawerHeader-905 makeStyles-drawerHeaderLogo-906"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-770"
+              class="makeStyles-logo-915"
               src="fisker-badge.svg"
             />
           </div>
@@ -1463,11 +1451,10 @@ exports[`App Route /carupdate-status authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-937 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -1490,10 +1477,10 @@ exports[`App Route /carupdate-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-762 makeStyles-contentShift-763"
+        class="makeStyles-content-907 makeStyles-contentShift-908"
       >
         <div
-          class="makeStyles-drawerHeader-761"
+          class="makeStyles-drawerHeader-905"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -1502,8 +1489,7 @@ exports[`App Route /carupdate-status authenticated 1`] = `
             data-testid="mocked-updatesprovider"
           >
             <div
-              class="makeStyles-paper-743"
-              style="height: 700px; width: 100%;"
+              class="makeStyles-paper-887 makeStyles-tableSize-938"
             >
               <table
                 class="MuiTable-root"
@@ -1690,10 +1676,10 @@ exports[`App Route /carupdate-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-198"
+      class="makeStyles-root-234"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-199 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-235 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1706,21 +1692,20 @@ exports[`App Route /carupdate-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-206"
+        class="makeStyles-content-243"
       >
         <div
-          class="makeStyles-drawerHeader-205"
+          class="makeStyles-drawerHeader-241"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-187"
-            style="justify-content: center;"
+            class="makeStyles-paper-223 makeStyles-textJustifyAlign-268"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-190 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-226 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1747,10 +1732,10 @@ exports[`App Route /datascope authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1042"
+      class="makeStyles-root-1240"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1043 makeStyles-appBarShift-1044 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1241 makeStyles-appBarShift-1242 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1763,7 +1748,7 @@ exports[`App Route /datascope authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-1052"
+            class="makeStyles-rightToolbar-1251"
             color="inherit"
           >
             <button
@@ -1786,17 +1771,17 @@ exports[`App Route /datascope authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1047"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1245"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1048 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1246 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1049"
+            class="makeStyles-drawerHeader-1247 makeStyles-drawerHeaderLogo-1248"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1058"
+              class="makeStyles-logo-1257"
               src="fisker-badge.svg"
             />
           </div>
@@ -1980,11 +1965,10 @@ exports[`App Route /datascope authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1279 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -2007,34 +1991,34 @@ exports[`App Route /datascope authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1050 makeStyles-contentShift-1051"
+        class="makeStyles-content-1249 makeStyles-contentShift-1250"
       >
         <div
-          class="makeStyles-drawerHeader-1049"
+          class="makeStyles-drawerHeader-1247"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-1031"
+            class="makeStyles-paper-1229"
           >
             <div
-              class="MuiGrid-root makeStyles-root-1042 MuiGrid-container MuiGrid-spacing-xs-2"
+              class="MuiGrid-root makeStyles-root-1240 MuiGrid-container MuiGrid-spacing-xs-2"
             >
               <div
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
               >
                 <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-1072 MuiPaper-elevation1 MuiPaper-rounded"
+                  class="MuiPaper-root makeStyles-grafanaContainer-1271 MuiPaper-elevation1 MuiPaper-rounded"
                   style="height: 150px;"
                 >
                   <h1
-                    class="makeStyles-datascopeContainerValue-1074"
+                    class="makeStyles-datascopeContainerValue-1273"
                   >
                     500
                   </h1>
                   <h2
-                    class="makeStyles-datascopeContainerText-1073"
+                    class="makeStyles-datascopeContainerText-1272"
                   >
                     Cars
                   </h2>
@@ -2044,16 +2028,16 @@ exports[`App Route /datascope authenticated 1`] = `
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
               >
                 <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-1072 MuiPaper-elevation1 MuiPaper-rounded"
+                  class="MuiPaper-root makeStyles-grafanaContainer-1271 MuiPaper-elevation1 MuiPaper-rounded"
                   style="height: 150px;"
                 >
                   <h1
-                    class="makeStyles-datascopeContainerValue-1074"
+                    class="makeStyles-datascopeContainerValue-1273"
                   >
                     1,234,567,890
                   </h1>
                   <h2
-                    class="makeStyles-datascopeContainerText-1073"
+                    class="makeStyles-datascopeContainerText-1272"
                   >
                     Signals Collected
                   </h2>
@@ -2063,10 +2047,10 @@ exports[`App Route /datascope authenticated 1`] = `
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
               >
                 <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-1072 MuiPaper-elevation1 MuiPaper-rounded"
+                  class="MuiPaper-root makeStyles-grafanaContainer-1271 MuiPaper-elevation1 MuiPaper-rounded"
                 >
                   <div
-                    class="makeStyles-embeddedWrapper-1060"
+                    class="makeStyles-embeddedWrapper-1259"
                   >
                     <iframe
                       frameborder="0"
@@ -2122,10 +2106,10 @@ exports[`App Route /datascope unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-336"
+      class="makeStyles-root-399"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-337 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-400 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -2138,21 +2122,20 @@ exports[`App Route /datascope unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-344"
+        class="makeStyles-content-408"
       >
         <div
-          class="makeStyles-drawerHeader-343"
+          class="makeStyles-drawerHeader-406"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-325"
-            style="justify-content: center;"
+            class="makeStyles-paper-388 makeStyles-textJustifyAlign-433"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-328 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-391 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -2179,10 +2162,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1088"
+      class="makeStyles-root-1295"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1089 makeStyles-appBarShift-1090 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1296 makeStyles-appBarShift-1297 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -2231,7 +2214,7 @@ exports[`App Route /datascope/battery authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1098"
+            class="makeStyles-rightToolbar-1306"
             color="inherit"
           >
             <button
@@ -2254,17 +2237,17 @@ exports[`App Route /datascope/battery authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1093"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1300"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1094 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1301 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1095"
+            class="makeStyles-drawerHeader-1302 makeStyles-drawerHeaderLogo-1303"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1104"
+              class="makeStyles-logo-1312"
               src="fisker-badge.svg"
             />
           </div>
@@ -2448,11 +2431,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1334 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -2475,16 +2457,16 @@ exports[`App Route /datascope/battery authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1096 makeStyles-contentShift-1097"
+        class="makeStyles-content-1304 makeStyles-contentShift-1305"
       >
         <div
-          class="makeStyles-drawerHeader-1095"
+          class="makeStyles-drawerHeader-1302"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-1077"
+            class="makeStyles-paper-1284"
           >
             <div
               class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
@@ -2497,10 +2479,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <form
-                      class="makeStyles-formControl-1081"
+                      class="makeStyles-formControl-1288"
                     >
                       <div
                         class="MuiFormControl-root MuiTextField-root"
@@ -2526,10 +2508,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                           />
                           <fieldset
                             aria-hidden="true"
-                            class="PrivateNotchedOutline-root-1121 MuiOutlinedInput-notchedOutline"
+                            class="PrivateNotchedOutline-root-1337 MuiOutlinedInput-notchedOutline"
                           >
                             <legend
-                              class="PrivateNotchedOutline-legendLabelled-1123 PrivateNotchedOutline-legendNotched-1124"
+                              class="PrivateNotchedOutline-legendLabelled-1339 PrivateNotchedOutline-legendNotched-1340"
                             >
                               <span>
                                 VIN
@@ -2540,7 +2522,7 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                       </div>
                     </form>
                     <div
-                      class="MuiFormControl-root makeStyles-formControl-1081"
+                      class="MuiFormControl-root makeStyles-formControl-1288"
                     >
                       <label
                         class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
@@ -2580,10 +2562,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-1121 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-1337 MuiOutlinedInput-notchedOutline"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legendLabelled-1123 PrivateNotchedOutline-legendNotched-1124"
+                            class="PrivateNotchedOutline-legendLabelled-1339 PrivateNotchedOutline-legendNotched-1340"
                           >
                             <span>
                               Cell
@@ -2598,12 +2580,12 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     Cell Voltage 
                     1
                     <div
-                      class="makeStyles-embeddedWrapper-1106"
+                      class="makeStyles-embeddedWrapper-1314"
                     >
                       <iframe
                         frameborder="0"
@@ -2618,12 +2600,12 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     Cell Temperature 
                     1
                     <div
-                      class="makeStyles-embeddedWrapper-1106"
+                      class="makeStyles-embeddedWrapper-1314"
                     >
                       <iframe
                         frameborder="0"
@@ -2638,10 +2620,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1106"
+                      class="makeStyles-embeddedWrapper-1314"
                     >
                       <iframe
                         frameborder="0"
@@ -2661,10 +2643,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1106"
+                      class="makeStyles-embeddedWrapper-1314"
                     >
                       <iframe
                         frameborder="0"
@@ -2679,10 +2661,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1106"
+                      class="makeStyles-embeddedWrapper-1314"
                     >
                       <iframe
                         frameborder="0"
@@ -2697,10 +2679,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1106"
+                      class="makeStyles-embeddedWrapper-1314"
                     >
                       <iframe
                         frameborder="0"
@@ -2715,10 +2697,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1106"
+                      class="makeStyles-embeddedWrapper-1314"
                     >
                       <iframe
                         frameborder="0"
@@ -2745,10 +2727,10 @@ exports[`App Route /datascope/battery unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-382"
+      class="makeStyles-root-454"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-383 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-455 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -2761,21 +2743,20 @@ exports[`App Route /datascope/battery unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-390"
+        class="makeStyles-content-463"
       >
         <div
-          class="makeStyles-drawerHeader-389"
+          class="makeStyles-drawerHeader-461"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-371"
-            style="justify-content: center;"
+            class="makeStyles-paper-443 makeStyles-textJustifyAlign-488"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-374 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-446 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -2802,10 +2783,10 @@ exports[`App Route /home authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-658"
+      class="makeStyles-root-784"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-659 makeStyles-appBarShift-660 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-785 makeStyles-appBarShift-786 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -2818,7 +2799,7 @@ exports[`App Route /home authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-668"
+            class="makeStyles-rightToolbar-795"
             color="inherit"
           >
             <button
@@ -2841,17 +2822,17 @@ exports[`App Route /home authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-663"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-789"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-664 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-790 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-665"
+            class="makeStyles-drawerHeader-791 makeStyles-drawerHeaderLogo-792"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-674"
+              class="makeStyles-logo-801"
               src="fisker-badge.svg"
             />
           </div>
@@ -3035,11 +3016,10 @@ exports[`App Route /home authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-823 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -3062,24 +3042,17 @@ exports[`App Route /home authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-666 makeStyles-contentShift-667"
+        class="makeStyles-content-793 makeStyles-contentShift-794"
       >
         <div
-          class="makeStyles-drawerHeader-665"
+          class="makeStyles-drawerHeader-791"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-647"
+            class="makeStyles-paper-773"
           >
-            <h1
-              class="MuiTypography-root makeStyles-homePageTitle-678 MuiTypography-h5"
-            >
-              Welcome 
-              John
-              !
-            </h1>
             <div
               data-testid="mocked-vehicleprovider"
             >
@@ -3202,10 +3175,10 @@ exports[`App Route /home unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-60"
+      class="makeStyles-root-69"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-61 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-70 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3218,21 +3191,20 @@ exports[`App Route /home unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-68"
+        class="makeStyles-content-78"
       >
         <div
-          class="makeStyles-drawerHeader-67"
+          class="makeStyles-drawerHeader-76"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-49"
-            style="justify-content: center;"
+            class="makeStyles-paper-58 makeStyles-textJustifyAlign-103"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-52 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-61 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -3259,10 +3231,10 @@ exports[`App Route /package-create authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1280"
+      class="makeStyles-root-1523"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1281 makeStyles-appBarShift-1282 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1524 makeStyles-appBarShift-1525 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3311,7 +3283,7 @@ exports[`App Route /package-create authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1290"
+            class="makeStyles-rightToolbar-1534"
             color="inherit"
           >
             <button
@@ -3334,17 +3306,17 @@ exports[`App Route /package-create authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1285"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1528"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1286 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1529 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1287"
+            class="makeStyles-drawerHeader-1530 makeStyles-drawerHeaderLogo-1531"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1296"
+              class="makeStyles-logo-1540"
               src="fisker-badge.svg"
             />
           </div>
@@ -3528,11 +3500,10 @@ exports[`App Route /package-create authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1562 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -3555,10 +3526,10 @@ exports[`App Route /package-create authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1288 makeStyles-contentShift-1289"
+        class="makeStyles-content-1532 makeStyles-contentShift-1533"
       >
         <div
-          class="makeStyles-drawerHeader-1287"
+          class="makeStyles-drawerHeader-1530"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -3567,11 +3538,11 @@ exports[`App Route /package-create authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-1269"
+              class="makeStyles-paper-1512"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-1271"
+                class="makeStyles-form-1514"
                 novalidate=""
               >
                 <div
@@ -3607,10 +3578,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1315"
+                        class="PrivateNotchedOutline-legendLabelled-1567"
                       >
                         <span>
                           Package name
@@ -3653,10 +3624,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1315"
+                        class="PrivateNotchedOutline-legendLabelled-1567"
                       >
                         <span>
                           Version
@@ -3699,10 +3670,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1315"
+                        class="PrivateNotchedOutline-legendLabelled-1567"
                       >
                         <span>
                           Description
@@ -3746,10 +3717,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1315"
+                        class="PrivateNotchedOutline-legendLabelled-1567"
                       >
                         <span>
                           Release Notes URL
@@ -3846,7 +3817,7 @@ exports[`App Route /package-create authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1272 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1515 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
@@ -3875,10 +3846,10 @@ exports[`App Route /package-create unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-566"
+      class="makeStyles-root-674"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-567 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-675 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3891,21 +3862,20 @@ exports[`App Route /package-create unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-574"
+        class="makeStyles-content-683"
       >
         <div
-          class="makeStyles-drawerHeader-573"
+          class="makeStyles-drawerHeader-681"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-555"
-            style="justify-content: center;"
+            class="makeStyles-paper-663 makeStyles-textJustifyAlign-708"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-558 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-666 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -3932,10 +3902,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1230"
+      class="makeStyles-root-1464"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1231 makeStyles-appBarShift-1232 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1465 makeStyles-appBarShift-1466 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3984,7 +3954,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1240"
+            class="makeStyles-rightToolbar-1475"
             color="inherit"
           >
             <button
@@ -4007,17 +3977,17 @@ exports[`App Route /package-deploy authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1235"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1469"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1236 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1470 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1237"
+            class="makeStyles-drawerHeader-1471 makeStyles-drawerHeaderLogo-1472"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1246"
+              class="makeStyles-logo-1481"
               src="fisker-badge.svg"
             />
           </div>
@@ -4201,11 +4171,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1503 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -4228,10 +4197,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1238 makeStyles-contentShift-1239"
+        class="makeStyles-content-1473 makeStyles-contentShift-1474"
       >
         <div
-          class="makeStyles-drawerHeader-1237"
+          class="makeStyles-drawerHeader-1471"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -4246,11 +4215,11 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 data-testid="mocked-carupdatesprovider"
               >
                 <div
-                  class="makeStyles-paper-1219"
+                  class="makeStyles-paper-1453"
                 >
                   <form
                     action="{onSubmit}"
-                    class="makeStyles-form-1221"
+                    class="makeStyles-form-1455"
                     novalidate=""
                   >
                     <p
@@ -4261,13 +4230,22 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       .
                     </p>
                     <div
-                      class="MuiGrid-root makeStyles-root-1230 MuiGrid-container MuiGrid-spacing-xs-2"
+                      class="MuiGrid-root makeStyles-root-1464 MuiGrid-container MuiGrid-spacing-xs-2"
                     >
                       <div
-                        class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-10"
+                        class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-2"
                       >
                         <div
-                          class="MuiFormControl-root makeStyles-margin-1243 makeStyles-textField-1244"
+                          class="makeStyles-labelInline-1459"
+                        >
+                          0 Selected
+                        </div>
+                      </div>
+                      <div
+                        class="MuiGrid-root makeStyles-textCenterAlign-1499 MuiGrid-item MuiGrid-grid-md-8"
+                      >
+                        <div
+                          class="MuiFormControl-root makeStyles-margin-1478 makeStyles-textField-1479"
                         >
                           <label
                             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -4316,18 +4294,12 @@ exports[`App Route /package-deploy authenticated 1`] = `
                             </div>
                           </div>
                         </div>
-                        <div
-                          class="makeStyles-labelInline-1225"
-                        >
-                          0 Selected
-                        </div>
                       </div>
                       <div
-                        class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-2"
-                        style="text-align: right;"
+                        class="MuiGrid-root makeStyles-textRightAlign-1500 MuiGrid-item MuiGrid-grid-md-2"
                       >
                         <button
-                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1223 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
+                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1457 MuiButton-containedPrimary Mui-disabled Mui-disabled"
                           disabled=""
                           tabindex="-1"
                           type="submit"
@@ -4341,8 +4313,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="makeStyles-paper-1219"
-                      style="height: 700px; width: 100%;"
+                      class="makeStyles-paper-1453 makeStyles-tableSize-1504"
                     >
                       <table
                         class="MuiTable-root"
@@ -4359,14 +4330,14 @@ exports[`App Route /package-deploy authenticated 1`] = `
                             >
                               <span
                                 aria-disabled="false"
-                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1263 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1506 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                               >
                                 <span
                                   class="MuiIconButton-label"
                                 >
                                   <input
                                     aria-label="select all desserts"
-                                    class="PrivateSwitchBase-input-1266"
+                                    class="PrivateSwitchBase-input-1509"
                                     data-indeterminate="false"
                                     type="checkbox"
                                     value=""
@@ -4400,7 +4371,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                               >
                                 VIN
                                 <span
-                                  class="makeStyles-hiddenSortSpan-1242"
+                                  class="makeStyles-hiddenSortSpan-1477"
                                 >
                                   sorted ascending
                                 </span>
@@ -4681,10 +4652,10 @@ exports[`App Route /package-deploy unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-520"
+      class="makeStyles-root-619"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-521 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-620 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -4697,21 +4668,20 @@ exports[`App Route /package-deploy unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-528"
+        class="makeStyles-content-628"
       >
         <div
-          class="makeStyles-drawerHeader-527"
+          class="makeStyles-drawerHeader-626"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-509"
-            style="justify-content: center;"
+            class="makeStyles-paper-608 makeStyles-textJustifyAlign-653"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-512 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-611 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -4738,10 +4708,10 @@ exports[`App Route /package-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1184"
+      class="makeStyles-root-1409"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1185 makeStyles-appBarShift-1186 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1410 makeStyles-appBarShift-1411 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -4790,7 +4760,7 @@ exports[`App Route /package-status authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1194"
+            class="makeStyles-rightToolbar-1420"
             color="inherit"
           >
             <button
@@ -4813,17 +4783,17 @@ exports[`App Route /package-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1189"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1414"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1190 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1415 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1191"
+            class="makeStyles-drawerHeader-1416 makeStyles-drawerHeaderLogo-1417"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1200"
+              class="makeStyles-logo-1426"
               src="fisker-badge.svg"
             />
           </div>
@@ -5007,11 +4977,10 @@ exports[`App Route /package-status authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1448 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -5034,10 +5003,10 @@ exports[`App Route /package-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1192 makeStyles-contentShift-1193"
+        class="makeStyles-content-1418 makeStyles-contentShift-1419"
       >
         <div
-          class="makeStyles-drawerHeader-1191"
+          class="makeStyles-drawerHeader-1416"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -5049,8 +5018,7 @@ exports[`App Route /package-status authenticated 1`] = `
               data-testid="mocked-carupdatesprovider"
             >
               <div
-                class="makeStyles-paper-1173"
-                style="height: 700px; width: 100%;"
+                class="makeStyles-paper-1398 makeStyles-tableSize-1449"
               >
                 <table
                   class="MuiTable-root"
@@ -5272,10 +5240,10 @@ exports[`App Route /package-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-474"
+      class="makeStyles-root-564"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-475 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-565 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5288,21 +5256,20 @@ exports[`App Route /package-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-482"
+        class="makeStyles-content-573"
       >
         <div
-          class="makeStyles-drawerHeader-481"
+          class="makeStyles-drawerHeader-571"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-463"
-            style="justify-content: center;"
+            class="makeStyles-paper-553 makeStyles-textJustifyAlign-598"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-466 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-556 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -5329,10 +5296,10 @@ exports[`App Route /packages authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1138"
+      class="makeStyles-root-1354"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1139 makeStyles-appBarShift-1140 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1355 makeStyles-appBarShift-1356 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5345,7 +5312,7 @@ exports[`App Route /packages authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-1148"
+            class="makeStyles-rightToolbar-1365"
             color="inherit"
           >
             <button
@@ -5368,17 +5335,17 @@ exports[`App Route /packages authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1143"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1359"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1144 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1360 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1145"
+            class="makeStyles-drawerHeader-1361 makeStyles-drawerHeaderLogo-1362"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1154"
+              class="makeStyles-logo-1371"
               src="fisker-badge.svg"
             />
           </div>
@@ -5562,11 +5529,10 @@ exports[`App Route /packages authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1393 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -5589,10 +5555,10 @@ exports[`App Route /packages authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1146 makeStyles-contentShift-1147"
+        class="makeStyles-content-1363 makeStyles-contentShift-1364"
       >
         <div
-          class="makeStyles-drawerHeader-1145"
+          class="makeStyles-drawerHeader-1361"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -5601,77 +5567,87 @@ exports[`App Route /packages authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-1127"
-              style="height: 700px; width: 100%;"
+              class="makeStyles-paper-1343 makeStyles-tableSize-1394"
             >
               <div
-                class="MuiToolbar-root MuiToolbar-regular makeStyles-tableToolbar-1153 MuiToolbar-gutters"
+                class="MuiGrid-root makeStyles-root-1354 MuiGrid-container MuiGrid-spacing-xs-2"
               >
-                <a
-                  class="makeStyles-labelInline-1133"
-                  href="/package-create"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"
-                    />
-                  </svg>
-                </a>
                 <div
-                  class="MuiFormControl-root makeStyles-margin-1151 makeStyles-textField-1152"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1388 MuiGrid-item MuiGrid-grid-md-4"
                 >
-                  <label
-                    class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
-                    data-shrink="false"
-                    for="search"
+                  <a
+                    class="makeStyles-labelInline-1349"
+                    href="/package-create"
                   >
-                    Search
-                  </label>
-                  <div
-                    class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl MuiInputBase-adornedEnd"
-                  >
-                    <input
-                      aria-invalid="false"
-                      class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd"
-                      id="search"
-                      type="text"
-                      value=""
-                    />
-                    <div
-                      class="MuiInputAdornment-root MuiInputAdornment-positionEnd"
+                    <svg
+                      aria-hidden="true"
+                      class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge"
+                      focusable="false"
+                      viewBox="0 0 24 24"
                     >
-                      <button
-                        aria-label="search"
-                        class="MuiButtonBase-root MuiIconButton-root"
-                        tabindex="0"
-                        type="button"
+                      <path
+                        d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"
+                      />
+                    </svg>
+                  </a>
+                </div>
+                <div
+                  class="MuiGrid-root makeStyles-textCenterAlign-1389 MuiGrid-item MuiGrid-grid-md-4"
+                >
+                  <div
+                    class="MuiFormControl-root makeStyles-margin-1368 makeStyles-textField-1369"
+                  >
+                    <label
+                      class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
+                      data-shrink="false"
+                      for="search"
+                    >
+                      Search
+                    </label>
+                    <div
+                      class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl MuiInputBase-adornedEnd"
+                    >
+                      <input
+                        aria-invalid="false"
+                        class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd"
+                        id="search"
+                        type="text"
+                        value=""
+                      />
+                      <div
+                        class="MuiInputAdornment-root MuiInputAdornment-positionEnd"
                       >
-                        <span
-                          class="MuiIconButton-label"
+                        <button
+                          aria-label="search"
+                          class="MuiButtonBase-root MuiIconButton-root"
+                          tabindex="0"
+                          type="button"
                         >
-                          <svg
-                            aria-hidden="true"
-                            class="MuiSvgIcon-root"
-                            focusable="false"
-                            viewBox="0 0 24 24"
+                          <span
+                            class="MuiIconButton-label"
                           >
-                            <path
-                              d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
-                            />
-                          </svg>
-                        </span>
-                        <span
-                          class="MuiTouchRipple-root"
-                        />
-                      </button>
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root"
+                              focusable="false"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
+                              />
+                            </svg>
+                          </span>
+                          <span
+                            class="MuiTouchRipple-root"
+                          />
+                        </button>
+                      </div>
                     </div>
                   </div>
                 </div>
+                <div
+                  class="MuiGrid-root makeStyles-textRightAlign-1390 MuiGrid-item MuiGrid-grid-md-4"
+                />
               </div>
               <table
                 class="MuiTable-root"
@@ -5695,7 +5671,7 @@ exports[`App Route /packages authenticated 1`] = `
                       >
                         ID
                         <span
-                          class="makeStyles-hiddenSortSpan-1150"
+                          class="makeStyles-hiddenSortSpan-1367"
                         >
                           sorted ascending
                         </span>
@@ -6042,10 +6018,10 @@ exports[`App Route /packages unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-428"
+      class="makeStyles-root-509"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-429 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-510 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6058,21 +6034,20 @@ exports[`App Route /packages unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-436"
+        class="makeStyles-content-518"
       >
         <div
-          class="makeStyles-drawerHeader-435"
+          class="makeStyles-drawerHeader-516"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-417"
-            style="justify-content: center;"
+            class="makeStyles-paper-498 makeStyles-textJustifyAlign-543"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-420 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-501 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -6099,10 +6074,10 @@ exports[`App Route /page-not-found authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-946"
+      class="makeStyles-root-1126"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-947 makeStyles-appBarShift-948 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1127 makeStyles-appBarShift-1128 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6113,7 +6088,7 @@ exports[`App Route /page-not-found authenticated 1`] = `
             />
           </div>
           <div
-            class="makeStyles-rightToolbar-956"
+            class="makeStyles-rightToolbar-1137"
             color="inherit"
           >
             <button
@@ -6136,17 +6111,17 @@ exports[`App Route /page-not-found authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-951"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1131"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-952 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1132 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-953"
+            class="makeStyles-drawerHeader-1133 makeStyles-drawerHeaderLogo-1134"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-962"
+              class="makeStyles-logo-1143"
               src="fisker-badge.svg"
             />
           </div>
@@ -6330,11 +6305,10 @@ exports[`App Route /page-not-found authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1165 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -6357,16 +6331,16 @@ exports[`App Route /page-not-found authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-954 makeStyles-contentShift-955"
+        class="makeStyles-content-1135 makeStyles-contentShift-1136"
       >
         <div
-          class="makeStyles-drawerHeader-953"
+          class="makeStyles-drawerHeader-1133"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-935"
+            class="makeStyles-paper-1115"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -6387,10 +6361,10 @@ exports[`App Route /page-not-found unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-900"
+      class="makeStyles-root-1071"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-901 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1072 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6403,16 +6377,16 @@ exports[`App Route /page-not-found unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-908"
+        class="makeStyles-content-1080"
       >
         <div
-          class="makeStyles-drawerHeader-907"
+          class="makeStyles-drawerHeader-1078"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-889"
+            class="makeStyles-paper-1060"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -6433,10 +6407,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-704"
+      class="makeStyles-root-839"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-705 makeStyles-appBarShift-706 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-840 makeStyles-appBarShift-841 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6485,7 +6459,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-714"
+            class="makeStyles-rightToolbar-850"
             color="inherit"
           >
             <button
@@ -6508,17 +6482,17 @@ exports[`App Route /vehicle-add authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-709"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-844"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-710 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-845 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-711"
+            class="makeStyles-drawerHeader-846 makeStyles-drawerHeaderLogo-847"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-720"
+              class="makeStyles-logo-856"
               src="fisker-badge.svg"
             />
           </div>
@@ -6702,11 +6676,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-878 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -6729,10 +6702,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-712 makeStyles-contentShift-713"
+        class="makeStyles-content-848 makeStyles-contentShift-849"
       >
         <div
-          class="makeStyles-drawerHeader-711"
+          class="makeStyles-drawerHeader-846"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -6741,11 +6714,11 @@ exports[`App Route /vehicle-add authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-693"
+              class="makeStyles-paper-828"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-695"
+                class="makeStyles-form-830"
                 novalidate=""
               >
                 <div
@@ -6781,10 +6754,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-739"
+                        class="PrivateNotchedOutline-legendLabelled-883"
                       >
                         <span>
                           VIN
@@ -6827,10 +6800,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-739 PrivateNotchedOutline-legendNotched-740"
+                        class="PrivateNotchedOutline-legendLabelled-883 PrivateNotchedOutline-legendNotched-884"
                       >
                         <span>
                           Model
@@ -6874,10 +6847,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-739 PrivateNotchedOutline-legendNotched-740"
+                        class="PrivateNotchedOutline-legendLabelled-883 PrivateNotchedOutline-legendNotched-884"
                       >
                         <span>
                           Year
@@ -6921,10 +6894,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-739 PrivateNotchedOutline-legendNotched-740"
+                        class="PrivateNotchedOutline-legendLabelled-883 PrivateNotchedOutline-legendNotched-884"
                       >
                         <span>
                           Trim
@@ -6935,7 +6908,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-696 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-831 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
@@ -6964,10 +6937,10 @@ exports[`App Route /vehicle-add unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-106"
+      class="makeStyles-root-124"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-107 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-125 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6980,21 +6953,20 @@ exports[`App Route /vehicle-add unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-114"
+        class="makeStyles-content-133"
       >
         <div
-          class="makeStyles-drawerHeader-113"
+          class="makeStyles-drawerHeader-131"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-95"
-            style="justify-content: center;"
+            class="makeStyles-paper-113 makeStyles-textJustifyAlign-158"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-98 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-116 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -7021,10 +6993,10 @@ exports[`App Route /vehicle-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-854"
+      class="makeStyles-root-1016"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-855 makeStyles-appBarShift-856 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1017 makeStyles-appBarShift-1018 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -7073,7 +7045,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-864"
+            class="makeStyles-rightToolbar-1027"
             color="inherit"
           >
             <button
@@ -7096,17 +7068,17 @@ exports[`App Route /vehicle-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-859"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1021"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-860 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1022 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-861"
+            class="makeStyles-drawerHeader-1023 makeStyles-drawerHeaderLogo-1024"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-870"
+              class="makeStyles-logo-1033"
               src="fisker-badge.svg"
             />
           </div>
@@ -7290,11 +7262,10 @@ exports[`App Route /vehicle-status authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1055 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -7317,10 +7288,10 @@ exports[`App Route /vehicle-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-862 makeStyles-contentShift-863"
+        class="makeStyles-content-1025 makeStyles-contentShift-1026"
       >
         <div
-          class="makeStyles-drawerHeader-861"
+          class="makeStyles-drawerHeader-1023"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -7332,7 +7303,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
               data-testid="mocked-updatesprovider"
             >
               <div
-                class="makeStyles-paper-843"
+                class="makeStyles-paper-1005"
                 style="height: 700px; width: 100%;"
               >
                 <table
@@ -7357,7 +7328,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                         >
                           ID
                           <span
-                            class="makeStyles-hiddenSortSpan-866"
+                            class="makeStyles-hiddenSortSpan-1029"
                           >
                             sorted descending
                           </span>
@@ -7612,10 +7583,10 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-290"
+      class="makeStyles-root-344"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-291 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-345 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -7628,21 +7599,20 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-298"
+        class="makeStyles-content-353"
       >
         <div
-          class="makeStyles-drawerHeader-297"
+          class="makeStyles-drawerHeader-351"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-279"
-            style="justify-content: center;"
+            class="makeStyles-paper-333 makeStyles-textJustifyAlign-378"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-282 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-336 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -7669,10 +7639,10 @@ exports[`App Route /vehicles authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-800"
+      class="makeStyles-root-953"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-801 makeStyles-appBarShift-802 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-954 makeStyles-appBarShift-955 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -7685,7 +7655,7 @@ exports[`App Route /vehicles authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-810"
+            class="makeStyles-rightToolbar-964"
             color="inherit"
           >
             <button
@@ -7708,17 +7678,17 @@ exports[`App Route /vehicles authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-805"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-958"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-806 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-959 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-807"
+            class="makeStyles-drawerHeader-960 makeStyles-drawerHeaderLogo-961"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-816"
+              class="makeStyles-logo-970"
               src="fisker-badge.svg"
             />
           </div>
@@ -7902,11 +7872,10 @@ exports[`App Route /vehicles authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-992 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
-                  style="text-decoration: inherit;"
                   tabindex="0"
                   target="_blank"
                 >
@@ -7929,10 +7898,10 @@ exports[`App Route /vehicles authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-808 makeStyles-contentShift-809"
+        class="makeStyles-content-962 makeStyles-contentShift-963"
       >
         <div
-          class="makeStyles-drawerHeader-807"
+          class="makeStyles-drawerHeader-960"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -7941,17 +7910,15 @@ exports[`App Route /vehicles authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-789"
-              style="height: 700px; width: 100%;"
+              class="makeStyles-paper-942 makeStyles-tableSize-993"
             >
               <div
-                class="MuiGrid-root makeStyles-root-800 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-953 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-987 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <a
-                    class="makeStyles-labelInline-795"
                     href="/vehicle-add"
                   >
                     <svg
@@ -7966,7 +7933,16 @@ exports[`App Route /vehicles authenticated 1`] = `
                     </svg>
                   </a>
                   <div
-                    class="MuiFormControl-root makeStyles-margin-813 makeStyles-textField-814"
+                    class="makeStyles-labelInline-948"
+                  >
+                    0 Selected
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root makeStyles-textCenterAlign-988 MuiGrid-item MuiGrid-grid-md-4"
+                >
+                  <div
+                    class="MuiFormControl-root makeStyles-margin-967 makeStyles-textField-968"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -8015,36 +7991,30 @@ exports[`App Route /vehicles authenticated 1`] = `
                       </div>
                     </div>
                   </div>
-                  <div
-                    class="makeStyles-labelInline-795"
-                  >
-                    0 Selected
-                  </div>
                 </div>
                 <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
-                  style="text-align: right;"
+                  class="MuiGrid-root makeStyles-textRightAlign-989 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="makeStyles-form-791"
+                    class="makeStyles-form-944"
+                    style="margin-top: 20px;"
                   >
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-794"
+                      class="MuiFormControl-root makeStyles-formControlInline-947"
                     >
                       <label
-                        class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
+                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-994 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
                         data-shrink="true"
                         for="send-command"
-                        style="background-color: White;"
                       >
                         Command
                       </label>
                       <div
-                        class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
+                        class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl MuiInputBase-marginDense MuiOutlinedInput-marginDense"
                       >
                         <select
                           aria-invalid="false"
-                          class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
+                          class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMarginDense MuiOutlinedInput-inputMarginDense"
                           id="send-command"
                           name="send-command"
                         >
@@ -8091,11 +8061,11 @@ exports[`App Route /vehicles authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-833 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-995 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-834"
+                            class="PrivateNotchedOutline-legend-996"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -8106,22 +8076,21 @@ exports[`App Route /vehicles authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-794"
+                      class="MuiFormControl-root makeStyles-formControlInline-947"
                     >
                       <label
-                        class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
+                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-994 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
                         data-shrink="true"
                         for="send-parameter"
-                        style="background-color: White;"
                       >
                         Parameter
                       </label>
                       <div
-                        class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
+                        class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl MuiInputBase-marginDense MuiOutlinedInput-marginDense"
                       >
                         <select
                           aria-invalid="false"
-                          class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
+                          class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMarginDense MuiOutlinedInput-inputMarginDense"
                           id="send-parameter"
                           name="send-parameter"
                         >
@@ -8163,11 +8132,11 @@ exports[`App Route /vehicles authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-833 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-995 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-834"
+                            class="PrivateNotchedOutline-legend-996"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -8180,7 +8149,7 @@ exports[`App Route /vehicles authenticated 1`] = `
                     <span
                       aria-disabled="true"
                       aria-label="send command"
-                      class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorPrimary Mui-disabled Mui-disabled"
+                      class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorPrimary Mui-disabled MuiIconButton-sizeSmall Mui-disabled"
                       role="button"
                       tabindex="-1"
                     >
@@ -8203,8 +8172,7 @@ exports[`App Route /vehicles authenticated 1`] = `
                 </div>
               </div>
               <div
-                class="makeStyles-paper-789"
-                style="height: 700px; width: 100%;"
+                class="makeStyles-paper-942 makeStyles-tableSize-993"
               >
                 <table
                   class="MuiTable-root"
@@ -8221,14 +8189,14 @@ exports[`App Route /vehicles authenticated 1`] = `
                       >
                         <span
                           aria-disabled="false"
-                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-837 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-999 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                         >
                           <span
                             class="MuiIconButton-label"
                           >
                             <input
                               aria-label="select all desserts"
-                              class="PrivateSwitchBase-input-840"
+                              class="PrivateSwitchBase-input-1002"
                               data-indeterminate="false"
                               type="checkbox"
                               value=""
@@ -8262,7 +8230,7 @@ exports[`App Route /vehicles authenticated 1`] = `
                         >
                           VIN
                           <span
-                            class="makeStyles-hiddenSortSpan-812"
+                            class="makeStyles-hiddenSortSpan-966"
                           >
                             sorted ascending
                           </span>
@@ -8540,10 +8508,10 @@ exports[`App Route /vehicles unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-244"
+      class="makeStyles-root-289"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-245 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-290 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -8556,21 +8524,20 @@ exports[`App Route /vehicles unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-252"
+        class="makeStyles-content-298"
       >
         <div
-          class="makeStyles-drawerHeader-251"
+          class="makeStyles-drawerHeader-296"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-233"
-            style="justify-content: center;"
+            class="makeStyles-paper-278 makeStyles-textJustifyAlign-323"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-236 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-281 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
diff --git a/src/components/CarUpdates/Status/index.jsx b/src/components/CarUpdates/Status/index.jsx
index 9771ada..1b11b2c 100644
--- a/src/components/CarUpdates/Status/index.jsx
+++ b/src/components/CarUpdates/Status/index.jsx
@@ -105,7 +105,7 @@ const MainForm = () => {
   };
 
   return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
+    <div className={`${classes.paper} ${classes.tableSize}`}>
       <Table>
         <TableHead>
           <TableRow>
@@ -125,7 +125,7 @@ const MainForm = () => {
               </TableCell>
               <TableCell align="center">
                 {row.status}
-                {row.progress > 0 && (
+                {row.progress > -1 && (
                   <LinearProgress variant="determinate" value={row.progress} />
                 )}
               </TableCell>
diff --git a/src/components/Cars/CarSelection/index.jsx b/src/components/Cars/CarSelection/index.jsx
deleted file mode 100644
index baaa909..0000000
--- a/src/components/Cars/CarSelection/index.jsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import React, { useEffect, useState } from "react";
-import PropTypes from "prop-types";
-import { FormControl, InputLabel, Select } from "@material-ui/core";
-
-import {
-  useVehicleContext,
-  VehicleProvider,
-} from "../../Contexts/VehicleContext";
-import { useUserContext } from "../../Contexts/UserContext";
-import useStyles from "../../useStyles";
-
-const Control = (props) => {
-  const classes = useStyles();
-  const { models, years, vehicles, getModels, getYears, getVehicles } =
-    useVehicleContext();
-  const {
-    token: {
-      idToken: { jwtToken: token },
-    },
-  } = useUserContext();
-  const [model, setModel] = useState("");
-  const [year, setYear] = useState(-1);
-  const [trim, setTrim] = useState("");
-
-  const handleChangeModel = (event) => {
-    setModel(event.target.value);
-  };
-  const handleChangeYear = (event) => {
-    setYear(event.target.value);
-  };
-  const handleChangeTrim = (event) => {
-    setTrim(event.target.value);
-  };
-
-  useEffect(() => {
-    if (!token) return;
-    (async () => {
-      try {
-        await getModels(token);
-        await getYears(token);
-      } catch (e) {}
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [token]);
-
-  useEffect(() => {
-    if (!models || models.length === 0) return;
-    setModel(models[0]);
-  }, [models]);
-
-  useEffect(() => {
-    if (!years || years.length === 0) return;
-    setYear(years[0]);
-  }, [years]);
-
-  useEffect(() => {
-    if (model === null || year === -1) return;
-    getVehicles({ model, year, trim }, token);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [model, year, trim]);
-
-  useEffect(() => {
-    if (!props.onSelection) return;
-    const vins = vehicles.map((item) => item.vin);
-    props.onSelection(vins);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [vehicles]);
-
-  return (
-    <div className={classes.paper}>
-      <div className={classes.form}>
-        <FormControl className={classes.formControlInline} variant="outlined">
-          <InputLabel htmlFor="car-model" style={{ backgroundColor: "White" }}>
-            Model
-          </InputLabel>
-          <Select
-            native
-            value={model}
-            onChange={handleChangeModel}
-            variant="outlined"
-            inputProps={{
-              name: "car-model",
-              id: "car-model",
-            }}
-          >
-            {models.map((item) => (
-              <option key={item} value={item}>
-                {item}
-              </option>
-            ))}
-          </Select>
-        </FormControl>
-        <FormControl className={classes.formControlInline} variant="outlined">
-          <InputLabel htmlFor="car-year" style={{ backgroundColor: "White" }}>
-            Year
-          </InputLabel>
-          <Select
-            native
-            value={year}
-            onChange={handleChangeYear}
-            variant="outlined"
-            inputProps={{
-              name: "car-year",
-              id: "car-year",
-            }}
-          >
-            {years.map((item) => (
-              <option key={item} value={item}>
-                {item}
-              </option>
-            ))}
-          </Select>
-        </FormControl>
-        <FormControl className={classes.formControlInline} variant="outlined">
-          <InputLabel htmlFor="car-trim" style={{ backgroundColor: "White" }}>
-            Trim
-          </InputLabel>
-          <Select
-            native
-            value={year}
-            onChange={handleChangeTrim}
-            variant="outlined"
-            inputProps={{
-              name: "car-trim",
-              id: "car-trim",
-            }}
-          >
-            {years.map((item) => (
-              <option key={item} value={item}>
-                {item}
-              </option>
-            ))}
-          </Select>
-        </FormControl>
-        <div className={classes.labelInline}>
-          {vehicles.length === 0
-            ? "No Cars Selected"
-            : vehicles.length === 1
-            ? "1 Car Selected"
-            : `${vehicles.length} Cars Selected`}
-        </div>
-      </div>
-      <div className={classes.form}></div>
-    </div>
-  );
-};
-
-const CarSelection = (props) => (
-  <VehicleProvider>
-    <Control {...props} />
-  </VehicleProvider>
-);
-
-CarSelection.propTypes = {
-  onSelection: PropTypes.func,
-};
-
-export default CarSelection;
diff --git a/src/components/Cars/CarSelectionTable/index.jsx b/src/components/Cars/CarSelectionTable/index.jsx
index b3b39d2..109de4e 100644
--- a/src/components/Cars/CarSelectionTable/index.jsx
+++ b/src/components/Cars/CarSelectionTable/index.jsx
@@ -114,7 +114,7 @@ const CarSelectionTable = (props) => {
   }, [pageIndex, pageSize, orderBy, order, search, token]);
 
   return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
+    <div className={`${classes.paper} ${classes.tableSize}`}>
       <Table>
         <TableHeaderSortable
           classes={classes}
diff --git a/src/components/Cars/SendCommand/index.jsx b/src/components/Cars/SendCommand/index.jsx
index a3d67f1..e1e1977 100644
--- a/src/components/Cars/SendCommand/index.jsx
+++ b/src/components/Cars/SendCommand/index.jsx
@@ -75,9 +75,13 @@ const SendCommand = ({ vins }) => {
   }, []);
 
   return (
-    <div className={classes.form}>
-      <FormControl className={classes.formControlInline} variant="outlined">
-        <InputLabel htmlFor="send-command" style={{ backgroundColor: "White" }}>
+    <div className={`${classes.form}`} style={{ marginTop: 20 }}>
+      <FormControl
+        className={classes.formControlInline}
+        variant="outlined"
+        size="small"
+      >
+        <InputLabel htmlFor="send-command" className={classes.whiteBackground}>
           Command
         </InputLabel>
         <Select
@@ -97,10 +101,14 @@ const SendCommand = ({ vins }) => {
           ))}
         </Select>
       </FormControl>
-      <FormControl className={classes.formControlInline} variant="outlined">
+      <FormControl
+        className={classes.formControlInline}
+        variant="outlined"
+        size="small"
+      >
         <InputLabel
           htmlFor="send-parameter"
-          style={{ backgroundColor: "White" }}
+          className={classes.whiteBackground}
         >
           Parameter
         </InputLabel>
@@ -127,6 +135,7 @@ const SendCommand = ({ vins }) => {
         aria-label="send command"
         component="span"
         onClick={clickHandler}
+        size="small"
         disabled={busy || vins.length === 0}
       >
         <SendIcon fontSize="large" />
diff --git a/src/components/Cars/SendCommandBulk/index.jsx b/src/components/Cars/SendCommandBulk/index.jsx
index d3bbf3d..cae15e8 100644
--- a/src/components/Cars/SendCommandBulk/index.jsx
+++ b/src/components/Cars/SendCommandBulk/index.jsx
@@ -54,19 +54,21 @@ const MainForm = () => {
   }, []);
 
   return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
+    <div className={`${classes.paper} ${classes.tableSize}`}>
       <Grid container className={classes.root} spacing={2}>
-        <Grid item md={6}>
-          <Link to="/vehicle-add" className={classes.labelInline}>
+        <Grid item md={4} className={classes.textJustifyAlign}>
+          <Link to="/vehicle-add">
             <AddCircleIcon fontSize="large" />
           </Link>
-          <SearchField classes={classes} onSearch={handleSearch} />
           <div
             className={classes.labelInline}
           >{`${selected.length} Selected`}</div>
         </Grid>
-        <Grid item md={6} style={{ textAlign: "right" }}>
-          <SendCommand vins={selected} style={{ display: "flex" }} />
+        <Grid item md={4} className={classes.textCenterAlign}>
+          <SearchField classes={classes} onSearch={handleSearch} />
+        </Grid>
+        <Grid item md={4} className={classes.textRightAlign}>
+          <SendCommand vins={selected} />
         </Grid>
       </Grid>
       <CarSelectionTable
diff --git a/src/components/Contexts/CarUpdatesContext.jsx b/src/components/Contexts/CarUpdatesContext.jsx
index 9ee8854..a33de65 100644
--- a/src/components/Contexts/CarUpdatesContext.jsx
+++ b/src/components/Contexts/CarUpdatesContext.jsx
@@ -1,7 +1,9 @@
 import React, { useContext, useState } from "react";
 
 import api from "../../services/updates";
+import { validateStatusMessage } from "../../utils/statusMessage";
 
+const FINAL_UPDATE_STATES = ["package_install_complete"];
 const CarUpdatesContext = React.createContext();
 
 const validateDeployCarUpdates = (data) => {
@@ -49,6 +51,8 @@ export const CarUpdatesProvider = ({ children }) => {
       result = await api.getCarUpdates(search, token);
       if (result.error)
         throw new Error(`Get car updates error. ${result.message}`);
+      result.data.forEach((item) => (item.progress = 0));
+      console.log(result.data);
       setCarUpdates(result.data);
       if (search && search.offset === 0 && result.total) {
         setTotalCarUpdates(result.total);
@@ -75,30 +79,48 @@ export const CarUpdatesProvider = ({ children }) => {
     return result;
   };
 
+  const getDownloadProgress = (status) => {
+    if (status.package_total > 0)
+      return Math.floor((100 * status.package_current) / status.package_total);
+    return 0;
+  };
+
+  const getInstallProgress = (status) => {
+    if (status.total_files > 0)
+      return Math.floor((100 * status.installed) / status.total_files);
+    return 0;
+  };
+
   const applyProgressStatus = (item, status) => {
-    if (status.msg === "package_download_complete") {
-      delete item.progress;
-      item.status = "downloaded";
-    } else if (status.msg === "downloading" && status.package_total > 0) {
-      let progress = Math.floor(
-        (100 * status.package_current) / status.package_total
-      );
-      if (progress > 99) progress = 0;
-      item.progress = progress;
-      item.status = `downloading ${progress}%`;
-    } else if (status.error > 0 || status.msg === "download_error") {
-      item.status = "download error";
-    } else {
-      item.status = "downloading";
+    if (validateStatusMessage(status)) {
+      if (status.msg === "downloading") {
+        item.progress = getDownloadProgress(status);
+        item.status = `downloading ${item.progress}%`;
+        return;
+      } else if (status.msg === "package_download_complete") {
+        item.progress = 100;
+        item.status = "downloaded";
+        return;
+      } else if (status.msg === "installing") {
+        item.progress = getInstallProgress(status);
+        item.status = `installing ${item.progress}%`;
+        return;
+      } else if (status.msg === "package_install_complete") {
+        item.progress = 100;
+        item.status = "installed";
+        return;
+      }
     }
+    delete item.progress;
+    item.status = status.msg;
   };
 
   const applyProgressStatuses = (statuses) => {
     let items = JSON.parse(JSON.stringify(carUpdates));
 
     statuses.forEach((status) => {
-      let item = items.find((item) => status.id === item.id);
-      if (!item || status.id === 0) return;
+      let item = items.find((item) => status.car_update_id === item.id);
+      if (!item || status.car_update_id === 0) return;
       applyProgressStatus(item, status);
     });
 
@@ -113,7 +135,7 @@ export const CarUpdatesProvider = ({ children }) => {
     try {
       setBusy(true);
       const carupdateids = carUpdates.reduce((accum, update) => {
-        if (update.status !== "downloaded") accum.push(update.id);
+        if (update.status !== "installed") accum.push(update.id);
         return accum;
       }, []);
       if (carupdateids.length === 0) return;
@@ -138,7 +160,7 @@ export const CarUpdatesProvider = ({ children }) => {
       return 1000;
     }
     for (let i = 0, len = carUpdates.length; i < len; i++) {
-      if (carUpdates[i].status.indexOf("downloading") > -1) return 1000;
+      if (FINAL_UPDATE_STATES.indexOf(carUpdates[i].status) === -1) return 1000;
     }
     return 10000;
   };
diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx
index 1e504e1..9805348 100644
--- a/src/components/Home/index.jsx
+++ b/src/components/Home/index.jsx
@@ -1,15 +1,11 @@
 import React, { useEffect } from "react";
-import { Typography } from "@material-ui/core";
 import useStyles from "../useStyles";
 
-import { useUserContext } from "../Contexts/UserContext";
 import { useStatusContext } from "../Contexts/StatusContext";
 import VehicleMap from "../VehicleMap";
-import { getName } from "../../utils/jwt";
 
 const Home = () => {
   const classes = useStyles();
-  const { token } = useUserContext();
   const { setTitle, setSitePath } = useStatusContext();
 
 
@@ -21,9 +17,6 @@ const Home = () => {
 
   return (
     <div className={classes.paper}>
-      <Typography className={classes.homePageTitle} component="h1" variant="h5">
-        Welcome {getName(token)}!
-      </Typography>
       <VehicleMap />
     </div>
   );
diff --git a/src/components/Layouts/MenuDrawer.jsx b/src/components/Layouts/MenuDrawer.jsx
index 6a19ead..60d0f26 100644
--- a/src/components/Layouts/MenuDrawer.jsx
+++ b/src/components/Layouts/MenuDrawer.jsx
@@ -52,7 +52,9 @@ export default function MenuDrawer({ children }) {
             paper: classes.drawerPaper,
           }}
         >
-          <div className={classes.drawerHeader}>
+          <div
+            className={`${classes.drawerHeader} ${classes.drawerHeaderLogo}`}
+          >
             <img
               src={logo}
               alt="Fisker Admin Portal"
@@ -69,9 +71,7 @@ export default function MenuDrawer({ children }) {
         })}
       >
         <div className={classes.drawerHeader} />
-        <Container component="main" maxWidth="lg">
-          {children}
-        </Container>
+        <Container component="main">{children}</Container>
       </main>
     </div>
   );
diff --git a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
index f36fe51..17dba3d 100644
--- a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
+++ b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
@@ -182,11 +182,10 @@ exports[`SideMenu Authenticated 1`] = `
         <li>
           <a
             aria-disabled="false"
-            class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+            class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-53 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
             href="https://grafana.fiskerdps.com"
             rel="noopener"
             role="button"
-            style="text-decoration: inherit;"
             tabindex="0"
             target="_blank"
           >
diff --git a/src/components/ListItemExternalLink.jsx b/src/components/ListItemExternalLink.jsx
index 13568a5..3e1e29f 100644
--- a/src/components/ListItemExternalLink.jsx
+++ b/src/components/ListItemExternalLink.jsx
@@ -5,31 +5,20 @@ import ListItemIcon from "@material-ui/core/ListItemIcon";
 import ListItemText from "@material-ui/core/ListItemText";
 import { Link } from "@material-ui/core";
 
+import useStyles from "./useStyles";
+
 function ListItemExternalLink(props) {
   const { icon, primary, url } = props;
-  const style = {
-    textDecoration: "inherit",
-    color: "inherit",
-    "&:link": {
-      textDecoration: "inherit",
-      color: "inherit",
-      cursor: "auto",
-    },
-    "&:visited": {
-      textDecoration: "inherit",
-      color: "inherit",
-      cursor: "auto",
-    },
-  };
+  const classes = useStyles();
 
   return (
     <ListItem
       button
       component={Link}
-      style={style}
       href={url}
       rel="noopener"
       target="_blank"
+      className={classes.menuExternalLink}
     >
       {icon ? <ListItemIcon>{icon}</ListItemIcon> : null}
       <ListItemText primary={primary} />
diff --git a/src/components/Manifest/Deploy/index.jsx b/src/components/Manifest/Deploy/index.jsx
index f2d7bc2..0e218fe 100644
--- a/src/components/Manifest/Deploy/index.jsx
+++ b/src/components/Manifest/Deploy/index.jsx
@@ -126,17 +126,18 @@ const MainForm = () => {
       <form className={classes.form} noValidate action="{onSubmit}">
         <Typography variant="body2">Created {createDate}.</Typography>
         <Grid container className={classes.root} spacing={2}>
-          <Grid item md={10}>
-            <SearchField classes={classes} onSearch={handleSearch} />
+          <Grid item md={2}>
             <div
               className={classes.labelInline}
             >{`${selected.length} Selected`}</div>
           </Grid>
-          <Grid item md={2} style={{ textAlign: "right" }}>
+          <Grid item md={8} className={classes.textCenterAlign}>
+            <SearchField classes={classes} onSearch={handleSearch} />
+          </Grid>
+          <Grid item md={2} className={classes.textRightAlign}>
             <Button
               type="submit"
               disabled={busy || selected.length === 0}
-              fullWidth
               variant="contained"
               color="primary"
               className={classes.formControl}
diff --git a/src/components/Manifest/List/index.jsx b/src/components/Manifest/List/index.jsx
index a63b95a..e4d6c9a 100644
--- a/src/components/Manifest/List/index.jsx
+++ b/src/components/Manifest/List/index.jsx
@@ -1,13 +1,13 @@
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import {
+  Grid,
   Table,
   TableBody,
   TableCell,
   TableFooter,
   TablePagination,
   TableRow,
-  Toolbar,
   Tooltip,
 } from "@material-ui/core";
 import AddCircleIcon from "@material-ui/icons/AddCircle";
@@ -184,13 +184,18 @@ const MainForm = () => {
   };
 
   return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <Toolbar className={classes.tableToolbar}>
-        <Link to="/package-create" className={classes.labelInline}>
-          <AddCircleIcon fontSize="large" />
-        </Link>
-        <SearchField classes={classes} onSearch={handleSearch} />
-      </Toolbar>
+    <div className={`${classes.paper} ${classes.tableSize}`}>
+      <Grid container className={classes.root} spacing={2}>
+        <Grid item md={4} className={classes.textJustifyAlign}>
+          <Link to="/package-create" className={classes.labelInline}>
+            <AddCircleIcon fontSize="large" />
+          </Link>
+        </Grid>
+        <Grid item md={4} className={classes.textCenterAlign}>
+          <SearchField classes={classes} onSearch={handleSearch} />
+        </Grid>
+        <Grid item md={4} className={classes.textRightAlign}></Grid>
+      </Grid>
       <Table>
         <TableHeaderSortable
           classes={classes}
diff --git a/src/components/Manifest/Status/index.jsx b/src/components/Manifest/Status/index.jsx
index b1bc624..fc9e525 100644
--- a/src/components/Manifest/Status/index.jsx
+++ b/src/components/Manifest/Status/index.jsx
@@ -119,7 +119,7 @@ const MainForm = () => {
   };
 
   return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
+    <div className={`${classes.paper} ${classes.tableSize}`}>
       <Table>
         <TableHead>
           <TableRow>
@@ -139,7 +139,7 @@ const MainForm = () => {
               </TableCell>
               <TableCell align="center">
                 {row.status}
-                {row.progress > 0 && (
+                {row.progress > -1 && (
                   <LinearProgress variant="determinate" value={row.progress} />
                 )}
               </TableCell>
diff --git a/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap b/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap
index 0779f27..c9b4462 100644
--- a/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap
+++ b/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap
@@ -3,8 +3,7 @@
 exports[`Sign In Form Should render 1`] = `
 <div>
   <div
-    class="makeStyles-paper-3"
-    style="justify-content: center;"
+    class="makeStyles-paper-3 makeStyles-textJustifyAlign-48"
   >
     <a
       aria-disabled="false"
diff --git a/src/components/SSOForm/index.jsx b/src/components/SSOForm/index.jsx
index 36c4b7e..76bb0cc 100644
--- a/src/components/SSOForm/index.jsx
+++ b/src/components/SSOForm/index.jsx
@@ -21,7 +21,7 @@ export default function SignInForm() {
   }, []);
 
   return (
-    <div className={classes.paper} style={{ justifyContent: "center" }}>
+    <div className={`${classes.paper} ${classes.textJustifyAlign}`}>
       <Button
         type="submit"
         variant="contained"
diff --git a/src/components/useStyles.jsx b/src/components/useStyles.jsx
index a653a66..f88cea7 100644
--- a/src/components/useStyles.jsx
+++ b/src/components/useStyles.jsx
@@ -45,7 +45,7 @@ const useStyles = makeStyles((theme) => ({
   },
   labelInline: {
     fontSize: "1.25em",
-    margin: theme.spacing(2, 1, 1),
+    margin: theme.spacing(4, 1, 1),
     display: "inline-flex",
     boxSizing: "border-box",
     verticalAlign: "bottom",
@@ -77,6 +77,8 @@ const useStyles = makeStyles((theme) => ({
       easing: theme.transitions.easing.sharp,
       duration: theme.transitions.duration.leavingScreen,
     }),
+    color: "black",
+    backgroundColor: "white",
   },
   appBarShift: {
     width: `calc(100% - ${DRAWER_WIDTH}px)`,
@@ -107,6 +109,9 @@ const useStyles = makeStyles((theme) => ({
     ...theme.mixins.toolbar,
     justifyContent: "flex-start",
   },
+  drawerHeaderLogo: {
+    backgroundColor: "#3f51b5",
+  },
   content: {
     flexGrow: 1,
     padding: theme.spacing(3),
@@ -231,6 +236,32 @@ const useStyles = makeStyles((theme) => ({
   datascopeContainerValue: {
     margin: 0,
   },
+  textJustifyAlign: { textAlign: "justifyContent" },
+  textCenterAlign: { textAlign: "center" },
+  textRightAlign: { textAlign: "right" },
+  fullWidth: { width: "100%" },
+  pageCenter: {
+    position: "absolute",
+    top: "50%",
+    left: "50%",
+    transform: "translate(-50%, -50%)",
+  },
+  menuExternalLink: {
+    textDecoration: "inherit",
+    color: "inherit",
+    "&:link": {
+      textDecoration: "inherit",
+      color: "inherit",
+      cursor: "auto",
+    },
+    "&:visited": {
+      textDecoration: "inherit",
+      color: "inherit",
+      cursor: "auto",
+    },
+  },
+  tableSize: { height: 700, width: "100%" },
+  whiteBackground: { backgroundColor: "White" },
 }));
 
 export default useStyles;
diff --git a/src/services/__mocks__/grafana.js b/src/services/__mocks__/grafana.js
index 4424256..8376f2c 100644
--- a/src/services/__mocks__/grafana.js
+++ b/src/services/__mocks__/grafana.js
@@ -1,19 +1,6 @@
 const grafanaAPI = {
-    getCarsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20countDistinct(vin)%20as%20count%0AFROM%20default.vehicle_data%20FORMAT%20JSON`, {
-        method: "GET",
-        headers: Object.assign({ "Content-Type": "application/json" }),
-    })
-        .then(fetchRespHandler)
-        .then(result => result.data[0].count)
-        .catch(error => console.log(error)),
-
-    getSignalsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20count()%20as%20count%0AFROM%20default.vehicle_signal%20FORMAT%20JSON`, {
-        method: "GET",
-        headers: Object.assign({ "Content-Type": "application/json" }),
-    })
-        .then(fetchRespHandler)
-        .then(result => result.data[0].count)
-        .catch(error => console.log(error)),
+    getCarsCount: async () => 500,
+    getSignalsCount: async () => 1234567890,
 };
 
-export default vehiclesAPI;
+export default grafanaAPI;
diff --git a/src/services/grafana.js b/src/services/grafana.js
index 8376f2c..a162eac 100644
--- a/src/services/grafana.js
+++ b/src/services/grafana.js
@@ -1,6 +1,23 @@
+import { fetchRespHandler } from "../utils/http"
+
+const API_ENDPOINT = "https://grafana.fiskerdps.com/api/datasources/proxy/2"
+
 const grafanaAPI = {
-    getCarsCount: async () => 500,
-    getSignalsCount: async () => 1234567890,
+    getCarsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20countDistinct(vin)%20as%20count%0AFROM%20default.vehicle_data%20FORMAT%20JSON`, {
+        method: "GET",
+        headers: Object.assign({ "Content-Type": "application/json" }),
+    })
+        .then(fetchRespHandler)
+        .then(result => result.data[0].count)
+        .catch(error => console.log(error)),
+
+    getSignalsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20count()%20as%20count%0AFROM%20default.vehicle_signal%20FORMAT%20JSON`, {
+        method: "GET",
+        headers: Object.assign({ "Content-Type": "application/json" }),
+    })
+        .then(fetchRespHandler)
+        .then(result => result.data[0].count)
+        .catch(error => console.log(error)),
 };
 
 export default grafanaAPI;
diff --git a/src/utils/statusMessage.js b/src/utils/statusMessage.js
new file mode 100644
index 0000000..69c0e17
--- /dev/null
+++ b/src/utils/statusMessage.js
@@ -0,0 +1,23 @@
+const DOWNLOAD_STATUSES = ["download_start", "downloading", "download_complete", "download_error", "package_download_complete"];
+const INSTALL_STATUSES = ["install_start", "installing", "install_complete", "install_error", "pacakge_install_complete"];
+
+export const isDownloadStatusMessage = (status) => {
+  return DOWNLOAD_STATUSES.indexOf(status.msg) > -1;
+};
+
+export const isInstallStatusMessage = (status) => {
+  return INSTALL_STATUSES.indexOf(status.msg) > -1;
+};
+
+export const validateStatusMessage = (status) => {
+  if (isDownloadStatusMessage(status)) {
+    if (!(status.package_current > -1 && status.package_total > -1)) return false;
+    if (status.package_current > status.package_total) return false;
+    return true;
+  } else if (isInstallStatusMessage(status)) {
+    if (!(status.installed > -1 && status.total_files > -1)) return false;
+    if (status.installed > status.total_files) return false;
+    return true;
+  }
+  return false;
+};
diff --git a/src/utils/statusMessage.test.js b/src/utils/statusMessage.test.js
new file mode 100644
index 0000000..511766a
--- /dev/null
+++ b/src/utils/statusMessage.test.js
@@ -0,0 +1,48 @@
+import { isDownloadStatusMessage, isInstallStatusMessage, validateStatusMessage} from "./statusMessage";
+
+describe("validatons", () => {
+  it("isDownloadStatusMessage", () => {
+    expect(isDownloadStatusMessage({ msg: "download_start"})).toEqual(true);
+    expect(isDownloadStatusMessage({ msg: "downloading"})).toEqual(true);
+    expect(isDownloadStatusMessage({ msg: "download_complete"})).toEqual(true);
+    expect(isDownloadStatusMessage({ msg: "download_error"})).toEqual(true);
+    expect(isDownloadStatusMessage({ msg: "package_download_complete"})).toEqual(true);
+    
+    expect(isDownloadStatusMessage({ msg: "installing"})).toEqual(false);
+    expect(isDownloadStatusMessage({ msg: "install_start"})).toEqual(false);
+    expect(isDownloadStatusMessage({ msg: "install_complete"})).toEqual(false);
+    expect(isDownloadStatusMessage({ msg: "install_error"})).toEqual(false);
+    expect(isDownloadStatusMessage({ msg: "pacakge_install_complete"})).toEqual(false);
+  });
+  it("isInstallStatusMessage", () => {
+    expect(isInstallStatusMessage({ msg: "download_start"})).toEqual(false);
+    expect(isInstallStatusMessage({ msg: "downloading"})).toEqual(false);
+    expect(isInstallStatusMessage({ msg: "download_complete"})).toEqual(false);
+    expect(isInstallStatusMessage({ msg: "download_error"})).toEqual(false);
+    expect(isInstallStatusMessage({ msg: "package_download_complete"})).toEqual(false);
+    
+    expect(isInstallStatusMessage({ msg: "installing"})).toEqual(true);
+    expect(isInstallStatusMessage({ msg: "install_start"})).toEqual(true);
+    expect(isInstallStatusMessage({ msg: "install_complete"})).toEqual(true);
+    expect(isInstallStatusMessage({ msg: "install_error"})).toEqual(true);
+    expect(isInstallStatusMessage({ msg: "pacakge_install_complete"})).toEqual(true);
+  });
+  it("validateStatusMessage", () => {
+    expect(validateStatusMessage({ msg: "download_start", package_current: 0, package_total: 0})).toEqual(true);
+    expect(validateStatusMessage({ msg: "downloading", package_current: 0, package_total: 0})).toEqual(true);
+    expect(validateStatusMessage({ msg: "download_complete", package_current: 0, package_total: 0})).toEqual(true);
+    expect(validateStatusMessage({ msg: "download_error", package_current: 0, package_total: 0})).toEqual(true);
+    expect(validateStatusMessage({ msg: "package_download_complete", package_current: 0, package_total: 0})).toEqual(true);
+    
+    expect(validateStatusMessage({ msg: "installing", installed: 0, total_files: 0 })).toEqual(true);
+    expect(validateStatusMessage({ msg: "install_start", installed: 0, total_files: 0 })).toEqual(true);
+    expect(validateStatusMessage({ msg: "install_complete", installed: 0, total_files: 0 })).toEqual(true);
+    expect(validateStatusMessage({ msg: "install_error", installed: 0, total_files: 0 })).toEqual(true);
+    expect(validateStatusMessage({ msg: "pacakge_install_complete", installed: 0, total_files: 0 })).toEqual(true);
+
+    expect(validateStatusMessage({ msg: "downloading", package_current: -1, package_total: -1})).toEqual(false);
+    expect(validateStatusMessage({ msg: "installing", installed: -1, total_files: -1})).toEqual(false);
+    expect(validateStatusMessage({ msg: "download_start", package_current: 100, package_total: 50})).toEqual(false);
+    expect(validateStatusMessage({ msg: "install_start", installed: 10, total_files: 9})).toEqual(false);
+  });
+})
\ No newline at end of file