diff --git a/package-lock.json b/package-lock.json
index 831b543..249ff80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1275,9 +1275,9 @@
       "integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
     },
     "@datadog/browser-core": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/@datadog/browser-core/-/browser-core-2.18.0.tgz",
-      "integrity": "sha512-1RvxLK8TiuAaDrwkrlOg7wM+7FilJtNbC30h5BxoGChWEBB7QsgeYGnliQ60byZUCzhbvARVzHHNZTxUiP+fPQ==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@datadog/browser-core/-/browser-core-3.1.2.tgz",
+      "integrity": "sha512-TVw6AEM39UgBm9wDAQJ/t1BurxfRvZY1TaKZiGOm2OQIFjQgdlbB1BXVZru/OcR3/kGA1JMQ6Nhh2cERDLpNHw==",
       "requires": {
         "tslib": "^1.10.0"
       },
@@ -1290,11 +1290,11 @@
       }
     },
     "@datadog/browser-logs": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/@datadog/browser-logs/-/browser-logs-2.18.0.tgz",
-      "integrity": "sha512-bDT5YkPNHGZmjADXtsVtwSyL+/J7MA4k2mBcHzutXK7/tKrIRiKH6ygHiBRryNHfD7/Q79tZqJzi32kSZy3AAA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@datadog/browser-logs/-/browser-logs-3.1.2.tgz",
+      "integrity": "sha512-XBtqH1RoLky4E7Gpr2eDVod4Zji1/BIOh+1T6zO+quapFWin9VRtiwpo9DjWFjSdGENbjGpz0HJfQIS5b+sLTA==",
       "requires": {
-        "@datadog/browser-core": "2.18.0",
+        "@datadog/browser-core": "3.1.2",
         "tslib": "^1.10.0"
       },
       "dependencies": {
@@ -1305,55 +1305,6 @@
         }
       }
     },
-    "@datadog/browser-rum": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/@datadog/browser-rum/-/browser-rum-2.18.0.tgz",
-      "integrity": "sha512-cfji5LdYJl1EpDhDZS67cpvgF6mC+qHSKRDxHQmqYurZW8R97wRhvrfpQWpDrKnl46MCvdQ76qDpSk9AVqK1zg==",
-      "requires": {
-        "@datadog/browser-core": "2.18.0",
-        "@datadog/browser-rum-core": "2.18.0",
-        "tslib": "^1.10.0"
-      },
-      "dependencies": {
-        "@datadog/browser-core": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/@datadog/browser-core/-/browser-core-2.18.0.tgz",
-          "integrity": "sha512-1RvxLK8TiuAaDrwkrlOg7wM+7FilJtNbC30h5BxoGChWEBB7QsgeYGnliQ60byZUCzhbvARVzHHNZTxUiP+fPQ==",
-          "requires": {
-            "tslib": "^1.10.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
-    "@datadog/browser-rum-core": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/@datadog/browser-rum-core/-/browser-rum-core-2.18.0.tgz",
-      "integrity": "sha512-HzdoQltOdIkEEDiZj7r0kHDa/bw6WIBfKPQIv680arRXwhIrvaguwWUiJFTEXI865NA5ouSwGMpPm8Xgrb3B5g==",
-      "requires": {
-        "@datadog/browser-core": "2.18.0",
-        "tslib": "^1.10.0"
-      },
-      "dependencies": {
-        "@datadog/browser-core": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/@datadog/browser-core/-/browser-core-2.18.0.tgz",
-          "integrity": "sha512-1RvxLK8TiuAaDrwkrlOg7wM+7FilJtNbC30h5BxoGChWEBB7QsgeYGnliQ60byZUCzhbvARVzHHNZTxUiP+fPQ==",
-          "requires": {
-            "tslib": "^1.10.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
     "@emotion/hash": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
@@ -2088,9 +2039,9 @@
       }
     },
     "@testing-library/dom": {
-      "version": "7.31.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz",
-      "integrity": "sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.1.0.tgz",
+      "integrity": "sha512-kmW9alndr19qd6DABzQ978zKQ+J65gU2Rzkl8hriIetPnwpesRaK4//jEQyYh8fEALmGhomD/LBQqt+o+DL95Q==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -2099,17 +2050,55 @@
         "chalk": "^4.1.0",
         "dom-accessibility-api": "^0.5.6",
         "lz-string": "^1.4.4",
-        "pretty-format": "^26.6.2"
+        "pretty-format": "^27.0.2"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "27.0.6",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz",
+          "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
         "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
           }
+        },
+        "pretty-format": {
+          "version": "27.0.6",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz",
+          "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==",
+          "requires": {
+            "@jest/types": "^27.0.6",
+            "ansi-regex": "^5.0.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^17.0.1"
+          },
+          "dependencies": {
+            "ansi-styles": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+            }
+          }
         }
       }
     },
@@ -2130,18 +2119,18 @@
       }
     },
     "@testing-library/react": {
-      "version": "11.2.7",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
-      "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-12.0.0.tgz",
+      "integrity": "sha512-sh3jhFgEshFyJ/0IxGltRhwZv2kFKfJ3fN1vTZ6hhMXzz9ZbbcTgmDYM4e+zJv+oiVKKEWZPyqPAh4MQBI65gA==",
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^7.28.1"
+        "@testing-library/dom": "^8.0.0"
       }
     },
     "@testing-library/user-event": {
-      "version": "12.8.3",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.8.3.tgz",
-      "integrity": "sha512-IR0iWbFkgd56Bu5ZI/ej8yQwrkCv8Qydx6RzwbKz9faXazR/+5tvYKsZQgyXJiwgpcva127YO6JcWy7YlCfofQ==",
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.2.1.tgz",
+      "integrity": "sha512-cczlgVl+krjOb3j1625usarNEibI0IFRJrSWX9UsJ1HKYFgCQv9Nb7QAipUDXl3Xdz8NDTsiS78eAkPSxlzTlw==",
       "requires": {
         "@babel/runtime": "^7.12.5"
       }
@@ -10492,9 +10481,9 @@
       "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
       "version": "1.8.0",
@@ -14189,9 +14178,9 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.10",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.10.tgz",
+      "integrity": "sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA==",
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -14825,9 +14814,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -15232,9 +15221,9 @@
       }
     },
     "web-vitals": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-0.2.4.tgz",
-      "integrity": "sha512-6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-2.1.0.tgz",
+      "integrity": "sha512-npEyJP8jHf3J71t1tRTEtz9FeKp8H2udWJUUq5ykfPhhstr//TUxiYhIEzLNwk4zv2ybAilMn7v7N6Mxmuitmg=="
     },
     "webidl-conversions": {
       "version": "6.1.0",
diff --git a/package.json b/package.json
index ba5ef47..b25e941 100644
--- a/package.json
+++ b/package.json
@@ -3,13 +3,12 @@
   "version": "0.1.1",
   "private": true,
   "dependencies": {
-    "@datadog/browser-logs": "^2.18.0",
-    "@datadog/browser-rum": "^2.17.0",
+    "@datadog/browser-logs": "^3.1.2",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "^4.11.2",
     "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^11.2.7",
-    "@testing-library/user-event": "^12.8.3",
+    "@testing-library/react": "^12.0.0",
+    "@testing-library/user-event": "^13.2.1",
     "axios": "^0.21.1",
     "clsx": "^1.1.1",
     "leaflet": "^1.7.1",
@@ -19,7 +18,7 @@
     "react-leaflet": "^3.2.1",
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.3",
-    "web-vitals": "^0.2.4"
+    "web-vitals": "^2.1.0"
   },
   "scripts": {
     "start": "react-scripts start",
diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js
index b1e5178..b284d56 100644
--- a/src/components/App/App.test.js
+++ b/src/components/App/App.test.js
@@ -1,6 +1,5 @@
 jest.mock("../Contexts/FileUploadContext");
 jest.mock("../Contexts/VehicleContext");
-jest.mock("../Contexts/UpdatesContext");
 jest.mock("../Contexts/UserContext");
 jest.mock("../Contexts/ManifestsContext");
 jest.mock("../Contexts/CarUpdatesContext");
@@ -65,26 +64,6 @@ describe("App", () => {
     await sleepAndCheck("/home", "span.MuiButton-label", "Sign In");
   });
 
-  it("Route /vehicle-add unauthenticated", async () => {
-    await check("/vehicle-add", "span.MuiButton-label", "Sign In");
-  });
-
-  it("Route /carupdate-deploy unauthenticated", async () => {
-    await check("/carupdate-deploy/1", "span.MuiButton-label", "Sign In");
-  });
-
-  it("Route /carupdate-status unauthenticated", async () => {
-    await check("/carupdate-status/1", "span.MuiButton-label", "Sign In");
-  });
-
-  it("Route /vehicles unauthenticated", async () => {
-    await check("/vehicles", "span.MuiButton-label", "Sign In");
-  });
-
-  it("Route /vehicle-status unauthenticated", async () => {
-    await check("/vehicle-status/FISKER123", "span.MuiButton-label", "Sign In");
-  });
-
   it("Route /datascope unauthenticated", async () => {
     await sleepAndCheck("/datascope", "span.MuiButton-label", "Sign In");
   });
@@ -109,6 +88,25 @@ describe("App", () => {
     await check("/package-create", "span.MuiButton-label", "Sign In");
   });
 
+  it("Route /vehicle-add unauthenticated", async () => {
+    await check("/vehicle-add", "span.MuiButton-label", "Sign In");
+  });
+
+  it("Route /vehicles unauthenticated", async () => {
+    await check("/vehicles", "span.MuiButton-label", "Sign In");
+  });
+
+  it("Route /vehicle-status unauthenticated", async () => {
+    await check("/vehicle-status/FISKER123", "span.MuiButton-label", "Sign In");
+  });
+
+  it("Route /vehicle-status/vin/carupdateid unauthenticated", async () => {
+    await check("/vehicle-status/1G1FP87S3GN100062/283", "span.MuiButton-label", "Sign In");
+  });
+  
+  it("Route /page-not-found unauthenticated", async () => {
+    await check("/page-not-found", "h1", "Page Not Found");
+  });
   it("Route / authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
     await sleepAndCheck("/", "h6", "Home");
@@ -119,40 +117,11 @@ describe("App", () => {
     await sleepAndCheck("/home", "h6", "Home");
   });
 
-  it("Route /vehicle-add authenticated", async () => {
-    setToken(TEST_AUTH_OBJECT);
-    await check("/vehicle-add", "h6", "Add Vehicle");
-  });
-
-  it("Route /carupdate-status authenticated", async () => {
-    setToken(TEST_AUTH_OBJECT);
-    await check("/carupdate-status/1", "h6", "Package Package 1.0");
-  });
-
-  it("Route /vehicles authenticated", async () => {
-    setToken(TEST_AUTH_OBJECT);
-    await check("/vehicles", "h6", "Vehicles");
-  });
-
-  it("Route /vehicle-status authenticated", async () => {
-    setToken(TEST_AUTH_OBJECT);
-    await check("/vehicle-status/FISKER123", "h6", "Vehicle FISKER123 Details");
-  });
-
-  it("Route /page-not-found unauthenticated", async () => {
-    await check("/page-not-found", "h1", "Page Not Found");
-  });
-
   it("Route /page-not-found authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
     await check("/page-not-found", "h1", "Page Not Found");
   });
 
-  it("Route /carupdate-deploy authenticated", async () => {
-    setToken(TEST_AUTH_OBJECT);
-    await check("/carupdate-deploy/1", "h6", "Deploy Package 1.0");
-  });
-
   it("Route /datascope authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
     await sleepAndCheck("/datascope", "h6", "Datascope");
@@ -182,4 +151,24 @@ describe("App", () => {
     setToken(TEST_AUTH_OBJECT);
     await check("/package-create", "h6", "Create Deployments");
   });
+
+  it("Route /vehicle-add authenticated", async () => {
+    setToken(TEST_AUTH_OBJECT);
+    await check("/vehicle-add", "h6", "Add Vehicle");
+  });
+
+  it("Route /vehicles authenticated", async () => {
+    setToken(TEST_AUTH_OBJECT);
+    await check("/vehicles", "h6", "Vehicles");
+  });
+
+  it("Route /vehicle-status authenticated", async () => {
+    setToken(TEST_AUTH_OBJECT);
+    await check("/vehicle-status/FISKER123", "h6", "Vehicle FISKER123 Details");
+  });
+
+  it("Route /vehicle-status/vin/carupdateid authenticated", async () => {
+    setToken(TEST_AUTH_OBJECT);
+    await sleepAndCheck("/vehicle-status/1G1FP87S3GN100062/283", "h6", "Vehicle 1G1FP87S3GN100062, Update TEST UPDATE");
+  });
 });
diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index bde050a..e3a6392 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-729"
+      class="makeStyles-root-768"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-730 makeStyles-appBarShift-731 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-769 makeStyles-appBarShift-770 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-740"
+            class="makeStyles-rightToolbar-779"
             color="inherit"
           >
             <button
@@ -45,17 +45,17 @@ exports[`App Route / authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-734"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-773"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-735 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-774 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-736 makeStyles-drawerHeaderLogo-737"
+            class="makeStyles-drawerHeader-775 makeStyles-drawerHeaderLogo-776"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-746"
+              class="makeStyles-logo-785"
               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-768 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-807 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-738 makeStyles-contentShift-739"
+        class="makeStyles-content-777 makeStyles-contentShift-778"
       >
         <div
-          class="makeStyles-drawerHeader-736"
+          class="makeStyles-drawerHeader-775"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-718"
+            class="makeStyles-paper-757"
           >
             <div
               data-testid="mocked-vehicleprovider"
@@ -448,16 +448,16 @@ exports[`App Route / unauthenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /carupdate-deploy authenticated 1`] = `
+exports[`App Route /datascope authenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1181"
+      class="makeStyles-root-942"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1182 makeStyles-appBarShift-1183 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-943 makeStyles-appBarShift-944 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -466,11 +466,11 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
             <h6
               class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Deploy Package 1.0
+              Datascope
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-1192"
+            class="makeStyles-rightToolbar-953"
             color="inherit"
           >
             <button
@@ -493,17 +493,17 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1186"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-947"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1187 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-948 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1188 makeStyles-drawerHeaderLogo-1189"
+            class="makeStyles-drawerHeader-949 makeStyles-drawerHeaderLogo-950"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1198"
+              class="makeStyles-logo-959"
               src="fisker-badge.svg"
             />
           </div>
@@ -687,7 +687,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1220 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-981 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -713,439 +713,726 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1190 makeStyles-contentShift-1191"
+        class="makeStyles-content-951 makeStyles-contentShift-952"
       >
         <div
-          class="makeStyles-drawerHeader-1188"
+          class="makeStyles-drawerHeader-949"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            data-testid="mocked-vehicleprovider"
+            class="makeStyles-paper-931"
           >
             <div
-              data-testid="mocked-updatesprovider"
+              class="MuiGrid-root makeStyles-root-942 MuiGrid-container MuiGrid-spacing-xs-2"
             >
               <div
-                class="makeStyles-paper-1170"
+                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
               >
-                <form
-                  action="{onSubmit}"
-                  class="makeStyles-form-1172"
-                  novalidate=""
+                <div
+                  class="MuiPaper-root makeStyles-grafanaContainer-973 MuiPaper-elevation1 MuiPaper-rounded"
+                  style="height: 150px;"
                 >
-                  <p
-                    class="MuiTypography-root MuiTypography-body2"
+                  <h1
+                    class="makeStyles-datascopeContainerValue-975"
                   >
-                    Created 
-                    7/6/2021 11:48:19 PM
-                    . 
-                    Description
-                  </p>
+                    500
+                  </h1>
+                  <h2
+                    class="makeStyles-datascopeContainerText-974"
+                  >
+                    Cars
+                  </h2>
+                </div>
+              </div>
+              <div
+                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
+              >
+                <div
+                  class="MuiPaper-root makeStyles-grafanaContainer-973 MuiPaper-elevation1 MuiPaper-rounded"
+                  style="height: 150px;"
+                >
+                  <h1
+                    class="makeStyles-datascopeContainerValue-975"
+                  >
+                    1,234,567,890
+                  </h1>
+                  <h2
+                    class="makeStyles-datascopeContainerText-974"
+                  >
+                    Signals Collected
+                  </h2>
+                </div>
+              </div>
+              <div
+                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+              >
+                <div
+                  class="MuiPaper-root makeStyles-grafanaContainer-973 MuiPaper-elevation1 MuiPaper-rounded"
+                >
                   <div
-                    class="MuiGrid-root makeStyles-root-1181 MuiGrid-container MuiGrid-spacing-xs-2"
+                    class="makeStyles-embeddedWrapper-961"
                   >
-                    <div
-                      class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-10"
+                    <iframe
+                      frameborder="0"
+                      src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12"
+                      style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                      title="Signals Time Series"
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+            <a
+              aria-disabled="false"
+              aria-label="create"
+              class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiTypography-colorPrimary"
+              href="https://grafana.fiskerdps.com"
+              rel="noopener"
+              role="button"
+              style="margin-top: 10px;"
+              tabindex="0"
+              target="_blank"
+            >
+              <span
+                class="MuiButton-label"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.9959.9959 0 00-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"
+                  />
+                </svg>
+                Go to Grafana
+              </span>
+              <span
+                class="MuiTouchRipple-root"
+              />
+            </a>
+          </div>
+        </main>
+      </main>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`App Route /datascope unauthenticated 1`] = `
+<div>
+  <div
+    data-testid="mocked-userprovider"
+  >
+    <div
+      class="makeStyles-root-130"
+    >
+      <header
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-131 mui-00000fixed MuiPaper-elevation4"
+      >
+        <div
+          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
+        >
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
+        </div>
+      </header>
+      <main
+        class="makeStyles-content-139"
+      >
+        <div
+          class="makeStyles-drawerHeader-137"
+        />
+        <main
+          class="MuiContainer-root MuiContainer-maxWidthLg"
+        >
+          <div
+            class="makeStyles-paper-119 makeStyles-textJustifyAlign-164"
+          >
+            <a
+              aria-disabled="false"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-122 MuiButton-containedPrimary"
+              href="https://cognito.com/authorize?redirect=https://example.com/callback"
+              tabindex="0"
+            >
+              <span
+                class="MuiButton-label"
+              >
+                Sign In
+              </span>
+              <span
+                class="MuiTouchRipple-root"
+              />
+            </a>
+          </div>
+        </main>
+      </main>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`App Route /datascope/battery authenticated 1`] = `
+<div>
+  <div
+    data-testid="mocked-userprovider"
+  >
+    <div
+      class="makeStyles-root-1000"
+    >
+      <header
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1001 makeStyles-appBarShift-1002 mui-00000fixed MuiPaper-elevation4"
+      >
+        <div
+          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
+        >
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            >
+              Battery
+            </h6>
+            <nav
+              aria-label="breadcrumb"
+              class="MuiTypography-root MuiBreadcrumbs-root MuiTypography-body1 MuiTypography-colorInherit"
+              style="font-size: 10px;"
+            >
+              <ol
+                class="MuiBreadcrumbs-ol"
+              >
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/datascope"
+                  >
+                    Datascope
+                  </a>
+                </li>
+                <li
+                  aria-hidden="true"
+                  class="MuiBreadcrumbs-separator"
+                >
+                  /
+                </li>
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/datascope/battery"
+                  >
+                    Battery
+                  </a>
+                </li>
+              </ol>
+            </nav>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-1011"
+            color="inherit"
+          >
+            <button
+              aria-controls="fade-menu"
+              aria-haspopup="true"
+              class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-colorInherit"
+              tabindex="0"
+              type="button"
+            >
+              <span
+                class="MuiButton-label"
+              >
+                John
+              </span>
+              <span
+                class="MuiTouchRipple-root"
+              />
+            </button>
+          </div>
+        </div>
+      </header>
+      <div
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1005"
+      >
+        <div
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1006 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+        >
+          <div
+            class="makeStyles-drawerHeader-1007 makeStyles-drawerHeaderLogo-1008"
+          >
+            <img
+              alt="Fisker Admin Portal"
+              class="makeStyles-logo-1017"
+              src="fisker-badge.svg"
+            />
+          </div>
+          <hr
+            class="MuiDivider-root"
+          />
+          <ul
+            class="MuiList-root MuiList-padding"
+          >
+            <li>
+              <a
+                aria-disabled="false"
+                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                href="/home"
+                role="button"
+                tabindex="0"
+              >
+                <div
+                  class="MuiListItemIcon-root"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="MuiListItemText-root"
+                >
+                  <span
+                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  >
+                    Home
+                  </span>
+                </div>
+                <span
+                  class="MuiTouchRipple-root"
+                />
+              </a>
+            </li>
+            <li>
+              <a
+                aria-disabled="false"
+                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                href="/packages"
+                role="button"
+                tabindex="0"
+              >
+                <div
+                  class="MuiListItemIcon-root"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="MuiListItemText-root"
+                >
+                  <span
+                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  >
+                    Deployments
+                  </span>
+                </div>
+                <span
+                  class="MuiTouchRipple-root"
+                />
+              </a>
+            </li>
+            <li>
+              <a
+                aria-disabled="false"
+                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                href="/vehicles"
+                role="button"
+                tabindex="0"
+              >
+                <div
+                  class="MuiListItemIcon-root"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M12 4H5C3.34 4 2 5.34 2 7v8c0 1.66 1.34 3 3 3l-1 1v1h1l2-2.03L9 18v-5H4V5.98L13 6v2h2V7c0-1.66-1.34-3-3-3zM5 14c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm15.57-4.34c-.14-.4-.52-.66-.97-.66h-7.19c-.46 0-.83.26-.98.66L10 13.77l.01 5.51c0 .38.31.72.69.72h.62c.38 0 .68-.38.68-.76V18h8v1.24c0 .38.31.76.69.76h.61c.38 0 .69-.34.69-.72l.01-1.37v-4.14l-1.43-4.11zm-8.16.34h7.19l1.03 3h-9.25l1.03-3zM12 16c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm8 0c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1z"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="MuiListItemText-root"
+                >
+                  <span
+                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  >
+                    Vehicles
+                  </span>
+                </div>
+                <span
+                  class="MuiTouchRipple-root"
+                />
+              </a>
+            </li>
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiListItemIcon-root"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="MuiSvgIcon-root"
+                      focusable="false"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"
+                      />
+                    </svg>
+                  </div>
+                  <div
+                    class="MuiListItemText-root"
+                  >
+                    <span
+                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                    >
+                      Datascope
+                    </span>
+                  </div>
+                  <span
+                    class="MuiTouchRipple-root"
+                  />
+                </a>
+              </li>
+            </span>
+            <ul
+              style="margin-left: 50px;"
+            >
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope/battery"
+                  role="button"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiListItemText-root"
+                  >
+                    <span
+                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                    >
+                      Battery
+                    </span>
+                  </div>
+                  <span
+                    class="MuiTouchRipple-root"
+                  />
+                </a>
+              </li>
+              <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"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  tabindex="0"
+                  target="_blank"
+                >
+                  <div
+                    class="MuiListItemText-root"
+                  >
+                    <span
+                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                    >
+                      Diagnostics
+                    </span>
+                  </div>
+                  <span
+                    class="MuiTouchRipple-root"
+                  />
+                </a>
+              </li>
+            </ul>
+          </ul>
+        </div>
+      </div>
+      <main
+        class="makeStyles-content-1009 makeStyles-contentShift-1010"
+      >
+        <div
+          class="makeStyles-drawerHeader-1007"
+        />
+        <main
+          class="MuiContainer-root MuiContainer-maxWidthLg"
+        >
+          <div
+            class="makeStyles-paper-989"
+          >
+            <div
+              class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
+            >
+              <div
+                class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-md-4"
+                space="2"
+              >
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <div
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <form
+                      class="makeStyles-formControl-993"
                     >
                       <div
-                        class="MuiFormControl-root makeStyles-margin-1195 makeStyles-fullWidth-1218"
+                        class="MuiFormControl-root MuiTextField-root"
+                        style="width: 100%;"
                       >
                         <label
-                          class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
-                          data-shrink="false"
-                          for="search"
+                          class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
+                          data-shrink="true"
+                          for="vin"
+                          id="vin-label"
                         >
-                          Search
+                          VIN
                         </label>
                         <div
-                          class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl MuiInputBase-adornedEnd"
+                          class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
                         >
                           <input
                             aria-invalid="false"
-                            class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd"
-                            id="search"
+                            class="MuiInputBase-input MuiOutlinedInput-input"
+                            id="vin"
                             type="text"
-                            value=""
+                            value="1F15K3R45N1234567"
                           />
-                          <div
-                            class="MuiInputAdornment-root MuiInputAdornment-positionEnd"
+                          <fieldset
+                            aria-hidden="true"
+                            class="PrivateNotchedOutline-root-1045 MuiOutlinedInput-notchedOutline"
                           >
-                            <button
-                              aria-label="search"
-                              class="MuiButtonBase-root MuiIconButton-root"
-                              tabindex="0"
-                              type="button"
+                            <legend
+                              class="PrivateNotchedOutline-legendLabelled-1047 PrivateNotchedOutline-legendNotched-1048"
                             >
-                              <span
-                                class="MuiIconButton-label"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="MuiSvgIcon-root"
-                                  focusable="false"
-                                  viewBox="0 0 24 24"
-                                >
-                                  <path
-                                    d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
-                                  />
-                                </svg>
+                              <span>
+                                VIN
                               </span>
-                              <span
-                                class="MuiTouchRipple-root"
-                              />
-                            </button>
-                          </div>
+                            </legend>
+                          </fieldset>
                         </div>
                       </div>
-                      <div
-                        class="makeStyles-labelInline-1176"
+                    </form>
+                    <div
+                      class="MuiFormControl-root makeStyles-formControl-993"
+                    >
+                      <label
+                        class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
+                        data-shrink="true"
+                        id="demo-simple-select-outlined-label"
                       >
-                        0 Selected
+                        Cell
+                      </label>
+                      <div
+                        class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
+                      >
+                        <div
+                          aria-haspopup="listbox"
+                          aria-labelledby="demo-simple-select-outlined-label demo-simple-select-outlined"
+                          class="MuiSelect-root MuiSelect-select MuiSelect-selectMenu MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
+                          id="demo-simple-select-outlined"
+                          role="button"
+                          tabindex="0"
+                        >
+                          1
+                        </div>
+                        <input
+                          aria-hidden="true"
+                          class="MuiSelect-nativeInput"
+                          tabindex="-1"
+                          value="1"
+                        />
+                        <svg
+                          aria-hidden="true"
+                          class="MuiSvgIcon-root MuiSelect-icon MuiSelect-iconOutlined"
+                          focusable="false"
+                          viewBox="0 0 24 24"
+                        >
+                          <path
+                            d="M7 10l5 5 5-5z"
+                          />
+                        </svg>
+                        <fieldset
+                          aria-hidden="true"
+                          class="PrivateNotchedOutline-root-1045 MuiOutlinedInput-notchedOutline"
+                        >
+                          <legend
+                            class="PrivateNotchedOutline-legendLabelled-1047 PrivateNotchedOutline-legendNotched-1048"
+                          >
+                            <span>
+                              Cell
+                            </span>
+                          </legend>
+                        </fieldset>
                       </div>
                     </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <div
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    Cell Voltage 
+                    1
                     <div
-                      class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-2"
-                      style="text-align: right;"
+                      class="makeStyles-embeddedWrapper-1019"
                     >
-                      <button
-                        class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1174 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
-                        disabled=""
-                        tabindex="-1"
-                        type="submit"
-                      >
-                        <span
-                          class="MuiButton-label"
-                        >
-                          Deploy
-                        </span>
-                      </button>
+                      <iframe
+                        frameborder="0"
+                        src="https://grafana.fiskerdps.com/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=1F15K3R45N1234567&var-Signal=BMS_CellVolt1&panelId=2"
+                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                        title="Cell Voltage"
+                      />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
                   <div
-                    class="makeStyles-paper-1170 makeStyles-tableSize-1221"
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
                   >
-                    <table
-                      class="MuiTable-root"
+                    Cell Temperature 
+                    1
+                    <div
+                      class="makeStyles-embeddedWrapper-1019"
                     >
-                      <thead
-                        class="MuiTableHead-root"
-                      >
-                        <tr
-                          class="MuiTableRow-root MuiTableRow-head"
-                        >
-                          <th
-                            class="MuiTableCell-root MuiTableCell-head MuiTableCell-paddingCheckbox"
-                            scope="col"
-                          >
-                            <span
-                              aria-disabled="false"
-                              class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1223 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
-                            >
-                              <span
-                                class="MuiIconButton-label"
-                              >
-                                <input
-                                  aria-label="select all desserts"
-                                  class="PrivateSwitchBase-input-1226"
-                                  data-indeterminate="false"
-                                  type="checkbox"
-                                  value=""
-                                />
-                                <svg
-                                  aria-hidden="true"
-                                  class="MuiSvgIcon-root"
-                                  focusable="false"
-                                  viewBox="0 0 24 24"
-                                >
-                                  <path
-                                    d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
-                                  />
-                                </svg>
-                              </span>
-                              <span
-                                class="MuiTouchRipple-root"
-                              />
-                            </span>
-                          </th>
-                          <th
-                            aria-sort="ascending"
-                            class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                            scope="col"
-                          >
-                            <span
-                              aria-disabled="false"
-                              class="MuiButtonBase-root MuiTableSortLabel-root MuiTableSortLabel-active"
-                              role="button"
-                              tabindex="0"
-                            >
-                              VIN
-                              <span
-                                class="makeStyles-hiddenSortSpan-1194"
-                              >
-                                sorted ascending
-                              </span>
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
-                                />
-                              </svg>
-                            </span>
-                          </th>
-                          <th
-                            class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                            scope="col"
-                          >
-                            <span
-                              aria-disabled="false"
-                              class="MuiButtonBase-root MuiTableSortLabel-root"
-                              role="button"
-                              tabindex="0"
-                            >
-                              Model
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
-                                />
-                              </svg>
-                            </span>
-                          </th>
-                          <th
-                            class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                            scope="col"
-                          >
-                            <span
-                              aria-disabled="false"
-                              class="MuiButtonBase-root MuiTableSortLabel-root"
-                              role="button"
-                              tabindex="0"
-                            >
-                              Year
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
-                                />
-                              </svg>
-                            </span>
-                          </th>
-                          <th
-                            class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                            scope="col"
-                          >
-                            <span
-                              aria-disabled="false"
-                              class="MuiButtonBase-root MuiTableSortLabel-root"
-                              role="button"
-                              tabindex="0"
-                            >
-                              Trim
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
-                                />
-                              </svg>
-                            </span>
-                          </th>
-                          <th
-                            class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                            scope="col"
-                          >
-                            <span
-                              aria-disabled="false"
-                              class="MuiButtonBase-root MuiTableSortLabel-root"
-                              role="button"
-                              tabindex="0"
-                            >
-                              Created
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
-                                />
-                              </svg>
-                            </span>
-                          </th>
-                          <th
-                            class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                            scope="col"
-                          >
-                            <span
-                              aria-disabled="false"
-                              class="MuiButtonBase-root MuiTableSortLabel-root"
-                              role="button"
-                              tabindex="0"
-                            >
-                              Updated
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
-                                />
-                              </svg>
-                            </span>
-                          </th>
-                        </tr>
-                      </thead>
-                      <tbody
-                        class="MuiTableBody-root"
+                      <iframe
+                        frameborder="0"
+                        src="https://grafana.fiskerdps.com/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=1F15K3R45N1234567&var-Signal=BMS_CellT1&panelId=2"
+                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                        title="Cell Temperature"
                       />
-                      <tfoot
-                        class="MuiTableFooter-root"
-                      >
-                        <tr
-                          class="MuiTableRow-root MuiTableRow-footer"
-                        >
-                          <td
-                            class="MuiTableCell-root MuiTableCell-footer MuiTablePagination-root"
-                            colspan="7"
-                          >
-                            <div
-                              class="MuiToolbar-root MuiToolbar-regular MuiTablePagination-toolbar MuiToolbar-gutters"
-                            >
-                              <div
-                                class="MuiTablePagination-spacer"
-                              />
-                              <p
-                                class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
-                                id="mui-00000"
-                              >
-                                Rows per page:
-                              </p>
-                              <div
-                                class="MuiInputBase-root MuiTablePagination-input MuiTablePagination-selectRoot"
-                              >
-                                <select
-                                  aria-label="rows per page"
-                                  class="MuiSelect-root MuiSelect-select MuiTablePagination-select MuiInputBase-input"
-                                  id="mui-00000"
-                                >
-                                  <option
-                                    class="MuiTablePagination-menuItem"
-                                    value="5"
-                                  >
-                                    5
-                                  </option>
-                                  <option
-                                    class="MuiTablePagination-menuItem"
-                                    value="10"
-                                  >
-                                    10
-                                  </option>
-                                  <option
-                                    class="MuiTablePagination-menuItem"
-                                    value="25"
-                                  >
-                                    25
-                                  </option>
-                                  <option
-                                    class="MuiTablePagination-menuItem"
-                                    value="100"
-                                  >
-                                    100
-                                  </option>
-                                </select>
-                                <svg
-                                  aria-hidden="true"
-                                  class="MuiSvgIcon-root MuiSelect-icon MuiTablePagination-selectIcon"
-                                  focusable="false"
-                                  viewBox="0 0 24 24"
-                                >
-                                  <path
-                                    d="M7 10l5 5 5-5z"
-                                  />
-                                </svg>
-                              </div>
-                              <p
-                                class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
-                              >
-                                0-0 of 0
-                              </p>
-                              <div
-                                class="MuiTablePagination-actions"
-                              >
-                                <button
-                                  aria-label="Previous page"
-                                  class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit Mui-disabled Mui-disabled"
-                                  disabled=""
-                                  tabindex="-1"
-                                  title="Previous page"
-                                  type="button"
-                                >
-                                  <span
-                                    class="MuiIconButton-label"
-                                  >
-                                    <svg
-                                      aria-hidden="true"
-                                      class="MuiSvgIcon-root"
-                                      focusable="false"
-                                      viewBox="0 0 24 24"
-                                    >
-                                      <path
-                                        d="M15.41 16.09l-4.58-4.59 4.58-4.59L14 5.5l-6 6 6 6z"
-                                      />
-                                    </svg>
-                                  </span>
-                                </button>
-                                <button
-                                  aria-label="Next page"
-                                  class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit Mui-disabled Mui-disabled"
-                                  disabled=""
-                                  tabindex="-1"
-                                  title="Next page"
-                                  type="button"
-                                >
-                                  <span
-                                    class="MuiIconButton-label"
-                                  >
-                                    <svg
-                                      aria-hidden="true"
-                                      class="MuiSvgIcon-root"
-                                      focusable="false"
-                                      viewBox="0 0 24 24"
-                                    >
-                                      <path
-                                        d="M8.59 16.34l4.58-4.59-4.58-4.59L10 5.75l6 6-6 6z"
-                                      />
-                                    </svg>
-                                  </span>
-                                </button>
-                              </div>
-                            </div>
-                          </td>
-                        </tr>
-                      </tfoot>
-                    </table>
+                    </div>
                   </div>
-                </form>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <div
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1019"
+                    >
+                      <iframe
+                        frameborder="0"
+                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=4"
+                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                        title="Battery Temperature Time Series"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-md-8"
+                space="2"
+              >
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <div
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1019"
+                    >
+                      <iframe
+                        frameborder="0"
+                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=6"
+                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                        title="Battery Capacity Time Series"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <div
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1019"
+                    >
+                      <iframe
+                        frameborder="0"
+                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&panelId=12"
+                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                        title="Battery Percent Time Series"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
+                >
+                  <div
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1019"
+                    >
+                      <iframe
+                        frameborder="0"
+                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=2"
+                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                        title="12V Battery Percentage Time Series"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
+                >
+                  <div
+                    class="MuiPaper-root makeStyles-grafanaContainer-1031 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1019"
+                    >
+                      <iframe
+                        frameborder="0"
+                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=9"
+                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
+                        title="12V Battery Voltage Time Series"
+                      />
+                    </div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -1156,16 +1443,16 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /carupdate-deploy unauthenticated 1`] = `
+exports[`App Route /datascope/battery unauthenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-179"
+      class="makeStyles-root-188"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-180 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-189 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1178,20 +1465,20 @@ exports[`App Route /carupdate-deploy unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-188"
+        class="makeStyles-content-197"
       >
         <div
-          class="makeStyles-drawerHeader-186"
+          class="makeStyles-drawerHeader-195"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-168 makeStyles-textJustifyAlign-213"
+            class="makeStyles-paper-177 makeStyles-textJustifyAlign-222"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-171 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-180 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1212,16 +1499,16 @@ exports[`App Route /carupdate-deploy unauthenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /carupdate-status authenticated 1`] = `
+exports[`App Route /home authenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-898"
+      class="makeStyles-root-826"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-899 makeStyles-appBarShift-900 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-827 makeStyles-appBarShift-828 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1230,11 +1517,11 @@ exports[`App Route /carupdate-status authenticated 1`] = `
             <h6
               class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Package Package 1.0
+              Home
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-909"
+            class="makeStyles-rightToolbar-837"
             color="inherit"
           >
             <button
@@ -1257,17 +1544,17 @@ exports[`App Route /carupdate-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-903"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-831"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-904 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-832 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-905 makeStyles-drawerHeaderLogo-906"
+            class="makeStyles-drawerHeader-833 makeStyles-drawerHeaderLogo-834"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-915"
+              class="makeStyles-logo-843"
               src="fisker-badge.svg"
             />
           </div>
@@ -1451,7 +1738,7 @@ exports[`App Route /carupdate-status authenticated 1`] = `
               <li>
                 <a
                   aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-937 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-865 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -1477,190 +1764,124 @@ exports[`App Route /carupdate-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-907 makeStyles-contentShift-908"
+        class="makeStyles-content-835 makeStyles-contentShift-836"
       >
         <div
-          class="makeStyles-drawerHeader-905"
+          class="makeStyles-drawerHeader-833"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            data-testid="mocked-updatesprovider"
+            class="makeStyles-paper-815"
           >
             <div
-              class="makeStyles-paper-887 makeStyles-tableSize-938"
+              data-testid="mocked-vehicleprovider"
             >
-              <table
-                class="MuiTable-root"
+              <div
+                class="leaflet-container leaflet-grab leaflet-touch-drag"
+                style="width: 100%; height: 900px; position: relative;"
+                tabindex="0"
               >
-                <thead
-                  class="MuiTableHead-root"
+                <div
+                  class="leaflet-pane leaflet-map-pane"
+                  style="left: 0px; top: 0px;"
                 >
-                  <tr
-                    class="MuiTableRow-root MuiTableRow-head"
+                  <div
+                    class="leaflet-pane leaflet-tile-pane"
                   >
-                    <th
-                      class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                      scope="col"
-                    >
-                      ID
-                    </th>
-                    <th
-                      class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                      scope="col"
-                    >
-                      Vehicle
-                    </th>
-                    <th
-                      class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                      scope="col"
-                    >
-                      Status
-                    </th>
-                    <th
-                      class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                      scope="col"
-                    >
-                      Created
-                    </th>
-                    <th
-                      class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
-                      scope="col"
-                    >
-                      Updated
-                    </th>
-                  </tr>
-                </thead>
-                <tbody
-                  class="MuiTableBody-root"
-                />
-                <tfoot
-                  class="MuiTableFooter-root"
-                >
-                  <tr
-                    class="MuiTableRow-root MuiTableRow-footer"
-                  >
-                    <td
-                      class="MuiTableCell-root MuiTableCell-footer MuiTablePagination-root"
-                      colspan="5"
+                    <div
+                      class="leaflet-layer "
+                      style="z-index: 1;"
                     >
                       <div
-                        class="MuiToolbar-root MuiToolbar-regular MuiTablePagination-toolbar MuiToolbar-gutters"
+                        class="leaflet-tile-container leaflet-zoom-animated"
+                        style="z-index: 18; left: 0px; top: 0px;"
                       >
-                        <div
-                          class="MuiTablePagination-spacer"
+                        <img
+                          alt=""
+                          class="leaflet-tile"
+                          role="presentation"
+                          src="https://b.tile.openstreetmap.org/5/7/12.png"
+                          style="width: 256px; height: 256px; left: -126px; top: -114px;"
                         />
-                        <p
-                          class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
-                          id="mui-00000"
-                        >
-                          Rows per page:
-                        </p>
-                        <div
-                          class="MuiInputBase-root MuiTablePagination-input MuiTablePagination-selectRoot"
-                        >
-                          <select
-                            aria-label="rows per page"
-                            class="MuiSelect-root MuiSelect-select MuiTablePagination-select MuiInputBase-input"
-                            id="mui-00000"
-                          >
-                            <option
-                              class="MuiTablePagination-menuItem"
-                              value="5"
-                            >
-                              5
-                            </option>
-                            <option
-                              class="MuiTablePagination-menuItem"
-                              value="10"
-                            >
-                              10
-                            </option>
-                            <option
-                              class="MuiTablePagination-menuItem"
-                              value="25"
-                            >
-                              25
-                            </option>
-                            <option
-                              class="MuiTablePagination-menuItem"
-                              value="100"
-                            >
-                              100
-                            </option>
-                          </select>
-                          <svg
-                            aria-hidden="true"
-                            class="MuiSvgIcon-root MuiSelect-icon MuiTablePagination-selectIcon"
-                            focusable="false"
-                            viewBox="0 0 24 24"
-                          >
-                            <path
-                              d="M7 10l5 5 5-5z"
-                            />
-                          </svg>
-                        </div>
-                        <p
-                          class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
-                        >
-                          0-0 of 0
-                        </p>
-                        <div
-                          class="MuiTablePagination-actions"
-                        >
-                          <button
-                            aria-label="Previous page"
-                            class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit Mui-disabled Mui-disabled"
-                            disabled=""
-                            tabindex="-1"
-                            title="Previous page"
-                            type="button"
-                          >
-                            <span
-                              class="MuiIconButton-label"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M15.41 16.09l-4.58-4.59 4.58-4.59L14 5.5l-6 6 6 6z"
-                                />
-                              </svg>
-                            </span>
-                          </button>
-                          <button
-                            aria-label="Next page"
-                            class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit Mui-disabled Mui-disabled"
-                            disabled=""
-                            tabindex="-1"
-                            title="Next page"
-                            type="button"
-                          >
-                            <span
-                              class="MuiIconButton-label"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="MuiSvgIcon-root"
-                                focusable="false"
-                                viewBox="0 0 24 24"
-                              >
-                                <path
-                                  d="M8.59 16.34l4.58-4.59-4.58-4.59L10 5.75l6 6-6 6z"
-                                />
-                              </svg>
-                            </span>
-                          </button>
-                        </div>
                       </div>
-                    </td>
-                  </tr>
-                </tfoot>
-              </table>
+                    </div>
+                  </div>
+                  <div
+                    class="leaflet-pane leaflet-shadow-pane"
+                  />
+                  <div
+                    class="leaflet-pane leaflet-overlay-pane"
+                  />
+                  <div
+                    class="leaflet-pane leaflet-marker-pane"
+                  />
+                  <div
+                    class="leaflet-pane leaflet-tooltip-pane"
+                  />
+                  <div
+                    class="leaflet-pane leaflet-popup-pane"
+                  />
+                </div>
+                <div
+                  class="leaflet-control-container"
+                >
+                  <div
+                    class="leaflet-top leaflet-left"
+                  >
+                    <div
+                      class="leaflet-control-zoom leaflet-bar leaflet-control"
+                    >
+                      <a
+                        aria-label="Zoom in"
+                        class="leaflet-control-zoom-in"
+                        href="#"
+                        role="button"
+                        title="Zoom in"
+                      >
+                        +
+                      </a>
+                      <a
+                        aria-label="Zoom out"
+                        class="leaflet-control-zoom-out"
+                        href="#"
+                        role="button"
+                        title="Zoom out"
+                      >
+                        −
+                      </a>
+                    </div>
+                  </div>
+                  <div
+                    class="leaflet-top leaflet-right"
+                  />
+                  <div
+                    class="leaflet-bottom leaflet-left"
+                  />
+                  <div
+                    class="leaflet-bottom leaflet-right"
+                  >
+                    <div
+                      class="leaflet-control-attribution leaflet-control"
+                    >
+                      <a
+                        href="https://leafletjs.com"
+                        title="A JS library for interactive maps"
+                      >
+                        Leaflet
+                      </a>
+                       | © 
+                      <a
+                        href="http://osm.org/copyright"
+                      >
+                        OpenStreetMap
+                      </a>
+                       contributors
+                    </div>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </main>
@@ -1670,16 +1891,16 @@ exports[`App Route /carupdate-status authenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /carupdate-status unauthenticated 1`] = `
+exports[`App Route /home unauthenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-234"
+      class="makeStyles-root-72"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-235 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-73 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -1692,20 +1913,20 @@ exports[`App Route /carupdate-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-243"
+        class="makeStyles-content-81"
       >
         <div
-          class="makeStyles-drawerHeader-241"
+          class="makeStyles-drawerHeader-79"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-223 makeStyles-textJustifyAlign-268"
+            class="makeStyles-paper-61 makeStyles-textJustifyAlign-106"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-226 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-64 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1726,7 +1947,7 @@ exports[`App Route /carupdate-status unauthenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /datascope authenticated 1`] = `
+exports[`App Route /package-create authenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
@@ -1744,8 +1965,44 @@ exports[`App Route /datascope authenticated 1`] = `
             <h6
               class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Datascope
+              Create Deployments
             </h6>
+            <nav
+              aria-label="breadcrumb"
+              class="MuiTypography-root MuiBreadcrumbs-root MuiTypography-body1 MuiTypography-colorInherit"
+              style="font-size: 10px;"
+            >
+              <ol
+                class="MuiBreadcrumbs-ol"
+              >
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/packages"
+                  >
+                    Deployments
+                  </a>
+                </li>
+                <li
+                  aria-hidden="true"
+                  class="MuiBreadcrumbs-separator"
+                >
+                  /
+                </li>
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/package-create"
+                  >
+                    Create Deployments
+                  </a>
+                </li>
+              </ol>
+            </nav>
           </div>
           <div
             class="makeStyles-rightToolbar-1251"
@@ -1996,1541 +2253,6 @@ exports[`App Route /datascope authenticated 1`] = `
         <div
           class="makeStyles-drawerHeader-1247"
         />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
-          <div
-            class="makeStyles-paper-1229"
-          >
-            <div
-              class="MuiGrid-root makeStyles-root-1240 MuiGrid-container MuiGrid-spacing-xs-2"
-            >
-              <div
-                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
-              >
-                <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-1271 MuiPaper-elevation1 MuiPaper-rounded"
-                  style="height: 150px;"
-                >
-                  <h1
-                    class="makeStyles-datascopeContainerValue-1273"
-                  >
-                    500
-                  </h1>
-                  <h2
-                    class="makeStyles-datascopeContainerText-1272"
-                  >
-                    Cars
-                  </h2>
-                </div>
-              </div>
-              <div
-                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
-              >
-                <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-1271 MuiPaper-elevation1 MuiPaper-rounded"
-                  style="height: 150px;"
-                >
-                  <h1
-                    class="makeStyles-datascopeContainerValue-1273"
-                  >
-                    1,234,567,890
-                  </h1>
-                  <h2
-                    class="makeStyles-datascopeContainerText-1272"
-                  >
-                    Signals Collected
-                  </h2>
-                </div>
-              </div>
-              <div
-                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
-              >
-                <div
-                  class="MuiPaper-root makeStyles-grafanaContainer-1271 MuiPaper-elevation1 MuiPaper-rounded"
-                >
-                  <div
-                    class="makeStyles-embeddedWrapper-1259"
-                  >
-                    <iframe
-                      frameborder="0"
-                      src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12"
-                      style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                      title="Signals Time Series"
-                    />
-                  </div>
-                </div>
-              </div>
-            </div>
-            <a
-              aria-disabled="false"
-              aria-label="create"
-              class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiTypography-colorPrimary"
-              href="https://grafana.fiskerdps.com"
-              rel="noopener"
-              role="button"
-              style="margin-top: 10px;"
-              tabindex="0"
-              target="_blank"
-            >
-              <span
-                class="MuiButton-label"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge"
-                  focusable="false"
-                  viewBox="0 0 24 24"
-                >
-                  <path
-                    d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.9959.9959 0 00-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"
-                  />
-                </svg>
-                Go to Grafana
-              </span>
-              <span
-                class="MuiTouchRipple-root"
-              />
-            </a>
-          </div>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /datascope unauthenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-399"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-400 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <div>
-            <h6
-              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-            />
-          </div>
-        </div>
-      </header>
-      <main
-        class="makeStyles-content-408"
-      >
-        <div
-          class="makeStyles-drawerHeader-406"
-        />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
-          <div
-            class="makeStyles-paper-388 makeStyles-textJustifyAlign-433"
-          >
-            <a
-              aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-391 MuiButton-containedPrimary"
-              href="https://cognito.com/authorize?redirect=https://example.com/callback"
-              tabindex="0"
-            >
-              <span
-                class="MuiButton-label"
-              >
-                Sign In
-              </span>
-              <span
-                class="MuiTouchRipple-root"
-              />
-            </a>
-          </div>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /datascope/battery authenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-1295"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1296 makeStyles-appBarShift-1297 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <div>
-            <h6
-              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-            >
-              Battery
-            </h6>
-            <nav
-              aria-label="breadcrumb"
-              class="MuiTypography-root MuiBreadcrumbs-root MuiTypography-body1 MuiTypography-colorInherit"
-              style="font-size: 10px;"
-            >
-              <ol
-                class="MuiBreadcrumbs-ol"
-              >
-                <li
-                  class="MuiBreadcrumbs-li"
-                >
-                  <a
-                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
-                    href="/datascope"
-                  >
-                    Datascope
-                  </a>
-                </li>
-                <li
-                  aria-hidden="true"
-                  class="MuiBreadcrumbs-separator"
-                >
-                  /
-                </li>
-                <li
-                  class="MuiBreadcrumbs-li"
-                >
-                  <a
-                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
-                    href="/datascope/battery"
-                  >
-                    Battery
-                  </a>
-                </li>
-              </ol>
-            </nav>
-          </div>
-          <div
-            class="makeStyles-rightToolbar-1306"
-            color="inherit"
-          >
-            <button
-              aria-controls="fade-menu"
-              aria-haspopup="true"
-              class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-colorInherit"
-              tabindex="0"
-              type="button"
-            >
-              <span
-                class="MuiButton-label"
-              >
-                John
-              </span>
-              <span
-                class="MuiTouchRipple-root"
-              />
-            </button>
-          </div>
-        </div>
-      </header>
-      <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1300"
-      >
-        <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1301 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
-        >
-          <div
-            class="makeStyles-drawerHeader-1302 makeStyles-drawerHeaderLogo-1303"
-          >
-            <img
-              alt="Fisker Admin Portal"
-              class="makeStyles-logo-1312"
-              src="fisker-badge.svg"
-            />
-          </div>
-          <hr
-            class="MuiDivider-root"
-          />
-          <ul
-            class="MuiList-root MuiList-padding"
-          >
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/home"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Home
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/packages"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Deployments
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M12 4H5C3.34 4 2 5.34 2 7v8c0 1.66 1.34 3 3 3l-1 1v1h1l2-2.03L9 18v-5H4V5.98L13 6v2h2V7c0-1.66-1.34-3-3-3zM5 14c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm15.57-4.34c-.14-.4-.52-.66-.97-.66h-7.19c-.46 0-.83.26-.98.66L10 13.77l.01 5.51c0 .38.31.72.69.72h.62c.38 0 .68-.38.68-.76V18h8v1.24c0 .38.31.76.69.76h.61c.38 0 .69-.34.69-.72l.01-1.37v-4.14l-1.43-4.11zm-8.16.34h7.19l1.03 3h-9.25l1.03-3zM12 16c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm8 0c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Vehicles
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <span>
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                  href="/datascope"
-                  role="button"
-                  tabindex="0"
-                >
-                  <div
-                    class="MuiListItemIcon-root"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="MuiSvgIcon-root"
-                      focusable="false"
-                      viewBox="0 0 24 24"
-                    >
-                      <path
-                        d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"
-                      />
-                    </svg>
-                  </div>
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Datascope
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-            </span>
-            <ul
-              style="margin-left: 50px;"
-            >
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                  href="/datascope/battery"
-                  role="button"
-                  tabindex="0"
-                >
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Battery
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1334 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                  href="https://grafana.fiskerdps.com"
-                  rel="noopener"
-                  role="button"
-                  tabindex="0"
-                  target="_blank"
-                >
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Diagnostics
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-            </ul>
-          </ul>
-        </div>
-      </div>
-      <main
-        class="makeStyles-content-1304 makeStyles-contentShift-1305"
-      >
-        <div
-          class="makeStyles-drawerHeader-1302"
-        />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
-          <div
-            class="makeStyles-paper-1284"
-          >
-            <div
-              class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
-            >
-              <div
-                class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-md-4"
-                space="2"
-              >
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    <form
-                      class="makeStyles-formControl-1288"
-                    >
-                      <div
-                        class="MuiFormControl-root MuiTextField-root"
-                        style="width: 100%;"
-                      >
-                        <label
-                          class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
-                          data-shrink="true"
-                          for="vin"
-                          id="vin-label"
-                        >
-                          VIN
-                        </label>
-                        <div
-                          class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
-                        >
-                          <input
-                            aria-invalid="false"
-                            class="MuiInputBase-input MuiOutlinedInput-input"
-                            id="vin"
-                            type="text"
-                            value="1F15K3R45N1234567"
-                          />
-                          <fieldset
-                            aria-hidden="true"
-                            class="PrivateNotchedOutline-root-1337 MuiOutlinedInput-notchedOutline"
-                          >
-                            <legend
-                              class="PrivateNotchedOutline-legendLabelled-1339 PrivateNotchedOutline-legendNotched-1340"
-                            >
-                              <span>
-                                VIN
-                              </span>
-                            </legend>
-                          </fieldset>
-                        </div>
-                      </div>
-                    </form>
-                    <div
-                      class="MuiFormControl-root makeStyles-formControl-1288"
-                    >
-                      <label
-                        class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
-                        data-shrink="true"
-                        id="demo-simple-select-outlined-label"
-                      >
-                        Cell
-                      </label>
-                      <div
-                        class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
-                      >
-                        <div
-                          aria-haspopup="listbox"
-                          aria-labelledby="demo-simple-select-outlined-label demo-simple-select-outlined"
-                          class="MuiSelect-root MuiSelect-select MuiSelect-selectMenu MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
-                          id="demo-simple-select-outlined"
-                          role="button"
-                          tabindex="0"
-                        >
-                          1
-                        </div>
-                        <input
-                          aria-hidden="true"
-                          class="MuiSelect-nativeInput"
-                          tabindex="-1"
-                          value="1"
-                        />
-                        <svg
-                          aria-hidden="true"
-                          class="MuiSvgIcon-root MuiSelect-icon MuiSelect-iconOutlined"
-                          focusable="false"
-                          viewBox="0 0 24 24"
-                        >
-                          <path
-                            d="M7 10l5 5 5-5z"
-                          />
-                        </svg>
-                        <fieldset
-                          aria-hidden="true"
-                          class="PrivateNotchedOutline-root-1337 MuiOutlinedInput-notchedOutline"
-                        >
-                          <legend
-                            class="PrivateNotchedOutline-legendLabelled-1339 PrivateNotchedOutline-legendNotched-1340"
-                          >
-                            <span>
-                              Cell
-                            </span>
-                          </legend>
-                        </fieldset>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    Cell Voltage 
-                    1
-                    <div
-                      class="makeStyles-embeddedWrapper-1314"
-                    >
-                      <iframe
-                        frameborder="0"
-                        src="https://grafana.fiskerdps.com/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=1F15K3R45N1234567&var-Signal=BMS_CellVolt1&panelId=2"
-                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                        title="Cell Voltage"
-                      />
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    Cell Temperature 
-                    1
-                    <div
-                      class="makeStyles-embeddedWrapper-1314"
-                    >
-                      <iframe
-                        frameborder="0"
-                        src="https://grafana.fiskerdps.com/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=1F15K3R45N1234567&var-Signal=BMS_CellT1&panelId=2"
-                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                        title="Cell Temperature"
-                      />
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    <div
-                      class="makeStyles-embeddedWrapper-1314"
-                    >
-                      <iframe
-                        frameborder="0"
-                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=4"
-                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                        title="Battery Temperature Time Series"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-md-8"
-                space="2"
-              >
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    <div
-                      class="makeStyles-embeddedWrapper-1314"
-                    >
-                      <iframe
-                        frameborder="0"
-                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=6"
-                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                        title="Battery Capacity Time Series"
-                      />
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    <div
-                      class="makeStyles-embeddedWrapper-1314"
-                    >
-                      <iframe
-                        frameborder="0"
-                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&panelId=12"
-                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                        title="Battery Percent Time Series"
-                      />
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    <div
-                      class="makeStyles-embeddedWrapper-1314"
-                    >
-                      <iframe
-                        frameborder="0"
-                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=2"
-                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                        title="12V Battery Percentage Time Series"
-                      />
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
-                >
-                  <div
-                    class="MuiPaper-root makeStyles-grafanaContainer-1326 MuiPaper-elevation1 MuiPaper-rounded"
-                  >
-                    <div
-                      class="makeStyles-embeddedWrapper-1314"
-                    >
-                      <iframe
-                        frameborder="0"
-                        src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=1F15K3R45N1234567&refresh=1m&panelId=9"
-                        style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                        title="12V Battery Voltage Time Series"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /datascope/battery unauthenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-454"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-455 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <div>
-            <h6
-              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-            />
-          </div>
-        </div>
-      </header>
-      <main
-        class="makeStyles-content-463"
-      >
-        <div
-          class="makeStyles-drawerHeader-461"
-        />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
-          <div
-            class="makeStyles-paper-443 makeStyles-textJustifyAlign-488"
-          >
-            <a
-              aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-446 MuiButton-containedPrimary"
-              href="https://cognito.com/authorize?redirect=https://example.com/callback"
-              tabindex="0"
-            >
-              <span
-                class="MuiButton-label"
-              >
-                Sign In
-              </span>
-              <span
-                class="MuiTouchRipple-root"
-              />
-            </a>
-          </div>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /home authenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-784"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-785 makeStyles-appBarShift-786 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <div>
-            <h6
-              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-            >
-              Home
-            </h6>
-          </div>
-          <div
-            class="makeStyles-rightToolbar-795"
-            color="inherit"
-          >
-            <button
-              aria-controls="fade-menu"
-              aria-haspopup="true"
-              class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-colorInherit"
-              tabindex="0"
-              type="button"
-            >
-              <span
-                class="MuiButton-label"
-              >
-                John
-              </span>
-              <span
-                class="MuiTouchRipple-root"
-              />
-            </button>
-          </div>
-        </div>
-      </header>
-      <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-789"
-      >
-        <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-790 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
-        >
-          <div
-            class="makeStyles-drawerHeader-791 makeStyles-drawerHeaderLogo-792"
-          >
-            <img
-              alt="Fisker Admin Portal"
-              class="makeStyles-logo-801"
-              src="fisker-badge.svg"
-            />
-          </div>
-          <hr
-            class="MuiDivider-root"
-          />
-          <ul
-            class="MuiList-root MuiList-padding"
-          >
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/home"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Home
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/packages"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Deployments
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M12 4H5C3.34 4 2 5.34 2 7v8c0 1.66 1.34 3 3 3l-1 1v1h1l2-2.03L9 18v-5H4V5.98L13 6v2h2V7c0-1.66-1.34-3-3-3zM5 14c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm15.57-4.34c-.14-.4-.52-.66-.97-.66h-7.19c-.46 0-.83.26-.98.66L10 13.77l.01 5.51c0 .38.31.72.69.72h.62c.38 0 .68-.38.68-.76V18h8v1.24c0 .38.31.76.69.76h.61c.38 0 .69-.34.69-.72l.01-1.37v-4.14l-1.43-4.11zm-8.16.34h7.19l1.03 3h-9.25l1.03-3zM12 16c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm8 0c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Vehicles
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <span>
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                  href="/datascope"
-                  role="button"
-                  tabindex="0"
-                >
-                  <div
-                    class="MuiListItemIcon-root"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="MuiSvgIcon-root"
-                      focusable="false"
-                      viewBox="0 0 24 24"
-                    >
-                      <path
-                        d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"
-                      />
-                    </svg>
-                  </div>
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Datascope
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-            </span>
-            <ul
-              style="margin-left: 50px;"
-            >
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                  href="/datascope/battery"
-                  role="button"
-                  tabindex="0"
-                >
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Battery
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-823 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                  href="https://grafana.fiskerdps.com"
-                  rel="noopener"
-                  role="button"
-                  tabindex="0"
-                  target="_blank"
-                >
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Diagnostics
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-            </ul>
-          </ul>
-        </div>
-      </div>
-      <main
-        class="makeStyles-content-793 makeStyles-contentShift-794"
-      >
-        <div
-          class="makeStyles-drawerHeader-791"
-        />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
-          <div
-            class="makeStyles-paper-773"
-          >
-            <div
-              data-testid="mocked-vehicleprovider"
-            >
-              <div
-                class="leaflet-container leaflet-grab leaflet-touch-drag"
-                style="width: 100%; height: 900px; position: relative;"
-                tabindex="0"
-              >
-                <div
-                  class="leaflet-pane leaflet-map-pane"
-                  style="left: 0px; top: 0px;"
-                >
-                  <div
-                    class="leaflet-pane leaflet-tile-pane"
-                  >
-                    <div
-                      class="leaflet-layer "
-                      style="z-index: 1;"
-                    >
-                      <div
-                        class="leaflet-tile-container leaflet-zoom-animated"
-                        style="z-index: 18; left: 0px; top: 0px;"
-                      >
-                        <img
-                          alt=""
-                          class="leaflet-tile"
-                          role="presentation"
-                          src="https://b.tile.openstreetmap.org/5/7/12.png"
-                          style="width: 256px; height: 256px; left: -126px; top: -114px;"
-                        />
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="leaflet-pane leaflet-shadow-pane"
-                  />
-                  <div
-                    class="leaflet-pane leaflet-overlay-pane"
-                  />
-                  <div
-                    class="leaflet-pane leaflet-marker-pane"
-                  />
-                  <div
-                    class="leaflet-pane leaflet-tooltip-pane"
-                  />
-                  <div
-                    class="leaflet-pane leaflet-popup-pane"
-                  />
-                </div>
-                <div
-                  class="leaflet-control-container"
-                >
-                  <div
-                    class="leaflet-top leaflet-left"
-                  >
-                    <div
-                      class="leaflet-control-zoom leaflet-bar leaflet-control"
-                    >
-                      <a
-                        aria-label="Zoom in"
-                        class="leaflet-control-zoom-in"
-                        href="#"
-                        role="button"
-                        title="Zoom in"
-                      >
-                        +
-                      </a>
-                      <a
-                        aria-label="Zoom out"
-                        class="leaflet-control-zoom-out"
-                        href="#"
-                        role="button"
-                        title="Zoom out"
-                      >
-                        −
-                      </a>
-                    </div>
-                  </div>
-                  <div
-                    class="leaflet-top leaflet-right"
-                  />
-                  <div
-                    class="leaflet-bottom leaflet-left"
-                  />
-                  <div
-                    class="leaflet-bottom leaflet-right"
-                  >
-                    <div
-                      class="leaflet-control-attribution leaflet-control"
-                    >
-                      <a
-                        href="https://leafletjs.com"
-                        title="A JS library for interactive maps"
-                      >
-                        Leaflet
-                      </a>
-                       | © 
-                      <a
-                        href="http://osm.org/copyright"
-                      >
-                        OpenStreetMap
-                      </a>
-                       contributors
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /home unauthenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-69"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-70 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <div>
-            <h6
-              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-            />
-          </div>
-        </div>
-      </header>
-      <main
-        class="makeStyles-content-78"
-      >
-        <div
-          class="makeStyles-drawerHeader-76"
-        />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
-          <div
-            class="makeStyles-paper-58 makeStyles-textJustifyAlign-103"
-          >
-            <a
-              aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-61 MuiButton-containedPrimary"
-              href="https://cognito.com/authorize?redirect=https://example.com/callback"
-              tabindex="0"
-            >
-              <span
-                class="MuiButton-label"
-              >
-                Sign In
-              </span>
-              <span
-                class="MuiTouchRipple-root"
-              />
-            </a>
-          </div>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /package-create authenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-1523"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1524 makeStyles-appBarShift-1525 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <div>
-            <h6
-              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-            >
-              Create Deployments
-            </h6>
-            <nav
-              aria-label="breadcrumb"
-              class="MuiTypography-root MuiBreadcrumbs-root MuiTypography-body1 MuiTypography-colorInherit"
-              style="font-size: 10px;"
-            >
-              <ol
-                class="MuiBreadcrumbs-ol"
-              >
-                <li
-                  class="MuiBreadcrumbs-li"
-                >
-                  <a
-                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
-                    href="/packages"
-                  >
-                    Deployments
-                  </a>
-                </li>
-                <li
-                  aria-hidden="true"
-                  class="MuiBreadcrumbs-separator"
-                >
-                  /
-                </li>
-                <li
-                  class="MuiBreadcrumbs-li"
-                >
-                  <a
-                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
-                    href="/package-create"
-                  >
-                    Create Deployments
-                  </a>
-                </li>
-              </ol>
-            </nav>
-          </div>
-          <div
-            class="makeStyles-rightToolbar-1534"
-            color="inherit"
-          >
-            <button
-              aria-controls="fade-menu"
-              aria-haspopup="true"
-              class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-colorInherit"
-              tabindex="0"
-              type="button"
-            >
-              <span
-                class="MuiButton-label"
-              >
-                John
-              </span>
-              <span
-                class="MuiTouchRipple-root"
-              />
-            </button>
-          </div>
-        </div>
-      </header>
-      <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1528"
-      >
-        <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1529 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
-        >
-          <div
-            class="makeStyles-drawerHeader-1530 makeStyles-drawerHeaderLogo-1531"
-          >
-            <img
-              alt="Fisker Admin Portal"
-              class="makeStyles-logo-1540"
-              src="fisker-badge.svg"
-            />
-          </div>
-          <hr
-            class="MuiDivider-root"
-          />
-          <ul
-            class="MuiList-root MuiList-padding"
-          >
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/home"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Home
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/packages"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Deployments
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemIcon-root"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="MuiSvgIcon-root"
-                    focusable="false"
-                    viewBox="0 0 24 24"
-                  >
-                    <path
-                      d="M12 4H5C3.34 4 2 5.34 2 7v8c0 1.66 1.34 3 3 3l-1 1v1h1l2-2.03L9 18v-5H4V5.98L13 6v2h2V7c0-1.66-1.34-3-3-3zM5 14c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm15.57-4.34c-.14-.4-.52-.66-.97-.66h-7.19c-.46 0-.83.26-.98.66L10 13.77l.01 5.51c0 .38.31.72.69.72h.62c.38 0 .68-.38.68-.76V18h8v1.24c0 .38.31.76.69.76h.61c.38 0 .69-.34.69-.72l.01-1.37v-4.14l-1.43-4.11zm-8.16.34h7.19l1.03 3h-9.25l1.03-3zM12 16c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm8 0c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Vehicles
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <span>
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                  href="/datascope"
-                  role="button"
-                  tabindex="0"
-                >
-                  <div
-                    class="MuiListItemIcon-root"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="MuiSvgIcon-root"
-                      focusable="false"
-                      viewBox="0 0 24 24"
-                    >
-                      <path
-                        d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"
-                      />
-                    </svg>
-                  </div>
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Datascope
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-            </span>
-            <ul
-              style="margin-left: 50px;"
-            >
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                  href="/datascope/battery"
-                  role="button"
-                  tabindex="0"
-                >
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Battery
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-              <li>
-                <a
-                  aria-disabled="false"
-                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1562 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                  href="https://grafana.fiskerdps.com"
-                  rel="noopener"
-                  role="button"
-                  tabindex="0"
-                  target="_blank"
-                >
-                  <div
-                    class="MuiListItemText-root"
-                  >
-                    <span
-                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                    >
-                      Diagnostics
-                    </span>
-                  </div>
-                  <span
-                    class="MuiTouchRipple-root"
-                  />
-                </a>
-              </li>
-            </ul>
-          </ul>
-        </div>
-      </div>
-      <main
-        class="makeStyles-content-1532 makeStyles-contentShift-1533"
-      >
-        <div
-          class="makeStyles-drawerHeader-1530"
-        />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
@@ -3538,11 +2260,11 @@ exports[`App Route /package-create authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-1512"
+              class="makeStyles-paper-1229"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-1514"
+                class="makeStyles-form-1231"
                 novalidate=""
               >
                 <div
@@ -3578,10 +2300,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1567"
+                        class="PrivateNotchedOutline-legendLabelled-1287"
                       >
                         <span>
                           Package name
@@ -3624,10 +2346,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1567"
+                        class="PrivateNotchedOutline-legendLabelled-1287"
                       >
                         <span>
                           Version
@@ -3670,10 +2392,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1567"
+                        class="PrivateNotchedOutline-legendLabelled-1287"
                       >
                         <span>
                           Description
@@ -3717,10 +2439,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1565 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1285 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1567"
+                        class="PrivateNotchedOutline-legendLabelled-1287"
                       >
                         <span>
                           Release Notes URL
@@ -3817,7 +2539,7 @@ exports[`App Route /package-create authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1515 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1232 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
@@ -3846,10 +2568,10 @@ exports[`App Route /package-create unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-674"
+      class="makeStyles-root-420"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-675 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-421 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3862,20 +2584,20 @@ exports[`App Route /package-create unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-683"
+        class="makeStyles-content-429"
       >
         <div
-          class="makeStyles-drawerHeader-681"
+          class="makeStyles-drawerHeader-427"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-663 makeStyles-textJustifyAlign-708"
+            class="makeStyles-paper-409 makeStyles-textJustifyAlign-454"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-666 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-412 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -3902,10 +2624,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1464"
+      class="makeStyles-root-1178"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1465 makeStyles-appBarShift-1466 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1179 makeStyles-appBarShift-1180 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -3954,7 +2676,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1475"
+            class="makeStyles-rightToolbar-1189"
             color="inherit"
           >
             <button
@@ -3977,17 +2699,17 @@ exports[`App Route /package-deploy authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1469"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1183"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1470 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1184 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1471 makeStyles-drawerHeaderLogo-1472"
+            class="makeStyles-drawerHeader-1185 makeStyles-drawerHeaderLogo-1186"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1481"
+              class="makeStyles-logo-1195"
               src="fisker-badge.svg"
             />
           </div>
@@ -4171,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-1503 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1217 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -4197,10 +2919,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1473 makeStyles-contentShift-1474"
+        class="makeStyles-content-1187 makeStyles-contentShift-1188"
       >
         <div
-          class="makeStyles-drawerHeader-1471"
+          class="makeStyles-drawerHeader-1185"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -4215,11 +2937,11 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 data-testid="mocked-carupdatesprovider"
               >
                 <div
-                  class="makeStyles-paper-1453"
+                  class="makeStyles-paper-1167"
                 >
                   <form
                     action="{onSubmit}"
-                    class="makeStyles-form-1455"
+                    class="makeStyles-form-1169"
                     novalidate=""
                   >
                     <p
@@ -4230,22 +2952,22 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       .
                     </p>
                     <div
-                      class="MuiGrid-root makeStyles-root-1464 MuiGrid-container MuiGrid-spacing-xs-2"
+                      class="MuiGrid-root makeStyles-root-1178 MuiGrid-container MuiGrid-spacing-xs-2"
                     >
                       <div
                         class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-4"
                       >
                         <div
-                          class="makeStyles-labelInline-1459"
+                          class="makeStyles-labelInline-1173"
                         >
                           0 Selected
                         </div>
                       </div>
                       <div
-                        class="MuiGrid-root makeStyles-textCenterAlign-1499 MuiGrid-item MuiGrid-grid-md-4"
+                        class="MuiGrid-root makeStyles-textCenterAlign-1213 MuiGrid-item MuiGrid-grid-md-4"
                       >
                         <div
-                          class="MuiFormControl-root makeStyles-margin-1478 makeStyles-fullWidth-1501"
+                          class="MuiFormControl-root makeStyles-margin-1192 makeStyles-fullWidth-1215"
                         >
                           <label
                             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -4296,10 +3018,10 @@ exports[`App Route /package-deploy authenticated 1`] = `
                         </div>
                       </div>
                       <div
-                        class="MuiGrid-root makeStyles-textRightAlign-1500 MuiGrid-item MuiGrid-grid-md-4"
+                        class="MuiGrid-root makeStyles-textRightAlign-1214 MuiGrid-item MuiGrid-grid-md-4"
                       >
                         <button
-                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1457 makeStyles-textField-1479 MuiButton-containedPrimary Mui-disabled Mui-disabled"
+                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1171 makeStyles-textField-1193 MuiButton-containedPrimary Mui-disabled Mui-disabled"
                           disabled=""
                           tabindex="-1"
                           type="submit"
@@ -4313,7 +3035,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="makeStyles-paper-1453 makeStyles-tableSize-1504"
+                      class="makeStyles-paper-1167 makeStyles-tableSize-1218"
                     >
                       <table
                         class="MuiTable-root"
@@ -4330,14 +3052,14 @@ exports[`App Route /package-deploy authenticated 1`] = `
                             >
                               <span
                                 aria-disabled="false"
-                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1506 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1223 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                               >
                                 <span
                                   class="MuiIconButton-label"
                                 >
                                   <input
                                     aria-label="select all desserts"
-                                    class="PrivateSwitchBase-input-1509"
+                                    class="PrivateSwitchBase-input-1226"
                                     data-indeterminate="false"
                                     type="checkbox"
                                     value=""
@@ -4371,7 +3093,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                               >
                                 VIN
                                 <span
-                                  class="makeStyles-hiddenSortSpan-1477"
+                                  class="makeStyles-hiddenSortSpan-1191"
                                 >
                                   sorted ascending
                                 </span>
@@ -4652,10 +3374,10 @@ exports[`App Route /package-deploy unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-619"
+      class="makeStyles-root-362"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-620 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-363 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -4668,20 +3390,20 @@ exports[`App Route /package-deploy unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-628"
+        class="makeStyles-content-371"
       >
         <div
-          class="makeStyles-drawerHeader-626"
+          class="makeStyles-drawerHeader-369"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-608 makeStyles-textJustifyAlign-653"
+            class="makeStyles-paper-351 makeStyles-textJustifyAlign-396"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-611 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-354 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -4708,10 +3430,10 @@ exports[`App Route /package-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1409"
+      class="makeStyles-root-1120"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1410 makeStyles-appBarShift-1411 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1121 makeStyles-appBarShift-1122 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -4746,6 +3468,22 @@ exports[`App Route /package-status authenticated 1`] = `
                 >
                   /
                 </li>
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/package-deploy/1"
+                  >
+                    Deploy Test Manifest 1.0
+                  </a>
+                </li>
+                <li
+                  aria-hidden="true"
+                  class="MuiBreadcrumbs-separator"
+                >
+                  /
+                </li>
                 <li
                   class="MuiBreadcrumbs-li"
                 >
@@ -4760,7 +3498,7 @@ exports[`App Route /package-status authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1420"
+            class="makeStyles-rightToolbar-1131"
             color="inherit"
           >
             <button
@@ -4783,17 +3521,17 @@ exports[`App Route /package-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1414"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1125"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1415 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1126 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1416 makeStyles-drawerHeaderLogo-1417"
+            class="makeStyles-drawerHeader-1127 makeStyles-drawerHeaderLogo-1128"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1426"
+              class="makeStyles-logo-1137"
               src="fisker-badge.svg"
             />
           </div>
@@ -4977,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-1448 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1159 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -5003,10 +3741,10 @@ exports[`App Route /package-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1418 makeStyles-contentShift-1419"
+        class="makeStyles-content-1129 makeStyles-contentShift-1130"
       >
         <div
-          class="makeStyles-drawerHeader-1416"
+          class="makeStyles-drawerHeader-1127"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -5018,7 +3756,7 @@ exports[`App Route /package-status authenticated 1`] = `
               data-testid="mocked-carupdatesprovider"
             >
               <div
-                class="makeStyles-paper-1398 makeStyles-tableSize-1449"
+                class="makeStyles-paper-1109 makeStyles-tableSize-1160"
               >
                 <table
                   class="MuiTable-root"
@@ -5240,10 +3978,10 @@ exports[`App Route /package-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-564"
+      class="makeStyles-root-304"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-565 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-305 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5256,20 +3994,20 @@ exports[`App Route /package-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-573"
+        class="makeStyles-content-313"
       >
         <div
-          class="makeStyles-drawerHeader-571"
+          class="makeStyles-drawerHeader-311"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-553 makeStyles-textJustifyAlign-598"
+            class="makeStyles-paper-293 makeStyles-textJustifyAlign-338"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-556 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-296 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -5296,10 +4034,10 @@ exports[`App Route /packages authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1354"
+      class="makeStyles-root-1062"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1355 makeStyles-appBarShift-1356 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1063 makeStyles-appBarShift-1064 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -5312,7 +4050,7 @@ exports[`App Route /packages authenticated 1`] = `
             </h6>
           </div>
           <div
-            class="makeStyles-rightToolbar-1365"
+            class="makeStyles-rightToolbar-1073"
             color="inherit"
           >
             <button
@@ -5335,17 +4073,17 @@ exports[`App Route /packages authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1359"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1067"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1360 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1068 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1361 makeStyles-drawerHeaderLogo-1362"
+            class="makeStyles-drawerHeader-1069 makeStyles-drawerHeaderLogo-1070"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1371"
+              class="makeStyles-logo-1079"
               src="fisker-badge.svg"
             />
           </div>
@@ -5529,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-1393 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1101 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -5555,10 +4293,10 @@ exports[`App Route /packages authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1363 makeStyles-contentShift-1364"
+        class="makeStyles-content-1071 makeStyles-contentShift-1072"
       >
         <div
-          class="makeStyles-drawerHeader-1361"
+          class="makeStyles-drawerHeader-1069"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -5567,16 +4305,16 @@ exports[`App Route /packages authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-1343 makeStyles-tableSize-1394"
+              class="makeStyles-paper-1051 makeStyles-tableSize-1102"
             >
               <div
-                class="MuiGrid-root makeStyles-root-1354 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-1062 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root makeStyles-textJustifyAlign-1388 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1096 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <a
-                    class="makeStyles-labelInline-1349"
+                    class="makeStyles-labelInline-1057"
                     href="/package-create"
                   >
                     <svg
@@ -5592,10 +4330,10 @@ exports[`App Route /packages authenticated 1`] = `
                   </a>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textCenterAlign-1389 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textCenterAlign-1097 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="MuiFormControl-root makeStyles-margin-1368 makeStyles-fullWidth-1391"
+                    class="MuiFormControl-root makeStyles-margin-1076 makeStyles-fullWidth-1099"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -5646,7 +4384,7 @@ exports[`App Route /packages authenticated 1`] = `
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textRightAlign-1390 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textRightAlign-1098 MuiGrid-item MuiGrid-grid-md-4"
                 />
               </div>
               <table
@@ -5671,7 +4409,7 @@ exports[`App Route /packages authenticated 1`] = `
                       >
                         ID
                         <span
-                          class="makeStyles-hiddenSortSpan-1367"
+                          class="makeStyles-hiddenSortSpan-1075"
                         >
                           sorted ascending
                         </span>
@@ -6018,10 +4756,10 @@ exports[`App Route /packages unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-509"
+      class="makeStyles-root-246"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-510 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-247 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6034,20 +4772,20 @@ exports[`App Route /packages unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-518"
+        class="makeStyles-content-255"
       >
         <div
-          class="makeStyles-drawerHeader-516"
+          class="makeStyles-drawerHeader-253"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-498 makeStyles-textJustifyAlign-543"
+            class="makeStyles-paper-235 makeStyles-textJustifyAlign-280"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-501 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-238 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -6074,10 +4812,10 @@ exports[`App Route /page-not-found authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1126"
+      class="makeStyles-root-884"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1127 makeStyles-appBarShift-1128 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-885 makeStyles-appBarShift-886 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6088,7 +4826,7 @@ exports[`App Route /page-not-found authenticated 1`] = `
             />
           </div>
           <div
-            class="makeStyles-rightToolbar-1137"
+            class="makeStyles-rightToolbar-895"
             color="inherit"
           >
             <button
@@ -6111,17 +4849,17 @@ exports[`App Route /page-not-found authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1131"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-889"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1132 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-890 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1133 makeStyles-drawerHeaderLogo-1134"
+            class="makeStyles-drawerHeader-891 makeStyles-drawerHeaderLogo-892"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1143"
+              class="makeStyles-logo-901"
               src="fisker-badge.svg"
             />
           </div>
@@ -6305,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-1165 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-923 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -6331,16 +5069,16 @@ exports[`App Route /page-not-found authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1135 makeStyles-contentShift-1136"
+        class="makeStyles-content-893 makeStyles-contentShift-894"
       >
         <div
-          class="makeStyles-drawerHeader-1133"
+          class="makeStyles-drawerHeader-891"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-1115"
+            class="makeStyles-paper-873"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -6361,10 +5099,10 @@ exports[`App Route /page-not-found unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1071"
+      class="makeStyles-root-710"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1072 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-711 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6377,16 +5115,16 @@ exports[`App Route /page-not-found unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-1080"
+        class="makeStyles-content-719"
       >
         <div
-          class="makeStyles-drawerHeader-1078"
+          class="makeStyles-drawerHeader-717"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-1060"
+            class="makeStyles-paper-699"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -6407,10 +5145,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-839"
+      class="makeStyles-root-1302"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-840 makeStyles-appBarShift-841 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1303 makeStyles-appBarShift-1304 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6459,7 +5197,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-850"
+            class="makeStyles-rightToolbar-1313"
             color="inherit"
           >
             <button
@@ -6482,17 +5220,17 @@ exports[`App Route /vehicle-add authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-844"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1307"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-845 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1308 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-846 makeStyles-drawerHeaderLogo-847"
+            class="makeStyles-drawerHeader-1309 makeStyles-drawerHeaderLogo-1310"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-856"
+              class="makeStyles-logo-1319"
               src="fisker-badge.svg"
             />
           </div>
@@ -6676,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-878 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1341 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -6702,10 +5440,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-848 makeStyles-contentShift-849"
+        class="makeStyles-content-1311 makeStyles-contentShift-1312"
       >
         <div
-          class="makeStyles-drawerHeader-846"
+          class="makeStyles-drawerHeader-1309"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -6714,11 +5452,11 @@ exports[`App Route /vehicle-add authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-828"
+              class="makeStyles-paper-1291"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-830"
+                class="makeStyles-form-1293"
                 novalidate=""
               >
                 <div
@@ -6754,10 +5492,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-883"
+                        class="PrivateNotchedOutline-legendLabelled-1349"
                       >
                         <span>
                           VIN
@@ -6800,10 +5538,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-883 PrivateNotchedOutline-legendNotched-884"
+                        class="PrivateNotchedOutline-legendLabelled-1349 PrivateNotchedOutline-legendNotched-1350"
                       >
                         <span>
                           Model
@@ -6847,10 +5585,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-883 PrivateNotchedOutline-legendNotched-884"
+                        class="PrivateNotchedOutline-legendLabelled-1349 PrivateNotchedOutline-legendNotched-1350"
                       >
                         <span>
                           Year
@@ -6894,10 +5632,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-881 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1347 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-883 PrivateNotchedOutline-legendNotched-884"
+                        class="PrivateNotchedOutline-legendLabelled-1349 PrivateNotchedOutline-legendNotched-1350"
                       >
                         <span>
                           Trim
@@ -6908,7 +5646,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-831 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1294 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
@@ -6937,10 +5675,10 @@ exports[`App Route /vehicle-add unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-124"
+      class="makeStyles-root-478"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-125 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-479 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -6953,20 +5691,20 @@ exports[`App Route /vehicle-add unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-133"
+        class="makeStyles-content-487"
       >
         <div
-          class="makeStyles-drawerHeader-131"
+          class="makeStyles-drawerHeader-485"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-113 makeStyles-textJustifyAlign-158"
+            class="makeStyles-paper-467 makeStyles-textJustifyAlign-512"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-116 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-470 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -6993,10 +5731,10 @@ exports[`App Route /vehicle-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1016"
+      class="makeStyles-root-1430"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1017 makeStyles-appBarShift-1018 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1431 makeStyles-appBarShift-1432 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -7045,7 +5783,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
             </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-1027"
+            class="makeStyles-rightToolbar-1441"
             color="inherit"
           >
             <button
@@ -7068,17 +5806,17 @@ exports[`App Route /vehicle-status authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1021"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1435"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1022 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1436 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1023 makeStyles-drawerHeaderLogo-1024"
+            class="makeStyles-drawerHeader-1437 makeStyles-drawerHeaderLogo-1438"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1033"
+              class="makeStyles-logo-1447"
               src="fisker-badge.svg"
             />
           </div>
@@ -7262,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-1055 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1469 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -7288,10 +6026,10 @@ exports[`App Route /vehicle-status authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-1025 makeStyles-contentShift-1026"
+        class="makeStyles-content-1439 makeStyles-contentShift-1440"
       >
         <div
-          class="makeStyles-drawerHeader-1023"
+          class="makeStyles-drawerHeader-1437"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -7300,7 +6038,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-1005 makeStyles-tableSize-1056"
+              class="makeStyles-paper-1419 makeStyles-tableSize-1470"
             >
               <h6
                 class="MuiTypography-root MuiTypography-h6"
@@ -7308,7 +6046,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 Car Updates
               </h6>
               <div
-                data-testid="mocked-updatesprovider"
+                data-testid="mocked-carupdatesprovider"
               >
                 <table
                   class="MuiTable-root"
@@ -7332,7 +6070,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                         >
                           ID
                           <span
-                            class="makeStyles-hiddenSortSpan-1029"
+                            class="makeStyles-hiddenSortSpan-1443"
                           >
                             sorted descending
                           </span>
@@ -7444,7 +6182,41 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                   </thead>
                   <tbody
                     class="MuiTableBody-root"
-                  />
+                  >
+                    <tr
+                      class="MuiTableRow-root"
+                    >
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        1
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        <a
+                          href="/vehicle-status/1G1FP87S3GN100062/1"
+                        >
+                          TEST UPDATE 1000
+                        </a>
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        downloaded
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        7/1/2021 10:40:07 PM
+                      </td>
+                      <td
+                        class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                      >
+                        7/12/2021 6:22:13 PM
+                      </td>
+                    </tr>
+                  </tbody>
                   <tfoot
                     class="MuiTableFooter-root"
                   >
@@ -7514,7 +6286,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                           <p
                             class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
                           >
-                            0-0 of 0
+                            1-1 of 1
                           </p>
                           <div
                             class="MuiTablePagination-actions"
@@ -7573,25 +6345,25 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 </table>
               </div>
               <div
-                class="MuiGrid-root makeStyles-root-1016 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-1430 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root makeStyles-textJustifyAlign-1050 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1464 MuiGrid-item MuiGrid-grid-md-4"
                 />
                 <div
-                  class="MuiGrid-root makeStyles-textCenterAlign-1051 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textCenterAlign-1465 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <h6
-                    class="MuiTypography-root makeStyles-labelInline-1011 MuiTypography-h6"
+                    class="MuiTypography-root makeStyles-labelInline-1425 MuiTypography-h6"
                   >
                     Car ECUs
                   </h6>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textRightAlign-1052 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textRightAlign-1466 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <button
-                    class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1009 makeStyles-textField-1031 MuiButton-containedPrimary"
+                    class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1423 makeStyles-textField-1445 MuiButton-containedPrimary"
                     tabindex="0"
                     type="submit"
                   >
@@ -7607,7 +6379,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 </div>
               </div>
               <div
-                class="makeStyles-paper-1005 makeStyles-tableSize-1056"
+                class="makeStyles-paper-1419 makeStyles-tableSize-1470"
               >
                 <table
                   class="MuiTable-root"
@@ -7631,7 +6403,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                         >
                           ECU
                           <span
-                            class="makeStyles-hiddenSortSpan-1029"
+                            class="makeStyles-hiddenSortSpan-1443"
                           >
                             sorted descending
                           </span>
@@ -8110,10 +6882,10 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-344"
+      class="makeStyles-root-594"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-345 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-595 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -8126,20 +6898,20 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-353"
+        class="makeStyles-content-603"
       >
         <div
-          class="makeStyles-drawerHeader-351"
+          class="makeStyles-drawerHeader-601"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-333 makeStyles-textJustifyAlign-378"
+            class="makeStyles-paper-583 makeStyles-textJustifyAlign-628"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-336 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-586 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -8160,16 +6932,16 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /vehicles authenticated 1`] = `
+exports[`App Route /vehicle-status/vin/carupdateid authenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-953"
+      class="makeStyles-root-1488"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-954 makeStyles-appBarShift-955 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1489 makeStyles-appBarShift-1490 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -8178,11 +6950,63 @@ exports[`App Route /vehicles authenticated 1`] = `
             <h6
               class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Vehicles
+              Vehicle 1G1FP87S3GN100062, Update TEST UPDATE
             </h6>
+            <nav
+              aria-label="breadcrumb"
+              class="MuiTypography-root MuiBreadcrumbs-root MuiTypography-body1 MuiTypography-colorInherit"
+              style="font-size: 10px;"
+            >
+              <ol
+                class="MuiBreadcrumbs-ol"
+              >
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/vehicles"
+                  >
+                    Vehicles
+                  </a>
+                </li>
+                <li
+                  aria-hidden="true"
+                  class="MuiBreadcrumbs-separator"
+                >
+                  /
+                </li>
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/vehicle-status/1G1FP87S3GN100062"
+                  >
+                    Vehicle 1G1FP87S3GN100062 Details
+                  </a>
+                </li>
+                <li
+                  aria-hidden="true"
+                  class="MuiBreadcrumbs-separator"
+                >
+                  /
+                </li>
+                <li
+                  class="MuiBreadcrumbs-li"
+                >
+                  <a
+                    class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorInherit"
+                    href="/vehicle-status/1G1FP87S3GN100062/283"
+                  >
+                    Vehicle 1G1FP87S3GN100062, Update TEST UPDATE
+                  </a>
+                </li>
+              </ol>
+            </nav>
           </div>
           <div
-            class="makeStyles-rightToolbar-964"
+            class="makeStyles-rightToolbar-1499"
             color="inherit"
           >
             <button
@@ -8205,17 +7029,17 @@ exports[`App Route /vehicles authenticated 1`] = `
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-958"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1493"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-959 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1494 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-960 makeStyles-drawerHeaderLogo-961"
+            class="makeStyles-drawerHeader-1495 makeStyles-drawerHeaderLogo-1496"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-970"
+              class="makeStyles-logo-1505"
               src="fisker-badge.svg"
             />
           </div>
@@ -8399,7 +7223,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-992 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-1527 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
                   href="https://grafana.fiskerdps.com"
                   rel="noopener"
                   role="button"
@@ -8425,10 +7249,866 @@ exports[`App Route /vehicles authenticated 1`] = `
         </div>
       </div>
       <main
-        class="makeStyles-content-962 makeStyles-contentShift-963"
+        class="makeStyles-content-1497 makeStyles-contentShift-1498"
       >
         <div
-          class="makeStyles-drawerHeader-960"
+          class="makeStyles-drawerHeader-1495"
+        />
+        <main
+          class="MuiContainer-root MuiContainer-maxWidthLg"
+        >
+          <div
+            data-testid="mocked-carupdatesprovider"
+          >
+            <div
+              class="makeStyles-root-1488"
+            >
+              <div
+                class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
+              >
+                <div
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1522 MuiGrid-item MuiGrid-grid-md-4"
+                >
+                  <div
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                  >
+                    <label
+                      class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
+                      data-shrink="true"
+                    >
+                      Name
+                    </label>
+                    <div
+                      class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
+                    >
+                      <input
+                        aria-invalid="false"
+                        class="MuiInputBase-input MuiInput-input"
+                        readonly=""
+                        type="text"
+                        value="TEST UPDATE"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root makeStyles-textCenterAlign-1523 MuiGrid-item MuiGrid-grid-md-4"
+                >
+                  <div
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                  >
+                    <label
+                      class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
+                      data-shrink="true"
+                    >
+                      Version
+                    </label>
+                    <div
+                      class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
+                    >
+                      <input
+                        aria-invalid="false"
+                        class="MuiInputBase-input MuiInput-input"
+                        readonly=""
+                        type="text"
+                        value="1000"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root makeStyles-textRightAlign-1524 MuiGrid-item MuiGrid-grid-md-4"
+                >
+                  <div
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                  >
+                    <label
+                      class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
+                      data-shrink="true"
+                    >
+                      Created
+                    </label>
+                    <div
+                      class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
+                    >
+                      <input
+                        aria-invalid="false"
+                        class="MuiInputBase-input MuiInput-input"
+                        readonly=""
+                        type="text"
+                        value="8/20/2021 6:37:41 PM"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <div
+                    class="MuiFormControl-root MuiTextField-root makeStyles-fullWidth-1525"
+                  >
+                    <label
+                      class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
+                      data-shrink="true"
+                    >
+                      Description
+                    </label>
+                    <div
+                      class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
+                    >
+                      <input
+                        aria-invalid="false"
+                        class="MuiInputBase-input MuiInput-input"
+                        readonly=""
+                        type="text"
+                        value="UPDATE DESCRIPTION"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <div
+                    style="width: 100%; display: flex; justify-content: space-between; flex-wrap: wrap;"
+                  >
+                    <div
+                      class="makeStyles-textCenterAlign-1523"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="MuiSvgIcon-root makeStyles-progressIcon-1530 makeStyles-progressSuccess-1531"
+                        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 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
+                        />
+                      </svg>
+                      <p
+                        class="MuiTypography-root MuiTypography-body1"
+                      >
+                        Pending
+                      </p>
+                    </div>
+                    <div
+                      class="makeStyles-textCenterAlign-1523"
+                    >
+                      <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"
+                      >
+                        Recieved
+                      </p>
+                    </div>
+                    <div
+                      class="makeStyles-textCenterAlign-1523"
+                    >
+                      <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"
+                        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"
+                      >
+                        Precondition
+                      </p>
+                    </div>
+                    <div
+                      class="makeStyles-textCenterAlign-1523"
+                    >
+                      <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"
+                      >
+                        Download
+                      </p>
+                    </div>
+                    <div
+                      class="makeStyles-textCenterAlign-1523"
+                    >
+                      <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"
+                      >
+                        Install
+                      </p>
+                    </div>
+                    <div
+                      class="makeStyles-textCenterAlign-1523"
+                    >
+                      <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"
+                      >
+                        Clean up
+                      </p>
+                    </div>
+                    <div
+                      class="makeStyles-textCenterAlign-1523"
+                    >
+                      <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"
+                      >
+                        Updated
+                      </p>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+                >
+                  <table
+                    class="MuiTable-root"
+                  >
+                    <thead
+                      class="MuiTableHead-root"
+                    >
+                      <tr
+                        class="MuiTableRow-root MuiTableRow-head"
+                      >
+                        <th
+                          class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
+                          scope="col"
+                        >
+                          <span
+                            aria-disabled="false"
+                            class="MuiButtonBase-root MuiTableSortLabel-root"
+                            role="button"
+                            tabindex="0"
+                          >
+                            Date
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
+                              focusable="false"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
+                              />
+                            </svg>
+                          </span>
+                        </th>
+                        <th
+                          class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
+                          scope="col"
+                        >
+                          <span
+                            aria-disabled="false"
+                            class="MuiButtonBase-root MuiTableSortLabel-root"
+                            role="button"
+                            tabindex="0"
+                          >
+                            Status
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
+                              focusable="false"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
+                              />
+                            </svg>
+                          </span>
+                        </th>
+                        <th
+                          class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignCenter"
+                          scope="col"
+                        >
+                          <span
+                            aria-disabled="false"
+                            class="MuiButtonBase-root MuiTableSortLabel-root"
+                            role="button"
+                            tabindex="0"
+                          >
+                            Error
+                            <svg
+                              aria-hidden="true"
+                              class="MuiSvgIcon-root MuiTableSortLabel-icon MuiTableSortLabel-iconDirectionAsc"
+                              focusable="false"
+                              viewBox="0 0 24 24"
+                            >
+                              <path
+                                d="M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z"
+                              />
+                            </svg>
+                          </span>
+                        </th>
+                      </tr>
+                    </thead>
+                    <tbody
+                      class="MuiTableBody-root"
+                    >
+                      <tr
+                        class="MuiTableRow-root"
+                      >
+                        <td
+                          class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        >
+                          8/23/2021 5:06:38 PM
+                        </td>
+                        <td
+                          class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        >
+                          package_install_complete
+                        </td>
+                        <td
+                          class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        />
+                      </tr>
+                      <tr
+                        class="MuiTableRow-root"
+                      >
+                        <td
+                          class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        >
+                          8/23/2021 5:06:38 PM
+                        </td>
+                        <td
+                          class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        >
+                          package_install_start
+                        </td>
+                        <td
+                          class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
+                        />
+                      </tr>
+                    </tbody>
+                    <tfoot
+                      class="MuiTableFooter-root"
+                    >
+                      <tr
+                        class="MuiTableRow-root MuiTableRow-footer"
+                      >
+                        <td
+                          class="MuiTableCell-root MuiTableCell-footer MuiTablePagination-root"
+                          colspan="5"
+                        >
+                          <div
+                            class="MuiToolbar-root MuiToolbar-regular MuiTablePagination-toolbar MuiToolbar-gutters"
+                          >
+                            <div
+                              class="MuiTablePagination-spacer"
+                            />
+                            <p
+                              class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
+                              id="mui-00000"
+                            >
+                              Rows per page:
+                            </p>
+                            <div
+                              class="MuiInputBase-root MuiTablePagination-input MuiTablePagination-selectRoot"
+                            >
+                              <select
+                                aria-label="rows per page"
+                                class="MuiSelect-root MuiSelect-select MuiTablePagination-select MuiInputBase-input"
+                                id="mui-00000"
+                              >
+                                <option
+                                  class="MuiTablePagination-menuItem"
+                                  value="5"
+                                >
+                                  5
+                                </option>
+                                <option
+                                  class="MuiTablePagination-menuItem"
+                                  value="10"
+                                >
+                                  10
+                                </option>
+                                <option
+                                  class="MuiTablePagination-menuItem"
+                                  value="25"
+                                >
+                                  25
+                                </option>
+                                <option
+                                  class="MuiTablePagination-menuItem"
+                                  value="100"
+                                >
+                                  100
+                                </option>
+                              </select>
+                              <svg
+                                aria-hidden="true"
+                                class="MuiSvgIcon-root MuiSelect-icon MuiTablePagination-selectIcon"
+                                focusable="false"
+                                viewBox="0 0 24 24"
+                              >
+                                <path
+                                  d="M7 10l5 5 5-5z"
+                                />
+                              </svg>
+                            </div>
+                            <p
+                              class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
+                            >
+                              1-2 of 2
+                            </p>
+                            <div
+                              class="MuiTablePagination-actions"
+                            >
+                              <button
+                                aria-label="Previous page"
+                                class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit Mui-disabled Mui-disabled"
+                                disabled=""
+                                tabindex="-1"
+                                title="Previous page"
+                                type="button"
+                              >
+                                <span
+                                  class="MuiIconButton-label"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="MuiSvgIcon-root"
+                                    focusable="false"
+                                    viewBox="0 0 24 24"
+                                  >
+                                    <path
+                                      d="M15.41 16.09l-4.58-4.59 4.58-4.59L14 5.5l-6 6 6 6z"
+                                    />
+                                  </svg>
+                                </span>
+                              </button>
+                              <button
+                                aria-label="Next page"
+                                class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit Mui-disabled Mui-disabled"
+                                disabled=""
+                                tabindex="-1"
+                                title="Next page"
+                                type="button"
+                              >
+                                <span
+                                  class="MuiIconButton-label"
+                                >
+                                  <svg
+                                    aria-hidden="true"
+                                    class="MuiSvgIcon-root"
+                                    focusable="false"
+                                    viewBox="0 0 24 24"
+                                  >
+                                    <path
+                                      d="M8.59 16.34l4.58-4.59-4.58-4.59L10 5.75l6 6-6 6z"
+                                    />
+                                  </svg>
+                                </span>
+                              </button>
+                            </div>
+                          </div>
+                        </td>
+                      </tr>
+                    </tfoot>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+        </main>
+      </main>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`App Route /vehicle-status/vin/carupdateid unauthenticated 1`] = `
+<div>
+  <div
+    data-testid="mocked-userprovider"
+  >
+    <div
+      class="makeStyles-root-652"
+    >
+      <header
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-653 mui-00000fixed MuiPaper-elevation4"
+      >
+        <div
+          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
+        >
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
+        </div>
+      </header>
+      <main
+        class="makeStyles-content-661"
+      >
+        <div
+          class="makeStyles-drawerHeader-659"
+        />
+        <main
+          class="MuiContainer-root MuiContainer-maxWidthLg"
+        >
+          <div
+            class="makeStyles-paper-641 makeStyles-textJustifyAlign-686"
+          >
+            <a
+              aria-disabled="false"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-644 MuiButton-containedPrimary"
+              href="https://cognito.com/authorize?redirect=https://example.com/callback"
+              tabindex="0"
+            >
+              <span
+                class="MuiButton-label"
+              >
+                Sign In
+              </span>
+              <span
+                class="MuiTouchRipple-root"
+              />
+            </a>
+          </div>
+        </main>
+      </main>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`App Route /vehicles authenticated 1`] = `
+<div>
+  <div
+    data-testid="mocked-userprovider"
+  >
+    <div
+      class="makeStyles-root-1364"
+    >
+      <header
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1365 makeStyles-appBarShift-1366 mui-00000fixed MuiPaper-elevation4"
+      >
+        <div
+          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
+        >
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            >
+              Vehicles
+            </h6>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-1375"
+            color="inherit"
+          >
+            <button
+              aria-controls="fade-menu"
+              aria-haspopup="true"
+              class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-colorInherit"
+              tabindex="0"
+              type="button"
+            >
+              <span
+                class="MuiButton-label"
+              >
+                John
+              </span>
+              <span
+                class="MuiTouchRipple-root"
+              />
+            </button>
+          </div>
+        </div>
+      </header>
+      <div
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1369"
+      >
+        <div
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1370 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+        >
+          <div
+            class="makeStyles-drawerHeader-1371 makeStyles-drawerHeaderLogo-1372"
+          >
+            <img
+              alt="Fisker Admin Portal"
+              class="makeStyles-logo-1381"
+              src="fisker-badge.svg"
+            />
+          </div>
+          <hr
+            class="MuiDivider-root"
+          />
+          <ul
+            class="MuiList-root MuiList-padding"
+          >
+            <li>
+              <a
+                aria-disabled="false"
+                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                href="/home"
+                role="button"
+                tabindex="0"
+              >
+                <div
+                  class="MuiListItemIcon-root"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="MuiListItemText-root"
+                >
+                  <span
+                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  >
+                    Home
+                  </span>
+                </div>
+                <span
+                  class="MuiTouchRipple-root"
+                />
+              </a>
+            </li>
+            <li>
+              <a
+                aria-disabled="false"
+                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                href="/packages"
+                role="button"
+                tabindex="0"
+              >
+                <div
+                  class="MuiListItemIcon-root"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="MuiListItemText-root"
+                >
+                  <span
+                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  >
+                    Deployments
+                  </span>
+                </div>
+                <span
+                  class="MuiTouchRipple-root"
+                />
+              </a>
+            </li>
+            <li>
+              <a
+                aria-disabled="false"
+                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                href="/vehicles"
+                role="button"
+                tabindex="0"
+              >
+                <div
+                  class="MuiListItemIcon-root"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M12 4H5C3.34 4 2 5.34 2 7v8c0 1.66 1.34 3 3 3l-1 1v1h1l2-2.03L9 18v-5H4V5.98L13 6v2h2V7c0-1.66-1.34-3-3-3zM5 14c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm15.57-4.34c-.14-.4-.52-.66-.97-.66h-7.19c-.46 0-.83.26-.98.66L10 13.77l.01 5.51c0 .38.31.72.69.72h.62c.38 0 .68-.38.68-.76V18h8v1.24c0 .38.31.76.69.76h.61c.38 0 .69-.34.69-.72l.01-1.37v-4.14l-1.43-4.11zm-8.16.34h7.19l1.03 3h-9.25l1.03-3zM12 16c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm8 0c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1z"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="MuiListItemText-root"
+                >
+                  <span
+                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  >
+                    Vehicles
+                  </span>
+                </div>
+                <span
+                  class="MuiTouchRipple-root"
+                />
+              </a>
+            </li>
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiListItemIcon-root"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="MuiSvgIcon-root"
+                      focusable="false"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zM9 17H7v-7h2v7zm4 0h-2V7h2v10zm4 0h-2v-4h2v4z"
+                      />
+                    </svg>
+                  </div>
+                  <div
+                    class="MuiListItemText-root"
+                  >
+                    <span
+                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                    >
+                      Datascope
+                    </span>
+                  </div>
+                  <span
+                    class="MuiTouchRipple-root"
+                  />
+                </a>
+              </li>
+            </span>
+            <ul
+              style="margin-left: 50px;"
+            >
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope/battery"
+                  role="button"
+                  tabindex="0"
+                >
+                  <div
+                    class="MuiListItemText-root"
+                  >
+                    <span
+                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                    >
+                      Battery
+                    </span>
+                  </div>
+                  <span
+                    class="MuiTouchRipple-root"
+                  />
+                </a>
+              </li>
+              <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"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  tabindex="0"
+                  target="_blank"
+                >
+                  <div
+                    class="MuiListItemText-root"
+                  >
+                    <span
+                      class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                    >
+                      Diagnostics
+                    </span>
+                  </div>
+                  <span
+                    class="MuiTouchRipple-root"
+                  />
+                </a>
+              </li>
+            </ul>
+          </ul>
+        </div>
+      </div>
+      <main
+        class="makeStyles-content-1373 makeStyles-contentShift-1374"
+      >
+        <div
+          class="makeStyles-drawerHeader-1371"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -8437,13 +8117,13 @@ exports[`App Route /vehicles authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-942 makeStyles-tableSize-993"
+              class="makeStyles-paper-1353 makeStyles-tableSize-1404"
             >
               <div
-                class="MuiGrid-root makeStyles-root-953 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-1364 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
-                  class="MuiGrid-root makeStyles-textJustifyAlign-987 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textJustifyAlign-1398 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <a
                     href="/vehicle-add"
@@ -8460,16 +8140,16 @@ exports[`App Route /vehicles authenticated 1`] = `
                     </svg>
                   </a>
                   <div
-                    class="makeStyles-labelInline-948"
+                    class="makeStyles-labelInline-1359"
                   >
                     0 Selected
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textCenterAlign-988 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textCenterAlign-1399 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="MuiFormControl-root makeStyles-margin-967 makeStyles-fullWidth-990"
+                    class="MuiFormControl-root makeStyles-margin-1378 makeStyles-fullWidth-1401"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -8520,17 +8200,17 @@ exports[`App Route /vehicles authenticated 1`] = `
                   </div>
                 </div>
                 <div
-                  class="MuiGrid-root makeStyles-textRightAlign-989 MuiGrid-item MuiGrid-grid-md-4"
+                  class="MuiGrid-root makeStyles-textRightAlign-1400 MuiGrid-item MuiGrid-grid-md-4"
                 >
                   <div
-                    class="makeStyles-form-944"
+                    class="makeStyles-form-1355"
                     style="margin-top: 20px;"
                   >
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-947"
+                      class="MuiFormControl-root makeStyles-formControlInline-1358"
                     >
                       <label
-                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-994 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
+                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-1405 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
                         data-shrink="true"
                         for="send-command"
                       >
@@ -8593,11 +8273,11 @@ exports[`App Route /vehicles authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-995 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-1409 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-996"
+                            class="PrivateNotchedOutline-legend-1410"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -8608,10 +8288,10 @@ exports[`App Route /vehicles authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-947"
+                      class="MuiFormControl-root makeStyles-formControlInline-1358"
                     >
                       <label
-                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-994 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
+                        class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-1405 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-marginDense MuiInputLabel-outlined MuiFormLabel-filled"
                         data-shrink="true"
                         for="send-parameter"
                       >
@@ -8664,11 +8344,11 @@ exports[`App Route /vehicles authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-995 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-1409 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-996"
+                            class="PrivateNotchedOutline-legend-1410"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -8704,7 +8384,7 @@ exports[`App Route /vehicles authenticated 1`] = `
                 </div>
               </div>
               <div
-                class="makeStyles-paper-942 makeStyles-tableSize-993"
+                class="makeStyles-paper-1353 makeStyles-tableSize-1404"
               >
                 <table
                   class="MuiTable-root"
@@ -8721,14 +8401,14 @@ exports[`App Route /vehicles authenticated 1`] = `
                       >
                         <span
                           aria-disabled="false"
-                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-999 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1413 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                         >
                           <span
                             class="MuiIconButton-label"
                           >
                             <input
                               aria-label="select all desserts"
-                              class="PrivateSwitchBase-input-1002"
+                              class="PrivateSwitchBase-input-1416"
                               data-indeterminate="false"
                               type="checkbox"
                               value=""
@@ -8762,7 +8442,7 @@ exports[`App Route /vehicles authenticated 1`] = `
                         >
                           VIN
                           <span
-                            class="makeStyles-hiddenSortSpan-966"
+                            class="makeStyles-hiddenSortSpan-1377"
                           >
                             sorted ascending
                           </span>
@@ -9040,10 +8720,10 @@ exports[`App Route /vehicles unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-289"
+      class="makeStyles-root-536"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-290 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-537 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
@@ -9056,20 +8736,20 @@ exports[`App Route /vehicles unauthenticated 1`] = `
         </div>
       </header>
       <main
-        class="makeStyles-content-298"
+        class="makeStyles-content-545"
       >
         <div
-          class="makeStyles-drawerHeader-296"
+          class="makeStyles-drawerHeader-543"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-278 makeStyles-textJustifyAlign-323"
+            class="makeStyles-paper-525 makeStyles-textJustifyAlign-570"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-281 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-528 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
diff --git a/src/components/CarUpdates/Deploy/index.jsx b/src/components/CarUpdates/Deploy/index.jsx
deleted file mode 100644
index 2ee06fd..0000000
--- a/src/components/CarUpdates/Deploy/index.jsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useParams, Redirect } from "react-router";
-import { Button, Grid, Typography } from "@material-ui/core";
-import {
-  UpdatesProvider,
-  useUpdatesContext,
-} from "../../Contexts/UpdatesContext";
-import { VehicleProvider } from "../../Contexts/VehicleContext";
-import { useUserContext } from "../../Contexts/UserContext";
-import { useStatusContext } from "../../Contexts/StatusContext";
-import useStyles from "../../useStyles";
-import { tsLocalDateTimeString } from "../../../utils/dates";
-import SearchField from "../../Controls/SearchField";
-import CarSelectionTable from "../../Cars/CarSelectionTable";
-import { logger } from "../../../services/monitoring";
-
-const MainForm = () => {
-  const { packageid } = useParams();
-  const { getPackages, createCarUpdates, packages, busy } = useUpdatesContext();
-  const {
-    token: {
-      idToken: { jwtToken: token },
-    },
-  } = useUserContext();
-  const { setMessage, setTitle } = useStatusContext();
-  const [packageName, setPackageName] = useState("");
-  const [version, setVersion] = useState("");
-  const [description, setDescription] = useState("");
-  const [createDate, setCreateDate] = useState("");
-  const [selected, setSelected] = useState([]);
-  const [search, setSearch] = useState("");
-  const [redirect, setRedirect] = useState("");
-  const classes = useStyles();
-
-  const handleSearch = (search) => {
-    setSelected([]);
-    setSearch(search);
-  };
-
-  const handleSelectAll = (cars) => {
-    setSelected(cars);
-  };
-
-  const handleSelect = (event, key) => {
-    try {
-      let newSelected;
-      if (event.target.checked) {
-        newSelected = [...selected];
-        newSelected.push(key);
-      } else {
-        newSelected = selected.filter((vin) => vin !== key);
-      }
-      setSelected(newSelected);
-    } catch (e) {
-      logger.warn(e.stack);
-    }
-  };
-
-  const onSubmit = async (event) => {
-    try {
-      event.preventDefault();
-      const data = {
-        package_id: parseInt(packageid),
-        vins: selected,
-      };
-      await createCarUpdates(data, token);
-      setMessage(
-        `Deployed ${packageName} ${version} to ${selected.length} cars`
-      );
-      setRedirect(`/carupdate-status/${packageid}`);
-    } catch (e) {
-      setMessage(e.message);
-      logger.warn(e.stack);
-    }
-  };
-
-  const getData = async () => {
-    try {
-      getPackages({ id: parseInt(packageid) }, token);
-    } catch (e) {
-      setMessage(e.message);
-      logger.warn(e.stack);
-    }
-  };
-
-  useEffect(() => {
-    getData();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [token]);
-
-  useEffect(() => {
-    setTitle(`Deploy ${packageName} ${version}`);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [packageName, version]);
-
-  useEffect(() => {
-    if (!packages || packages.length === 0) return;
-    var data = packages[0];
-
-    setPackageName(data.package_name);
-    setVersion(data.version);
-    setDescription(data.desc || "");
-    setCreateDate(tsLocalDateTimeString(data.timestamp));
-  }, [packages]);
-
-  if (redirect.length > 0) {
-    return <Redirect to={redirect} />;
-  }
-
-  return (
-    <div className={classes.paper}>
-      <form className={classes.form} noValidate action="{onSubmit}">
-        <Typography variant="body2">
-          Created {createDate}. {description || "No description"}
-        </Typography>
-        <Grid container className={classes.root} spacing={2}>
-          <Grid item md={10}>
-            <SearchField classes={classes} onSearch={handleSearch} />
-            <div
-              className={classes.labelInline}
-            >{`${selected.length} Selected`}</div>
-          </Grid>
-          <Grid item md={2} style={{ textAlign: "right" }}>
-            <Button
-              type="submit"
-              disabled={busy || selected.length === 0}
-              fullWidth
-              variant="contained"
-              color="primary"
-              className={classes.formControl}
-              onClick={onSubmit}
-            >
-              {busy ? "Deploying..." : "Deploy"}
-            </Button>
-          </Grid>
-        </Grid>
-        <CarSelectionTable
-          classes={classes}
-          token={token}
-          search={{ search }}
-          selected={selected}
-          onSelect={handleSelect}
-          onSelectAll={handleSelectAll}
-        />
-      </form>
-    </div>
-  );
-};
-
-const UpdatePackageDeployForm = () => (
-  <VehicleProvider>
-    <UpdatesProvider>
-      <MainForm />
-    </UpdatesProvider>
-  </VehicleProvider>
-);
-
-export default UpdatePackageDeployForm;
diff --git a/src/components/CarUpdates/Status/index.jsx b/src/components/CarUpdates/Status/index.jsx
deleted file mode 100644
index 88e7474..0000000
--- a/src/components/CarUpdates/Status/index.jsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useParams } from "react-router";
-import { Link } from "react-router-dom";
-import {
-  LinearProgress,
-  Table,
-  TableBody,
-  TableCell,
-  TableFooter,
-  TableHead,
-  TablePagination,
-  TableRow,
-} from "@material-ui/core";
-import clsx from "clsx";
-
-import {
-  UpdatesProvider,
-  useUpdatesContext,
-} from "../../Contexts/UpdatesContext";
-import { useUserContext } from "../../Contexts/UserContext";
-import { useStatusContext } from "../../Contexts/StatusContext";
-import useStyles from "../../useStyles";
-import { LocalDateTimeString } from "../../../utils/dates";
-import { logger } from "../../../services/monitoring";
-
-const MainForm = () => {
-  const { packageid } = useParams();
-  const classes = useStyles();
-  const [pageSize, setPageSize] = useState(10);
-  const [pageIndex, setPageIndex] = useState(0);
-  const {
-    getCarUpdates,
-    carUpdates,
-    totalCarUpdates,
-    getPackages,
-    packages,
-    startMonitor,
-    stopMonitor,
-  } = useUpdatesContext();
-  const { setMessage, setTitle } = useStatusContext();
-  const {
-    token: {
-      idToken: { jwtToken: token },
-    },
-  } = useUserContext();
-
-  useEffect(() => {
-    (async () => {
-      try {
-        await getPackages({ id: packageid }, token);
-      } catch (e) {
-        setMessage(e.message);
-        logger.warn(e.stack);
-      }
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [token]);
-
-  useEffect(() => {
-    if (!packages || packages.length === 0) return;
-    setTitle(`Package ${packages[0].package_name} ${packages[0].version}`);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [packages]);
-
-  useEffect(() => {
-    (async () => {
-      try {
-        stopMonitor();
-        await getCarUpdates(
-          {
-            packageid,
-            limit: pageSize,
-            offset: pageSize * pageIndex,
-          },
-          token
-        );
-      } catch (e) {
-        setMessage(e.message);
-        logger.warn(e.stack);
-      }
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [pageIndex, pageSize, token]);
-
-  useEffect(() => {
-    try {
-      if (carUpdates.length === 0) return;
-      startMonitor(token);
-    } catch (e) {
-      setMessage(e.message);
-      logger.warn(e.stack);
-    }
-    return () => {
-      stopMonitor();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [carUpdates]);
-
-  const handleChangePageIndex = (event, newIndex) => {
-    setPageIndex(newIndex);
-  };
-
-  const handleChangePageSize = (event) => {
-    setPageSize(parseInt(event.target.value, 10));
-    setPageIndex(0);
-  };
-
-  return (
-    <div className={clsx(classes.paper, classes.tableSize)}>
-      <Table>
-        <TableHead>
-          <TableRow>
-            <TableCell align="center">ID</TableCell>
-            <TableCell align="center">Vehicle</TableCell>
-            <TableCell align="center">Status</TableCell>
-            <TableCell align="center">Created</TableCell>
-            <TableCell align="center">Updated</TableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {carUpdates.map((row) => (
-            <TableRow key={row.id}>
-              <TableCell align="center">{row.id}</TableCell>
-              <TableCell align="center">
-                <Link to={`/vehicle-status/${row.vin}`}>{row.vin}</Link>
-              </TableCell>
-              <TableCell align="center">
-                {row.status}
-                {row.progress > -1 && (
-                  <LinearProgress variant="determinate" value={row.progress} />
-                )}
-              </TableCell>
-              <TableCell align="center">
-                {LocalDateTimeString(row.created)}
-              </TableCell>
-              <TableCell align="center">
-                {LocalDateTimeString(row.updated)}
-              </TableCell>
-            </TableRow>
-          ))}
-        </TableBody>
-        <TableFooter>
-          <TableRow>
-            <TablePagination
-              rowsPerPageOptions={[5, 10, 25, 100]}
-              colSpan={5}
-              count={totalCarUpdates}
-              rowsPerPage={pageSize}
-              page={pageIndex}
-              SelectProps={{
-                inputProps: { "aria-label": "rows per page" },
-                native: true,
-              }}
-              onPageChange={handleChangePageIndex}
-              onRowsPerPageChange={handleChangePageSize}
-            />
-          </TableRow>
-        </TableFooter>
-      </Table>
-    </div>
-  );
-};
-
-const CarUpdatesStatus = () => (
-  <UpdatesProvider>
-    <MainForm />
-  </UpdatesProvider>
-);
-
-export default CarUpdatesStatus;
diff --git a/src/components/Cars/SendCommandBulk/index.jsx b/src/components/Cars/List/index.jsx
similarity index 95%
rename from src/components/Cars/SendCommandBulk/index.jsx
rename to src/components/Cars/List/index.jsx
index a5c8d50..35d3aac 100644
--- a/src/components/Cars/SendCommandBulk/index.jsx
+++ b/src/components/Cars/List/index.jsx
@@ -8,9 +8,9 @@ import { VehicleProvider } from "../../Contexts/VehicleContext";
 import { useUserContext } from "../../Contexts/UserContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import useStyles from "../../useStyles";
-import SendCommand from "../SendCommand";
+import SendCommand from "../../Controls/SendCommand";
 import SearchField from "../../Controls/SearchField";
-import CarSelectionTable from "../CarSelectionTable";
+import CarSelectionTable from "../../Controls/CarSelectionTable";
 import { logger } from "../../../services/monitoring";
 
 const MainForm = () => {
diff --git a/src/components/Cars/Status/index.jsx b/src/components/Cars/Status/index.jsx
index 6716ee3..27dfae8 100644
--- a/src/components/Cars/Status/index.jsx
+++ b/src/components/Cars/Status/index.jsx
@@ -3,8 +3,8 @@ import { useParams } from "react-router";
 import clsx from "clsx";
 import { Button, Grid, Typography } from "@material-ui/core";
 
-import CarECUs from "../CarECUs";
-import CarUpdates from "../CarUpdates";
+import CarECUsTable from "../../Controls/CarECUsTable";
+import CarUpdatesTable from "../../Controls/CarUpdatesTable";
 import {
   VehicleProvider,
   useVehicleContext,
@@ -52,7 +52,7 @@ const MainForm = () => {
   return (
     <div className={clsx(classes.paper, classes.tableSize)}>
       <Typography variant="h6">Car Updates</Typography>
-      <CarUpdates vin={vin} token={token} />
+      <CarUpdatesTable vin={vin} token={token} />
       <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>
-      <CarECUs vin={vin} token={token} />
+      <CarECUsTable vin={vin} token={token} />
     </div>
   );
 };
diff --git a/src/components/Cars/UpdateStatus/index.jsx b/src/components/Cars/UpdateStatus/index.jsx
new file mode 100644
index 0000000..28fd61b
--- /dev/null
+++ b/src/components/Cars/UpdateStatus/index.jsx
@@ -0,0 +1,145 @@
+import React, { useEffect } from "react";
+import { useState } from "react";
+import { useParams } from "react-router-dom";
+import { Grid, TextField } from "@material-ui/core";
+
+import CarUpdateStatusProgress from "../../Controls/CarUpdateStatusProgress";
+import CarUpdateStatusTable from "../../Controls/CarUpdateStatusTable";
+import {
+  CarUpdatesProvider,
+  useCarUpdatesContext,
+} from "../../Contexts/CarUpdatesContext";
+import { useStatusContext } from "../../Contexts/StatusContext";
+import useStyles from "../../useStyles";
+import { useUserContext } from "../../Contexts/UserContext";
+import { logger } from "../../../services/monitoring";
+import { LocalDateTimeString } from "../../../utils/dates";
+
+const MainForm = () => {
+  const { vin, carupdateid } = useParams();
+  const [manifest, setManifest] = useState(null);
+  const [status, setStatus] = useState(null);
+  const { setTitle, setSitePath, setMessage } = useStatusContext();
+  const { getCarUpdates, carUpdates, startMonitor, stopMonitor } =
+    useCarUpdatesContext();
+  const {
+    token: {
+      idToken: { jwtToken: token },
+    },
+  } = useUserContext();
+  const classes = useStyles();
+
+  useEffect(() => {
+    (async () => {
+      try {
+        const result = await getCarUpdates({ id: carupdateid }, token);
+        if (!result.data && result.data.length === 0)
+          throw new Error(`error getting update ${carupdateid}`);
+        setManifest(result.data[0]["updatemanifest"]);
+      } catch (e) {
+        setMessage(e.message);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (!manifest) return;
+    const title = `Vehicle ${vin}, Update ${manifest.name}`;
+    setTitle(title);
+    setSitePath([
+      {
+        label: "Vehicles",
+        link: "/vehicles",
+      },
+      {
+        label: `Vehicle ${vin} Details`,
+        link: `/vehicle-status/${vin}`,
+      },
+      {
+        label: title,
+      },
+    ]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [manifest]);
+
+  useEffect(() => {
+    try {
+      if (carUpdates.length === 0) return;
+      setStatus(carUpdates[0]);
+      startMonitor(token);
+    } catch (e) {
+      setMessage(e.message);
+      logger.warn(e.stack);
+    }
+    return () => {
+      stopMonitor();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [carUpdates]);
+
+  return (
+    <div className={classes.root}>
+      <Grid container spacing={2}>
+        {manifest && (
+          <>
+            <Grid item md={4} className={classes.textJustifyAlign}>
+              <TextField
+                label="Name"
+                defaultValue={manifest.name}
+                className={classes.fullWidth}
+                InputProps={{
+                  readOnly: true,
+                }}
+              />
+            </Grid>
+            <Grid item md={4} className={classes.textCenterAlign}>
+              <TextField
+                label="Version"
+                defaultValue={manifest.version}
+                className={classes.fullWidth}
+                InputProps={{
+                  readOnly: true,
+                }}
+              />
+            </Grid>
+            <Grid item md={4} className={classes.textRightAlign}>
+              <TextField
+                label="Created"
+                defaultValue={LocalDateTimeString(manifest.created)}
+                className={classes.fullWidth}
+                InputProps={{
+                  readOnly: true,
+                }}
+              />
+            </Grid>
+            <Grid item md={12}>
+              <TextField
+                label="Description"
+                defaultValue={manifest.description}
+                className={classes.fullWidth}
+                InputProps={{
+                  readOnly: true,
+                }}
+              />
+            </Grid>
+          </>
+        )}
+        <Grid item md={12}>
+          <CarUpdateStatusProgress status={status} />
+        </Grid>
+        <Grid item md={12}>
+          <CarUpdateStatusTable carupdateid={carupdateid} token={token} />
+        </Grid>
+      </Grid>
+    </div>
+  );
+};
+
+const UpdateStatus = () => (
+  <CarUpdatesProvider>
+    <MainForm />
+  </CarUpdatesProvider>
+);
+
+export default UpdateStatus;
diff --git a/src/components/Contexts/CarUpdatesContext.jsx b/src/components/Contexts/CarUpdatesContext.jsx
index a33de65..016d9ea 100644
--- a/src/components/Contexts/CarUpdatesContext.jsx
+++ b/src/components/Contexts/CarUpdatesContext.jsx
@@ -51,8 +51,11 @@ export const CarUpdatesProvider = ({ children }) => {
       result = await api.getCarUpdates(search, token);
       if (result.error)
         throw new Error(`Get car updates error. ${result.message}`);
-      result.data.forEach((item) => (item.progress = 0));
-      console.log(result.data);
+      result.data.forEach((item) => {
+        item.progress = 0;
+        item.msg = item.status;
+        applyProgressStatus(item, item);
+      });
       setCarUpdates(result.data);
       if (search && search.offset === 0 && result.total) {
         setTotalCarUpdates(result.total);
@@ -179,6 +182,21 @@ export const CarUpdatesProvider = ({ children }) => {
     progressTimer = 0;
   };
 
+  const getLog = async (query, token) => {
+    let result;
+
+    try {
+      setBusy(true);
+      result = await api.getCarUpdateLog(query, token);
+      if (result.error)
+        throw new Error(`Get car update log error. ${result.message}`);
+    } finally {
+      setBusy(false);
+    }
+
+    return result;
+  };
+
   return (
     <CarUpdatesContext.Provider
       value={{
@@ -187,6 +205,7 @@ export const CarUpdatesProvider = ({ children }) => {
         totalCarUpdates,
         deployCarUpdates,
         getCarUpdates,
+        getLog,
         getVINUpdates,
         startMonitor,
         stopMonitor,
diff --git a/src/components/Contexts/UpdatesContext.jsx b/src/components/Contexts/UpdatesContext.jsx
deleted file mode 100644
index 854f4db..0000000
--- a/src/components/Contexts/UpdatesContext.jsx
+++ /dev/null
@@ -1,252 +0,0 @@
-import React, { useContext, useState } from "react";
-
-import api from "../../services/updates";
-
-const UpdatesContext = React.createContext();
-
-export const UpdatesProvider = ({ children }) => {
-  const [busy, setBusy] = useState(false);
-  const [packages, setPackages] = useState([]);
-  const [carUpdates, setCarUpdates] = useState([]);
-  const [totalPackages, setTotalPackages] = useState(0);
-  const [totalCarUpdates, setTotalCarUpdates] = useState(0);
-  const [delayCount, setDelayCount] = useState(0);
-  let progressTimer = 0;
-
-  const getPackages = async (search, token) => {
-    let result;
-
-    try {
-      setBusy(true);
-      result = await api.getPackages(search, token);
-      if (result.error)
-        throw new Error(`Get packages error. ${result.message}`);
-      setPackages(result.data);
-      if (search && search.offset === 0 && result.total) {
-        setTotalPackages(result.total);
-      }
-    } finally {
-      setBusy(false);
-    }
-
-    return result;
-  };
-
-  const updatePackage = async (data, token) => {
-    let result = null;
-
-    try {
-      setBusy(true);
-      validateUpdatePackage(data);
-      result = await api.updatePackage(data, token);
-      if (result.error)
-        throw new Error(`Update package error. ${result.message}`);
-    } finally {
-      setBusy(false);
-    }
-
-    return result;
-  };
-
-  const deletePackage = async (package_id, token) => {
-    let result;
-
-    const index = packages.findIndex((element) => {
-      return element.id === package_id;
-    });
-    packages.splice(index, 1);
-
-    try {
-      setBusy(true);
-      result = await api.deletePackage(package_id, token);
-      if (result.error)
-        throw new Error(`Delete package error. ${result.message}`);
-    } finally {
-      setBusy(false);
-    }
-
-    return result;
-  };
-
-  const createCarUpdates = async (data, token) => {
-    let result;
-
-    try {
-      setBusy(true);
-      validateCreateCarUpdates(data);
-      result = await api.createCarUpdates(data, token);
-      if (result.error)
-        throw new Error(`Create car updates error. ${result.message}`);
-    } finally {
-      setBusy(false);
-    }
-
-    return result;
-  };
-
-  const getCarUpdates = async (search, token) => {
-    let result;
-
-    try {
-      setBusy(true);
-      result = await api.getCarUpdates(search, token);
-      if (result.error)
-        throw new Error(`Get packages error. ${result.message}`);
-      setCarUpdates(result.data);
-      if (search && search.offset === 0 && result.total) {
-        setTotalCarUpdates(result.total);
-      }
-    } finally {
-      setBusy(false);
-    }
-
-    return result;
-  };
-
-  const getVINUpdates = async (vin, token) => {
-    let result;
-
-    try {
-      setBusy(true);
-      result = await api.getVINUpdates(vin, token);
-      if (result.error)
-        throw new Error(`Get VIN updates error. ${result.message}`);
-    } finally {
-      setBusy(false);
-    }
-
-    return result;
-  };
-
-  const applyProgressStatus = (item, status) => {
-    if (status.msg === "DONE") {
-      delete item.progress;
-      item.status = "downloaded";
-    } else if (status.msg === "downloading" && status.total > 0) {
-      let progress = Math.floor((100 * status.bytes) / status.total);
-      if (progress > 99) progress = 0;
-      item.progress = progress;
-      item.status = `downloading ${progress}%`;
-    } else if (status.error > 0) {
-      item.status = "download error";
-    } else {
-      item.status = "downloading";
-    }
-  };
-
-  const applyProgressStatuses = (statuses) => {
-    let items = JSON.parse(JSON.stringify(carUpdates));
-
-    statuses.forEach((status) => {
-      let item = items.find((item) => status.id === item.id);
-      if (!item || status.id === 0) return;
-      applyProgressStatus(item, status);
-    });
-
-    setCarUpdates(items);
-  };
-
-  const updateStatusProgress = async (token) => {
-    stopMonitor();
-
-    if (!token || carUpdates.length === 0) return;
-
-    try {
-      setBusy(true);
-      const carupdateids = carUpdates.reduce((accum, update) => {
-        if (update.status !== "downloaded") accum.push(update.id);
-        return accum;
-      }, []);
-      if (carupdateids.length === 0) return;
-
-      const result = await api.getCarUpdateProgress(
-        carupdateids.join(","),
-        token
-      );
-      if (result.error)
-        throw new Error(`Get update progress error. ${result.message}`);
-
-      applyProgressStatuses(result.statuses);
-    } catch (e) {
-    } finally {
-      setBusy(false);
-    }
-  };
-
-  const getDelay = () => {
-    if (delayCount < 3) {
-      setDelayCount(delayCount + 1);
-      return 1000;
-    }
-    for (let i = 0, len = carUpdates.length; i < len; i++) {
-      if (carUpdates[i].status.indexOf("downloading") > -1) return 1000;
-    }
-    return 10000;
-  };
-
-  const startMonitor = async (token) => {
-    const delay = getDelay();
-    stopMonitor();
-    progressTimer = setTimeout(() => {
-      updateStatusProgress(token);
-    }, delay);
-  };
-
-  const stopMonitor = async () => {
-    if (progressTimer === 0) return;
-    clearTimeout(progressTimer);
-    progressTimer = 0;
-  };
-
-  return (
-    <UpdatesContext.Provider
-      value={{
-        busy,
-        packages,
-        totalPackages,
-        carUpdates,
-        totalCarUpdates,
-        getPackages,
-        updatePackage,
-        deletePackage,
-        createCarUpdates,
-        getCarUpdates,
-        getVINUpdates,
-        startMonitor,
-        stopMonitor,
-      }}
-    >
-      {children}
-    </UpdatesContext.Provider>
-  );
-};
-
-export const useUpdatesContext = () => useContext(UpdatesContext);
-
-const validateUpdatePackage = (data) => {
-  if (data === null) {
-    throw new Error("No update data");
-  }
-
-  if (!data.package_name) {
-    throw new Error("Package name required");
-  }
-
-  if (!data.version) {
-    throw new Error("Version required");
-  }
-};
-
-const validateCreateCarUpdates = (data) => {
-  if (data === null) {
-    throw new Error("No car update data");
-  }
-
-  if (!data.package_id || data.package_id === 0) {
-    throw new Error("Package id required");
-  }
-
-  if (!data.vins || data.vins.length === 0) {
-    throw new Error("Cars are required");
-  }
-};
diff --git a/src/components/Contexts/UpdatesContext.test.jsx b/src/components/Contexts/UpdatesContext.test.jsx
deleted file mode 100644
index 29f63e2..0000000
--- a/src/components/Contexts/UpdatesContext.test.jsx
+++ /dev/null
@@ -1,291 +0,0 @@
-jest.mock("../../services/updates");
-
-import {
-  render,
-  cleanup,
-  screen,
-  fireEvent,
-  waitFor,
-} from "@testing-library/react";
-import { UpdatesProvider, useUpdatesContext } from "./UpdatesContext";
-import { StatusProvider, useStatusContext } from "./StatusContext";
-import { TEST_AUTH_OBJECT } from "../../utils/testing";
-
-describe("UpdatesContext", () => {
-  describe("getPackages", () => {
-    const expectedData = `[{"id":1,"package_name":"Test","version":"1.0","link":"http://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","ecu_list":"ECU1 1.0.1,ECU2 1.0.2"},{"id":3,"package_name":"Test","version":"1.2","link":"http://cloudfront.com/download","ecu_list":"ECU1 1.1.0,ECU2 1.1.2"}]`;
-    const checkState = (busy, packages, message) => {
-      expect(screen.getByTestId("busy").innerHTML).toEqual(busy);
-      expect(screen.getByTestId("packages").innerHTML).toEqual(packages);
-      expect(screen.getByTestId("message").innerHTML).toEqual(message);
-    };
-
-    beforeEach(() => {
-      const TestComp = () => {
-        const { busy, packages, getPackages } = useUpdatesContext();
-        const { message, setMessage } = useStatusContext();
-        const exec = async (data, token) => {
-          try {
-            await getPackages(data, token);
-          } catch (e) {
-            setMessage(e.message);
-          }
-        };
-
-        return (
-          <>
-            <div data-testid="busy">{busy.toString()}</div>
-            <div data-testid="packages">{JSON.stringify(packages)}</div>
-            <div data-testid="message">{message}</div>
-            <button
-              data-testid="no-filter"
-              onClick={() => {
-                exec(null, TEST_AUTH_OBJECT);
-              }}
-            />
-            <button
-              data-testid="with-filter"
-              onClick={() => {
-                exec({ package_name: "Test" }, TEST_AUTH_OBJECT);
-              }}
-            />
-          </>
-        );
-      };
-      render(
-        <StatusProvider>
-          <UpdatesProvider>
-            <TestComp />
-          </UpdatesProvider>
-        </StatusProvider>
-      );
-    });
-
-    afterEach(() => {
-      cleanup();
-    });
-
-    it("Initial state", async () => {
-      checkState("false", "[]", "");
-    });
-
-    it("getPackages no filter", async () => {
-      fireEvent.click(screen.getByTestId("no-filter"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", expectedData, "");
-    });
-
-    it("getPackages with filter", async () => {
-      fireEvent.click(screen.getByTestId("with-filter"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", expectedData, "");
-    });
-  });
-
-  describe("updatePackage", () => {
-    let result = null;
-    const checkState = (busy, message, data) => {
-      expect(screen.getByTestId("busy").innerHTML).toEqual(busy);
-      expect(screen.getByTestId("message").innerHTML).toEqual(message);
-      expect(result).toEqual(data);
-    };
-
-    beforeEach(() => {
-      const TestComp = () => {
-        const { busy, updatePackage } = useUpdatesContext();
-        const { message, setMessage } = useStatusContext();
-        const exec = async (data, token) => {
-          var r = null;
-
-          try {
-            r = await updatePackage(data, token);
-          } catch (e) {
-            setMessage(e.message);
-          }
-
-          return r;
-        };
-
-        return (
-          <>
-            <div data-testid="busy">{busy.toString()}</div>
-            <div data-testid="message">{message}</div>
-            <button
-              data-testid="no-data"
-              onClick={async () => {
-                result = await exec(null, TEST_AUTH_OBJECT);
-              }}
-            />
-            <button
-              data-testid="with-bad-data"
-              onClick={async () => {
-                result = await exec({ package_name: "Test" }, TEST_AUTH_OBJECT);
-              }}
-            />
-            <button
-              data-testid="with-good-data"
-              onClick={async () => {
-                result = await exec(
-                  {
-                    package_name: "Test",
-                    version: "1.0",
-                  },
-                  TEST_AUTH_OBJECT
-                );
-              }}
-            />
-          </>
-        );
-      };
-      render(
-        <StatusProvider>
-          <UpdatesProvider>
-            <TestComp />
-          </UpdatesProvider>
-        </StatusProvider>
-      );
-    });
-
-    afterEach(() => {
-      cleanup();
-      result = null;
-    });
-
-    it("Initial state", () => {
-      checkState("false", "", null);
-    });
-
-    it("no-data", async () => {
-      fireEvent.click(screen.getByTestId("no-data"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", "No update data", null);
-    });
-
-    it("with-bad-data", async () => {
-      fireEvent.click(screen.getByTestId("with-bad-data"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", "Version required", null);
-    });
-
-    it("with-good-data", async () => {
-      fireEvent.click(screen.getByTestId("with-good-data"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", "", { package_name: "Test", version: "1.0" });
-    });
-  });
-
-  describe("createCarUpdates", () => {
-    let result = null;
-    const checkState = (busy, message, data) => {
-      expect(screen.getByTestId("busy").innerHTML).toEqual(busy);
-      expect(screen.getByTestId("message").innerHTML).toEqual(message);
-      expect(result).toEqual(data);
-    };
-
-    beforeEach(() => {
-      const TestComp = () => {
-        const { busy, createCarUpdates } = useUpdatesContext();
-        const { message, setMessage } = useStatusContext();
-        const exec = async (data, token) => {
-          var r = null;
-
-          try {
-            r = await createCarUpdates(data, token);
-          } catch (e) {
-            setMessage(e.message);
-          }
-
-          return r;
-        };
-
-        return (
-          <>
-            <div data-testid="busy">{busy.toString()}</div>
-            <div data-testid="message">{message}</div>
-            <button
-              data-testid="no-data"
-              onClick={async () => {
-                result = await exec(null, TEST_AUTH_OBJECT);
-              }}
-            />
-            <button
-              data-testid="with-bad-data"
-              onClick={async () => {
-                result = await exec(
-                  { package_id: 1, vins: [] },
-                  TEST_AUTH_OBJECT
-                );
-              }}
-            />
-            <button
-              data-testid="with-good-data"
-              onClick={async () => {
-                result = await exec(
-                  {
-                    package_id: 1,
-                    vins: ["FISKER123", "FISKER124", "FISKER125"],
-                  },
-                  TEST_AUTH_OBJECT
-                );
-              }}
-            />
-          </>
-        );
-      };
-      render(
-        <StatusProvider>
-          <UpdatesProvider>
-            <TestComp />
-          </UpdatesProvider>
-        </StatusProvider>
-      );
-    });
-
-    afterEach(() => {
-      cleanup();
-      result = null;
-    });
-
-    it("Initial state", () => {
-      checkState("false", "", null);
-    });
-
-    it("no-data", async () => {
-      fireEvent.click(screen.getByTestId("no-data"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", "No car update data", null);
-    });
-
-    it("with-bad-data", async () => {
-      fireEvent.click(screen.getByTestId("with-bad-data"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", "Cars are required", null);
-    });
-
-    it("with-good-data", async () => {
-      fireEvent.click(screen.getByTestId("with-good-data"));
-      await waitFor(() =>
-        expect(screen.getByTestId("busy").innerHTML).toBe("false")
-      );
-      checkState("false", "", {
-        id: 1,
-        package_id: 1,
-        vins: ["FISKER123", "FISKER124", "FISKER125"],
-      });
-    });
-  });
-});
diff --git a/src/components/Contexts/__mocks__/CarUpdatesContext.jsx b/src/components/Contexts/__mocks__/CarUpdatesContext.jsx
index abc3cff..1ded07f 100644
--- a/src/components/Contexts/__mocks__/CarUpdatesContext.jsx
+++ b/src/components/Contexts/__mocks__/CarUpdatesContext.jsx
@@ -11,9 +11,38 @@ let carUpdates = [
     status: "downloaded",
     created: "2021-07-01T22:40:07.778509Z",
     updated: "2021-07-12T18:22:13.736755Z",
+    updatemanifest: {
+      id: 283,
+      name: "TEST UPDATE",
+      version: "1000",
+      description: "UPDATE DESCRIPTION",
+      ecu_list: "AGS 1.0.0,AMP 1.0.0",
+      created: "2021-08-20T18:37:41.960397Z",
+      updated: "2021-08-20T18:37:50.007853Z",
+    },
   },
 ];
 let totalCarUpdates = 1;
+let carUpdateLog = {
+  data: [
+    {
+      id: 90,
+      status: "package_install_complete",
+      error_code: 0,
+      created: "2021-08-23T17:06:38.410115Z",
+      updated: "2021-08-23T17:06:38.410115Z",
+    },
+    {
+      id: 89,
+      carupdate_id: 283,
+      status: "package_install_start",
+      error_code: 0,
+      created: "2021-08-23T17:06:38.030052Z",
+      updated: "2021-08-23T17:06:38.030052Z",
+    },
+  ],
+  total: 2,
+};
 
 export const CarUpdatesProvider = ({ children }) => {
   return <div data-testid="mocked-carupdatesprovider">{children}</div>;
@@ -24,7 +53,10 @@ export const useCarUpdatesContext = () => ({
   carUpdates,
   totalCarUpdates,
   deployCarUpdates: jest.fn((data) => data),
-  getCarUpdates: jest.fn(() => carUpdates),
+  getCarUpdates: jest.fn(() => ({
+    data: carUpdates,
+  })),
+  getLog: jest.fn(() => carUpdateLog),
   getVINUpdates: jest.fn(() => carUpdates),
   startMonitor: jest.fn(),
   stopMonitor: jest.fn(),
diff --git a/src/components/Contexts/__mocks__/UpdatesContext.jsx b/src/components/Contexts/__mocks__/UpdatesContext.jsx
deleted file mode 100644
index 3bf7a0e..0000000
--- a/src/components/Contexts/__mocks__/UpdatesContext.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from "react";
-
-const UpdatesContext = React.createContext();
-
-let busy = false;
-let packages = [];
-const examplePackage = {
-  id: 0,
-  package_name: "Package",
-  version: "1.0",
-  desc: "Description",
-  release_notes: "https://www.google.com/",
-  timestamp: 1625615299,
-  created: "2021-07-01T22:40:07.778509Z",
-  updated: "2021-07-12T18:22:13.736755Z",
-};
-packages.push(examplePackage);
-let totalPackages = 0;
-let carUpdates = [];
-let totalCarUpdates = 0;
-
-export const UpdatesProvider = ({ children }) => {
-  return <div data-testid="mocked-updatesprovider">{children}</div>;
-};
-
-export const useUpdatesContext = () => ({
-  busy,
-  packages,
-  totalPackages,
-  carUpdates,
-  totalCarUpdates,
-  getPackages: jest.fn(() => packages),
-  updatePackage: jest.fn((data) => data),
-  createCarUpdates: jest.fn((data) => data),
-  getCarUpdates: jest.fn(() => carUpdates),
-  getVINUpdates: jest.fn(() => carUpdates),
-  startMonitor: jest.fn(),
-  stopMonitor: jest.fn(),
-});
diff --git a/src/components/Controls/CarECUsTable/index.jsx b/src/components/Controls/CarECUsTable/index.jsx
new file mode 100644
index 0000000..fd025be
--- /dev/null
+++ b/src/components/Controls/CarECUsTable/index.jsx
@@ -0,0 +1,174 @@
+import React, { useEffect, useState } from "react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableFooter,
+  TablePagination,
+  TableRow,
+} from "@material-ui/core";
+import clsx from "clsx";
+
+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 = [
+  {
+    id: "ecu",
+    label: "ECU",
+  },
+  {
+    id: "sw_version",
+    label: "SW Version",
+  },
+  {
+    id: "boot_loader_version",
+    label: "BL Version",
+  },
+  {
+    id: "hw_version",
+    label: "HW Version",
+  },
+  {
+    id: "vendor",
+    label: "Vendor",
+  },
+  {
+    id: "config",
+    label: "Config",
+  },
+  {
+    id: "fingerprint",
+    label: "Fingerprint",
+  },
+  {
+    id: "serial_number",
+    label: "Serial",
+  },
+  {
+    id: "created_at",
+    label: "Created",
+  },
+  {
+    id: "updated_at",
+    label: "Updated",
+  },
+];
+
+const CarECUsTable = ({ vin, token }) => {
+  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");
+  const [order, setOrder] = useState("desc");
+  const { getECUs } = useVehicleContext();
+  const { setMessage } = useStatusContext();
+
+  useEffect(() => {
+    (async () => {
+      try {
+        if (!vin || !token) return;
+        const result = await getECUs(
+          {
+            vin,
+            limit: pageSize,
+            offset: pageSize * pageIndex,
+            order: `${orderBy} ${order}`,
+          },
+          token
+        );
+        setECUs(result.data);
+        if (result.total > -1) setTotal(result.total);
+      } catch (e) {
+        setMessage(e.message);
+        logger.warn(e.stack);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [vin, token, pageIndex, pageSize, orderBy, order]);
+
+  const handleChangePageIndex = (event, newIndex) => {
+    setPageIndex(newIndex);
+  };
+
+  const handleChangePageSize = (event) => {
+    setPageSize(parseInt(event.target.value, 10));
+    setPageIndex(0);
+  };
+
+  const handleSort = (event, property) => {
+    try {
+      if (property === orderBy) {
+        if (order === "asc") {
+          setOrder("desc");
+        } else {
+          setOrder("asc");
+        }
+      } else {
+        setOrderBy(property);
+        setOrder("asc");
+      }
+    } catch (e) {
+      logger.warn(e.stack);
+    }
+  };
+
+  return (
+    <div className={clsx(classes.paper, classes.tableSize)}>
+      <Table>
+        <TableHeaderSortable
+          classes={classes}
+          orderBy={orderBy}
+          order={order}
+          columnData={tableColumns}
+          onSortRequest={handleSort}
+        />
+        <TableBody>
+          {ecus.map((row) => (
+            <TableRow key={row.ecu}>
+              <TableCell align="center">{row.ecu}</TableCell>
+              <TableCell align="center">{row.sw_version}</TableCell>
+              <TableCell align="center">{row.boot_loader_version}</TableCell>
+              <TableCell align="center">{row.hw_version}</TableCell>
+              <TableCell align="center">{row.vendor}</TableCell>
+              <TableCell align="center">{row.config}</TableCell>
+              <TableCell align="center">{row.fingerprint}</TableCell>
+              <TableCell align="center">{row.serial_number}</TableCell>
+              <TableCell align="center">
+                {LocalDateTimeString(row.created)}
+              </TableCell>
+              <TableCell align="center">
+                {LocalDateTimeString(row.updated)}
+              </TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+        <TableFooter>
+          <TableRow>
+            <TablePagination
+              rowsPerPageOptions={[5, 10, 25, 100]}
+              colSpan={10}
+              count={total}
+              rowsPerPage={pageSize}
+              page={pageIndex}
+              SelectProps={{
+                inputProps: { "aria-label": "rows per page" },
+                native: true,
+              }}
+              onPageChange={handleChangePageIndex}
+              onRowsPerPageChange={handleChangePageSize}
+            />
+          </TableRow>
+        </TableFooter>
+      </Table>
+    </div>
+  );
+};
+
+export default CarECUsTable;
diff --git a/src/components/Cars/CarSelectionTable/index.jsx b/src/components/Controls/CarSelectionTable/index.jsx
similarity index 100%
rename from src/components/Cars/CarSelectionTable/index.jsx
rename to src/components/Controls/CarSelectionTable/index.jsx
diff --git a/src/components/Controls/CarUpdateStatusProgress/index.jsx b/src/components/Controls/CarUpdateStatusProgress/index.jsx
new file mode 100644
index 0000000..9e15ee9
--- /dev/null
+++ b/src/components/Controls/CarUpdateStatusProgress/index.jsx
@@ -0,0 +1,128 @@
+import React, { useState, useEffect } from "react";
+import Typography from "@material-ui/core/Typography";
+import { CheckCircle, RadioButtonUnchecked, Error } from "@material-ui/icons";
+import clsx from "clsx";
+
+import CircularProgress from "../CircularProgress";
+import useStyles from "../../useStyles";
+
+const Progress = ({ value }) => {
+  const classes = useStyles();
+
+  if (value === 100)
+    return (
+      <CheckCircle
+        className={clsx(classes.progressIcon, classes.progressSuccess)}
+      />
+    );
+  if (value >= 0) return <CircularProgress value={value} />;
+  if (value < -1)
+    return (
+      <Error className={clsx(classes.progressIcon, classes.progressError)} />
+    );
+
+  return <RadioButtonUnchecked className={classes.progressIcon} />;
+};
+
+const CarUpdateStatus = ({ status }) => {
+  const classes = useStyles();
+  const [received, setReceived] = useState(-1);
+  const [approval, setApproval] = useState(-1);
+  const [precondition, setPrecondition] = useState(-1);
+  const [download, setDownload] = useState(-1);
+  const [install, setInstall] = useState(-1);
+  const [cleanup, setCleanup] = useState(-1);
+  const [updated, setUpdated] = useState(-1);
+
+  useEffect(() => {
+    /* eslint-disable no-fallthrough, default-case */
+    if (!status) return;
+    // update previous steps
+    switch (status.msg) {
+      case "cleanup_success":
+        setUpdated(100);
+      case "package_install_complete":
+        setInstall(100);
+      case "install_start":
+      case "installing":
+      case "install_complete":
+      case "install_error":
+      case "package_download_complete":
+        setDownload(100);
+      case "download_start":
+      case "downloading":
+      case "download_complete":
+      case "download_error":
+      case "install_approval_received":
+        setApproval(100);
+      case "requirements_succeeded":
+        setPrecondition(100);
+      case "manifest_received":
+        setReceived(100);
+    }
+    // update progress and errors
+    switch (status.msg) {
+      case "installing":
+        setInstall(status.progress);
+        break;
+      case "install_error":
+        setInstall(-100);
+        break;
+      case "downloading":
+        setDownload(status.progress);
+        break;
+      case "download_error":
+        setDownload(-100);
+        break;
+      case "cleanup_failed":
+        setCleanup(-100);
+        break;
+    }
+  }, [status]);
+
+  return (
+    <div
+      style={{
+        width: "100%",
+        display: "flex",
+        justifyContent: "space-between",
+        flexWrap: "wrap",
+      }}
+    >
+      <div className={classes.textCenterAlign}>
+        <Progress value={100} />
+        <Typography>Pending</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={received} />
+        <Typography>Recieved</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={approval} />
+        <Typography>Approved</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={precondition} />
+        <Typography>Precondition</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={download} />
+        <Typography>Download</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={install} />
+        <Typography>Install</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={cleanup} />
+        <Typography>Clean up</Typography>
+      </div>
+      <div className={classes.textCenterAlign}>
+        <Progress value={updated} />
+        <Typography>Updated</Typography>
+      </div>
+    </div>
+  );
+};
+
+export default CarUpdateStatus;
diff --git a/src/components/Controls/CarUpdateStatusTable/index.jsx b/src/components/Controls/CarUpdateStatusTable/index.jsx
new file mode 100644
index 0000000..41eec5b
--- /dev/null
+++ b/src/components/Controls/CarUpdateStatusTable/index.jsx
@@ -0,0 +1,134 @@
+import React, { useEffect, useState } from "react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableFooter,
+  TablePagination,
+  TableRow,
+} from "@material-ui/core";
+
+import { LocalDateTimeString } from "../../../utils/dates";
+import { logger } from "../../../services/monitoring";
+import TableHeaderSortable from "../../Table/HeaderSortable";
+import { useCarUpdatesContext } from "../../Contexts/CarUpdatesContext";
+import { useStatusContext } from "../../Contexts/StatusContext";
+import useStyles from "../../useStyles";
+
+const tableColumns = [
+  {
+    id: "created_at",
+    label: "Date",
+  },
+  {
+    id: "status",
+    label: "Status",
+  },
+  {
+    id: "error_code",
+    label: "Error",
+  },
+];
+
+const CarUpdateStatusTable = ({ carupdateid, token }) => {
+  const classes = useStyles();
+  const [log, setLog] = useState([]);
+  const [logTotal, setLogTotal] = useState(0);
+  const [pageSize, setPageSize] = useState(10);
+  const [pageIndex, setPageIndex] = useState(0);
+  const [orderBy, setOrderBy] = useState("id");
+  const [order, setOrder] = useState("desc");
+  const { getLog } = useCarUpdatesContext();
+  const { setMessage } = useStatusContext();
+
+  useEffect(() => {
+    (async () => {
+      try {
+        if (!carupdateid || !token) return;
+        const result = await getLog(
+          {
+            carupdateid,
+            limit: pageSize,
+            offset: pageSize * pageIndex,
+            order: `${orderBy} ${order}`,
+          },
+          token
+        );
+        setLog(result.data);
+        if (pageIndex === 0 && result.total) setLogTotal(result.total);
+      } catch (e) {
+        setMessage(e.message);
+        logger.warn(e.stack);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [carupdateid, token, pageIndex, pageSize, orderBy, order]);
+
+  const handleChangePageIndex = (event, newIndex) => {
+    setPageIndex(newIndex);
+  };
+
+  const handleChangePageSize = (event) => {
+    setPageSize(parseInt(event.target.value, 10));
+    setPageIndex(0);
+  };
+
+  const handleSort = (event, property) => {
+    try {
+      if (property === orderBy) {
+        if (order === "asc") {
+          setOrder("desc");
+        } else {
+          setOrder("asc");
+        }
+      } else {
+        setOrderBy(property);
+        setOrder("asc");
+      }
+    } catch (e) {
+      logger.warn(e.stack);
+    }
+  };
+
+  return (
+    <Table>
+      <TableHeaderSortable
+        classes={classes}
+        orderBy={orderBy}
+        order={order}
+        columnData={tableColumns}
+        onSortRequest={handleSort}
+      />
+      <TableBody>
+        {log.map((row) => (
+          <TableRow key={row.id}>
+            <TableCell align="center">
+              {LocalDateTimeString(row.created)}
+            </TableCell>
+            <TableCell align="center">{row.status}</TableCell>
+            <TableCell align="center">{row.error}</TableCell>
+          </TableRow>
+        ))}
+      </TableBody>
+      <TableFooter>
+        <TableRow>
+          <TablePagination
+            rowsPerPageOptions={[5, 10, 25, 100]}
+            colSpan={5}
+            count={logTotal}
+            rowsPerPage={pageSize}
+            page={pageIndex}
+            SelectProps={{
+              inputProps: { "aria-label": "rows per page" },
+              native: true,
+            }}
+            onPageChange={handleChangePageIndex}
+            onRowsPerPageChange={handleChangePageSize}
+          />
+        </TableRow>
+      </TableFooter>
+    </Table>
+  );
+};
+
+export default CarUpdateStatusTable;
diff --git a/src/components/Controls/CarUpdatesTable/index.jsx b/src/components/Controls/CarUpdatesTable/index.jsx
new file mode 100644
index 0000000..c5a3107
--- /dev/null
+++ b/src/components/Controls/CarUpdatesTable/index.jsx
@@ -0,0 +1,162 @@
+import React, { useEffect, useState } from "react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableFooter,
+  TablePagination,
+  TableRow,
+} from "@material-ui/core";
+import { Link } from "react-router-dom";
+
+import { LocalDateTimeString } from "../../../utils/dates";
+import TableHeaderSortable from "../../Table/HeaderSortable";
+import {
+  CarUpdatesProvider,
+  useCarUpdatesContext,
+} from "../../Contexts/CarUpdatesContext";
+import { useStatusContext } from "../../Contexts/StatusContext";
+import useStyles from "../../useStyles";
+import { logger } from "../../../services/monitoring";
+
+const tableColumns = [
+  {
+    id: "id",
+    label: "ID",
+  },
+  {
+    id: "update_package_id",
+    label: "Name",
+  },
+  {
+    id: "status",
+    label: "Status",
+  },
+  {
+    id: "created_at",
+    label: "Created",
+  },
+  {
+    id: "updated_at",
+    label: "Updated",
+  },
+];
+
+const MainForm = ({ vin, token }) => {
+  const classes = useStyles();
+  const [pageSize, setPageSize] = useState(10);
+  const [pageIndex, setPageIndex] = useState(0);
+  const [orderBy, setOrderBy] = useState("id");
+  const [order, setOrder] = useState("desc");
+  const { getCarUpdates, carUpdates, totalCarUpdates } = useCarUpdatesContext();
+  const { setMessage } = useStatusContext();
+
+  useEffect(() => {
+    (async () => {
+      try {
+        if (!vin || !token) return;
+        await getCarUpdates(
+          {
+            vin,
+            limit: pageSize,
+            offset: pageSize * pageIndex,
+            order: `${orderBy} ${order}`,
+          },
+          token
+        );
+      } catch (e) {
+        setMessage(e.message);
+        logger.warn(e.stack);
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [vin, token, pageIndex, pageSize, orderBy, order]);
+
+  const handleChangePageIndex = (event, newIndex) => {
+    setPageIndex(newIndex);
+  };
+
+  const handleChangePageSize = (event) => {
+    setPageSize(parseInt(event.target.value, 10));
+    setPageIndex(0);
+  };
+
+  const handleSort = (event, property) => {
+    try {
+      if (property === orderBy) {
+        if (order === "asc") {
+          setOrder("desc");
+        } else {
+          setOrder("asc");
+        }
+      } else {
+        setOrderBy(property);
+        setOrder("asc");
+      }
+    } catch (e) {
+      logger.warn(e.stack);
+    }
+  };
+
+  const updateName = (row) => {
+    if (row.updatemanifest)
+      return `${row.updatemanifest.name} ${row.updatemanifest.version}`;
+    return "None";
+  };
+
+  return (
+    <Table>
+      <TableHeaderSortable
+        classes={classes}
+        orderBy={orderBy}
+        order={order}
+        columnData={tableColumns}
+        onSortRequest={handleSort}
+      />
+      <TableBody>
+        {carUpdates.map((row) => (
+          <TableRow key={row.id}>
+            <TableCell align="center">{row.id}</TableCell>
+            <TableCell align="center">
+              <Link to={`/vehicle-status/${row.vin}/${row.id}`}>
+                {updateName(row)}
+              </Link>
+            </TableCell>
+            <TableCell align="center">{row.status}</TableCell>
+            <TableCell align="center">
+              {LocalDateTimeString(row.created)}
+            </TableCell>
+            <TableCell align="center">
+              {LocalDateTimeString(row.updated)}
+            </TableCell>
+          </TableRow>
+        ))}
+      </TableBody>
+      <TableFooter>
+        <TableRow>
+          <TablePagination
+            rowsPerPageOptions={[5, 10, 25, 100]}
+            colSpan={5}
+            count={totalCarUpdates}
+            rowsPerPage={pageSize}
+            page={pageIndex}
+            SelectProps={{
+              inputProps: { "aria-label": "rows per page" },
+              native: true,
+            }}
+            onPageChange={handleChangePageIndex}
+            onRowsPerPageChange={handleChangePageSize}
+          />
+        </TableRow>
+      </TableFooter>
+    </Table>
+  );
+};
+
+const CarUpdatesTable = (props) => (
+  <CarUpdatesProvider>
+    <MainForm {...props} />
+  </CarUpdatesProvider>
+);
+
+export default CarUpdatesTable;
diff --git a/src/components/Controls/CircularProgress/index.jsx b/src/components/Controls/CircularProgress/index.jsx
new file mode 100644
index 0000000..0e1fb9e
--- /dev/null
+++ b/src/components/Controls/CircularProgress/index.jsx
@@ -0,0 +1,43 @@
+import React from "react";
+import PropTypes from "prop-types";
+import CircularProgress from "@material-ui/core/CircularProgress";
+import Typography from "@material-ui/core/Typography";
+import Box from "@material-ui/core/Box";
+
+const CircularProgressWithLabel = (props) => {
+  return (
+    <Box position="relative" display="inline-flex">
+      <CircularProgress
+        variant="determinate"
+        {...props}
+        style={{ color: "green" }}
+      />
+      <Box
+        top={0}
+        left={0}
+        bottom={0}
+        right={0}
+        position="absolute"
+        display="flex"
+        alignItems="center"
+        justifyContent="center"
+      >
+        <Typography
+          variant="caption"
+          component="div"
+          color="textSecondary"
+        >{`${Math.round(props.value)}%`}</Typography>
+      </Box>
+    </Box>
+  );
+};
+
+CircularProgressWithLabel.propTypes = {
+  /**
+   * The value of the progress indicator for the determinate variant.
+   * Value between 0 and 100.
+   */
+  value: PropTypes.number.isRequired,
+};
+
+export default CircularProgressWithLabel;
diff --git a/src/components/Cars/SendCommand/index.jsx b/src/components/Controls/SendCommand/index.jsx
similarity index 100%
rename from src/components/Cars/SendCommand/index.jsx
rename to src/components/Controls/SendCommand/index.jsx
diff --git a/src/components/Datascope/Home/index.jsx b/src/components/Datascope/Home/index.jsx
index 22c409e..5cdb104 100644
--- a/src/components/Datascope/Home/index.jsx
+++ b/src/components/Datascope/Home/index.jsx
@@ -6,6 +6,7 @@ import api from "../../../services/grafana";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import useStyles from "../../useStyles";
 import ResponsiveIFrame from "../../Controls/ResponsiveIFrame";
+import { logger } from "../../../services/monitoring";
 
 const Datascope = () => {
   const classes = useStyles();
@@ -23,7 +24,7 @@ const Datascope = () => {
     api
       .getCarsCount()
       .then((result) => setCarsCount(result))
-      .catch((error) => console.log(error));
+      .catch((error) => logger.warn(error.stack));
   }, []);
 
   const [signalsCount, setSignalsCount] = useState("0");
@@ -45,7 +46,7 @@ const Datascope = () => {
         let num = result.toLocaleString();
         setSignalsCount(num);
       })
-      .catch((error) => console.log(error));
+      .catch((error) => logger.warn(error.stack));
   };
 
   return (
diff --git a/src/components/ErrorBoundary.jsx b/src/components/ErrorBoundary.jsx
index ad4a168..31bb4bb 100644
--- a/src/components/ErrorBoundary.jsx
+++ b/src/components/ErrorBoundary.jsx
@@ -2,6 +2,8 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Typography } from "@material-ui/core";
 
+import { logger } from "../services/monitoring";
+
 const reload = () => {
   window.location.reload();
 };
@@ -22,6 +24,10 @@ export default class ErrorBoundary extends Component {
 
   render() {
     if (this.state.hasError) {
+      try {
+        logger.error(this.state.error.stack);
+      } catch (e) {}
+
       if (this.state.error && this.state.error.name === "ChunkLoadError") {
         reload();
         return;
diff --git a/src/components/Manifest/Deploy/index.jsx b/src/components/Manifest/Deploy/index.jsx
index 9b75d17..fc7374e 100644
--- a/src/components/Manifest/Deploy/index.jsx
+++ b/src/components/Manifest/Deploy/index.jsx
@@ -16,7 +16,7 @@ import { useUserContext } from "../../Contexts/UserContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import useStyles from "../../useStyles";
 import SearchField from "../../Controls/SearchField";
-import CarSelectionTable from "../../Cars/CarSelectionTable";
+import CarSelectionTable from "../../Controls/CarSelectionTable";
 import { logger } from "../../../services/monitoring";
 import { LocalDateTimeString } from "../../../utils/dates";
 
@@ -111,7 +111,7 @@ const MainForm = () => {
 
   useEffect(() => {
     if (!manifests || manifests.length === 0) return;
-    var data = manifests[0];
+    const data = manifests[0];
 
     setManifestName(data.name);
     setVersion(data.version);
diff --git a/src/components/Manifest/Status/index.jsx b/src/components/Manifest/Status/index.jsx
index d2130bb..7334238 100644
--- a/src/components/Manifest/Status/index.jsx
+++ b/src/components/Manifest/Status/index.jsx
@@ -68,6 +68,10 @@ const MainForm = () => {
         label: "Deployments",
         link: "/packages",
       },
+      {
+        label: `Deploy ${manifests[0].name} ${manifests[0].version}`,
+        link: `/package-deploy/${manifests[0].id}`,
+      },
       {
         label: title,
       },
diff --git a/src/components/Routes/SiteRoutes.jsx b/src/components/Routes/SiteRoutes.jsx
index 47613a2..c6d8b2d 100644
--- a/src/components/Routes/SiteRoutes.jsx
+++ b/src/components/Routes/SiteRoutes.jsx
@@ -6,20 +6,19 @@ import { MessageBar } from "../MessageBar";
 import { useUserContext } from "../Contexts/UserContext";
 import { Roles } from "../../utils/roles";
 
-const SSOForm = React.lazy(() => import("../SSOForm"));
-const Home = React.lazy(() => import("../Home"));
-const VehicleAddForm = React.lazy(() => import("../Cars/Add"));
-const PageNotFound = React.lazy(() => import("../404"));
-const CarUpdatesDeploy = React.lazy(() => import("../CarUpdates/Deploy"));
-const CarUpdatesStatus = React.lazy(() => import("../CarUpdates/Status"));
-const CarUpdates = React.lazy(() => import("../Cars/Status"));
-const SendCommandBulk = React.lazy(() => import("../Cars/SendCommandBulk"));
-const Datascope = React.lazy(() => import("../Datascope/Home"));
 const BatteryDatascope = React.lazy(() => import("../Datascope/Battery"));
+const CarsList = React.lazy(() => import("../Cars/List"));
+const CarStatus = React.lazy(() => import("../Cars/Status"));
+const CarUpdateStatus = React.lazy(() => import("../Cars/UpdateStatus"));
+const Datascope = React.lazy(() => import("../Datascope/Home"));
+const Home = React.lazy(() => import("../Home"));
 const Manifests = React.lazy(() => import("../Manifest/List"));
 const ManifestDeploy = React.lazy(() => import("../Manifest/Deploy"));
 const ManifestStatus = React.lazy(() => import("../Manifest/Status"));
 const ManifestCreate = React.lazy(() => import("../Manifest/Create"));
+const PageNotFound = React.lazy(() => import("../404"));
+const SSOForm = React.lazy(() => import("../SSOForm"));
+const VehicleAddForm = React.lazy(() => import("../Cars/Add"));
 
 const SiteRoutes = () => {
   const { token, groups } = useUserContext();
@@ -34,52 +33,6 @@ const SiteRoutes = () => {
           type={TYPES.GUEST}
           token={token}
         />
-        <AuthRoute
-          path="/home"
-          render={() => <Home />}
-          type={TYPES.PROTECTED}
-          token={token}
-        />
-        <AuthRoute
-          path="/carupdate-deploy/:packageid"
-          render={() => <CarUpdatesDeploy />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/carupdate-status/:packageid"
-          render={() => <CarUpdatesStatus />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.READ, Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/vehicles"
-          render={() => <SendCommandBulk />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/vehicle-add"
-          render={() => <VehicleAddForm />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/vehicle-status/:vin"
-          render={() => <CarUpdates />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.READ, Roles.CREATE]}
-        />
         <AuthRoute
           path="/datascope/battery"
           render={() => <BatteryDatascope />}
@@ -96,6 +49,12 @@ const SiteRoutes = () => {
           groups={groups}
           roles={[Roles.READ, Roles.CREATE]}
         />
+        <AuthRoute
+          path="/home"
+          render={() => <Home />}
+          type={TYPES.PROTECTED}
+          token={token}
+        />
         <AuthRoute
           path="/packages"
           render={() => <Manifests />}
@@ -104,6 +63,14 @@ const SiteRoutes = () => {
           groups={groups}
           roles={[Roles.READ, Roles.CREATE]}
         />
+        <AuthRoute
+          path="/package-create"
+          render={() => <ManifestCreate />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.CREATE]}
+        />
         <AuthRoute
           path="/package-deploy/:manifest_id"
           render={() => <ManifestDeploy />}
@@ -121,13 +88,37 @@ const SiteRoutes = () => {
           roles={[Roles.READ, Roles.CREATE]}
         />
         <AuthRoute
-          path="/package-create"
-          render={() => <ManifestCreate />}
+          path="/vehicles"
+          render={() => <CarsList />}
           type={TYPES.PROTECTED}
           token={token}
           groups={groups}
           roles={[Roles.CREATE]}
         />
+        <AuthRoute
+          path="/vehicle-add"
+          render={() => <VehicleAddForm />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.CREATE]}
+        />
+        <AuthRoute
+          path="/vehicle-status/:vin/:carupdateid"
+          render={() => <CarUpdateStatus />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.READ, Roles.CREATE]}
+        />
+        <AuthRoute
+          path="/vehicle-status/:vin"
+          render={() => <CarStatus />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.READ, Roles.CREATE]}
+        />
         <PageNotFound />
       </Switch>
     </Suspense>
diff --git a/src/components/VehicleMap/index.jsx b/src/components/VehicleMap/index.jsx
index 6ea4ab3..e515cb9 100644
--- a/src/components/VehicleMap/index.jsx
+++ b/src/components/VehicleMap/index.jsx
@@ -9,13 +9,14 @@ import { useVehicleContext, VehicleProvider } from "../Contexts/VehicleContext";
 import { VehiclePopUp } from "./popup";
 import GreenMarkerIcon from "../../assets/green-marker.png";
 import GrayMarkerIcon from "../../assets/gray-marker.png";
+import { logger } from "../../services/monitoring";
 
 const Component = () => {
   const classes = useStyles();
   const {
     token: {
       idToken: { jwtToken: token },
-    }
+    },
   } = useUserContext();
   const { getConnections, getLocations, getState } = useVehicleContext();
 
@@ -26,29 +27,34 @@ const Component = () => {
   const [markers, setMarkers] = useState([]);
 
   useEffect(() => {
-    retrieveAndStoreLocations()
-      .then(points => {
-        centerAroundMarkers(points);
-      })
+    retrieveAndStoreLocations().then((points) => {
+      centerAroundMarkers(points);
+    });
     const id = setInterval(function () {
       retrieveAndStoreLocations();
     }, REQUEST_INTERVAL);
-    return () => { clearInterval(id) };
+    return () => {
+      clearInterval(id);
+    };
     // eslint-disable-next-line
   }, []);
 
   const retrieveAndStoreLocations = () => {
     return getLocations(token)
-      .then(result => {
+      .then((result) => {
         if (result.data != null) {
-          const points = result.data.map(point => [point.latitude, point.longitude, point.vin]);
+          const points = result.data.map((point) => [
+            point.latitude,
+            point.longitude,
+            point.vin,
+          ]);
           setMarkers(points);
-          return points
+          return points;
         }
-        return []
+        return [];
       })
-      .catch(error => console.log(error));
-  }
+      .catch((error) => logger.warn(error.stack));
+  };
 
   const centerAroundMarkers = (markers) => {
     // if (markers == null) {
@@ -62,20 +68,19 @@ const Component = () => {
 
     setCenter([37.0902, -95.7129]);
     setZoom(4.5);
-  }
+  };
 
   const [connections, setConnections] = useState({});
 
   useEffect(() => {
     if (markers.length > 0) {
-      const vins = markers.map(marker => marker[2]);
-      getConnections(vins, token)
-        .then(connections => {
-          setConnections(connections);
-        })
+      const vins = markers.map((marker) => marker[2]);
+      getConnections(vins, token).then((connections) => {
+        setConnections(connections);
+      });
     }
     // eslint-disable-next-line
-  }, [markers, token])
+  }, [markers, token]);
 
   const [selectedVIN, setSelectedVIN] = useState(null);
   const [carState, setCarState] = useState(null);
@@ -86,7 +91,9 @@ const Component = () => {
       const id = setInterval(function () {
         retrieveAndStoreCarState(selectedVIN);
       }, REQUEST_INTERVAL);
-      return () => { clearInterval(id) };
+      return () => {
+        clearInterval(id);
+      };
     }
     // eslint-disable-next-line
   }, [selectedVIN]);
@@ -94,14 +101,13 @@ const Component = () => {
   const selectCar = (e, vin) => {
     e.preventDefault();
     setSelectedVIN(vin);
-  }
+  };
 
   const retrieveAndStoreCarState = (vin) => {
-    getState(token, vin)
-      .then(results => {
-        setCarState({ ...results.data, vin: vin });
-      });
-  }
+    getState(token, vin).then((results) => {
+      setCarState({ ...results.data, vin: vin });
+    });
+  };
 
   const handleClose = () => {
     setSelectedVIN(null);
@@ -117,7 +123,7 @@ const Component = () => {
 
     return new L.Icon({
       iconUrl: icon,
-      iconAnchor: [24, 42]
+      iconAnchor: [24, 42],
     });
   }
 
@@ -126,8 +132,8 @@ const Component = () => {
       center={center}
       zoom={zoom}
       style={{
-        width: '100%',
-        height: '900px'
+        width: "100%",
+        height: "900px",
       }}
     >
       <TileLayer
@@ -146,37 +152,36 @@ const Component = () => {
         >
           <Popup>
             <div align="center">
-              <p className={classes.markerTitle}><b>{marker[2]}</b></p>
+              <p className={classes.markerTitle}>
+                <b>{marker[2]}</b>
+              </p>
               <Button
                 type="submit"
                 variant="contained"
                 color="primary"
-                onClick={e => selectCar(e, marker[2])}
+                onClick={(e) => selectCar(e, marker[2])}
               >
                 View Stats
               </Button>
             </div>
           </Popup>
         </Marker>
-      ))
-      }
+      ))}
 
-      {
-        carState ? (
-          <VehiclePopUp
-            key={carState.vin}
-            vin={carState.vin}
-            online={carState.online}
-            battery={carState.battery}
-            doors={carState.doors}
-            location={carState.location}
-            windows={carState.windows}
-            className={classes.popup}
-            onClose={handleClose}
-          />
-        ) : null
-      }
-    </MapContainer >
+      {carState ? (
+        <VehiclePopUp
+          key={carState.vin}
+          vin={carState.vin}
+          online={carState.online}
+          battery={carState.battery}
+          doors={carState.doors}
+          location={carState.location}
+          windows={carState.windows}
+          className={classes.popup}
+          onClose={handleClose}
+        />
+      ) : null}
+    </MapContainer>
   );
 };
 
@@ -192,12 +197,12 @@ const CenterFocus = ({ center, zoom }) => {
   }, [center, zoom, map]);
 
   return null;
-}
+};
 
 const VehicleMap = () => (
   <VehicleProvider>
     <Component />
   </VehicleProvider>
-)
+);
 
 export default VehicleMap;
diff --git a/src/components/useStyles.jsx b/src/components/useStyles.jsx
index f88cea7..d0506da 100644
--- a/src/components/useStyles.jsx
+++ b/src/components/useStyles.jsx
@@ -262,6 +262,9 @@ const useStyles = makeStyles((theme) => ({
   },
   tableSize: { height: 700, width: "100%" },
   whiteBackground: { backgroundColor: "White" },
+  progressIcon: { width: 40, height: 40 },
+  progressSuccess: { color: "green" },
+  progressError: { color: "red" },
 }));
 
 export default useStyles;
diff --git a/src/services/__mocks__/updates.js b/src/services/__mocks__/updates.js
index aeff668..49bdade 100644
--- a/src/services/__mocks__/updates.js
+++ b/src/services/__mocks__/updates.js
@@ -6,43 +6,7 @@ const updatesAPI = {
     data.id++;
     return data;
   },
-    
-  getPackages: async (search, token) => {
-    return {
-      data: [
-        {
-          id: 1,
-          package_name: "Test",
-          version: "1.0",
-          link: "http://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",
-          ecu_list: "ECU1 1.0.1,ECU2 1.0.2",
-        },
-        {
-          id: 3,
-          package_name: "Test",
-          version: "1.2",
-          link: "http://cloudfront.com/download",
-          ecu_list: "ECU1 1.1.0,ECU2 1.1.2",
-        }
-      ]
-    }
-  },
-
-  updatePackage: async (data, token) => {
-    return data;
-  },
-
-  deployPackage: async (data, token) => {
-    return data;
-  },
-
+  
   getCarUpdates: async (filter, token) => {
     return { data: [] };
   },
diff --git a/src/services/grafana.js b/src/services/grafana.js
index a162eac..d9d7b91 100644
--- a/src/services/grafana.js
+++ b/src/services/grafana.js
@@ -1,4 +1,5 @@
 import { fetchRespHandler } from "../utils/http"
+import { logger } from "../services/monitoring";
 
 const API_ENDPOINT = "https://grafana.fiskerdps.com/api/datasources/proxy/2"
 
@@ -9,7 +10,7 @@ const grafanaAPI = {
     })
         .then(fetchRespHandler)
         .then(result => result.data[0].count)
-        .catch(error => console.log(error)),
+        .catch(error => logger.warn(error.stack)),
 
     getSignalsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20count()%20as%20count%0AFROM%20default.vehicle_signal%20FORMAT%20JSON`, {
         method: "GET",
@@ -17,7 +18,7 @@ const grafanaAPI = {
     })
         .then(fetchRespHandler)
         .then(result => result.data[0].count)
-        .catch(error => console.log(error)),
+        .catch(error => logger.warn(error.stack)),
 };
 
 export default grafanaAPI;
diff --git a/src/services/manifests.js b/src/services/manifests.js
index ade3d6b..e5f3714 100644
--- a/src/services/manifests.js
+++ b/src/services/manifests.js
@@ -10,7 +10,7 @@ const manifestsAPI = {
     .then(fetchRespHandler),
 
   getManifests: async (search, token) => {
-    var u = addQueryParams(`${API_ENDPOINT}/manifests`, search);
+    const u = addQueryParams(`${API_ENDPOINT}/manifests`, search);
     return fetch(u, {
       method: "GET",
       headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
diff --git a/src/services/monitoring.js b/src/services/monitoring.js
index 6cf5297..39c0393 100644
--- a/src/services/monitoring.js
+++ b/src/services/monitoring.js
@@ -1,22 +1,9 @@
-import { datadogRum } from '@datadog/browser-rum';
 import { datadogLogs } from "@datadog/browser-logs";
 
-const applicationId = '8ecd160c-ad5c-4e06-8d88-3a6b89833246';
 const clientToken = 'pubeb25449bb91773fc993855c7378e375a';
 const site = 'datadoghq.com';
 const service = 'ota-portal';
 
-datadogRum.init({
-    applicationId,
-    clientToken,
-    site,
-    service,
-    // Specify a version number to identify the deployed version of your application in Datadog 
-    // version: '1.0.0',
-    sampleRate: 100,
-    trackInteractions: true
-});
-
 datadogLogs.init({
     clientToken,
     site,
diff --git a/src/services/updates.js b/src/services/updates.js
index 527a5b0..4cad939 100644
--- a/src/services/updates.js
+++ b/src/services/updates.js
@@ -10,32 +10,26 @@ const updatesAPI = {
   })
     .then(fetchRespHandler),
 
-  deletePackage: async (package_id, token) => fetch(`${API_ENDPOINT}/update?id=${package_id}`, {
-    method: "DELETE",
-    headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
-  })
-    .then(fetchRespHandler),
-
-  getPackages: async (search, token) => {
-    var u = addQueryParams(`${API_ENDPOINT}/updates`, search);
+  getCarUpdateLog: async (query, token) => {
+    const u = addQueryParams(`${API_ENDPOINT}/carupdateslog`, query);
     return fetch(u, {
       method: "GET",
       headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
-
     })
       .then(fetchRespHandler);
   },
-
-  updatePackage: async (update, token) => fetch(`${API_ENDPOINT}/update`, {
-    method: "PUT",
-    headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
-    body: JSON.stringify(update),
-  })
-    .then(fetchRespHandler),
-
-
+  
+  getCarUpdateProgress: async (carupdateids, token) => {
+    const u = `${API_ENDPOINT}/carupdatesstatuses?carupdateids=${carupdateids}`;
+    return fetch(u, {
+      method: "GET",
+      headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
+    })
+      .then(fetchRespHandler);
+  },
+  
   getCarUpdates: async (search, token) => {
-    var u = addQueryParams(`${API_ENDPOINT}/carupdates`, search);
+    const u = addQueryParams(`${API_ENDPOINT}/carupdates`, search);
     return fetch(u, {
       method: "GET",
       headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
@@ -44,16 +38,7 @@ const updatesAPI = {
   },
 
   getVINUpdates: async (vin, token) => {
-    var u = addQueryParams(`${API_ENDPOINT}/carupdates`, { vin });
-    return fetch(u, {
-      method: "GET",
-      headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
-    })
-      .then(fetchRespHandler);
-  },
-
-  getCarUpdateProgress: async (carupdateids, token) => {
-    var u = `${API_ENDPOINT}/carupdatesstatuses?carupdateids=${carupdateids}`;
+    const u = addQueryParams(`${API_ENDPOINT}/carupdates`, { vin });
     return fetch(u, {
       method: "GET",
       headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
diff --git a/src/utils/http.js b/src/utils/http.js
index e3f176c..2dffd33 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -24,7 +24,7 @@ export const fetchRespHandler = (response) => {
 export const addQueryParams = (url, params) => {
   if (!params) return url;
 
-  var u = new URL(url);
+  const u = new URL(url);
   
   Object.keys(params).forEach(key => u.searchParams.append(key, params[key]))