diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js
index b284d56..cfa8333 100644
--- a/src/components/App/App.test.js
+++ b/src/components/App/App.test.js
@@ -4,7 +4,7 @@ jest.mock("../Contexts/UserContext");
 jest.mock("../Contexts/ManifestsContext");
 jest.mock("../Contexts/CarUpdatesContext");
 jest.mock("../../services/monitoring");
-jest.mock("../../services/grafana");
+jest.mock("../../services/grafanaAPI");
 
 import { render, screen, cleanup, waitFor, waitForElementToBeRemoved } from "@testing-library/react";
 import { setToken } from "../Contexts/UserContext";
diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index e3a6392..c76947c 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-768"
+      class="makeStyles-root-781"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-769 makeStyles-appBarShift-770 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-782 makeStyles-appBarShift-783 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-779"
+            class="makeStyles-rightToolbar-792"
             color="inherit"
           >
             <button
@@ -45,17 +45,17 @@ exports[`App Route / authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-773"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-786"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-774 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-787 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-775 makeStyles-drawerHeaderLogo-776"
+            class="makeStyles-drawerHeader-788 makeStyles-drawerHeaderLogo-789"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-785"
+              class="makeStyles-logo-798"
               src="fisker-badge.svg"
             />
           </div>
@@ -239,7 +239,7 @@ exports[`App Route / authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-807 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-821 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -265,16 +265,16 @@ exports[`App Route / authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-777 makeStyles-contentShift-778"
+        class="makeStyles-content-790 makeStyles-contentShift-791"
       >
         <div
-          class="makeStyles-drawerHeader-775"
+          class="makeStyles-drawerHeader-788"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-757"
+            class="makeStyles-paper-770"
           >
             <div
               data-testid="mocked-vehicleprovider"
@@ -423,7 +423,7 @@ exports[`App Route / unauthenticated 1`] = `
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-3 makeStyles-textJustifyAlign-48"
+            class="makeStyles-paper-3 makeStyles-textJustifyAlign-49"
           >
             <a
               aria-disabled="false"
@@ -454,10 +454,10 @@ exports[`App Route /datascope authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-942"
+      class="makeStyles-root-958"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-943 makeStyles-appBarShift-944 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-959 makeStyles-appBarShift-960 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -470,7 +470,7 @@ exports[`App Route /datascope authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-953"
+            class="makeStyles-rightToolbar-969"
             color="inherit"
           >
             <button
@@ -493,17 +493,17 @@ exports[`App Route /datascope authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-947"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-963"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-948 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-964 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-949 makeStyles-drawerHeaderLogo-950"
+            class="makeStyles-drawerHeader-965 makeStyles-drawerHeaderLogo-966"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-959"
+              class="makeStyles-logo-975"
               src="fisker-badge.svg"
             />
           </div>
@@ -687,7 +687,7 @@ exports[`App Route /datascope authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-981 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-998 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -713,34 +713,34 @@ exports[`App Route /datascope authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-951 makeStyles-contentShift-952"
+        class="makeStyles-content-967 makeStyles-contentShift-968"
       >
         <div
-          class="makeStyles-drawerHeader-949"
+          class="makeStyles-drawerHeader-965"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-931"
+            class="makeStyles-paper-947"
           >
             <div
-              class="MuiGrid-root makeStyles-root-942 MuiGrid-container MuiGrid-spacing-xs-2"
+              class="MuiGrid-root makeStyles-root-958 MuiGrid-container MuiGrid-spacing-xs-2"
             >
               <div
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
               >
                 <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-973 MuiPaper-elevation1 MuiPaper-rounded"
+                  class="MuiPaper-root makeStyles-grafanaContainer-990 MuiPaper-elevation1 MuiPaper-rounded"
                   style="height: 150px;"
                 >
                   <h1
-                    class="makeStyles-datascopeContainerValue-975"
+                    class="makeStyles-datascopeContainerValue-992"
                   >
                     500
                   </h1>
                   <h2
-                    class="makeStyles-datascopeContainerText-974"
+                    class="makeStyles-datascopeContainerText-991"
                   >
                     Cars
                   </h2>
@@ -750,16 +750,16 @@ exports[`App Route /datascope authenticated 1`] = `
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
               >
                 <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-973 MuiPaper-elevation1 MuiPaper-rounded"
+                  class="MuiPaper-root makeStyles-grafanaContainer-990 MuiPaper-elevation1 MuiPaper-rounded"
                   style="height: 150px;"
                 >
                   <h1
-                    class="makeStyles-datascopeContainerValue-975"
+                    class="makeStyles-datascopeContainerValue-992"
                   >
                     1,234,567,890
                   </h1>
                   <h2
-                    class="makeStyles-datascopeContainerText-974"
+                    class="makeStyles-datascopeContainerText-991"
                   >
                     Signals Collected
                   </h2>
@@ -769,10 +769,10 @@ exports[`App Route /datascope authenticated 1`] = `
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
               >
                 <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-973 MuiPaper-elevation1 MuiPaper-rounded"
+                  class="MuiPaper-root makeStyles-grafanaContainer-990 MuiPaper-elevation1 MuiPaper-rounded"
                 >
                   <div
-                    class="makeStyles-embeddedWrapper-961"
+                    class="makeStyles-embeddedWrapper-977"
                   >
                     <iframe
                       frameborder="0"
@@ -828,10 +828,10 @@ exports[`App Route /datascope unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-130"
+      class="makeStyles-root-132"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-131 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-133 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -844,20 +844,20 @@ exports[`App Route /datascope unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-139"
+        class="makeStyles-content-141"
       >
         <div
-          class="makeStyles-drawerHeader-137"
+          class="makeStyles-drawerHeader-139"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-119 makeStyles-textJustifyAlign-164"
+            class="makeStyles-paper-121 makeStyles-textJustifyAlign-167"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-122 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-124 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -884,10 +884,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1000"
+      class="makeStyles-root-1017"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1001 makeStyles-appBarShift-1002 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1018 makeStyles-appBarShift-1019 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -936,7 +936,7 @@ exports[`App Route /datascope/battery authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1011"
+            class="makeStyles-rightToolbar-1028"
             color="inherit"
           >
             <button
@@ -959,17 +959,17 @@ exports[`App Route /datascope/battery authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1005"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1022"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1006 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1023 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1007 makeStyles-drawerHeaderLogo-1008"
+            class="makeStyles-drawerHeader-1024 makeStyles-drawerHeaderLogo-1025"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1017"
+              class="makeStyles-logo-1034"
               src="fisker-badge.svg"
             />
           </div>
@@ -1153,7 +1153,7 @@ exports[`App Route /datascope/battery authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1039 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1057 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -1179,16 +1179,16 @@ exports[`App Route /datascope/battery authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1009 makeStyles-contentShift-1010"
+        class="makeStyles-content-1026 makeStyles-contentShift-1027"
       >
         <div
-          class="makeStyles-drawerHeader-1007"
+          class="makeStyles-drawerHeader-1024"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-989"
+            class="makeStyles-paper-1006"
           >
             <div
               class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
@@ -1201,10 +1201,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <form
-                      class="makeStyles-formControl-993"
+                      class="makeStyles-formControl-1010"
                     >
                       <div
                         class="MuiFormControl-root MuiTextField-root"
@@ -1230,10 +1230,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                           />
                           <fieldset
                             aria-hidden="true"
-                            class="PrivateNotchedOutline-root-1045 MuiOutlinedInput-notchedOutline"
+                            class="PrivateNotchedOutline-root-1063 MuiOutlinedInput-notchedOutline"
                           >
                             <legend
-                              class="PrivateNotchedOutline-legendLabelled-1047 PrivateNotchedOutline-legendNotched-1048"
+                              class="PrivateNotchedOutline-legendLabelled-1065 PrivateNotchedOutline-legendNotched-1066"
                             >
                               <span>
                                 VIN
@@ -1244,7 +1244,7 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                       </div>
                     </form>
                     <div
-                      class="MuiFormControl-root makeStyles-formControl-993"
+                      class="MuiFormControl-root makeStyles-formControl-1010"
                     >
                       <label
                         class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
@@ -1284,10 +1284,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-1045 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-1063 MuiOutlinedInput-notchedOutline"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legendLabelled-1047 PrivateNotchedOutline-legendNotched-1048"
+                            class="PrivateNotchedOutline-legendLabelled-1065 PrivateNotchedOutline-legendNotched-1066"
                           >
                             <span>
                               Cell
@@ -1302,12 +1302,12 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     Cell Voltage 
                     1
                     <div
-                      class="makeStyles-embeddedWrapper-1019"
+                      class="makeStyles-embeddedWrapper-1036"
                     >
                       <iframe
                         frameborder="0"
@@ -1322,12 +1322,12 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     Cell Temperature 
                     1
                     <div
-                      class="makeStyles-embeddedWrapper-1019"
+                      class="makeStyles-embeddedWrapper-1036"
                     >
                       <iframe
                         frameborder="0"
@@ -1342,10 +1342,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1019"
+                      class="makeStyles-embeddedWrapper-1036"
                     >
                       <iframe
                         frameborder="0"
@@ -1365,10 +1365,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1019"
+                      class="makeStyles-embeddedWrapper-1036"
                     >
                       <iframe
                         frameborder="0"
@@ -1383,10 +1383,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1019"
+                      class="makeStyles-embeddedWrapper-1036"
                     >
                       <iframe
                         frameborder="0"
@@ -1401,10 +1401,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1019"
+                      class="makeStyles-embeddedWrapper-1036"
                     >
                       <iframe
                         frameborder="0"
@@ -1419,10 +1419,10 @@ exports[`App Route /datascope/battery authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
                 >
                   <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1049 MuiPaper-elevation1 MuiPaper-rounded"
                   >
                     <div
-                      class="makeStyles-embeddedWrapper-1019"
+                      class="makeStyles-embeddedWrapper-1036"
                     >
                       <iframe
                         frameborder="0"
@@ -1449,10 +1449,10 @@ exports[`App Route /datascope/battery unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-188"
+      class="makeStyles-root-191"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-189 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-192 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1465,20 +1465,20 @@ exports[`App Route /datascope/battery unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-197"
+        class="makeStyles-content-200"
       >
         <div
-          class="makeStyles-drawerHeader-195"
+          class="makeStyles-drawerHeader-198"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-177 makeStyles-textJustifyAlign-222"
+            class="makeStyles-paper-180 makeStyles-textJustifyAlign-226"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-180 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-183 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1505,10 +1505,10 @@ exports[`App Route /home authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-826"
+      class="makeStyles-root-840"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-827 makeStyles-appBarShift-828 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-841 makeStyles-appBarShift-842 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1521,7 +1521,7 @@ exports[`App Route /home authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-837"
+            class="makeStyles-rightToolbar-851"
             color="inherit"
           >
             <button
@@ -1544,17 +1544,17 @@ exports[`App Route /home authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-831"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-845"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-832 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-846 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-833 makeStyles-drawerHeaderLogo-834"
+            class="makeStyles-drawerHeader-847 makeStyles-drawerHeaderLogo-848"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-843"
+              class="makeStyles-logo-857"
               src="fisker-badge.svg"
             />
           </div>
@@ -1738,7 +1738,7 @@ exports[`App Route /home authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-865 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-880 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -1764,16 +1764,16 @@ exports[`App Route /home authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-835 makeStyles-contentShift-836"
+        class="makeStyles-content-849 makeStyles-contentShift-850"
       >
         <div
-          class="makeStyles-drawerHeader-833"
+          class="makeStyles-drawerHeader-847"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-815"
+            class="makeStyles-paper-829"
           >
             <div
               data-testid="mocked-vehicleprovider"
@@ -1897,10 +1897,10 @@ exports[`App Route /home unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-72"
+      class="makeStyles-root-73"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-73 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-74 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1913,20 +1913,20 @@ exports[`App Route /home unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-81"
+        class="makeStyles-content-82"
       >
         <div
-          class="makeStyles-drawerHeader-79"
+          class="makeStyles-drawerHeader-80"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-61 makeStyles-textJustifyAlign-106"
+            class="makeStyles-paper-62 makeStyles-textJustifyAlign-108"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-64 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-65 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1953,10 +1953,10 @@ exports[`App Route /package-create authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1240"
+      class="makeStyles-root-1261"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1241 makeStyles-appBarShift-1242 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1262 makeStyles-appBarShift-1263 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -2005,7 +2005,7 @@ exports[`App Route /package-create authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1251"
+            class="makeStyles-rightToolbar-1272"
             color="inherit"
           >
             <button
@@ -2028,17 +2028,17 @@ exports[`App Route /package-create authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1245"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1266"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1246 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1267 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1247 makeStyles-drawerHeaderLogo-1248"
+            class="makeStyles-drawerHeader-1268 makeStyles-drawerHeaderLogo-1269"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1257"
+              class="makeStyles-logo-1278"
               src="fisker-badge.svg"
             />
           </div>
@@ -2222,7 +2222,7 @@ exports[`App Route /package-create authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1279 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1301 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -2248,10 +2248,10 @@ exports[`App Route /package-create authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1249 makeStyles-contentShift-1250"
+        class="makeStyles-content-1270 makeStyles-contentShift-1271"
       >
         <div
-          class="makeStyles-drawerHeader-1247"
+          class="makeStyles-drawerHeader-1268"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -2260,11 +2260,11 @@ exports[`App Route /package-create authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-1229"
+              class="makeStyles-paper-1250"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-1231"
+                class="makeStyles-form-1252"
                 novalidate=""
               >
                 <div
@@ -2300,10 +2300,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1307 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1287"
+                        class="PrivateNotchedOutline-legendLabelled-1309"
                       >
                         <span>
                           Package name
@@ -2346,10 +2346,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1307 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1287"
+                        class="PrivateNotchedOutline-legendLabelled-1309"
                       >
                         <span>
                           Version
@@ -2392,10 +2392,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1307 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1287"
+                        class="PrivateNotchedOutline-legendLabelled-1309"
                       >
                         <span>
                           Description
@@ -2439,10 +2439,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1307 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1287"
+                        class="PrivateNotchedOutline-legendLabelled-1309"
                       >
                         <span>
                           Release Notes URL
@@ -2539,7 +2539,7 @@ exports[`App Route /package-create authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1232 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1253 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
@@ -2568,10 +2568,10 @@ exports[`App Route /package-create unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-420"
+      class="makeStyles-root-427"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-421 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-428 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -2584,20 +2584,20 @@ exports[`App Route /package-create unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-429"
+        class="makeStyles-content-436"
       >
         <div
-          class="makeStyles-drawerHeader-427"
+          class="makeStyles-drawerHeader-434"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-409 makeStyles-textJustifyAlign-454"
+            class="makeStyles-paper-416 makeStyles-textJustifyAlign-462"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-412 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-419 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -2624,10 +2624,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1178"
+      class="makeStyles-root-1198"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1179 makeStyles-appBarShift-1180 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1199 makeStyles-appBarShift-1200 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -2676,7 +2676,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1189"
+            class="makeStyles-rightToolbar-1209"
             color="inherit"
           >
             <button
@@ -2699,17 +2699,17 @@ exports[`App Route /package-deploy authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1183"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1203"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1184 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1204 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1185 makeStyles-drawerHeaderLogo-1186"
+            class="makeStyles-drawerHeader-1205 makeStyles-drawerHeaderLogo-1206"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1195"
+              class="makeStyles-logo-1215"
               src="fisker-badge.svg"
             />
           </div>
@@ -2893,7 +2893,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1217 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1238 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -2919,10 +2919,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1187 makeStyles-contentShift-1188"
+        class="makeStyles-content-1207 makeStyles-contentShift-1208"
       >
         <div
-          class="makeStyles-drawerHeader-1185"
+          class="makeStyles-drawerHeader-1205"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -2937,11 +2937,11 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 data-testid="mocked-carupdatesprovider"
               >
                 <div
-                  class="makeStyles-paper-1167"
+                  class="makeStyles-paper-1187"
                 >
                   <form
                     action="{onSubmit}"
-                    class="makeStyles-form-1169"
+                    class="makeStyles-form-1189"
                     novalidate=""
                   >
                     <p
@@ -2952,22 +2952,22 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       .
                     </p>
                     <div
-                      class="MuiGrid-root makeStyles-root-1178 MuiGrid-container MuiGrid-spacing-xs-2"
+                      class="MuiGrid-root makeStyles-root-1198 MuiGrid-container MuiGrid-spacing-xs-2"
                     >
                       <div
                         class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-4"
                       >
                         <div
-                          class="makeStyles-labelInline-1173"
+                          class="makeStyles-labelInline-1193"
                         >
                           0 Selected
                         </div>
                       </div>
                       <div
-                        class="MuiGrid-root makeStyles-textCenterAlign-1213 MuiGrid-item MuiGrid-grid-md-4"
+                        class="MuiGrid-root makeStyles-textCenterAlign-1234 MuiGrid-item MuiGrid-grid-md-4"
                       >
                         <div
-                          class="MuiFormControl-root makeStyles-margin-1192 makeStyles-fullWidth-1215"
+                          class="MuiFormControl-root makeStyles-margin-1212 makeStyles-fullWidth-1236"
                         >
                           <label
                             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -3018,10 +3018,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
                         </div>
                       </div>
                       <div
-                        class="MuiGrid-root makeStyles-textRightAlign-1214 MuiGrid-item MuiGrid-grid-md-4"
+                        class="MuiGrid-root makeStyles-textRightAlign-1235 MuiGrid-item MuiGrid-grid-md-4"
                       >
                         <button
-                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1171 makeStyles-textField-1193 MuiButton-containedPrimary Mui-disabled Mui-disabled"
+                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1191 makeStyles-textField-1213 MuiButton-containedPrimary Mui-disabled Mui-disabled"
                           disabled=""
                           tabindex="-1"
                           type="submit"
@@ -3035,7 +3035,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="makeStyles-paper-1167 makeStyles-tableSize-1218"
+                      class="makeStyles-paper-1187 makeStyles-tableSize-1239"
                     >
                       <table
                         class="MuiTable-root"
@@ -3052,14 +3052,14 @@ exports[`App Route /package-deploy authenticated 1`] = `
                             >
                               <span
                                 aria-disabled="false"
-                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1223 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1244 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                               >
                                 <span
                                   class="MuiIconButton-label"
                                 >
                                   <input
                                     aria-label="select all desserts"
-                                    class="PrivateSwitchBase-input-1226"
+                                    class="PrivateSwitchBase-input-1247"
                                     data-indeterminate="false"
                                     type="checkbox"
                                     value=""
@@ -3093,7 +3093,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                               >
                                 VIN
                                 <span
-                                  class="makeStyles-hiddenSortSpan-1191"
+                                  class="makeStyles-hiddenSortSpan-1211"
                                 >
                                   sorted ascending
                                 </span>
@@ -3374,10 +3374,10 @@ exports[`App Route /package-deploy unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-362"
+      class="makeStyles-root-368"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-363 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-369 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3390,20 +3390,20 @@ exports[`App Route /package-deploy unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-371"
+        class="makeStyles-content-377"
       >
         <div
-          class="makeStyles-drawerHeader-369"
+          class="makeStyles-drawerHeader-375"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-351 makeStyles-textJustifyAlign-396"
+            class="makeStyles-paper-357 makeStyles-textJustifyAlign-403"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-354 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-360 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -3430,10 +3430,10 @@ exports[`App Route /package-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1120"
+      class="makeStyles-root-1139"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1121 makeStyles-appBarShift-1122 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1140 makeStyles-appBarShift-1141 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3498,7 +3498,7 @@ exports[`App Route /package-status authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1131"
+            class="makeStyles-rightToolbar-1150"
             color="inherit"
           >
             <button
@@ -3521,17 +3521,17 @@ exports[`App Route /package-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1125"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1144"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1126 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1145 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1127 makeStyles-drawerHeaderLogo-1128"
+            class="makeStyles-drawerHeader-1146 makeStyles-drawerHeaderLogo-1147"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1137"
+              class="makeStyles-logo-1156"
               src="fisker-badge.svg"
             />
           </div>
@@ -3715,7 +3715,7 @@ exports[`App Route /package-status authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1159 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1179 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -3741,10 +3741,10 @@ exports[`App Route /package-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1129 makeStyles-contentShift-1130"
+        class="makeStyles-content-1148 makeStyles-contentShift-1149"
       >
         <div
-          class="makeStyles-drawerHeader-1127"
+          class="makeStyles-drawerHeader-1146"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -3756,7 +3756,7 @@ exports[`App Route /package-status authenticated 1`] = `
               data-testid="mocked-carupdatesprovider"
             >
               <div
-                class="makeStyles-paper-1109 makeStyles-tableSize-1160"
+                class="makeStyles-paper-1128 makeStyles-tableSize-1180"
               >
                 <table
                   class="MuiTable-root"
@@ -3978,10 +3978,10 @@ exports[`App Route /package-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-304"
+      class="makeStyles-root-309"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-305 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-310 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3994,20 +3994,20 @@ exports[`App Route /package-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-313"
+        class="makeStyles-content-318"
       >
         <div
-          class="makeStyles-drawerHeader-311"
+          class="makeStyles-drawerHeader-316"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-293 makeStyles-textJustifyAlign-338"
+            class="makeStyles-paper-298 makeStyles-textJustifyAlign-344"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-296 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-301 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -4034,10 +4034,10 @@ exports[`App Route /packages authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1062"
+      class="makeStyles-root-1080"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1063 makeStyles-appBarShift-1064 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1081 makeStyles-appBarShift-1082 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -4050,7 +4050,7 @@ exports[`App Route /packages authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-1073"
+            class="makeStyles-rightToolbar-1091"
             color="inherit"
           >
             <button
@@ -4073,17 +4073,17 @@ exports[`App Route /packages authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1067"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1085"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1068 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1086 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1069 makeStyles-drawerHeaderLogo-1070"
+            class="makeStyles-drawerHeader-1087 makeStyles-drawerHeaderLogo-1088"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1079"
+              class="makeStyles-logo-1097"
               src="fisker-badge.svg"
             />
           </div>
@@ -4267,7 +4267,7 @@ exports[`App Route /packages authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1101 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1120 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -4293,10 +4293,10 @@ exports[`App Route /packages authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1071 makeStyles-contentShift-1072"
+        class="makeStyles-content-1089 makeStyles-contentShift-1090"
       >
         <div
-          class="makeStyles-drawerHeader-1069"
+          class="makeStyles-drawerHeader-1087"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -4305,16 +4305,16 @@ exports[`App Route /packages authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-1051 makeStyles-tableSize-1102"
+              class="makeStyles-paper-1069 makeStyles-tableSize-1121"
             >
               <div
-                class="MuiGrid-root makeStyles-root-1062 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-1080 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root makeStyles-textJustifyAlign-1096 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1115 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <a
-                    class="makeStyles-labelInline-1057"
+                    class="makeStyles-labelInline-1075"
                     href="/package-create"
                   >
                     <svg
@@ -4330,10 +4330,10 @@ exports[`App Route /packages authenticated 1`] = `
                   </a>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textCenterAlign-1097 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textCenterAlign-1116 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="MuiFormControl-root makeStyles-margin-1076 makeStyles-fullWidth-1099"
+                    class="MuiFormControl-root makeStyles-margin-1094 makeStyles-fullWidth-1118"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -4384,7 +4384,7 @@ exports[`App Route /packages authenticated 1`] = `
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textRightAlign-1098 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textRightAlign-1117 MuiGrid-item MuiGrid-grid-md-4"
                 />
               </div>
               <table
@@ -4409,7 +4409,7 @@ exports[`App Route /packages authenticated 1`] = `
                       >
                         ID
                         <span
-                          class="makeStyles-hiddenSortSpan-1075"
+                          class="makeStyles-hiddenSortSpan-1093"
                         >
                           sorted ascending
                         </span>
@@ -4756,10 +4756,10 @@ exports[`App Route /packages unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-246"
+      class="makeStyles-root-250"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-247 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-251 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -4772,20 +4772,20 @@ exports[`App Route /packages unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-255"
+        class="makeStyles-content-259"
       >
         <div
-          class="makeStyles-drawerHeader-253"
+          class="makeStyles-drawerHeader-257"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-235 makeStyles-textJustifyAlign-280"
+            class="makeStyles-paper-239 makeStyles-textJustifyAlign-285"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-238 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-242 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -4812,10 +4812,10 @@ exports[`App Route /page-not-found authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-884"
+      class="makeStyles-root-899"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-885 makeStyles-appBarShift-886 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-900 makeStyles-appBarShift-901 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -4826,7 +4826,7 @@ exports[`App Route /page-not-found authenticated 1`] = `
             />
           </div>
           <div
-            class="makeStyles-rightToolbar-895"
+            class="makeStyles-rightToolbar-910"
             color="inherit"
           >
             <button
@@ -4849,17 +4849,17 @@ exports[`App Route /page-not-found authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-889"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-904"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-890 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-905 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-891 makeStyles-drawerHeaderLogo-892"
+            class="makeStyles-drawerHeader-906 makeStyles-drawerHeaderLogo-907"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-901"
+              class="makeStyles-logo-916"
               src="fisker-badge.svg"
             />
           </div>
@@ -5043,7 +5043,7 @@ exports[`App Route /page-not-found authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-923 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-939 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -5069,16 +5069,16 @@ exports[`App Route /page-not-found authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-893 makeStyles-contentShift-894"
+        class="makeStyles-content-908 makeStyles-contentShift-909"
       >
         <div
-          class="makeStyles-drawerHeader-891"
+          class="makeStyles-drawerHeader-906"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-873"
+            class="makeStyles-paper-888"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -5099,10 +5099,10 @@ exports[`App Route /page-not-found unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-710"
+      class="makeStyles-root-722"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-711 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-723 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5115,16 +5115,16 @@ exports[`App Route /page-not-found unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-719"
+        class="makeStyles-content-731"
       >
         <div
-          class="makeStyles-drawerHeader-717"
+          class="makeStyles-drawerHeader-729"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-699"
+            class="makeStyles-paper-711"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -5145,10 +5145,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1302"
+      class="makeStyles-root-1324"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1303 makeStyles-appBarShift-1304 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1325 makeStyles-appBarShift-1326 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5197,7 +5197,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1313"
+            class="makeStyles-rightToolbar-1335"
             color="inherit"
           >
             <button
@@ -5220,17 +5220,17 @@ exports[`App Route /vehicle-add authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1307"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1329"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1308 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1330 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1309 makeStyles-drawerHeaderLogo-1310"
+            class="makeStyles-drawerHeader-1331 makeStyles-drawerHeaderLogo-1332"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1319"
+              class="makeStyles-logo-1341"
               src="fisker-badge.svg"
             />
           </div>
@@ -5414,7 +5414,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1341 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1364 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -5440,10 +5440,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1311 makeStyles-contentShift-1312"
+        class="makeStyles-content-1333 makeStyles-contentShift-1334"
       >
         <div
-          class="makeStyles-drawerHeader-1309"
+          class="makeStyles-drawerHeader-1331"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -5452,11 +5452,11 @@ exports[`App Route /vehicle-add authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-1291"
+              class="makeStyles-paper-1313"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-1293"
+                class="makeStyles-form-1315"
                 novalidate=""
               >
                 <div
@@ -5492,10 +5492,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1370 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1349"
+                        class="PrivateNotchedOutline-legendLabelled-1372"
                       >
                         <span>
                           VIN
@@ -5538,10 +5538,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1370 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1349 PrivateNotchedOutline-legendNotched-1350"
+                        class="PrivateNotchedOutline-legendLabelled-1372 PrivateNotchedOutline-legendNotched-1373"
                       >
                         <span>
                           Model
@@ -5585,10 +5585,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1370 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1349 PrivateNotchedOutline-legendNotched-1350"
+                        class="PrivateNotchedOutline-legendLabelled-1372 PrivateNotchedOutline-legendNotched-1373"
                       >
                         <span>
                           Year
@@ -5632,10 +5632,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1370 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1349 PrivateNotchedOutline-legendNotched-1350"
+                        class="PrivateNotchedOutline-legendLabelled-1372 PrivateNotchedOutline-legendNotched-1373"
                       >
                         <span>
                           Trim
@@ -5646,7 +5646,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1294 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1316 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
@@ -5675,10 +5675,10 @@ exports[`App Route /vehicle-add unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-478"
+      class="makeStyles-root-486"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-479 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-487 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5691,20 +5691,20 @@ exports[`App Route /vehicle-add unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-487"
+        class="makeStyles-content-495"
       >
         <div
-          class="makeStyles-drawerHeader-485"
+          class="makeStyles-drawerHeader-493"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-467 makeStyles-textJustifyAlign-512"
+            class="makeStyles-paper-475 makeStyles-textJustifyAlign-521"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-470 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-478 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -5731,10 +5731,10 @@ exports[`App Route /vehicle-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1430"
+      class="makeStyles-root-1454"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1431 makeStyles-appBarShift-1432 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1455 makeStyles-appBarShift-1456 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5783,7 +5783,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1441"
+            class="makeStyles-rightToolbar-1465"
             color="inherit"
           >
             <button
@@ -5806,17 +5806,17 @@ exports[`App Route /vehicle-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1435"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1459"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1436 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1460 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1437 makeStyles-drawerHeaderLogo-1438"
+            class="makeStyles-drawerHeader-1461 makeStyles-drawerHeaderLogo-1462"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1447"
+              class="makeStyles-logo-1471"
               src="fisker-badge.svg"
             />
           </div>
@@ -6000,7 +6000,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1469 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1494 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -6026,10 +6026,10 @@ exports[`App Route /vehicle-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1439 makeStyles-contentShift-1440"
+        class="makeStyles-content-1463 makeStyles-contentShift-1464"
       >
         <div
-          class="makeStyles-drawerHeader-1437"
+          class="makeStyles-drawerHeader-1461"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -6038,7 +6038,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-1419 makeStyles-tableSize-1470"
+              class="makeStyles-paper-1443 makeStyles-tableSize-1495"
             >
               <h6
                 class="MuiTypography-root MuiTypography-h6"
@@ -6070,7 +6070,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                         >
                           ID
                           <span
-                            class="makeStyles-hiddenSortSpan-1443"
+                            class="makeStyles-hiddenSortSpan-1467"
                           >
                             sorted descending
                           </span>
@@ -6345,25 +6345,25 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 </table>
               </div>
               <div
-                class="MuiGrid-root makeStyles-root-1430 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-1454 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root makeStyles-textJustifyAlign-1464 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1489 MuiGrid-item MuiGrid-grid-md-4"
                 />
                 <div
-                  class="MuiGrid-root makeStyles-textCenterAlign-1465 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textCenterAlign-1490 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <h6
-                    class="MuiTypography-root makeStyles-labelInline-1425 MuiTypography-h6"
+                    class="MuiTypography-root makeStyles-labelInline-1449 MuiTypography-h6"
                   >
                     Car ECUs
                   </h6>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textRightAlign-1466 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textRightAlign-1491 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <button
-                    class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1423 makeStyles-textField-1445 MuiButton-containedPrimary"
+                    class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1447 makeStyles-textField-1469 MuiButton-containedPrimary"
                     tabindex="0"
                     type="submit"
                   >
@@ -6379,7 +6379,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 </div>
               </div>
               <div
-                class="makeStyles-paper-1419 makeStyles-tableSize-1470"
+                class="makeStyles-paper-1443 makeStyles-tableSize-1495"
               >
                 <table
                   class="MuiTable-root"
@@ -6403,7 +6403,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                         >
                           ECU
                           <span
-                            class="makeStyles-hiddenSortSpan-1443"
+                            class="makeStyles-hiddenSortSpan-1467"
                           >
                             sorted descending
                           </span>
@@ -6882,10 +6882,10 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-594"
+      class="makeStyles-root-604"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-595 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-605 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6898,20 +6898,20 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-603"
+        class="makeStyles-content-613"
       >
         <div
-          class="makeStyles-drawerHeader-601"
+          class="makeStyles-drawerHeader-611"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-583 makeStyles-textJustifyAlign-628"
+            class="makeStyles-paper-593 makeStyles-textJustifyAlign-639"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-586 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-596 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -6938,10 +6938,10 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1488"
+      class="makeStyles-root-1513"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1489 makeStyles-appBarShift-1490 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1514 makeStyles-appBarShift-1515 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -7006,7 +7006,7 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1499"
+            class="makeStyles-rightToolbar-1524"
             color="inherit"
           >
             <button
@@ -7029,17 +7029,17 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1493"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1518"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1494 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1519 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1495 makeStyles-drawerHeaderLogo-1496"
+            class="makeStyles-drawerHeader-1520 makeStyles-drawerHeaderLogo-1521"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1505"
+              class="makeStyles-logo-1530"
               src="fisker-badge.svg"
             />
           </div>
@@ -7223,7 +7223,7 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1527 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1553 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -7249,10 +7249,10 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1497 makeStyles-contentShift-1498"
+        class="makeStyles-content-1522 makeStyles-contentShift-1523"
       >
         <div
-          class="makeStyles-drawerHeader-1495"
+          class="makeStyles-drawerHeader-1520"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -7261,16 +7261,16 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
             data-testid="mocked-carupdatesprovider"
           >
             <div
-              class="makeStyles-root-1488"
+              class="makeStyles-root-1513"
             >
               <div
                 class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root makeStyles-textJustifyAlign-1522 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1548 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1551"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
@@ -7292,10 +7292,10 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textCenterAlign-1523 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textCenterAlign-1549 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1551"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
@@ -7317,10 +7317,10 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textRightAlign-1524 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textRightAlign-1550 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1551"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
@@ -7345,7 +7345,7 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
                 >
                   <div
-                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1551"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
@@ -7373,11 +7373,11 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                     style="width: 100%; display: flex; justify-content: space-between; flex-wrap: wrap;"
                   >
                     <div
-                      class="makeStyles-textCenterAlign-1523"
+                      class="makeStyles-textCenterAlign-1549"
                     >
                       <svg
                         aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530 makeStyles-progressSuccess-1531"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556 makeStyles-progressSuccess-1557"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
@@ -7392,11 +7392,11 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                       </p>
                     </div>
                     <div
-                      class="makeStyles-textCenterAlign-1523"
+                      class="makeStyles-textCenterAlign-1549"
                     >
                       <svg
                         aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
@@ -7411,30 +7411,11 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                       </p>
                     </div>
                     <div
-                      class="makeStyles-textCenterAlign-1523"
+                      class="makeStyles-textCenterAlign-1549"
                     >
                       <svg
                         aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530"
-                        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 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
-                        />
-                      </svg>
-                      <p
-                        class="MuiTypography-root MuiTypography-body1"
-                      >
-                        Approved
-                      </p>
-                    </div>
-                    <div
-                      class="makeStyles-textCenterAlign-1523"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
@@ -7449,11 +7430,11 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                       </p>
                     </div>
                     <div
-                      class="makeStyles-textCenterAlign-1523"
+                      class="makeStyles-textCenterAlign-1549"
                     >
                       <svg
                         aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
@@ -7468,11 +7449,30 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                       </p>
                     </div>
                     <div
-                      class="makeStyles-textCenterAlign-1523"
+                      class="makeStyles-textCenterAlign-1549"
                     >
                       <svg
                         aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556"
+                        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 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"
+                        />
+                      </svg>
+                      <p
+                        class="MuiTypography-root MuiTypography-body1"
+                      >
+                        Approved
+                      </p>
+                    </div>
+                    <div
+                      class="makeStyles-textCenterAlign-1549"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
@@ -7487,11 +7487,11 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                       </p>
                     </div>
                     <div
-                      class="makeStyles-textCenterAlign-1523"
+                      class="makeStyles-textCenterAlign-1549"
                     >
                       <svg
                         aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
@@ -7506,11 +7506,11 @@ exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
                       </p>
                     </div>
                     <div
-                      class="makeStyles-textCenterAlign-1523"
+                      class="makeStyles-textCenterAlign-1549"
                     >
                       <svg
                         aria-hidden="true"
-                        class="MuiSvgIcon-root makeStyles-progressIcon-1530"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1556"
                         focusable="false"
                         viewBox="0 0 24 24"
                       >
@@ -7790,10 +7790,10 @@ exports[`App Route /vehicle-status/vin/carupdateid unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-652"
+      class="makeStyles-root-663"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-653 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-664 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -7806,20 +7806,20 @@ exports[`App Route /vehicle-status/vin/carupdateid unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-661"
+        class="makeStyles-content-672"
       >
         <div
-          class="makeStyles-drawerHeader-659"
+          class="makeStyles-drawerHeader-670"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-641 makeStyles-textJustifyAlign-686"
+            class="makeStyles-paper-652 makeStyles-textJustifyAlign-698"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-644 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-655 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -7846,10 +7846,10 @@ exports[`App Route /vehicles authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1364"
+      class="makeStyles-root-1387"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1365 makeStyles-appBarShift-1366 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1388 makeStyles-appBarShift-1389 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -7862,7 +7862,7 @@ exports[`App Route /vehicles authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-1375"
+            class="makeStyles-rightToolbar-1398"
             color="inherit"
           >
             <button
@@ -7885,17 +7885,17 @@ exports[`App Route /vehicles authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1369"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1392"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1370 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1393 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1371 makeStyles-drawerHeaderLogo-1372"
+            class="makeStyles-drawerHeader-1394 makeStyles-drawerHeaderLogo-1395"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1381"
+              class="makeStyles-logo-1404"
               src="fisker-badge.svg"
             />
           </div>
@@ -8079,7 +8079,7 @@ exports[`App Route /vehicles authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1403 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1427 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -8105,10 +8105,10 @@ exports[`App Route /vehicles authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1373 makeStyles-contentShift-1374"
+        class="makeStyles-content-1396 makeStyles-contentShift-1397"
       >
         <div
-          class="makeStyles-drawerHeader-1371"
+          class="makeStyles-drawerHeader-1394"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -8117,13 +8117,13 @@ exports[`App Route /vehicles authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-1353 makeStyles-tableSize-1404"
+              class="makeStyles-paper-1376 makeStyles-tableSize-1428"
             >
               <div
-                class="MuiGrid-root makeStyles-root-1364 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-1387 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root makeStyles-textJustifyAlign-1398 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1422 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <a
                     href="/vehicle-add"
@@ -8140,16 +8140,16 @@ exports[`App Route /vehicles authenticated 1`] = `
                     </svg>
                   </a>
                   <div
-                    class="makeStyles-labelInline-1359"
+                    class="makeStyles-labelInline-1382"
                   >
                     0 Selected
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textCenterAlign-1399 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textCenterAlign-1423 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="MuiFormControl-root makeStyles-margin-1378 makeStyles-fullWidth-1401"
+                    class="MuiFormControl-root makeStyles-margin-1401 makeStyles-fullWidth-1425"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -8200,17 +8200,17 @@ exports[`App Route /vehicles authenticated 1`] = `
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textRightAlign-1400 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textRightAlign-1424 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="makeStyles-form-1355"
+                    class="makeStyles-form-1378"
                     style="margin-top: 20px;"
                   >
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-1358"
+                      class="MuiFormControl-root makeStyles-formControlInline-1381"
                     >
                       <label
-                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-1405 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
+                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-1429 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
                         data-shrink="true"
                         for="send-command"
                       >
@@ -8273,11 +8273,11 @@ exports[`App Route /vehicles authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-1409 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-1433 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-1410"
+                            class="PrivateNotchedOutline-legend-1434"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -8288,10 +8288,10 @@ exports[`App Route /vehicles authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-1358"
+                      class="MuiFormControl-root makeStyles-formControlInline-1381"
                     >
                       <label
-                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-1405 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
+                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-1429 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
                         data-shrink="true"
                         for="send-parameter"
                       >
@@ -8344,11 +8344,11 @@ exports[`App Route /vehicles authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-1409 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-1433 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-1410"
+                            class="PrivateNotchedOutline-legend-1434"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -8384,7 +8384,7 @@ exports[`App Route /vehicles authenticated 1`] = `
                 </div>
               </div>
               <div
-                class="makeStyles-paper-1353 makeStyles-tableSize-1404"
+                class="makeStyles-paper-1376 makeStyles-tableSize-1428"
               >
                 <table
                   class="MuiTable-root"
@@ -8401,14 +8401,14 @@ exports[`App Route /vehicles authenticated 1`] = `
                       >
                         <span
                           aria-disabled="false"
-                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1413 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1437 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                         >
                           <span
                             class="MuiIconButton-label"
                           >
                             <input
                               aria-label="select all desserts"
-                              class="PrivateSwitchBase-input-1416"
+                              class="PrivateSwitchBase-input-1440"
                               data-indeterminate="false"
                               type="checkbox"
                               value=""
@@ -8442,7 +8442,7 @@ exports[`App Route /vehicles authenticated 1`] = `
                         >
                           VIN
                           <span
-                            class="makeStyles-hiddenSortSpan-1377"
+                            class="makeStyles-hiddenSortSpan-1400"
                           >
                             sorted ascending
                           </span>
@@ -8720,10 +8720,10 @@ exports[`App Route /vehicles unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-536"
+      class="makeStyles-root-545"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-537 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-546 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -8736,20 +8736,20 @@ exports[`App Route /vehicles unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-545"
+        class="makeStyles-content-554"
       >
         <div
-          class="makeStyles-drawerHeader-543"
+          class="makeStyles-drawerHeader-552"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-525 makeStyles-textJustifyAlign-570"
+            class="makeStyles-paper-534 makeStyles-textJustifyAlign-580"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-528 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-537 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
diff --git a/src/components/Cars/List/index.jsx b/src/components/Cars/List/index.jsx
index 35d3aac..9e635c6 100644
--- a/src/components/Cars/List/index.jsx
+++ b/src/components/Cars/List/index.jsx
@@ -24,9 +24,9 @@ const MainForm = () => {
     },
   } = useUserContext();
 
-  const handleSearch = (search) => {
+  const handleSearch = (query) => {
     setSelected([]);
-    setSearch(search);
+    setSearch(query);
   };
 
   const handleSelectAll = (cars) => {
diff --git a/src/components/Cars/Status/index.jsx b/src/components/Cars/Status/index.jsx
index 27dfae8..12f6f86 100644
--- a/src/components/Cars/Status/index.jsx
+++ b/src/components/Cars/Status/index.jsx
@@ -5,6 +5,7 @@ import { Button, Grid, Typography } from "@material-ui/core";
 
 import CarECUsTable from "../../Controls/CarECUsTable";
 import CarUpdatesTable from "../../Controls/CarUpdatesTable";
+import { logger } from "../../../services/monitoring";
 import {
   VehicleProvider,
   useVehicleContext,
@@ -12,7 +13,6 @@ import {
 import { useUserContext } from "../../Contexts/UserContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import useStyles from "../../useStyles";
-import { logger } from "../../../services/monitoring";
 
 const MainForm = () => {
   const { vin } = useParams();
@@ -28,9 +28,9 @@ const MainForm = () => {
     try {
       await sendCommand([vin], "ecu", "", token);
       setMessage(`Sent command to ${vin}`);
-    } catch (e) {
-      setMessage(e.message);
-      logger.error(e.stack);
+    } catch (error) {
+      setMessage(error.message);
+      logger.error(error.stack);
     }
   };
 
@@ -52,7 +52,7 @@ const MainForm = () => {
   return (
     <div className={clsx(classes.paper, classes.tableSize)}>
       <Typography variant="h6">Car Updates</Typography>
-      <CarUpdatesTable vin={vin} token={token} />
+      <CarUpdatesTable vin={vin} token={token} classes={classes} />
       <Grid container className={classes.root} spacing={2}>
         <Grid item md={4} className={classes.textJustifyAlign}></Grid>
         <Grid item md={4} className={classes.textCenterAlign}>
@@ -73,7 +73,7 @@ const MainForm = () => {
           </Button>
         </Grid>
       </Grid>
-      <CarECUsTable vin={vin} token={token} />
+      <CarECUsTable vin={vin} token={token} classes={classes} />
     </div>
   );
 };
diff --git a/src/components/Cars/UpdateStatus/index.jsx b/src/components/Cars/UpdateStatus/index.jsx
index 28fd61b..f39933c 100644
--- a/src/components/Cars/UpdateStatus/index.jsx
+++ b/src/components/Cars/UpdateStatus/index.jsx
@@ -1,5 +1,4 @@
-import React, { useEffect } from "react";
-import { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 import { Grid, TextField } from "@material-ui/core";
 
@@ -126,7 +125,7 @@ const MainForm = () => {
           </>
         )}
         <Grid item md={12}>
-          <CarUpdateStatusProgress status={status} />
+          <CarUpdateStatusProgress status={status} classes={classes} />
         </Grid>
         <Grid item md={12}>
           <CarUpdateStatusTable carupdateid={carupdateid} token={token} />
diff --git a/src/components/Contexts/CarUpdatesContext.jsx b/src/components/Contexts/CarUpdatesContext.jsx
index 016d9ea..d3df57b 100644
--- a/src/components/Contexts/CarUpdatesContext.jsx
+++ b/src/components/Contexts/CarUpdatesContext.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 
-import api from "../../services/updates";
+import api from "../../services/updatesAPI";
 import { validateStatusMessage } from "../../utils/statusMessage";
 
 const FINAL_UPDATE_STATES = ["package_install_complete"];
@@ -122,9 +122,9 @@ export const CarUpdatesProvider = ({ children }) => {
     let items = JSON.parse(JSON.stringify(carUpdates));
 
     statuses.forEach((status) => {
-      let item = items.find((item) => status.car_update_id === item.id);
-      if (!item || status.car_update_id === 0) return;
-      applyProgressStatus(item, status);
+      let x = items.find((item) => status.car_update_id === item.id);
+      if (!x || status.car_update_id === 0) return;
+      applyProgressStatus(x, status);
     });
 
     setCarUpdates(items);
diff --git a/src/components/Contexts/ManifestsContext.jsx b/src/components/Contexts/ManifestsContext.jsx
index 3018387..668ea6f 100644
--- a/src/components/Contexts/ManifestsContext.jsx
+++ b/src/components/Contexts/ManifestsContext.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 
-import api from "../../services/manifests";
+import api from "../../services/manifestsAPI";
 import { uploadFile, getCancelToken } from "../../services/uploadFile";
 
 const ManifestsContext = React.createContext();
diff --git a/src/components/Contexts/UserContext.jsx b/src/components/Contexts/UserContext.jsx
index c867a4a..e9330b9 100644
--- a/src/components/Contexts/UserContext.jsx
+++ b/src/components/Contexts/UserContext.jsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useState } from "react";
 import auth from "../../services/auth";
-import getTimerWorker from "../../services/timer";
+import getTimerWorker from "../../services/getTimerWorker";
 import { parsePayload } from "../../utils/jwt";
 import { getGroups } from "../../utils/roles";
 
@@ -37,8 +37,7 @@ export const UserProvider = ({ children }) => {
 
   const refreshTokens = async () => {
     if (!token || !token.refreshToken || !token.refreshToken.token) return null;
-    const result = await refresh(token.refreshToken.token);
-    return result;
+    return refresh(token.refreshToken.token);
   };
 
   const startSessionTimer = () => {
diff --git a/src/components/Contexts/UserContext.test.jsx b/src/components/Contexts/UserContext.test.jsx
index 5646cb0..b5df51a 100644
--- a/src/components/Contexts/UserContext.test.jsx
+++ b/src/components/Contexts/UserContext.test.jsx
@@ -1,5 +1,5 @@
 jest.mock("../../services/auth");
-jest.mock("../../services/timer");
+jest.mock("../../services/getTimerWorker");
 
 import {
   render,
@@ -10,7 +10,7 @@ import {
 } from "@testing-library/react";
 import { UserProvider, useUserContext } from "../Contexts/UserContext";
 import auth from "../../services/auth";
-import getTimerWorker from "../../services/timer";
+import getTimerWorker from "../../services/getTimerWorker";
 import { TEST_AUTH_OBJECT, TEST_EXPECTED_GROUPS } from "../../utils/testing";
 
 const INVALID_TOKEN_RESPONSE = {
@@ -125,14 +125,8 @@ describe("UseContext", () => {
   describe("Signout", () => {
     beforeEach(async () => {
       const TestComp = () => {
-        const {
-          signIn,
-          signOut,
-          error,
-          token,
-          groups,
-          fetching,
-        } = useUserContext();
+        const { signIn, signOut, error, token, groups, fetching } =
+          useUserContext();
         return (
           <>
             <div data-testid="error">{error}</div>
diff --git a/src/components/Controls/CarECUsTable/index.jsx b/src/components/Controls/CarECUsTable/index.jsx
index fd025be..a022a83 100644
--- a/src/components/Controls/CarECUsTable/index.jsx
+++ b/src/components/Controls/CarECUsTable/index.jsx
@@ -13,7 +13,6 @@ import { LocalDateTimeString } from "../../../utils/dates";
 import TableHeaderSortable from "../../Table/HeaderSortable";
 import { useVehicleContext } from "../../Contexts/VehicleContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
-import useStyles from "../../useStyles";
 import { logger } from "../../../services/monitoring";
 
 const tableColumns = [
@@ -59,10 +58,9 @@ const tableColumns = [
   },
 ];
 
-const CarECUsTable = ({ vin, token }) => {
+const CarECUsTable = ({ vin, token, classes }) => {
   const [ecus, setECUs] = useState([]);
   const [total, setTotal] = useState(0);
-  const classes = useStyles();
   const [pageSize, setPageSize] = useState(10);
   const [pageIndex, setPageIndex] = useState(0);
   const [orderBy, setOrderBy] = useState("ecu");
diff --git a/src/components/Controls/CarUpdateStatusProgress/index.jsx b/src/components/Controls/CarUpdateStatusProgress/index.jsx
index 9e15ee9..56a8fa8 100644
--- a/src/components/Controls/CarUpdateStatusProgress/index.jsx
+++ b/src/components/Controls/CarUpdateStatusProgress/index.jsx
@@ -1,14 +1,11 @@
 import React, { useState, useEffect } from "react";
-import Typography from "@material-ui/core/Typography";
 import { CheckCircle, RadioButtonUnchecked, Error } from "@material-ui/icons";
+import Typography from "@material-ui/core/Typography";
 import clsx from "clsx";
 
 import CircularProgress from "../CircularProgress";
-import useStyles from "../../useStyles";
-
-const Progress = ({ value }) => {
-  const classes = useStyles();
 
+const Progress = ({ value, classes }) => {
   if (value === 100)
     return (
       <CheckCircle
@@ -24,14 +21,13 @@ const Progress = ({ value }) => {
   return <RadioButtonUnchecked className={classes.progressIcon} />;
 };
 
-const CarUpdateStatus = ({ status }) => {
-  const classes = useStyles();
-  const [received, setReceived] = useState(-1);
+const CarUpdateStatus = ({ status, classes }) => {
   const [approval, setApproval] = useState(-1);
-  const [precondition, setPrecondition] = useState(-1);
+  const [cleanup, setCleanup] = useState(-1);
   const [download, setDownload] = useState(-1);
   const [install, setInstall] = useState(-1);
-  const [cleanup, setCleanup] = useState(-1);
+  const [precondition, setPrecondition] = useState(-1);
+  const [received, setReceived] = useState(-1);
   const [updated, setUpdated] = useState(-1);
 
   useEffect(() => {
@@ -39,10 +35,15 @@ const CarUpdateStatus = ({ status }) => {
     if (!status) return;
     // update previous steps
     switch (status.msg) {
-      case "cleanup_success":
+      case "manifest_succeeded":
         setUpdated(100);
+      case "cleanup_success":
+        setCleanup(100);
       case "package_install_complete":
         setInstall(100);
+      case "install_approval_received":
+        setApproval(100);
+      case "install_approval_await":
       case "install_start":
       case "installing":
       case "install_complete":
@@ -53,10 +54,10 @@ const CarUpdateStatus = ({ status }) => {
       case "downloading":
       case "download_complete":
       case "download_error":
-      case "install_approval_received":
-        setApproval(100);
+      case "package_download_start":
       case "requirements_succeeded":
         setPrecondition(100);
+      case "manifest_accepted":
       case "manifest_received":
         setReceived(100);
     }
@@ -90,35 +91,35 @@ const CarUpdateStatus = ({ status }) => {
       }}
     >
       <div className={classes.textCenterAlign}>
-        <Progress value={100} />
+        <Progress value={100} classes={classes} />
         <Typography>Pending</Typography>
       </div>
       <div className={classes.textCenterAlign}>
-        <Progress value={received} />
+        <Progress value={received} classes={classes} />
         <Typography>Recieved</Typography>
       </div>
       <div className={classes.textCenterAlign}>
-        <Progress value={approval} />
-        <Typography>Approved</Typography>
-      </div>
-      <div className={classes.textCenterAlign}>
-        <Progress value={precondition} />
+        <Progress value={precondition} classes={classes} />
         <Typography>Precondition</Typography>
       </div>
       <div className={classes.textCenterAlign}>
-        <Progress value={download} />
+        <Progress value={download} classes={classes} />
         <Typography>Download</Typography>
       </div>
       <div className={classes.textCenterAlign}>
-        <Progress value={install} />
+        <Progress value={approval} classes={classes} />
+        <Typography>Approved</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={install} classes={classes} />
         <Typography>Install</Typography>
       </div>
       <div className={classes.textCenterAlign}>
-        <Progress value={cleanup} />
+        <Progress value={cleanup} classes={classes} />
         <Typography>Clean up</Typography>
       </div>
       <div className={classes.textCenterAlign}>
-        <Progress value={updated} />
+        <Progress value={updated} classes={classes} />
         <Typography>Updated</Typography>
       </div>
     </div>
diff --git a/src/components/Controls/SendCommand/index.jsx b/src/components/Controls/SendCommand/index.jsx
index 57d8c1d..4de4635 100644
--- a/src/components/Controls/SendCommand/index.jsx
+++ b/src/components/Controls/SendCommand/index.jsx
@@ -49,16 +49,16 @@ const SendCommand = ({ vins }) => {
       } else {
         setMessage(`Sent command to ${vins.length} cars`);
       }
-    } catch (e) {
-      setMessage(e.message);
-      logger.error(e.stack);
+    } catch (error) {
+      setMessage(error.message);
+      logger.error(error.stack);
     }
   };
 
-  const getParameters = (command) => {
+  const getParameters = (cmd) => {
     for (let i = 0, len = commands.length; i < len; i += 1) {
       const item = commands[i];
-      if (item.value === command) {
+      if (item.value === cmd) {
         if (!item.parameters) {
           break;
         }
diff --git a/src/components/Controls/SubListItem/index.jsx b/src/components/Controls/SubListItem/index.jsx
index e6a805b..3c38894 100644
--- a/src/components/Controls/SubListItem/index.jsx
+++ b/src/components/Controls/SubListItem/index.jsx
@@ -1,8 +1,7 @@
-import React from "react";
+import React, { useState } from "react";
 import { TableCell, TableRow, TextField } from "@material-ui/core";
 import { Link } from "react-router-dom";
 import DeleteIcon from "@material-ui/icons/Delete";
-import { useState } from "react";
 
 const DataDisplay = ({ data, option, onDelete }) => {
   const [text, setText] = useState(data[option.field]);
diff --git a/src/components/Datascope/Home/index.jsx b/src/components/Datascope/Home/index.jsx
index 5cdb104..12e5fc2 100644
--- a/src/components/Datascope/Home/index.jsx
+++ b/src/components/Datascope/Home/index.jsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { Button, Grid, Link, Paper } from "@material-ui/core";
 import CreateIcon from "@material-ui/icons/Create";
 
-import api from "../../../services/grafana";
+import api from "../../../services/grafanaAPI";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import useStyles from "../../useStyles";
 import ResponsiveIFrame from "../../Controls/ResponsiveIFrame";
diff --git a/src/components/Layouts/SideMenu.jsx b/src/components/Layouts/SideMenu.jsx
index 44aebda..f5b28f1 100644
--- a/src/components/Layouts/SideMenu.jsx
+++ b/src/components/Layouts/SideMenu.jsx
@@ -64,27 +64,18 @@ const MenuItem = ({ item, children }) => {
   );
 };
 
-const ExpandableSideMenuItem = ({ item }) => {
-  /*
-  const [expanded, setExpanded] = useState(true);
-  const clickHandler = (e) => {
-    setExpanded(!expanded);
-  };
-  */
-
-  return (
-    <>
-      <span>
-        <MenuItem item={item}></MenuItem>
-      </span>
-      <ul style={{ marginLeft: 50 }}>
-        {item.submenus.map((subitem, index) => (
-          <MenuItem key={`submenu-${index}`} item={subitem} />
-        ))}
-      </ul>
-    </>
-  );
-};
+const ExpandableSideMenuItem = ({ item }) => (
+  <>
+    <span>
+      <MenuItem item={item}></MenuItem>
+    </span>
+    <ul style={{ marginLeft: 50 }}>
+      {item.submenus.map((subitem, index) => (
+        <MenuItem key={`submenu-${index}`} item={subitem} />
+      ))}
+    </ul>
+  </>
+);
 
 const SideMenu = () => {
   const { groups } = useUserContext();
diff --git a/src/components/Layouts/SideMenu.test.jsx b/src/components/Layouts/SideMenu.test.jsx
index e1cc36d..ea8ff39 100644
--- a/src/components/Layouts/SideMenu.test.jsx
+++ b/src/components/Layouts/SideMenu.test.jsx
@@ -21,13 +21,13 @@ const renderMenu = async () => {
 describe("SideMenu", () => {
   it("Unauthenticated", async () => {
     setToken(null);
-    const container = await renderMenu(null);
+    const container = await renderMenu();
     expect(container).toMatchSnapshot();
   });
 
   it("Authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
-    const container = await renderMenu(TEST_AUTH_OBJECT);
+    const container = await renderMenu();
     expect(container).toMatchSnapshot();
   });
 });
diff --git a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
index 17dba3d..ba0608e 100644
--- a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
+++ b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
@@ -182,7 +182,7 @@ exports[`SideMenu Authenticated 1`] = `
         <li>
           <a
             aria-disabled="false"
-            class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-53 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+            class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-54 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
             href="https://grafana.fiskerdps.com"
             rel="noopener"
             role="button"
diff --git a/src/components/Manifest/Deploy/index.jsx b/src/components/Manifest/Deploy/index.jsx
index fc7374e..88afbeb 100644
--- a/src/components/Manifest/Deploy/index.jsx
+++ b/src/components/Manifest/Deploy/index.jsx
@@ -38,9 +38,9 @@ const MainForm = () => {
   const [redirect, setRedirect] = useState("");
   const classes = useStyles();
 
-  const handleSearch = (search) => {
+  const handleSearch = (query) => {
     setSelected([]);
-    setSearch(search);
+    setSearch(query);
   };
 
   const handleSelectAll = (cars) => {
diff --git a/src/components/Manifest/List/index.jsx b/src/components/Manifest/List/index.jsx
index a13ca4f..0bcddc7 100644
--- a/src/components/Manifest/List/index.jsx
+++ b/src/components/Manifest/List/index.jsx
@@ -122,8 +122,8 @@ const MainForm = () => {
     setPageIndex(0);
   };
 
-  const handleSearch = (search) => {
-    setSearch(search);
+  const handleSearch = (query) => {
+    setSearch(query);
   };
 
   const onDelete = async (manifest_id) => {
@@ -161,7 +161,7 @@ const MainForm = () => {
       ]);
     }
 
-    if (actions.length === 0) return "No actions";
+    if (actions.length === 0) return ["No actions"];
 
     return actions.map((action) => {
       if (action.link != null) {
diff --git a/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap b/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap
index c9b4462..976d9e2 100644
--- a/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap
+++ b/src/components/SSOForm/__snapshots__/SSOForm.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Sign In Form Should render 1`] = `
 <div>
   <div
-    class="makeStyles-paper-3 makeStyles-textJustifyAlign-48"
+    class="makeStyles-paper-3 makeStyles-textJustifyAlign-49"
   >
     <a
       aria-disabled="false"
diff --git a/src/components/VehicleMap/index.jsx b/src/components/VehicleMap/index.jsx
index e515cb9..4b70395 100644
--- a/src/components/VehicleMap/index.jsx
+++ b/src/components/VehicleMap/index.jsx
@@ -27,20 +27,21 @@ const Component = () => {
   const [markers, setMarkers] = useState([]);
 
   useEffect(() => {
-    retrieveAndStoreLocations().then((points) => {
+    if (!token) return;
+    retrieveAndStoreLocations(token).then((points) => {
       centerAroundMarkers(points);
     });
     const id = setInterval(function () {
-      retrieveAndStoreLocations();
+      retrieveAndStoreLocations(token);
     }, REQUEST_INTERVAL);
     return () => {
       clearInterval(id);
     };
     // eslint-disable-next-line
-  }, []);
+  }, [token]);
 
-  const retrieveAndStoreLocations = () => {
-    return getLocations(token)
+  const retrieveAndStoreLocations = (accessToken) => {
+    return getLocations(accessToken)
       .then((result) => {
         if (result.data != null) {
           const points = result.data.map((point) => [
@@ -73,6 +74,7 @@ const Component = () => {
   const [connections, setConnections] = useState({});
 
   useEffect(() => {
+    if (!token) return;
     if (markers.length > 0) {
       const vins = markers.map((marker) => marker[2]);
       getConnections(vins, token).then((connections) => {
@@ -177,6 +179,7 @@ const Component = () => {
           doors={carState.doors}
           location={carState.location}
           windows={carState.windows}
+          updatedAt={carState.updated}
           className={classes.popup}
           onClose={handleClose}
         />
diff --git a/src/components/VehicleMap/popup.jsx b/src/components/VehicleMap/popup.jsx
index 4e6e76f..8451d24 100644
--- a/src/components/VehicleMap/popup.jsx
+++ b/src/components/VehicleMap/popup.jsx
@@ -6,10 +6,11 @@ import CloseIcon from '@material-ui/icons/Close';
 import Typography from '@material-ui/core/Typography';
 
 import useStyles from "../useStyles";
+import { LocalDateTimeString } from "../../utils/dates";
 
 const VehiclePopUp = (props) => {
     const classes = useStyles();
-    const { vin, online, battery, doors, location, windows, onClose } = props;
+    const { vin, online, battery, doors, location, updatedAt, windows, onClose } = props;
 
     return (
         <Dialog
@@ -24,24 +25,35 @@ const VehiclePopUp = (props) => {
                 {online && (
                     <div>
                         {battery != null && (
-                            <p><b>battery</b>: {battery.percent}%</p>
+                            <p><b>Battery</b>: {battery.percent}%</p>
                         )}
                         {doors != null && (
-                            <div>
+                            <div className={classes.popupSection}>
                                 <h3>Doors</h3>
                                 {Object.entries(doors).map((value) => (<p key={value[0]}><b>{value[0]}</b>: {value[1] ? "open" : "closed"}</p>))}
                             </div>
                         )}
                         {windows != null && (
-                            <div>
+                            <div className={classes.popupSection}>
                                 <h3>Windows</h3>
                                 {Object.entries(windows).map((value) => (<p key={value[0]}><b>{value[0]}</b>: {value[1] ? "open" : "closed"}</p>))}
                             </div>
                         )}
                         {location != null && (
-                            <div>
+                            <div className={classes.popupSection}>
                                 <h3>Location</h3>
-                                {Object.entries(location).map((value) => (<p key={value[0]}><b>{value[0]}</b>: {value[1]}</p>))}
+                                {Object.entries(location).map((value) => {
+                                    if (value[0] === "altitude") {
+                                        return (<p key={value[0]}><b>{value[0]}</b>: {value[1]}</p>);
+                                    } else {
+                                        return (<p key={value[0]}><b>{value[0]}</b>: {value[1]}°</p>)
+                                    }
+                                })}
+                            </div>
+                        )}
+                        {updatedAt != null && (
+                            <div className={classes.popupSection}>
+                                <p><b>Updated at</b>: {LocalDateTimeString(updatedAt)}</p>
                             </div>
                         )}
                     </div>
diff --git a/src/components/menuItemStyle.jsx b/src/components/menuItemStyle.jsx
index c0d0965..a6c2c08 100644
--- a/src/components/menuItemStyle.jsx
+++ b/src/components/menuItemStyle.jsx
@@ -5,6 +5,6 @@ function menuItemStyle(item, selectedItems, theme) {
         ? theme.typography.fontWeightRegular
         : theme.typography.fontWeightMedium,
   };
-};
+}
 
-export default menuItemStyle
+export default menuItemStyle;
diff --git a/src/components/useStyles.jsx b/src/components/useStyles.jsx
index d0506da..b28393f 100644
--- a/src/components/useStyles.jsx
+++ b/src/components/useStyles.jsx
@@ -203,6 +203,9 @@ const useStyles = makeStyles((theme) => ({
     },
     paddingBottom: "2vh",
   },
+  popupSection: {
+    marginBottom: "1vh",
+  },
   toolbarFooter: {
     width: "100%",
     textAlign: "right",
diff --git a/src/services/__mocks__/timer.js b/src/services/__mocks__/getTimerWorker.js
similarity index 100%
rename from src/services/__mocks__/timer.js
rename to src/services/__mocks__/getTimerWorker.js
diff --git a/src/services/__mocks__/grafana.js b/src/services/__mocks__/grafanaAPI.js
similarity index 100%
rename from src/services/__mocks__/grafana.js
rename to src/services/__mocks__/grafanaAPI.js
diff --git a/src/services/__mocks__/manifests.js b/src/services/__mocks__/manifestsAPI.js
similarity index 83%
rename from src/services/__mocks__/manifests.js
rename to src/services/__mocks__/manifestsAPI.js
index aeff668..11436c8 100644
--- a/src/services/__mocks__/manifests.js
+++ b/src/services/__mocks__/manifestsAPI.js
@@ -1,6 +1,6 @@
 
 
-const updatesAPI = {
+const manifestsAPI = {
   createCarUpdates: async (data, token) => {
     if (!data.id) data.id = 0;
     data.id++;
@@ -14,21 +14,21 @@ const updatesAPI = {
           id: 1,
           package_name: "Test",
           version: "1.0",
-          link: "http://cloudfront.com/download",
+          link: "https://cloudfront.com/download",
           ecu_list: "ECU1 1.0.0,ECU2 1.0.2",
         },
         {
           id: 2,
           package_name: "Test",
           version: "1.1",
-          link: "http://cloudfront.com/download",
+          link: "https://cloudfront.com/download",
           ecu_list: "ECU1 1.0.1,ECU2 1.0.2",
         },
         {
           id: 3,
           package_name: "Test",
           version: "1.2",
-          link: "http://cloudfront.com/download",
+          link: "https://cloudfront.com/download",
           ecu_list: "ECU1 1.1.0,ECU2 1.1.2",
         }
       ]
@@ -56,4 +56,4 @@ const updatesAPI = {
   },
 };
 
-export default updatesAPI;
+export default manifestsAPI;
diff --git a/src/services/__mocks__/updates.js b/src/services/__mocks__/updatesAPI.js
similarity index 100%
rename from src/services/__mocks__/updates.js
rename to src/services/__mocks__/updatesAPI.js
diff --git a/src/services/timer.js b/src/services/getTimerWorker.js
similarity index 100%
rename from src/services/timer.js
rename to src/services/getTimerWorker.js
diff --git a/src/services/grafana.js b/src/services/grafanaAPI.js
similarity index 73%
rename from src/services/grafana.js
rename to src/services/grafanaAPI.js
index d9d7b91..6b4b456 100644
--- a/src/services/grafana.js
+++ b/src/services/grafanaAPI.js
@@ -1,10 +1,10 @@
 import { fetchRespHandler } from "../utils/http"
-import { logger } from "../services/monitoring";
+import { logger } from "./monitoring";
 
 const API_ENDPOINT = "https://grafana.fiskerdps.com/api/datasources/proxy/2"
 
 const grafanaAPI = {
-    getCarsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20countDistinct(vin)%20as%20count%0AFROM%20default.vehicle_data%20FORMAT%20JSON`, {
+    getCarsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20countDistinct(VIN)%20as%20count%0AFROM%20default.vehicle_signal%0AWHERE%20Timestamp%20%3C%3D%20toDateTime64(${Date.now() / Math.pow(10, 3)}%2C%203)%20AND%20Timestamp%20%3E%3D%20toDateTime64(${Date.now() / Math.pow(10, 3) - 60 * 60 * 24}%2C%203)%20FORMAT%20JSON`, {
         method: "GET",
         headers: Object.assign({ "Content-Type": "application/json" }),
     })
diff --git a/src/services/manifests.js b/src/services/manifestsAPI.js
similarity index 100%
rename from src/services/manifests.js
rename to src/services/manifestsAPI.js
diff --git a/src/services/updates.js b/src/services/updatesAPI.js
similarity index 100%
rename from src/services/updates.js
rename to src/services/updatesAPI.js