From e50eb886e63e66e016a7d21ef05d0f6e7d49c2c5 Mon Sep 17 00:00:00 2001
From: John Wu <76966357+jwu-fisker@users.noreply.github.com>
Date: Tue, 10 Aug 2021 08:11:06 -0700
Subject: [PATCH] Reorganize app pages (#73)

* Update layout and menus

* Add breadcrumbs
Add menu icons
Add ECU drop down

* Implement submenu
Update download progress

* revamped dashboard section - failing app.test.js

* Clean up

Co-authored-by: Drew Taylor <dtaylor@fiskerinc.com>
---
 src/assets/gray-marker.png                    |  Bin 0 -> 1252 bytes
 src/assets/green-marker.png                   |  Bin 0 -> 1267 bytes
 src/components/App/App.test.js                |   27 +-
 .../App/__snapshots__/App.test.js.snap        | 5380 ++++++++++-------
 src/components/Cars/Add/index.jsx             |   11 +-
 src/components/Cars/List/index.jsx            |  189 -
 src/components/Cars/SendCommandBulk/index.jsx |   10 +-
 src/components/Cars/Status/index.jsx          |   14 +-
 src/components/Contexts/CarUpdatesContext.jsx |   10 +-
 src/components/Contexts/ManifestsContext.jsx  |   13 +-
 src/components/Contexts/StatusContext.jsx     |    5 +-
 src/components/Controls/ECUDropDown/index.jsx |  121 +
 .../Controls/SiteBreadCrumbs/index.jsx        |   34 +
 src/components/Controls/SubListItem/index.jsx |    9 +
 src/components/Dashboard/index.jsx            |   52 -
 src/components/Datascope/Battery/index.jsx    |  159 +
 src/components/Datascope/Home/index.jsx       |   96 +
 src/components/Home/index.jsx                 |   22 +-
 src/components/Layouts/MenuDrawer.jsx         |   41 +-
 src/components/Layouts/SideMenu.jsx           |  107 +-
 src/components/Layouts/UserMenu/index.jsx     |   48 +
 .../__snapshots__/SideMenu.test.jsx.snap      |  217 +-
 src/components/Manifest/Create/index.jsx      |   17 +-
 src/components/Manifest/Deploy/index.jsx      |   15 +-
 .../Manifest/ECUFilesList/index.jsx           |    2 +
 src/components/Manifest/List/index.jsx        |    9 +-
 .../Manifest/ReleaseNotesList/index.jsx       |   28 -
 src/components/Manifest/Status/index.jsx      |   15 +-
 src/components/Routes/SiteRoutes.jsx          |   27 +-
 .../UpdatePackages/Create/Create.test.js      |   20 -
 .../Create/__snapshots__/Create.test.js.snap  |  250 -
 .../UpdatePackages/Create/index.jsx           |  171 -
 src/components/UpdatePackages/Edit/index.jsx  |  204 -
 src/components/UpdatePackages/List/index.jsx  |  244 -
 src/components/VehicleMap/index.jsx           |   32 +-
 src/components/useStyles.jsx                  |   29 +
 src/services/__mocks__/grafana.js             |   19 +
 src/services/grafana.js                       |    6 +
 src/utils/jwt.js                              |   13 +
 39 files changed, 4043 insertions(+), 3623 deletions(-)
 create mode 100644 src/assets/gray-marker.png
 create mode 100644 src/assets/green-marker.png
 delete mode 100644 src/components/Cars/List/index.jsx
 create mode 100644 src/components/Controls/ECUDropDown/index.jsx
 create mode 100644 src/components/Controls/SiteBreadCrumbs/index.jsx
 delete mode 100644 src/components/Dashboard/index.jsx
 create mode 100644 src/components/Datascope/Battery/index.jsx
 create mode 100644 src/components/Datascope/Home/index.jsx
 create mode 100644 src/components/Layouts/UserMenu/index.jsx
 delete mode 100644 src/components/Manifest/ReleaseNotesList/index.jsx
 delete mode 100644 src/components/UpdatePackages/Create/Create.test.js
 delete mode 100644 src/components/UpdatePackages/Create/__snapshots__/Create.test.js.snap
 delete mode 100644 src/components/UpdatePackages/Create/index.jsx
 delete mode 100644 src/components/UpdatePackages/Edit/index.jsx
 delete mode 100644 src/components/UpdatePackages/List/index.jsx
 create mode 100644 src/services/__mocks__/grafana.js
 create mode 100644 src/services/grafana.js

diff --git a/src/assets/gray-marker.png b/src/assets/gray-marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..45c6ac8e6e6b21750106e124228fa08da75ed85e
GIT binary patch
literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x1er-hK~!jg-I{M`RdpE0KhM4A-f6Bh5=yM7mqo!|g#`una@w1MgWh{*
z*u>?wMoADP=A<_UX*IdY3R^VqRg4sA?L|dJ6uBatP?3Kqvcyu*X>)nEbI#L?xrpJm
z=l9!LFZ#aR`F@}0`RsS^@BGf;!v92)X0hG7cVB;H{`{4|a#R~Y?f@2Dy*#Awvj|63
z^^^Hmu6)qk-27)+y;A|{?(JO?Wil@SYe25ErF2A)swVMEZB0!lXFJ2JK)U+->#`Rv
zZUWs1EbuHdrpS)u#)Vrt8XIfAvv`AaSF4L7<vrjb-x`zj6}jNiwlMtNC+r2X>z#e~
zB-x}NxXmX&l@vXdjk7B@tXcJ)Yt|X$)oS(TobnARLrh4~Q<2DhPZtV*xa2Y}=ANFO
zc{$}Ea|8h($nCj=16}?7buKw4kdgen=Yjj3Ci9W-KxSxYi(AB~@hvuc0{`8~NeZJG
z^sd%o@h6Mlydqcc6aNVWfIvPW^PGc!W|jBvuV*Ye1Jrv@=BLZ#f?L|caCj!8ZAGH!
z5!@hZpk11gWg~G^KN3gvnvrFy>>R&l)&h;9MvE~p7F=#_Eu4<y%!-btRYxaX82|>#
zmC9R)^r0*@l}mUS*guocwj!zxCLh$MfcQsk#o{2UE3vPPskiaVE_d2|+C3e_gxZS5
zL6A3XtuggBfhgQyELO4j07PS}ccHPjp(&`vm*jFkSbPAQ&s)z^iN$2Sj|>@oX2qkU
zsrI%OyI?9dHg>nM9syXr=S{th#ZFjEu}aBU50z}u=9FU=m+i|gm_E-UtS?t8Gj5mV
zN~J;3^`_pcrry>S88rIp5b2u^rd+8sAkrt0w-n5%d~5NU?(9hre3~7L5-i}#Qbh*J
zmA!9>#+8ZPNu%gqQ7I_8UepEwM3KawS&Zgme7RCRg7Ge!qP}P=79O-19UiRYecx&P
zC5Nm|Ge{y@^&7@pswD4P&1R6N3WXnmBVHr<>GSqt@fWMv>6u+o+d(f4sqAvGJAp_p
z*9%;98puy)g3Ff<xCER)+QM*HgdVq<JS3D`T3W_jB2FLxQIc%O?Qzvrmqu%~vTMj0
zq@z^&4drduoLS1wXV$KDK5aXL0A%9eMc}eeb~-7XugeEJe6n638y*i&tFqlEJDmjG
zvMvlw$M(tc0s$D!2it&Oee>7Qv0!+(+c)eDvM~(*5@oY*ezH`PXI*!yf6E&L;Oxoc
zy@2VMJ%c`OFO~XcQ(#sgot>Qt=sLjrKM6XLMO$Yx2h0)##@|t?@Um}SL^eNJESesr
zr_-!K0Fp(EwgTU~<`lkO90aeWF+(aK9gU4O(PSMEJH%=TPlRFUl9^JefB>|XN{3Ol
znFGqE_CmpV6{k{aAOPo<F6k8H%bA_};klE?UrDofsz2cX=-RXA)~sX(ft#kVoDGt=
zp{1$mOqzXDT@e^RR4Urcwci)VDwNWOfH?pGXfGBIfoz@pcR@F`7YZNEMbFefS`$)L
zdA+iCA3}Jw)4|r&s~-~))0=%)&B=-Yh=`I8no$No4if}x<_h9}rN040D2FLyV#u%n
O0000<MNUMnLSTY8`dY~V

literal 0
HcmV?d00001

diff --git a/src/assets/green-marker.png b/src/assets/green-marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..78f95cbd4ccf97af6d1cbcdf4e7136db799ee2aa
GIT binary patch
literal 1267
zcmV<P1PuF$P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x1gJ?wK~!jg-I`Hom1P*mf6sT$*`_X65tN9P(avlu5R6=lLc3d97e%RS
zh@^PYWduQDD%}{QQ6iy13FhWHq*&IV!baq_;}8{cxGj_{Sp}J<&Yhie-lv;Qa_aWH
z@A>S)|K&OV|MNV*^Pcm4@Aq=x7LmkR?70(9+%_$8i&b?YFc-KVxPA2PbHFL!n4$+R
zYx1iv<{Z2bSMOLrntSKXC`75ZfaM5NO(A7Sg%+2PcQOxl{aoq{C4n>!G?rKCxizT1
z222YqlSkNmUhY`eUfrGxoh2A#S>L?7Ao;l>PleXFN~&GOqI*75*YkTwJP2e-Z^Ofq
za9;znLh?71a#~%qsI9j1C*P<y$g-33@7BEZ5I4k_l+#kCkF`FK{lg~~`IuLnT2P@Q
z?B!-b00{SLUiLH&G?x3syg-KYxi=Ac+;6fVHB`B?>wE&{uU2#KycvZ=YJl*oldnc1
zDL&Ma?m1~On^$D?KJkA+0F*gRzF{?+R^-Lw3n~-I;X$A>c&sp8Di$j4$<%dRoXlui
zkz^|OEPfC<ln)T<Q^P}*so|kYgnET7fX_{DS~4;GjA=%TX>{*o)fvStYMXQD*tplT
zK(?vB;bW(6KQPl$%%M*MpH1eo{zm2+eL2M~YOA>h;)+_*okt^y7Gqo)5i#|)g3LC#
zlx-71jHxBvc@+34&fZp#>84^LyNvbFNUh!~Q*Ucuiz#0y?={xLjZCrbr<}!P1vzK*
znN?PH+1Oi5y{#aBTTH2BuGUzO0$9CgEhZC)Dgzc@5pA~k0L015HmCMkTqY0^HGQ82
zRyXxGOnSK-^{lqlwDq=us2sKUfO4m9|3olN{S9+RZ-`}<f~s=Z;xpaZ3yIYC372=+
zz-Kyj*`<B;+cnZ%V^^nS*~la6T$59`8Y2WyNF=nwVl;2#m-Nj)BG~S-G3v+NHQi5I
zjOJ~;Nc3g+Jb@D3XSLcvl$Nk*f~8R*k+GW1AgwiBCx9bCBZWx$p{2I-7pvXtnO)Vq
z(JNiThdy>M5Lc|&37q#DC`d9m{X%|^Pr?f%Q`d1(ML+Qy%3mtFb^D`-^FA3b5P+nx
z3BSixU;Q&BRk77K<PEZ`I{TZd?(of7CCZi^vpc+Z+uk4mPNKJgOCi}wbhc2G%^|@c
zkW5Y289_INWG9j$>oRp+rfvIp1%Ut*rbZiqUqkcbC1_vOg^_Kc`CyRDtgg!fYeVzn
z<s^FD_e%9&1%m+8q`P+_n6}vyN#MJ-bl3h;YLo=BUT_i7Dj@iiL>ZEzzFNv0P$CG7
zol)t#p?MY7w$x@#kJ1yVWDtP!(VZJWjt4{!x%8~}<Cq~9koM~KoJMXHQ1po9Br3j=
zk&I8~hKdCQpshOFEy_l#U(hwJ)jc7rcwNN?0x&pOu^u=$sZr&dnsoNPID5wm(y_3k
zkcf0C@Ye*kKa*}`#d@(Fg<2IW2wd4zuH^dX#YGWq{<QY+VBCFU2LWiClidewxaJLI
zO=~*)?ak;J>%W7pk|Im{>vsb$jlQyXce?up#CEdpE7Jj8kOVCruUMH#4&Mi8u~4!6
dW<lIi`WH<Lm{VCv-f{o{002ovPDHLkV1hb>Xj%XO

literal 0
HcmV?d00001

diff --git a/src/components/App/App.test.js b/src/components/App/App.test.js
index 346cb4a..44c1aba 100644
--- a/src/components/App/App.test.js
+++ b/src/components/App/App.test.js
@@ -84,12 +84,12 @@ describe("App", () => {
     await check("/vehicle-status/FISKER123", "span.MuiButton-label", "Sign In");
   });
 
-  it("Route /vehicles-command unauthenticated", async () => {
-    await check("/vehicles-command", "span.MuiButton-label", "Sign In");
+  it("Route /datascope unauthenticated", async () => {
+    await check("/datascope", "span.MuiButton-label", "Sign In");
   });
 
-  it("Route /dashboard unauthenticated", async () => {
-    await check("/dashboard", "span.MuiButton-label", "Sign In");
+  it("Route /datascope/battery unauthenticated", async () => {
+    await check("/datascope/battery", "span.MuiButton-label", "Sign In");
   });
 
   it("Route /packages unauthenticated", async () => {
@@ -138,11 +138,6 @@ describe("App", () => {
     await check("/vehicle-status/FISKER123", "h6", "Vehicle FISKER123 Details");
   });
 
-  it("Route /vehicles-command authenticated", async () => {
-    setToken(TEST_AUTH_OBJECT);
-    await check("/vehicles-command", "h6", "Send Command");
-  });
-
   it("Route /page-not-found unauthenticated", async () => {
     await check("/page-not-found", "h1", "Page Not Found");
   });
@@ -157,14 +152,19 @@ describe("App", () => {
     await check("/carupdate-deploy/1", "h6", "Deploy Package 1.0");
   });
 
-  it("Route /dashboard authenticated", async () => {
+  it("Route /datascope authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
-    await check("/dashboard", "h6", "Dashboard");
+    await check("/datascope", "h6", "Datascope");
+  });
+
+  it("Route /datascope/battery authenticated", async () => {
+    setToken(TEST_AUTH_OBJECT);
+    await check("/datascope/battery", "h6", "Battery");
   });
 
   it("Route /packages authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
-    await check("/packages", "h6", "Deploy Packages");
+    await check("/packages", "h6", "Deployments");
   });
 
   it("Route /package-status authenticated", async () => {
@@ -179,7 +179,6 @@ describe("App", () => {
 
   it("Route /package-create authenticated", async () => {
     setToken(TEST_AUTH_OBJECT);
-    await check("/package-create", "h6", "Create Package");
+    await check("/package-create", "h6", "Create Deployments");
   });
-
 });
diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 7ee5a7c..a11d353 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -6,47 +6,56 @@ exports[`App Route / authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-521"
+      class="makeStyles-root-612"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-522 makeStyles-appBarShift-523 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-613 makeStyles-appBarShift-614 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Home
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-531 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Home
+            </h6>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-622"
+            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-526"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-617"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-527 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-618 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-528"
+            class="makeStyles-drawerHeader-619"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-537"
+              class="makeStyles-logo-628"
               src="fisker-badge.svg"
             />
           </div>
@@ -64,6 +73,20 @@ exports[`App Route / authenticated 1`] = `
                 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"
                 >
@@ -78,28 +101,6 @@ exports[`App Route / authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -109,34 +110,26 @@ exports[`App Route / authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -153,34 +146,26 @@ exports[`App Route / authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -188,47 +173,116 @@ exports[`App Route / authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-529 makeStyles-contentShift-530"
+        class="makeStyles-content-620 makeStyles-contentShift-621"
       >
         <div
-          class="makeStyles-drawerHeader-528"
+          class="makeStyles-drawerHeader-619"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-510"
+            class="makeStyles-paper-601"
           >
             <h1
-              class="MuiTypography-root makeStyles-homePageTitle-541 MuiTypography-h5"
+              class="MuiTypography-root makeStyles-homePageTitle-632 MuiTypography-h5"
             >
-              Welcome John!
+              Welcome 
+              John
+              !
             </h1>
             <div
               data-testid="mocked-vehicleprovider"
@@ -257,29 +311,8 @@ exports[`App Route / authenticated 1`] = `
                           alt=""
                           class="leaflet-tile"
                           role="presentation"
-                          src="https://c.tile.openstreetmap.org/2/1/1.png"
-                          style="width: 256px; height: 256px; left: -256px; top: -256px;"
-                        />
-                        <img
-                          alt=""
-                          class="leaflet-tile"
-                          role="presentation"
-                          src="https://a.tile.openstreetmap.org/2/2/1.png"
-                          style="width: 256px; height: 256px; left: 0px; top: -256px;"
-                        />
-                        <img
-                          alt=""
-                          class="leaflet-tile"
-                          role="presentation"
-                          src="https://a.tile.openstreetmap.org/2/1/2.png"
-                          style="width: 256px; height: 256px; left: -256px; top: 0px;"
-                        />
-                        <img
-                          alt=""
-                          class="leaflet-tile"
-                          role="presentation"
-                          src="https://b.tile.openstreetmap.org/2/2/2.png"
-                          style="width: 256px; height: 256px; left: 0px; top: 0px;"
+                          src="https://b.tile.openstreetmap.org/5/7/12.png"
+                          style="width: 256px; height: 256px; left: -126px; top: -114px;"
                         />
                       </div>
                     </div>
@@ -381,9 +414,11 @@ exports[`App Route / unauthenticated 1`] = `
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
@@ -428,47 +463,56 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-884"
+      class="makeStyles-root-992"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-885 makeStyles-appBarShift-886 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-993 makeStyles-appBarShift-994 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Deploy Package 1.0
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-894 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Deploy Package 1.0
+            </h6>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-1002"
+            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-889"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-997"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-890 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-998 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-891"
+            class="makeStyles-drawerHeader-999"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-900"
+              class="makeStyles-logo-1008"
               src="fisker-badge.svg"
             />
           </div>
@@ -486,6 +530,20 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                 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"
                 >
@@ -500,28 +558,6 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -531,34 +567,26 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -575,34 +603,26 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -610,36 +630,103 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-892 makeStyles-contentShift-893"
+        class="makeStyles-content-1000 makeStyles-contentShift-1001"
       >
         <div
-          class="makeStyles-drawerHeader-891"
+          class="makeStyles-drawerHeader-999"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -651,11 +738,11 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
               data-testid="mocked-updatesprovider"
             >
               <div
-                class="makeStyles-paper-873"
+                class="makeStyles-paper-981"
               >
                 <form
                   action="{onSubmit}"
-                  class="makeStyles-form-875"
+                  class="makeStyles-form-983"
                   novalidate=""
                 >
                   <p
@@ -667,13 +754,13 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                     Description
                   </p>
                   <div
-                    class="MuiGrid-root makeStyles-root-884 MuiGrid-container MuiGrid-spacing-xs-2"
+                    class="MuiGrid-root makeStyles-root-992 MuiGrid-container MuiGrid-spacing-xs-2"
                   >
                     <div
                       class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-10"
                     >
                       <div
-                        class="MuiFormControl-root makeStyles-margin-897 makeStyles-textField-898"
+                        class="MuiFormControl-root makeStyles-margin-1005 makeStyles-textField-1006"
                       >
                         <label
                           class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -723,7 +810,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                         </div>
                       </div>
                       <div
-                        class="makeStyles-labelInline-879"
+                        class="makeStyles-labelInline-987"
                       >
                         0 Selected
                       </div>
@@ -733,7 +820,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                       style="text-align: right;"
                     >
                       <button
-                        class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-877 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
+                        class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-985 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
                         disabled=""
                         tabindex="-1"
                         type="submit"
@@ -747,7 +834,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                     </div>
                   </div>
                   <div
-                    class="makeStyles-paper-873"
+                    class="makeStyles-paper-981"
                     style="height: 700px; width: 100%;"
                   >
                     <table
@@ -765,14 +852,14 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                           >
                             <span
                               aria-disabled="false"
-                              class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-910 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                              class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1025 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                             >
                               <span
                                 class="MuiIconButton-label"
                               >
                                 <input
                                   aria-label="select all desserts"
-                                  class="PrivateSwitchBase-input-913"
+                                  class="PrivateSwitchBase-input-1028"
                                   data-indeterminate="false"
                                   type="checkbox"
                                   value=""
@@ -806,7 +893,7 @@ exports[`App Route /carupdate-deploy authenticated 1`] = `
                             >
                               VIN
                               <span
-                                class="makeStyles-hiddenSortSpan-896"
+                                class="makeStyles-hiddenSortSpan-1004"
                               >
                                 sorted ascending
                               </span>
@@ -1086,35 +1173,37 @@ exports[`App Route /carupdate-deploy unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-131"
+      class="makeStyles-root-152"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-132 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-153 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-139"
+        class="makeStyles-content-160"
       >
         <div
-          class="makeStyles-drawerHeader-138"
+          class="makeStyles-drawerHeader-159"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-120"
+            class="makeStyles-paper-141"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-123 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-144 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1141,47 +1230,56 @@ exports[`App Route /carupdate-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-642"
+      class="makeStyles-root-754"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-643 makeStyles-appBarShift-644 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-755 makeStyles-appBarShift-756 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Package Package 1.0
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-652 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Package Package 1.0
+            </h6>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-764"
+            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-647"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-759"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-648 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-760 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-649"
+            class="makeStyles-drawerHeader-761"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-658"
+              class="makeStyles-logo-770"
               src="fisker-badge.svg"
             />
           </div>
@@ -1199,6 +1297,20 @@ exports[`App Route /carupdate-status authenticated 1`] = `
                 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"
                 >
@@ -1213,28 +1325,6 @@ exports[`App Route /carupdate-status authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -1244,34 +1334,26 @@ exports[`App Route /carupdate-status authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -1288,34 +1370,26 @@ exports[`App Route /carupdate-status authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -1323,36 +1397,103 @@ exports[`App Route /carupdate-status authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-650 makeStyles-contentShift-651"
+        class="makeStyles-content-762 makeStyles-contentShift-763"
       >
         <div
-          class="makeStyles-drawerHeader-649"
+          class="makeStyles-drawerHeader-761"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -1361,7 +1502,7 @@ exports[`App Route /carupdate-status authenticated 1`] = `
             data-testid="mocked-updatesprovider"
           >
             <div
-              class="makeStyles-paper-631"
+              class="makeStyles-paper-743"
               style="height: 700px; width: 100%;"
             >
               <table
@@ -1549,35 +1690,37 @@ exports[`App Route /carupdate-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-170"
+      class="makeStyles-root-198"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-171 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-199 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-178"
+        class="makeStyles-content-206"
       >
         <div
-          class="makeStyles-drawerHeader-177"
+          class="makeStyles-drawerHeader-205"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-159"
+            class="makeStyles-paper-187"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-162 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-190 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1598,53 +1741,62 @@ exports[`App Route /carupdate-status unauthenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /dashboard authenticated 1`] = `
+exports[`App Route /datascope authenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-927"
+      class="makeStyles-root-1042"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-928 makeStyles-appBarShift-929 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1043 makeStyles-appBarShift-1044 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Dashboard
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-937 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Datascope
+            </h6>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-1052"
+            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-932"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1047"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-933 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1048 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-934"
+            class="makeStyles-drawerHeader-1049"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-943"
+              class="makeStyles-logo-1058"
               src="fisker-badge.svg"
             />
           </div>
@@ -1662,6 +1814,20 @@ exports[`App Route /dashboard authenticated 1`] = `
                 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"
                 >
@@ -1676,28 +1842,6 @@ exports[`App Route /dashboard authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -1707,34 +1851,26 @@ exports[`App Route /dashboard authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -1751,34 +1887,26 @@ exports[`App Route /dashboard authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -1786,72 +1914,167 @@ exports[`App Route /dashboard authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-935 makeStyles-contentShift-936"
+        class="makeStyles-content-1050 makeStyles-contentShift-1051"
       >
         <div
-          class="makeStyles-drawerHeader-934"
+          class="makeStyles-drawerHeader-1049"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-916"
+            class="makeStyles-paper-1031"
           >
             <div
-              class="MuiGrid-root makeStyles-root-927 MuiGrid-container MuiGrid-spacing-xs-2"
+              class="MuiGrid-root makeStyles-root-1042 MuiGrid-container MuiGrid-spacing-xs-2"
             >
               <div
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
               >
                 <div
-                  class="makeStyles-embeddedWrapper-945"
+                  class="MuiPaper-root makeStyles-grafanaContainer-1072 MuiPaper-elevation1 MuiPaper-rounded"
+                  style="height: 150px;"
                 >
-                  <iframe
-                    frameborder="0"
-                    src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&refresh=30s&panelId=2"
-                    style="position: absolute; top: 0px; left: 0px; bottom: 0px; right: 0px; width: 100%; height: 100%;"
-                    title="Battery Time Series"
-                  />
+                  <h1
+                    class="makeStyles-datascopeContainerValue-1074"
+                  >
+                    500
+                  </h1>
+                  <h2
+                    class="makeStyles-datascopeContainerText-1073"
+                  >
+                    Cars
+                  </h2>
                 </div>
               </div>
               <div
                 class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
               >
                 <div
-                  class="makeStyles-embeddedWrapper-945"
+                  class="MuiPaper-root makeStyles-grafanaContainer-1072 MuiPaper-elevation1 MuiPaper-rounded"
+                  style="height: 150px;"
                 >
-                  <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"
-                  />
+                  <h1
+                    class="makeStyles-datascopeContainerValue-1074"
+                  >
+                    1,234,567,890
+                  </h1>
+                  <h2
+                    class="makeStyles-datascopeContainerText-1073"
+                  >
+                    Signals Collected
+                  </h2>
+                </div>
+              </div>
+              <div
+                class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-12"
+              >
+                <div
+                  class="MuiPaper-root makeStyles-grafanaContainer-1072 MuiPaper-elevation1 MuiPaper-rounded"
+                >
+                  <div
+                    class="makeStyles-embeddedWrapper-1060"
+                  >
+                    <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>
@@ -1879,7 +2102,7 @@ exports[`App Route /dashboard authenticated 1`] = `
                     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>
-                Create Charts
+                Go to Grafana
               </span>
               <span
                 class="MuiTouchRipple-root"
@@ -1893,41 +2116,666 @@ exports[`App Route /dashboard authenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /dashboard unauthenticated 1`] = `
+exports[`App Route /datascope unauthenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-326"
+      class="makeStyles-root-336"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-327 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-337 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-334"
+        class="makeStyles-content-344"
       >
         <div
-          class="makeStyles-drawerHeader-333"
+          class="makeStyles-drawerHeader-343"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-315"
+            class="makeStyles-paper-325"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-318 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-328 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-1088"
+    >
+      <header
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1089 makeStyles-appBarShift-1090 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-1098"
+            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-1093"
+      >
+        <div
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1094 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+        >
+          <div
+            class="makeStyles-drawerHeader-1095"
+          >
+            <img
+              alt="Fisker Admin Portal"
+              class="makeStyles-logo-1104"
+              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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-1096 makeStyles-contentShift-1097"
+      >
+        <div
+          class="makeStyles-drawerHeader-1095"
+        />
+        <main
+          class="MuiContainer-root MuiContainer-maxWidthLg"
+        >
+          <div
+            class="makeStyles-paper-1077"
+          >
+            <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <form
+                      class="makeStyles-formControl-1081"
+                    >
+                      <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-1121 MuiOutlinedInput-notchedOutline"
+                          >
+                            <legend
+                              class="PrivateNotchedOutline-legendLabelled-1123 PrivateNotchedOutline-legendNotched-1124"
+                            >
+                              <span>
+                                VIN
+                              </span>
+                            </legend>
+                          </fieldset>
+                        </div>
+                      </div>
+                    </form>
+                    <div
+                      class="MuiFormControl-root makeStyles-formControl-1081"
+                    >
+                      <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-1121 MuiOutlinedInput-notchedOutline"
+                        >
+                          <legend
+                            class="PrivateNotchedOutline-legendLabelled-1123 PrivateNotchedOutline-legendNotched-1124"
+                          >
+                            <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    Cell Voltage 
+                    1
+                    <div
+                      class="makeStyles-embeddedWrapper-1106"
+                    >
+                      <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    Cell Temperature 
+                    1
+                    <div
+                      class="makeStyles-embeddedWrapper-1106"
+                    >
+                      <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1106"
+                    >
+                      <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1106"
+                    >
+                      <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1106"
+                    >
+                      <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1106"
+                    >
+                      <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-1118 MuiPaper-elevation1 MuiPaper-rounded"
+                  >
+                    <div
+                      class="makeStyles-embeddedWrapper-1106"
+                    >
+                      <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-382"
+    >
+      <header
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-383 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-390"
+      >
+        <div
+          class="makeStyles-drawerHeader-389"
+        />
+        <main
+          class="MuiContainer-root MuiContainer-maxWidthLg"
+        >
+          <div
+            class="makeStyles-paper-371"
+            style="justify-content: center;"
+          >
+            <a
+              aria-disabled="false"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-374 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -1954,47 +2802,56 @@ exports[`App Route /home authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-560"
+      class="makeStyles-root-658"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-561 makeStyles-appBarShift-562 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-659 makeStyles-appBarShift-660 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Home
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-570 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Home
+            </h6>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-668"
+            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-565"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-663"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-566 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-664 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-567"
+            class="makeStyles-drawerHeader-665"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-576"
+              class="makeStyles-logo-674"
               src="fisker-badge.svg"
             />
           </div>
@@ -2012,6 +2869,20 @@ exports[`App Route /home authenticated 1`] = `
                 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"
                 >
@@ -2026,28 +2897,6 @@ exports[`App Route /home authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -2057,34 +2906,26 @@ exports[`App Route /home authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -2101,34 +2942,26 @@ exports[`App Route /home authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -2136,47 +2969,116 @@ exports[`App Route /home authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-568 makeStyles-contentShift-569"
+        class="makeStyles-content-666 makeStyles-contentShift-667"
       >
         <div
-          class="makeStyles-drawerHeader-567"
+          class="makeStyles-drawerHeader-665"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-549"
+            class="makeStyles-paper-647"
           >
             <h1
-              class="MuiTypography-root makeStyles-homePageTitle-580 MuiTypography-h5"
+              class="MuiTypography-root makeStyles-homePageTitle-678 MuiTypography-h5"
             >
-              Welcome John!
+              Welcome 
+              John
+              !
             </h1>
             <div
               data-testid="mocked-vehicleprovider"
@@ -2205,29 +3107,8 @@ exports[`App Route /home authenticated 1`] = `
                           alt=""
                           class="leaflet-tile"
                           role="presentation"
-                          src="https://c.tile.openstreetmap.org/2/1/1.png"
-                          style="width: 256px; height: 256px; left: -256px; top: -256px;"
-                        />
-                        <img
-                          alt=""
-                          class="leaflet-tile"
-                          role="presentation"
-                          src="https://a.tile.openstreetmap.org/2/2/1.png"
-                          style="width: 256px; height: 256px; left: 0px; top: -256px;"
-                        />
-                        <img
-                          alt=""
-                          class="leaflet-tile"
-                          role="presentation"
-                          src="https://a.tile.openstreetmap.org/2/1/2.png"
-                          style="width: 256px; height: 256px; left: -256px; top: 0px;"
-                        />
-                        <img
-                          alt=""
-                          class="leaflet-tile"
-                          role="presentation"
-                          src="https://b.tile.openstreetmap.org/2/2/2.png"
-                          style="width: 256px; height: 256px; left: 0px; top: 0px;"
+                          src="https://b.tile.openstreetmap.org/5/7/12.png"
+                          style="width: 256px; height: 256px; left: -126px; top: -114px;"
                         />
                       </div>
                     </div>
@@ -2321,35 +3202,37 @@ exports[`App Route /home unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-53"
+      class="makeStyles-root-60"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-54 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-61 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-61"
+        class="makeStyles-content-68"
       >
         <div
-          class="makeStyles-drawerHeader-60"
+          class="makeStyles-drawerHeader-67"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-42"
+            class="makeStyles-paper-49"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-45 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-52 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -2376,47 +3259,92 @@ exports[`App Route /package-create authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1087"
+      class="makeStyles-root-1280"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1088 makeStyles-appBarShift-1089 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1281 makeStyles-appBarShift-1282 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Create Package
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-1097 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              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-1290"
+            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-1092"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1285"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1093 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1286 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1094"
+            class="makeStyles-drawerHeader-1287"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1103"
+              class="makeStyles-logo-1296"
               src="fisker-badge.svg"
             />
           </div>
@@ -2434,6 +3362,20 @@ exports[`App Route /package-create authenticated 1`] = `
                 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"
                 >
@@ -2448,28 +3390,6 @@ exports[`App Route /package-create authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -2479,34 +3399,26 @@ exports[`App Route /package-create authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -2523,34 +3435,26 @@ exports[`App Route /package-create authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -2558,36 +3462,103 @@ exports[`App Route /package-create authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-1095 makeStyles-contentShift-1096"
+        class="makeStyles-content-1288 makeStyles-contentShift-1289"
       >
         <div
-          class="makeStyles-drawerHeader-1094"
+          class="makeStyles-drawerHeader-1287"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -2596,11 +3567,11 @@ exports[`App Route /package-create authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-1076"
+              class="makeStyles-paper-1269"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-1078"
+                class="makeStyles-form-1271"
                 novalidate=""
               >
                 <div
@@ -2636,10 +3607,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1113 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1115"
+                        class="PrivateNotchedOutline-legendLabelled-1315"
                       >
                         <span>
                           Package name
@@ -2682,10 +3653,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1113 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1115"
+                        class="PrivateNotchedOutline-legendLabelled-1315"
                       >
                         <span>
                           Version
@@ -2728,10 +3699,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1113 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1115"
+                        class="PrivateNotchedOutline-legendLabelled-1315"
                       >
                         <span>
                           Description
@@ -2775,10 +3746,10 @@ exports[`App Route /package-create authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-1113 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-1313 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-1115"
+                        class="PrivateNotchedOutline-legendLabelled-1315"
                       >
                         <span>
                           Release Notes URL
@@ -2875,14 +3846,14 @@ exports[`App Route /package-create authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1079 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-1272 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
                   <span
                     class="MuiButton-label"
                   >
-                    "Submit"
+                    Submit
                   </span>
                   <span
                     class="MuiTouchRipple-root"
@@ -2904,35 +3875,37 @@ exports[`App Route /package-create unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-482"
+      class="makeStyles-root-566"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-483 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-567 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-490"
+        class="makeStyles-content-574"
       >
         <div
-          class="makeStyles-drawerHeader-489"
+          class="makeStyles-drawerHeader-573"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-471"
+            class="makeStyles-paper-555"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-474 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-558 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -2959,47 +3932,92 @@ exports[`App Route /package-deploy authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1044"
+      class="makeStyles-root-1230"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1045 makeStyles-appBarShift-1046 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1231 makeStyles-appBarShift-1232 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Deploy Test Manifest 1.0
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-1054 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Deploy Test Manifest 1.0
+            </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-deploy/1"
+                  >
+                    Deploy Test Manifest 1.0
+                  </a>
+                </li>
+              </ol>
+            </nav>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-1240"
+            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-1049"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1235"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1050 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1236 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1051"
+            class="makeStyles-drawerHeader-1237"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1060"
+              class="makeStyles-logo-1246"
               src="fisker-badge.svg"
             />
           </div>
@@ -3017,6 +4035,20 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 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"
                 >
@@ -3031,28 +4063,6 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -3062,34 +4072,26 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -3106,34 +4108,26 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -3141,36 +4135,103 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-1052 makeStyles-contentShift-1053"
+        class="makeStyles-content-1238 makeStyles-contentShift-1239"
       >
         <div
-          class="makeStyles-drawerHeader-1051"
+          class="makeStyles-drawerHeader-1237"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -3185,11 +4246,11 @@ exports[`App Route /package-deploy authenticated 1`] = `
                 data-testid="mocked-carupdatesprovider"
               >
                 <div
-                  class="makeStyles-paper-1033"
+                  class="makeStyles-paper-1219"
                 >
                   <form
                     action="{onSubmit}"
-                    class="makeStyles-form-1035"
+                    class="makeStyles-form-1221"
                     novalidate=""
                   >
                     <p
@@ -3200,13 +4261,13 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       .
                     </p>
                     <div
-                      class="MuiGrid-root makeStyles-root-1044 MuiGrid-container MuiGrid-spacing-xs-2"
+                      class="MuiGrid-root makeStyles-root-1230 MuiGrid-container MuiGrid-spacing-xs-2"
                     >
                       <div
                         class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-10"
                       >
                         <div
-                          class="MuiFormControl-root makeStyles-margin-1057 makeStyles-textField-1058"
+                          class="MuiFormControl-root makeStyles-margin-1243 makeStyles-textField-1244"
                         >
                           <label
                             class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -3256,7 +4317,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                           </div>
                         </div>
                         <div
-                          class="makeStyles-labelInline-1039"
+                          class="makeStyles-labelInline-1225"
                         >
                           0 Selected
                         </div>
@@ -3266,7 +4327,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                         style="text-align: right;"
                       >
                         <button
-                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1037 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
+                          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-formControl-1223 MuiButton-containedPrimary Mui-disabled MuiButton-fullWidth Mui-disabled"
                           disabled=""
                           tabindex="-1"
                           type="submit"
@@ -3280,7 +4341,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="makeStyles-paper-1033"
+                      class="makeStyles-paper-1219"
                       style="height: 700px; width: 100%;"
                     >
                       <table
@@ -3298,14 +4359,14 @@ exports[`App Route /package-deploy authenticated 1`] = `
                             >
                               <span
                                 aria-disabled="false"
-                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1070 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                                class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-1263 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                               >
                                 <span
                                   class="MuiIconButton-label"
                                 >
                                   <input
                                     aria-label="select all desserts"
-                                    class="PrivateSwitchBase-input-1073"
+                                    class="PrivateSwitchBase-input-1266"
                                     data-indeterminate="false"
                                     type="checkbox"
                                     value=""
@@ -3339,7 +4400,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
                               >
                                 VIN
                                 <span
-                                  class="makeStyles-hiddenSortSpan-1056"
+                                  class="makeStyles-hiddenSortSpan-1242"
                                 >
                                   sorted ascending
                                 </span>
@@ -3620,35 +4681,37 @@ exports[`App Route /package-deploy unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-443"
+      class="makeStyles-root-520"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-444 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-521 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-451"
+        class="makeStyles-content-528"
       >
         <div
-          class="makeStyles-drawerHeader-450"
+          class="makeStyles-drawerHeader-527"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-432"
+            class="makeStyles-paper-509"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-435 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-512 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -3675,47 +4738,92 @@ exports[`App Route /package-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-1005"
+      class="makeStyles-root-1184"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1006 makeStyles-appBarShift-1007 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1185 makeStyles-appBarShift-1186 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Manifest Test Manifest 1.0
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-1015 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Manifest Test Manifest 1.0
+            </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-status/1"
+                  >
+                    Manifest Test Manifest 1.0
+                  </a>
+                </li>
+              </ol>
+            </nav>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-1194"
+            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-1010"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1189"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1011 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1190 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-1012"
+            class="makeStyles-drawerHeader-1191"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-1021"
+              class="makeStyles-logo-1200"
               src="fisker-badge.svg"
             />
           </div>
@@ -3733,6 +4841,20 @@ exports[`App Route /package-status authenticated 1`] = `
                 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"
                 >
@@ -3747,28 +4869,6 @@ exports[`App Route /package-status authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -3778,34 +4878,26 @@ exports[`App Route /package-status authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -3822,34 +4914,26 @@ exports[`App Route /package-status authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -3857,36 +4941,103 @@ exports[`App Route /package-status authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-1013 makeStyles-contentShift-1014"
+        class="makeStyles-content-1192 makeStyles-contentShift-1193"
       >
         <div
-          class="makeStyles-drawerHeader-1012"
+          class="makeStyles-drawerHeader-1191"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -3898,7 +5049,7 @@ exports[`App Route /package-status authenticated 1`] = `
               data-testid="mocked-carupdatesprovider"
             >
               <div
-                class="makeStyles-paper-994"
+                class="makeStyles-paper-1173"
                 style="height: 700px; width: 100%;"
               >
                 <table
@@ -4121,35 +5272,37 @@ exports[`App Route /package-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-404"
+      class="makeStyles-root-474"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-405 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-475 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-412"
+        class="makeStyles-content-482"
       >
         <div
-          class="makeStyles-drawerHeader-411"
+          class="makeStyles-drawerHeader-481"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-393"
+            class="makeStyles-paper-463"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-396 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-466 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -4176,47 +5329,56 @@ exports[`App Route /packages authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-966"
+      class="makeStyles-root-1138"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-967 makeStyles-appBarShift-968 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-1139 makeStyles-appBarShift-1140 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Deploy Packages
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-976 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Deployments
+            </h6>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-1148"
+            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-971"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-1143"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-972 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-1144 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-973"
+            class="makeStyles-drawerHeader-1145"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-982"
+              class="makeStyles-logo-1154"
               src="fisker-badge.svg"
             />
           </div>
@@ -4234,6 +5396,20 @@ exports[`App Route /packages authenticated 1`] = `
                 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"
                 >
@@ -4248,28 +5424,6 @@ exports[`App Route /packages authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -4279,34 +5433,26 @@ exports[`App Route /packages authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -4323,34 +5469,26 @@ exports[`App Route /packages authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -4358,36 +5496,103 @@ exports[`App Route /packages authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-974 makeStyles-contentShift-975"
+        class="makeStyles-content-1146 makeStyles-contentShift-1147"
       >
         <div
-          class="makeStyles-drawerHeader-973"
+          class="makeStyles-drawerHeader-1145"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -4396,14 +5601,29 @@ exports[`App Route /packages authenticated 1`] = `
             data-testid="mocked-manifestsprovider"
           >
             <div
-              class="makeStyles-paper-955"
+              class="makeStyles-paper-1127"
               style="height: 700px; width: 100%;"
             >
               <div
-                class="MuiToolbar-root MuiToolbar-regular makeStyles-tableToolbar-981 MuiToolbar-gutters"
+                class="MuiToolbar-root MuiToolbar-regular makeStyles-tableToolbar-1153 MuiToolbar-gutters"
               >
+                <a
+                  class="makeStyles-labelInline-1133"
+                  href="/package-create"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge"
+                    focusable="false"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"
+                    />
+                  </svg>
+                </a>
                 <div
-                  class="MuiFormControl-root makeStyles-margin-979 makeStyles-textField-980"
+                  class="MuiFormControl-root makeStyles-margin-1151 makeStyles-textField-1152"
                 >
                   <label
                     class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -4475,7 +5695,7 @@ exports[`App Route /packages authenticated 1`] = `
                       >
                         ID
                         <span
-                          class="makeStyles-hiddenSortSpan-978"
+                          class="makeStyles-hiddenSortSpan-1150"
                         >
                           sorted ascending
                         </span>
@@ -4822,35 +6042,37 @@ exports[`App Route /packages unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-365"
+      class="makeStyles-root-428"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-366 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-429 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-373"
+        class="makeStyles-content-436"
       >
         <div
-          class="makeStyles-drawerHeader-372"
+          class="makeStyles-drawerHeader-435"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-354"
+            class="makeStyles-paper-417"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-357 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-420 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -4877,45 +6099,54 @@ exports[`App Route /page-not-found authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-845"
+      class="makeStyles-root-946"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-846 makeStyles-appBarShift-847 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-947 makeStyles-appBarShift-948 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-855 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
-            >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             />
-          </button>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-956"
+            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-850"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-951"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-851 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-952 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-852"
+            class="makeStyles-drawerHeader-953"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-861"
+              class="makeStyles-logo-962"
               src="fisker-badge.svg"
             />
           </div>
@@ -4933,6 +6164,20 @@ exports[`App Route /page-not-found authenticated 1`] = `
                 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"
                 >
@@ -4947,28 +6192,6 @@ exports[`App Route /page-not-found authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -4978,34 +6201,26 @@ exports[`App Route /page-not-found authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -5022,34 +6237,26 @@ exports[`App Route /page-not-found authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -5057,42 +6264,109 @@ exports[`App Route /page-not-found authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-853 makeStyles-contentShift-854"
+        class="makeStyles-content-954 makeStyles-contentShift-955"
       >
         <div
-          class="makeStyles-drawerHeader-852"
+          class="makeStyles-drawerHeader-953"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-834"
+            class="makeStyles-paper-935"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -5113,30 +6387,32 @@ exports[`App Route /page-not-found unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-806"
+      class="makeStyles-root-900"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-807 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-901 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-814"
+        class="makeStyles-content-908"
       >
         <div
-          class="makeStyles-drawerHeader-813"
+          class="makeStyles-drawerHeader-907"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-795"
+            class="makeStyles-paper-889"
           >
             <h1
               class="MuiTypography-root MuiTypography-h2"
@@ -5157,47 +6433,92 @@ exports[`App Route /vehicle-add authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-599"
+      class="makeStyles-root-704"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-600 makeStyles-appBarShift-601 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-705 makeStyles-appBarShift-706 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Add Vehicle
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-609 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Add Vehicle
+            </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-add"
+                  >
+                    Add Vehicle
+                  </a>
+                </li>
+              </ol>
+            </nav>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-714"
+            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-604"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-709"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-605 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-710 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-606"
+            class="makeStyles-drawerHeader-711"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-615"
+              class="makeStyles-logo-720"
               src="fisker-badge.svg"
             />
           </div>
@@ -5215,6 +6536,20 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                 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"
                 >
@@ -5229,28 +6564,6 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -5260,34 +6573,26 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -5304,34 +6609,26 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -5339,36 +6636,103 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-607 makeStyles-contentShift-608"
+        class="makeStyles-content-712 makeStyles-contentShift-713"
       >
         <div
-          class="makeStyles-drawerHeader-606"
+          class="makeStyles-drawerHeader-711"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -5377,11 +6741,11 @@ exports[`App Route /vehicle-add authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-588"
+              class="makeStyles-paper-693"
             >
               <form
                 action="{onSubmit}"
-                class="makeStyles-form-590"
+                class="makeStyles-form-695"
                 novalidate=""
               >
                 <div
@@ -5417,10 +6781,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-625 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-627"
+                        class="PrivateNotchedOutline-legendLabelled-739"
                       >
                         <span>
                           VIN
@@ -5463,10 +6827,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-625 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-627 PrivateNotchedOutline-legendNotched-628"
+                        class="PrivateNotchedOutline-legendLabelled-739 PrivateNotchedOutline-legendNotched-740"
                       >
                         <span>
                           Model
@@ -5510,10 +6874,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-625 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-627 PrivateNotchedOutline-legendNotched-628"
+                        class="PrivateNotchedOutline-legendLabelled-739 PrivateNotchedOutline-legendNotched-740"
                       >
                         <span>
                           Year
@@ -5557,10 +6921,10 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                     />
                     <fieldset
                       aria-hidden="true"
-                      class="PrivateNotchedOutline-root-625 MuiOutlinedInput-notchedOutline"
+                      class="PrivateNotchedOutline-root-737 MuiOutlinedInput-notchedOutline"
                     >
                       <legend
-                        class="PrivateNotchedOutline-legendLabelled-627 PrivateNotchedOutline-legendNotched-628"
+                        class="PrivateNotchedOutline-legendLabelled-739 PrivateNotchedOutline-legendNotched-740"
                       >
                         <span>
                           Trim
@@ -5571,7 +6935,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
                   </div>
                 </div>
                 <button
-                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-591 MuiButton-containedPrimary MuiButton-fullWidth"
+                  class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-696 MuiButton-containedPrimary MuiButton-fullWidth"
                   tabindex="0"
                   type="submit"
                 >
@@ -5600,35 +6964,37 @@ exports[`App Route /vehicle-add unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-92"
+      class="makeStyles-root-106"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-93 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-107 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-100"
+        class="makeStyles-content-114"
       >
         <div
-          class="makeStyles-drawerHeader-99"
+          class="makeStyles-drawerHeader-113"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-81"
+            class="makeStyles-paper-95"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-84 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-98 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -5655,47 +7021,92 @@ exports[`App Route /vehicle-status authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-720"
+      class="makeStyles-root-854"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-721 makeStyles-appBarShift-722 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-855 makeStyles-appBarShift-856 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Vehicle FISKER123 Details
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-730 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
+              Vehicle FISKER123 Details
+            </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/FISKER123"
+                  >
+                    Vehicle FISKER123 Details
+                  </a>
+                </li>
+              </ol>
+            </nav>
+          </div>
+          <div
+            class="makeStyles-rightToolbar-864"
+            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-725"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-859"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-726 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-860 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-727"
+            class="makeStyles-drawerHeader-861"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-736"
+              class="makeStyles-logo-870"
               src="fisker-badge.svg"
             />
           </div>
@@ -5713,6 +7124,20 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 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"
                 >
@@ -5727,28 +7152,6 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -5758,34 +7161,26 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -5802,34 +7197,26 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -5837,36 +7224,103 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-728 makeStyles-contentShift-729"
+        class="makeStyles-content-862 makeStyles-contentShift-863"
       >
         <div
-          class="makeStyles-drawerHeader-727"
+          class="makeStyles-drawerHeader-861"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -5878,7 +7332,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
               data-testid="mocked-updatesprovider"
             >
               <div
-                class="makeStyles-paper-709"
+                class="makeStyles-paper-843"
                 style="height: 700px; width: 100%;"
               >
                 <table
@@ -5903,7 +7357,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                         >
                           ID
                           <span
-                            class="makeStyles-hiddenSortSpan-732"
+                            class="makeStyles-hiddenSortSpan-866"
                           >
                             sorted descending
                           </span>
@@ -6158,35 +7612,37 @@ exports[`App Route /vehicle-status unauthenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-248"
+      class="makeStyles-root-290"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-249 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-291 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-256"
+        class="makeStyles-content-298"
       >
         <div
-          class="makeStyles-drawerHeader-255"
+          class="makeStyles-drawerHeader-297"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-237"
+            class="makeStyles-paper-279"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-240 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-282 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
@@ -6213,678 +7669,56 @@ exports[`App Route /vehicles authenticated 1`] = `
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-681"
+      class="makeStyles-root-800"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-682 makeStyles-appBarShift-683 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-801 makeStyles-appBarShift-802 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Vehicles
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-691 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
             >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
-        </div>
-      </header>
-      <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-686"
-      >
-        <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-687 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
-        >
-          <div
-            class="makeStyles-drawerHeader-688"
-          >
-            <img
-              alt="Fisker Admin Portal"
-              class="makeStyles-logo-697"
-              src="fisker-badge.svg"
-            />
+              Vehicles
+            </h6>
           </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="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="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </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="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Deploy Packages
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Create Package
-                  </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="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    View Vehicles
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Add Vehicle
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-          </ul>
-        </div>
-      </div>
-      <main
-        class="makeStyles-content-689 makeStyles-contentShift-690"
-      >
-        <div
-          class="makeStyles-drawerHeader-688"
-        />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
           <div
-            data-testid="mocked-vehicleprovider"
+            class="makeStyles-rightToolbar-810"
+            color="inherit"
           >
-            <div
-              class="makeStyles-paper-670"
-              style="height: 700px; width: 100%;"
-            >
-              <div
-                class="MuiToolbar-root MuiToolbar-regular makeStyles-tableToolbar-696 MuiToolbar-gutters"
-              >
-                <div
-                  class="MuiFormControl-root makeStyles-margin-694 makeStyles-textField-695"
-                >
-                  <label
-                    class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
-                    data-shrink="false"
-                    for="search"
-                  >
-                    Search
-                  </label>
-                  <div
-                    class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl MuiInputBase-adornedEnd"
-                  >
-                    <input
-                      aria-invalid="false"
-                      class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd"
-                      id="search"
-                      type="text"
-                      value=""
-                    />
-                    <div
-                      class="MuiInputAdornment-root MuiInputAdornment-positionEnd"
-                    >
-                      <button
-                        aria-label="search"
-                        class="MuiButtonBase-root MuiIconButton-root"
-                        tabindex="0"
-                        type="button"
-                      >
-                        <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>
-                        <span
-                          class="MuiTouchRipple-root"
-                        />
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <table
-                class="MuiTable-root"
-              >
-                <thead
-                  class="MuiTableHead-root"
-                >
-                  <tr
-                    class="MuiTableRow-root MuiTableRow-head"
-                  >
-                    <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-693"
-                        >
-                          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"
-                />
-                <tfoot
-                  class="MuiTableFooter-root"
-                >
-                  <tr
-                    class="MuiTableRow-root MuiTableRow-footer"
-                  >
-                    <td
-                      class="MuiTableCell-root MuiTableCell-footer MuiTablePagination-root"
-                      colspan="6"
-                    >
-                      <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>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /vehicles unauthenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-209"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-210 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
-        </div>
-      </header>
-      <main
-        class="makeStyles-content-217"
-      >
-        <div
-          class="makeStyles-drawerHeader-216"
-        />
-        <main
-          class="MuiContainer-root MuiContainer-maxWidthLg"
-        >
-          <div
-            class="makeStyles-paper-198"
-            style="justify-content: center;"
-          >
-            <a
-              aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-201 MuiButton-containedPrimary"
-              href="https://cognito.com/authorize?redirect=https://example.com/callback"
+            <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"
               >
-                Sign In
+                John
               </span>
               <span
                 class="MuiTouchRipple-root"
               />
-            </a>
+            </button>
           </div>
-        </main>
-      </main>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`App Route /vehicles-command authenticated 1`] = `
-<div>
-  <div
-    data-testid="mocked-userprovider"
-  >
-    <div
-      class="makeStyles-root-759"
-    >
-      <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-760 makeStyles-appBarShift-761 mui-00000fixed MuiPaper-elevation4"
-      >
-        <div
-          class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
-        >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          >
-            Send Command
-          </h6>
-          <button
-            class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-rightToolbar-769 MuiButton-colorInherit"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label"
-            >
-              Sign Out
-            </span>
-            <span
-              class="MuiTouchRipple-root"
-            />
-          </button>
         </div>
       </header>
       <div
-        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-764"
+        class="MuiDrawer-root MuiDrawer-docked makeStyles-drawer-805"
       >
         <div
-          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-765 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
+          class="MuiPaper-root MuiDrawer-paper makeStyles-drawerPaper-806 MuiDrawer-paperAnchorLeft MuiDrawer-paperAnchorDockedLeft MuiPaper-elevation0"
         >
           <div
-            class="makeStyles-drawerHeader-766"
+            class="makeStyles-drawerHeader-807"
           >
             <img
               alt="Fisker Admin Portal"
-              class="makeStyles-logo-775"
+              class="makeStyles-logo-816"
               src="fisker-badge.svg"
             />
           </div>
@@ -6902,6 +7736,20 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                 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"
                 >
@@ -6916,28 +7764,6 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/dashboard"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
-                >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-                  >
-                    Dashboard
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
             <li>
               <a
                 aria-disabled="false"
@@ -6947,34 +7773,26 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    Deploy Packages
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/package-create"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Create Package
+                    Deployments
                   </span>
                 </div>
                 <span
@@ -6991,34 +7809,26 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                 tabindex="0"
               >
                 <div
-                  class="MuiListItemText-root"
+                  class="MuiListItemIcon-root"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root"
+                    focusable="false"
+                    viewBox="0 0 24 24"
                   >
-                    View Vehicles
-                  </span>
+                    <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>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicle-add"
-                role="button"
-                tabindex="0"
-              >
                 <div
                   class="MuiListItemText-root"
                 >
                   <span
                     class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
                   >
-                    Add Vehicle
+                    Vehicles
                   </span>
                 </div>
                 <span
@@ -7026,36 +7836,103 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                 />
               </a>
             </li>
-            <li>
-              <a
-                aria-disabled="false"
-                class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-                href="/vehicles-command"
-                role="button"
-                tabindex="0"
-              >
-                <div
-                  class="MuiListItemText-root"
+            <span>
+              <li>
+                <a
+                  aria-disabled="false"
+                  class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+                  href="/datascope"
+                  role="button"
+                  tabindex="0"
                 >
-                  <span
-                    class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+                  <div
+                    class="MuiListItemIcon-root"
                   >
-                    Send Command
-                  </span>
-                </div>
-                <span
-                  class="MuiTouchRipple-root"
-                />
-              </a>
-            </li>
+                    <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+                  href="https://grafana.fiskerdps.com"
+                  rel="noopener"
+                  role="button"
+                  style="text-decoration: inherit;"
+                  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-767 makeStyles-contentShift-768"
+        class="makeStyles-content-808 makeStyles-contentShift-809"
       >
         <div
-          class="makeStyles-drawerHeader-766"
+          class="makeStyles-drawerHeader-807"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
@@ -7064,17 +7941,32 @@ exports[`App Route /vehicles-command authenticated 1`] = `
             data-testid="mocked-vehicleprovider"
           >
             <div
-              class="makeStyles-paper-748"
+              class="makeStyles-paper-789"
               style="height: 700px; width: 100%;"
             >
               <div
-                class="MuiGrid-root makeStyles-root-759 MuiGrid-container MuiGrid-spacing-xs-2"
+                class="MuiGrid-root makeStyles-root-800 MuiGrid-container MuiGrid-spacing-xs-2"
               >
                 <div
                   class="MuiGrid-root MuiGrid-item MuiGrid-grid-md-6"
                 >
+                  <a
+                    class="makeStyles-labelInline-795"
+                    href="/vehicle-add"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge"
+                      focusable="false"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"
+                      />
+                    </svg>
+                  </a>
                   <div
-                    class="MuiFormControl-root makeStyles-margin-772 makeStyles-textField-773"
+                    class="MuiFormControl-root makeStyles-margin-813 makeStyles-textField-814"
                   >
                     <label
                       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -7124,7 +8016,7 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                     </div>
                   </div>
                   <div
-                    class="makeStyles-labelInline-754"
+                    class="makeStyles-labelInline-795"
                   >
                     0 Selected
                   </div>
@@ -7134,10 +8026,10 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                   style="text-align: right;"
                 >
                   <div
-                    class="makeStyles-form-750"
+                    class="makeStyles-form-791"
                   >
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-753"
+                      class="MuiFormControl-root makeStyles-formControlInline-794"
                     >
                       <label
                         class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
@@ -7199,11 +8091,11 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-785 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-833 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-786"
+                            class="PrivateNotchedOutline-legend-834"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -7214,7 +8106,7 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                       </div>
                     </div>
                     <div
-                      class="MuiFormControl-root makeStyles-formControlInline-753"
+                      class="MuiFormControl-root makeStyles-formControlInline-794"
                     >
                       <label
                         class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
@@ -7271,11 +8163,11 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                         </svg>
                         <fieldset
                           aria-hidden="true"
-                          class="PrivateNotchedOutline-root-785 MuiOutlinedInput-notchedOutline"
+                          class="PrivateNotchedOutline-root-833 MuiOutlinedInput-notchedOutline"
                           style="padding-left: 8px;"
                         >
                           <legend
-                            class="PrivateNotchedOutline-legend-786"
+                            class="PrivateNotchedOutline-legend-834"
                             style="width: 0.01px;"
                           >
                             <span>
@@ -7311,7 +8203,7 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                 </div>
               </div>
               <div
-                class="makeStyles-paper-748"
+                class="makeStyles-paper-789"
                 style="height: 700px; width: 100%;"
               >
                 <table
@@ -7329,14 +8221,14 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                       >
                         <span
                           aria-disabled="false"
-                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-789 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
+                          class="MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-837 MuiCheckbox-root MuiCheckbox-colorSecondary MuiIconButton-colorSecondary"
                         >
                           <span
                             class="MuiIconButton-label"
                           >
                             <input
                               aria-label="select all desserts"
-                              class="PrivateSwitchBase-input-792"
+                              class="PrivateSwitchBase-input-840"
                               data-indeterminate="false"
                               type="checkbox"
                               value=""
@@ -7370,7 +8262,7 @@ exports[`App Route /vehicles-command authenticated 1`] = `
                         >
                           VIN
                           <span
-                            class="makeStyles-hiddenSortSpan-771"
+                            class="makeStyles-hiddenSortSpan-812"
                           >
                             sorted ascending
                           </span>
@@ -7642,41 +8534,43 @@ exports[`App Route /vehicles-command authenticated 1`] = `
 </div>
 `;
 
-exports[`App Route /vehicles-command unauthenticated 1`] = `
+exports[`App Route /vehicles unauthenticated 1`] = `
 <div>
   <div
     data-testid="mocked-userprovider"
   >
     <div
-      class="makeStyles-root-287"
+      class="makeStyles-root-244"
     >
       <header
-        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-288 mui-00000fixed MuiPaper-elevation4"
+        class="MuiPaper-root MuiAppBar-root MuiAppBar-positionFixed MuiAppBar-colorPrimary makeStyles-appBar-245 mui-00000fixed MuiPaper-elevation4"
       >
         <div
           class="MuiToolbar-root MuiToolbar-regular MuiToolbar-gutters"
         >
-          <h6
-            class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
-          />
+          <div>
+            <h6
+              class="MuiTypography-root MuiTypography-h6 MuiTypography-noWrap"
+            />
+          </div>
         </div>
       </header>
       <main
-        class="makeStyles-content-295"
+        class="makeStyles-content-252"
       >
         <div
-          class="makeStyles-drawerHeader-294"
+          class="makeStyles-drawerHeader-251"
         />
         <main
           class="MuiContainer-root MuiContainer-maxWidthLg"
         >
           <div
-            class="makeStyles-paper-276"
+            class="makeStyles-paper-233"
             style="justify-content: center;"
           >
             <a
               aria-disabled="false"
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-279 MuiButton-containedPrimary"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-236 MuiButton-containedPrimary"
               href="https://cognito.com/authorize?redirect=https://example.com/callback"
               tabindex="0"
             >
diff --git a/src/components/Cars/Add/index.jsx b/src/components/Cars/Add/index.jsx
index ddf8dbd..3e3ef55 100644
--- a/src/components/Cars/Add/index.jsx
+++ b/src/components/Cars/Add/index.jsx
@@ -12,7 +12,7 @@ import { logger } from "../../../services/monitoring";
 
 const MainForm = () => {
   const { addVehicle, busy } = useVehicleContext();
-  const { setMessage, setTitle } = useStatusContext();
+  const { setMessage, setTitle, setSitePath } = useStatusContext();
   const {
     token: {
       idToken: { jwtToken: token },
@@ -26,6 +26,15 @@ const MainForm = () => {
 
   useEffect(() => {
     setTitle("Add Vehicle");
+    setSitePath([
+      {
+        label: "Vehicles",
+        link: "/vehicles",
+      },
+      {
+        label: "Add Vehicle",
+      },
+    ]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   const onSubmit = async (event) => {
diff --git a/src/components/Cars/List/index.jsx b/src/components/Cars/List/index.jsx
deleted file mode 100644
index 83a6096..0000000
--- a/src/components/Cars/List/index.jsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { Link } from "react-router-dom";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableFooter,
-  TablePagination,
-  TableRow,
-  Toolbar,
-} from "@material-ui/core";
-
-import {
-  useVehicleContext,
-  VehicleProvider,
-} from "../../Contexts/VehicleContext";
-import { useUserContext } from "../../Contexts/UserContext";
-import { useStatusContext } from "../../Contexts/StatusContext";
-import useStyles from "../../useStyles";
-import { LocalDateTimeString } from "../../../utils/dates";
-import TableHeaderSortable from "../../Table/HeaderSortable";
-import SearchField from "../../Controls/SearchField";
-import { logger } from "../../../services/monitoring";
-import ConnectedIcon from "../../Controls/ConnectedIcon";
-import ECUList from "../../Controls/ECUList";
-
-const tableColumns = [
-  {
-    id: "vin",
-    label: "VIN",
-  },
-  {
-    id: "model",
-    label: "Model",
-  },
-  {
-    id: "year",
-    label: "Year",
-  },
-  {
-    id: "trim",
-    label: "Trim",
-  },
-  {
-    id: "created_at",
-    label: "Created",
-  },
-  {
-    id: "updated_at",
-    label: "Updated",
-  },
-];
-
-const MainForm = () => {
-  const classes = useStyles();
-  const [pageSize, setPageSize] = useState(10);
-  const [pageIndex, setPageIndex] = useState(0);
-  const [orderBy, setOrderBy] = useState("vin");
-  const [order, setOrder] = useState("asc");
-  const [search, setSearch] = useState("");
-  const { getVehicles, vehicles, totalVehicles } = useVehicleContext();
-  const { setMessage, setTitle } = useStatusContext();
-  const {
-    token: {
-      idToken: { jwtToken: token },
-    },
-  } = useUserContext();
-
-  const sortHandler = (event, property) => {
-    if (property === orderBy) {
-      if (order === "asc") {
-        setOrder("desc");
-      } else {
-        setOrder("asc");
-      }
-    } else {
-      setOrderBy(property);
-      setOrder("asc");
-    }
-  };
-
-  useEffect(() => {
-    setTitle("Vehicles");
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useEffect(() => {
-    (async () => {
-      try {
-        await getVehicles(
-          {
-            limit: pageSize,
-            offset: pageSize * pageIndex,
-            order: `${orderBy} ${order}`,
-            search,
-          },
-          token
-        );
-      } catch (e) {
-        setMessage(e.message);
-        logger.warn(e.stack);
-      }
-    })();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [pageIndex, pageSize, token, orderBy, order, search]);
-
-  const handleChangePageIndex = (event, newIndex) => {
-    setPageIndex(newIndex);
-  };
-
-  const handleChangePageSize = (event) => {
-    setPageSize(parseInt(event.target.value, 10));
-    setPageIndex(0);
-  };
-
-  const handleSearch = (search) => {
-    setSearch(search);
-  };
-
-  return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <Toolbar className={classes.tableToolbar}>
-        <SearchField classes={classes} onSearch={handleSearch} />
-      </Toolbar>
-      <Table>
-        <TableHeaderSortable
-          classes={classes}
-          orderBy={orderBy}
-          order={order}
-          columnData={tableColumns}
-          onSortRequest={sortHandler}
-        />
-        <TableBody>
-          {vehicles.map((row) => (
-            <TableRow key={row.vin}>
-              <TableCell align="center">
-                <ConnectedIcon
-                  connected={row.connected}
-                  style={{ marginRight: 5 }}
-                />
-                <Link to={`/vehicle-status/${row.vin}`}>{row.vin}</Link>
-                {row.ecu_list && (
-                  <>
-                    <br />
-                    <ECUList list={row.ecu_list} search={search} />
-                  </>
-                )}
-              </TableCell>
-              <TableCell align="center">{row.model}</TableCell>
-              <TableCell align="center">{row.year}</TableCell>
-              <TableCell align="center">{row.trim || ""}</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={6}
-              count={totalVehicles}
-              rowsPerPage={pageSize}
-              page={pageIndex}
-              SelectProps={{
-                inputProps: { "aria-label": "rows per page" },
-                native: true,
-              }}
-              onPageChange={handleChangePageIndex}
-              onRowsPerPageChange={handleChangePageSize}
-            />
-          </TableRow>
-        </TableFooter>
-      </Table>
-    </div>
-  );
-};
-
-const VehiclesList = () => (
-  <VehicleProvider>
-    <MainForm />
-  </VehicleProvider>
-);
-
-export default VehiclesList;
diff --git a/src/components/Cars/SendCommandBulk/index.jsx b/src/components/Cars/SendCommandBulk/index.jsx
index 6206b9f..d3bbf3d 100644
--- a/src/components/Cars/SendCommandBulk/index.jsx
+++ b/src/components/Cars/SendCommandBulk/index.jsx
@@ -1,5 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { Grid } from "@material-ui/core";
+import AddCircleIcon from "@material-ui/icons/AddCircle";
+import { Link } from "react-router-dom";
 
 import { VehicleProvider } from "../../Contexts/VehicleContext";
 import { useUserContext } from "../../Contexts/UserContext";
@@ -14,7 +16,7 @@ const MainForm = () => {
   const classes = useStyles();
   const [selected, setSelected] = useState([]);
   const [search, setSearch] = useState("");
-  const { setTitle } = useStatusContext();
+  const { setTitle, setSitePath } = useStatusContext();
   const {
     token: {
       idToken: { jwtToken: token },
@@ -46,7 +48,8 @@ const MainForm = () => {
   };
 
   useEffect(() => {
-    setTitle("Send Command");
+    setTitle("Vehicles");
+    setSitePath([]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -54,6 +57,9 @@ const MainForm = () => {
     <div className={classes.paper} style={{ height: 700, width: "100%" }}>
       <Grid container className={classes.root} spacing={2}>
         <Grid item md={6}>
+          <Link to="/vehicle-add" className={classes.labelInline}>
+            <AddCircleIcon fontSize="large" />
+          </Link>
           <SearchField classes={classes} onSearch={handleSearch} />
           <div
             className={classes.labelInline}
diff --git a/src/components/Cars/Status/index.jsx b/src/components/Cars/Status/index.jsx
index cd11662..92c8a19 100644
--- a/src/components/Cars/Status/index.jsx
+++ b/src/components/Cars/Status/index.jsx
@@ -52,7 +52,7 @@ const MainForm = () => {
   const [orderBy, setOrderBy] = useState("id");
   const [order, setOrder] = useState("desc");
   const { getCarUpdates, carUpdates, totalCarUpdates } = useUpdatesContext();
-  const { setMessage, setTitle } = useStatusContext();
+  const { setMessage, setTitle, setSitePath } = useStatusContext();
   const {
     token: {
       idToken: { jwtToken: token },
@@ -60,7 +60,17 @@ const MainForm = () => {
   } = useUserContext();
 
   useEffect(() => {
-    setTitle(`Vehicle ${vin} Details`);
+    const title = `Vehicle ${vin} Details`;
+    setTitle(title);
+    setSitePath([
+      {
+        label: "Vehicles",
+        link: "/vehicles",
+      },
+      {
+        label: title,
+      },
+    ]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [vin]);
 
diff --git a/src/components/Contexts/CarUpdatesContext.jsx b/src/components/Contexts/CarUpdatesContext.jsx
index 33f1f04..9ee8854 100644
--- a/src/components/Contexts/CarUpdatesContext.jsx
+++ b/src/components/Contexts/CarUpdatesContext.jsx
@@ -76,15 +76,17 @@ export const CarUpdatesProvider = ({ children }) => {
   };
 
   const applyProgressStatus = (item, status) => {
-    if (status.msg === "DONE") {
+    if (status.msg === "package_download_complete") {
       delete item.progress;
       item.status = "downloaded";
-    } else if (status.msg === "downloading" && status.total > 0) {
-      let progress = Math.floor((100 * status.bytes) / status.total);
+    } else if (status.msg === "downloading" && status.package_total > 0) {
+      let progress = Math.floor(
+        (100 * status.package_current) / status.package_total
+      );
       if (progress > 99) progress = 0;
       item.progress = progress;
       item.status = `downloading ${progress}%`;
-    } else if (status.error > 0) {
+    } else if (status.error > 0 || status.msg === "download_error") {
       item.status = "download error";
     } else {
       item.status = "downloading";
diff --git a/src/components/Contexts/ManifestsContext.jsx b/src/components/Contexts/ManifestsContext.jsx
index e54600b..3018387 100644
--- a/src/components/Contexts/ManifestsContext.jsx
+++ b/src/components/Contexts/ManifestsContext.jsx
@@ -117,6 +117,16 @@ export const ManifestsProvider = ({ children }) => {
     }
   };
 
+  const checkExistingManifest = async (data, token) => {
+    const check = {
+      name: data.name,
+      version: data.version,
+    };
+    const { data: result } = await api.getManifests(check, token);
+    if (result.length > 0)
+      throw new Error(`Update ${data.name} ${data.version} already exists`);
+  };
+
   const createManifest = async (data, token) => {
     let result;
 
@@ -125,7 +135,8 @@ export const ManifestsProvider = ({ children }) => {
       validateManifest(data, token);
       setUploadedFiles(data.files);
 
-      result = await api.createManifest(data, token);
+      await checkExistingManifest(data, token);
+      if (result !== null) result = await api.createManifest(data, token);
       if (result.error)
         throw new Error(`Create manifest error. ${result.message}`);
 
diff --git a/src/components/Contexts/StatusContext.jsx b/src/components/Contexts/StatusContext.jsx
index 07064c0..bf3bfcb 100644
--- a/src/components/Contexts/StatusContext.jsx
+++ b/src/components/Contexts/StatusContext.jsx
@@ -5,14 +5,17 @@ const StatusContext = React.createContext();
 export const StatusProvider = ({ children }) => {
   const [message, setMessage] = useState(null);
   const [title, setTitle] = useState("");
+  const [sitePath, setSitePath] = useState([]);
 
   return (
     <StatusContext.Provider
       value={{
         message,
-        setMessage,
         title,
+        sitePath,
+        setMessage,
         setTitle,
+        setSitePath,
       }}
     >
       {children}
diff --git a/src/components/Controls/ECUDropDown/index.jsx b/src/components/Controls/ECUDropDown/index.jsx
new file mode 100644
index 0000000..0ab44ec
--- /dev/null
+++ b/src/components/Controls/ECUDropDown/index.jsx
@@ -0,0 +1,121 @@
+import React from "react";
+import { Select } from "@material-ui/core";
+
+const ECUDropDown = (props) => {
+  const changeHandler = (e) => {
+    if (!props.changeHandler) return;
+    props.changeHandler(e);
+  };
+
+  return (
+    <Select
+      id={props.id}
+      native
+      variant="outlined"
+      value={props.value}
+      onChange={changeHandler}
+    >
+      {ECUs.map((item, index) => (
+        <option key={index} value={item[0]}>
+          {item[1]}
+        </option>
+      ))}
+    </Select>
+  );
+};
+
+export default ECUDropDown;
+
+const ECUs = [
+  ["AGS", "Active Grille Shutter"],
+  ["ADB", "Adaptive Driving Beam"],
+  ["ADAS", "Advanced Driver Assist System"],
+  ["ACU", "Airbag Control Unit"],
+  ["ACP", "Airconditioning Control Panel"],
+  ["AMP", "Amplifier"],
+  ["AP_FL", "Anti-Pinch Front Left"],
+  ["AP_FR", "Anti-Pinch Front Right"],
+  ["AP_RL", "Anti-Pinch Rear Left"],
+  ["AP_RR", "Anti-Pinch Rear Right"],
+  ["AL", "Atmosphere Lamp"],
+  ["BCS", "Battery HV Current Sensor"],
+  ["BMS", "Battery Management System"],
+  ["BMU", "Battery Management Unit"],
+  ["BCM", "Body Control Module"],
+  ["CDS", "Center Display Screen"],
+  ["CCU", "Charging Control Unit"],
+  ["CIM", "Column Integrated Module"],
+  ["CVM", "Coolant Valve Module"],
+  ["CFM", "Cooling Fan Module"],
+  ["CMRR_FL", "Corner Mid Range Radar Front Left"],
+  ["CMRR_FR", "Corner Mid Range Radar Front Right"],
+  ["CMRR_RL", "Corner Mid Range Radar Rear Left"],
+  ["CMRR_RR", "Corner Mid Range Radar Rear Right"],
+  ["DVRC", "Digital Video Recorder Camera"],
+  ["DC-CHM", "Direct Current Charge Machine"],
+  ["DMC", "Driver Monitor Camera"],
+  ["DSMC", "Driver Seat Memory Controller"],
+  ["DWSG", "Driver Window Switch Group"],
+  ["EPS", "Electric Power Steering"],
+  ["EAS", "Electrical Air Compressor System"],
+  ["ECC", "Electrical Climate Controller"],
+  ["EWP_B", "Electrical Water Pump Battery"],
+  ["EWP_FD", "Electrical Water Pump Front Drive"],
+  ["EWP_H", "Electrical Water Pump Heat"],
+  ["EWP_RD", "Electrical Water Pump Rear Drive"],
+  ["EWM", "Electrical Wiper Motor"],
+  ["EXV_B", "Electronic Expansion Value Battery"],
+  ["EXV_HP", "Electronic Expansion Valve HPC"],
+  ["ESP", "Electronic Stability Program"],
+  ["FDHA_FL", "Flush Door Handle Actuator Front Left"],
+  ["FDHA_FR", "Flush Door Handle Actuator Front Right"],
+  ["FDHA_RL", "Flush Door Handle Actuator Rear Left"],
+  ["FDHA_RR", "Flush Door Handle Actuator Rear Right"],
+  ["Lumber", "Four-Way Lumber"],
+  ["FBM_L", "Front Beam Module Left"],
+  ["FBM_R", "Front Beam Module Right"],
+  ["FVC", "Front Video Camera"],
+  ["GW", "Gateway"],
+  ["HUD", "Head-Up Display"],
+  ["IDS", "Instrument Display Screen"],
+  ["ICC", "Integrated Cockpit Controller"],
+  ["IBS", "Intelligent Battery Sensor"],
+  ["iBooster", "Intelligent Booster"],
+  ["KS", "Kick Sensor"],
+  ["LSC", "Left Side Camera"],
+  ["MRR", "Mid Range Radar"],
+  ["MCU_F", "Motor Control Unit Front"],
+  ["MCU_R", "Motor Control Unit Rear"],
+  ["MDV", "Motorized Deco-Vent"],
+  ["MFS", "Multifunction Steering"],
+  ["MIS", "Multimedia Interactive Switch"],
+  ["MPC", "Multipurpose Camera"],
+  ["OMC", "Occupant Monitor Camera"],
+  ["OHC", "Overhead Console"],
+  ["PAS", "Parking Assistant System"],
+  ["PCU", "Parking Control Unit"],
+  ["PMS", "Particulate Matter Sensor"],
+  ["PSM", "Passenger Seat Module"],
+  ["PEPS", "Passive Entry And Passive Start"],
+  ["PKC", "Phone Key Controller"],
+  ["PKC_ANT_L", "Phone Key Controller Antenna Left"],
+  ["PKC_ANT_R", "Phone Key Controller Antenna Right"],
+  ["PWC", "Phone Wireless Charging"],
+  ["PASC", "Power Adjust Steering Column"],
+  ["PDU", "Power Distribution Unit"],
+  ["PLGM", "Power Lift Gate Module"],
+  ["RLS", "Rain Light Sensor"],
+  ["RAC", "Rear Airconditioning Control"],
+  ["RVC", "Rear View Camera"],
+  ["RSC", "Right Side Camera"],
+  ["RCM", "Roof Control Module"],
+  ["RSM", "Roof Shade Module"],
+  ["TBOX", "Telematics Box"],
+  ["TPMS", "Tire Pressure Monitoring System"],
+  ["TDS", "Touch Display Screen"],
+  ["USB Box", "USB Box"],
+  ["VCU", "Vehicle Control Unit"],
+  ["VSP", "Vehicle Sound For Pedestraion"],
+  ["WTC_B", "Water Thermal Controller Battery"],
+  ["WTC_H", "Water Thermal Controller Heat"],
+];
diff --git a/src/components/Controls/SiteBreadCrumbs/index.jsx b/src/components/Controls/SiteBreadCrumbs/index.jsx
new file mode 100644
index 0000000..dd15229
--- /dev/null
+++ b/src/components/Controls/SiteBreadCrumbs/index.jsx
@@ -0,0 +1,34 @@
+import React from "react";
+import { Link as RouterLink } from "react-router-dom";
+import Breadcrumbs from "@material-ui/core/Breadcrumbs";
+import { Link } from "@material-ui/core";
+
+const SiteBreadcrumbs = ({ path }) => {
+  if (!path || path.length === 0) return null;
+
+  return (
+    <Breadcrumbs
+      aria-label="breadcrumb"
+      color="inherit"
+      style={{ fontSize: "10px" }}
+    >
+      {path.map((item, index, items) => {
+        if (index < items.length) {
+          return (
+            <Link
+              key={index}
+              color="inherit"
+              to={item.link || "#"}
+              component={RouterLink}
+            >
+              {item.label}
+            </Link>
+          );
+        }
+        return null;
+      })}
+    </Breadcrumbs>
+  );
+};
+
+export default SiteBreadcrumbs;
diff --git a/src/components/Controls/SubListItem/index.jsx b/src/components/Controls/SubListItem/index.jsx
index 5877189..e6a805b 100644
--- a/src/components/Controls/SubListItem/index.jsx
+++ b/src/components/Controls/SubListItem/index.jsx
@@ -27,6 +27,15 @@ const DataDisplay = ({ data, option, onDelete }) => {
         <DeleteIcon />
       </Link>
     );
+  } else if (option.control) {
+    return (
+      <option.control
+        id={option.field}
+        name={option.field}
+        value={text}
+        changeHandler={onChange}
+      ></option.control>
+    );
   }
 
   return (
diff --git a/src/components/Dashboard/index.jsx b/src/components/Dashboard/index.jsx
deleted file mode 100644
index 816dcdf..0000000
--- a/src/components/Dashboard/index.jsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useEffect } from "react";
-import { Button, Grid, Link } from "@material-ui/core";
-import CreateIcon from "@material-ui/icons/Create";
-
-import { useStatusContext } from "../Contexts/StatusContext";
-import useStyles from "../useStyles";
-import ResponsiveIFrame from "../Controls/ResponsiveIFrame";
-
-const Dashboard = () => {
-  const classes = useStyles();
-  const { setTitle } = useStatusContext();
-
-  useEffect(() => {
-    setTitle("Dashboard");
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <div className={classes.paper}>
-      <Grid container className={classes.root} spacing={2}>
-        <Grid item md={6}>
-          <ResponsiveIFrame
-            classes={classes}
-            src="https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&refresh=30s&panelId=2"
-            title="Battery Time Series"
-          />
-        </Grid>
-        <Grid item md={6}>
-          <ResponsiveIFrame
-            classes={classes}
-            src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12"
-            title="Signals Time Series"
-          />
-        </Grid>
-      </Grid>
-      <Button
-        style={{ marginTop: 10 }}
-        aria-label="create"
-        color="primary"
-        component={Link}
-        href="https://grafana.fiskerdps.com"
-        rel="noopener"
-        target="_blank"
-      >
-        <CreateIcon fontSize="large" />
-        Create Charts
-      </Button>
-    </div>
-  );
-};
-
-export default Dashboard;
diff --git a/src/components/Datascope/Battery/index.jsx b/src/components/Datascope/Battery/index.jsx
new file mode 100644
index 0000000..f752e90
--- /dev/null
+++ b/src/components/Datascope/Battery/index.jsx
@@ -0,0 +1,159 @@
+import React, { useEffect, useState } from "react";
+import {
+  FormControl,
+  Grid,
+  InputLabel,
+  MenuItem,
+  Paper,
+  Select,
+  TextField,
+} from "@material-ui/core";
+
+import { useStatusContext } from "../../Contexts/StatusContext";
+import useStyles from "../../useStyles";
+import ResponsiveIFrame from "../../Controls/ResponsiveIFrame";
+
+const Battery = () => {
+  const classes = useStyles();
+  const { setTitle, setSitePath } = useStatusContext();
+
+  useEffect(() => {
+    setTitle("Battery");
+    setSitePath([
+      {
+        label: "Datascope",
+        link: "/datascope",
+      },
+      {
+        label: "Battery",
+      },
+    ]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const [vin, setVIN] = useState("1F15K3R45N1234567");
+  const [cellNum, setCellNum] = useState(1);
+
+  const handleVINForm = (e) => {
+    if (e.target.value.length === 17) {
+      setVIN(e.target.value);
+    }
+  };
+
+  return (
+    <div className={classes.paper}>
+      <Grid container spacing={2}>
+        <Grid container item md={4} space={2}>
+          <Grid item md={12}>
+            <Paper className={classes.grafanaContainer}>
+              <form className={classes.formControl}>
+                <TextField
+                  id="vin"
+                  label="VIN"
+                  defaultValue="1F15K3R45N1234567"
+                  variant="outlined"
+                  onChange={handleVINForm}
+                  style={{ width: "100%" }}
+                />
+              </form>
+              <FormControl variant="outlined" className={classes.formControl}>
+                <InputLabel id="demo-simple-select-outlined-label">
+                  Cell
+                </InputLabel>
+                <Select
+                  labelId="demo-simple-select-outlined-label"
+                  id="demo-simple-select-outlined"
+                  value={cellNum}
+                  onChange={(e) => setCellNum(e.target.value)}
+                  label="Cell"
+                >
+                  {[...Array(112)].map((_, i) => (
+                    <MenuItem key={i + 1} value={i + 1}>
+                      {i + 1}
+                    </MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+            </Paper>
+          </Grid>
+
+          <Grid item md={12}>
+            <Paper className={classes.grafanaContainer}>
+              Cell Voltage {cellNum}
+              <ResponsiveIFrame
+                classes={classes}
+                src={`https://grafana.fiskerdps.com/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellVolt${cellNum}&panelId=2`}
+                title="Cell Voltage"
+              />
+            </Paper>
+          </Grid>
+
+          <Grid item md={12}>
+            <Paper className={classes.grafanaContainer}>
+              Cell Temperature {cellNum}
+              <ResponsiveIFrame
+                classes={classes}
+                src={`https://grafana.fiskerdps.com/d-solo/LVI-aQGnz/diagnostics?orgId=2&var-VIN=${vin}&var-Signal=BMS_CellT${cellNum}&panelId=2`}
+                title="Cell Temperature"
+              />
+            </Paper>
+          </Grid>
+
+          <Grid item md={12}>
+            <Paper className={classes.grafanaContainer}>
+              <ResponsiveIFrame
+                classes={classes}
+                src={`https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=4`}
+                title="Battery Temperature Time Series"
+              />
+            </Paper>
+          </Grid>
+        </Grid>
+
+        <Grid container item md={8} space={2}>
+          <Grid item md={12}>
+            <Paper className={classes.grafanaContainer}>
+              <ResponsiveIFrame
+                classes={classes}
+                src={`https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=6`}
+                title="Battery Capacity Time Series"
+              />
+            </Paper>
+          </Grid>
+
+          <Grid item md={12}>
+            <Paper className={classes.grafanaContainer}>
+              <ResponsiveIFrame
+                classes={classes}
+                src={`https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&panelId=12`}
+                title="Battery Percent Time Series"
+              />
+            </Paper>
+          </Grid>
+
+          <Grid item md={6}>
+            <Paper className={classes.grafanaContainer}>
+              <ResponsiveIFrame
+                classes={classes}
+                src={`https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=2`}
+                title="12V Battery Percentage Time Series"
+              />
+            </Paper>
+          </Grid>
+
+          <Grid item md={6}>
+            <Paper className={classes.grafanaContainer}>
+              <ResponsiveIFrame
+                classes={classes}
+                src={`https://grafana.fiskerdps.com/d-solo/jRKKo2gnz/battery?orgId=2&var-VIN=${vin}&refresh=1m&panelId=9`}
+                title="12V Battery Voltage Time Series"
+              />
+            </Paper>
+          </Grid>
+        </Grid>
+      </Grid>
+    </div>
+  );
+};
+
+export default Battery;
diff --git a/src/components/Datascope/Home/index.jsx b/src/components/Datascope/Home/index.jsx
new file mode 100644
index 0000000..22c409e
--- /dev/null
+++ b/src/components/Datascope/Home/index.jsx
@@ -0,0 +1,96 @@
+import React, { useEffect, useState } from "react";
+import { Button, Grid, Link, Paper } from "@material-ui/core";
+import CreateIcon from "@material-ui/icons/Create";
+
+import api from "../../../services/grafana";
+import { useStatusContext } from "../../Contexts/StatusContext";
+import useStyles from "../../useStyles";
+import ResponsiveIFrame from "../../Controls/ResponsiveIFrame";
+
+const Datascope = () => {
+  const classes = useStyles();
+  const { setTitle, setSitePath } = useStatusContext();
+  const REQUEST_INTERVAL = 10000;
+
+  useEffect(() => {
+    setTitle("Datascope");
+    setSitePath([]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const [carsCount, setCarsCount] = useState(0);
+  useEffect(() => {
+    api
+      .getCarsCount()
+      .then((result) => setCarsCount(result))
+      .catch((error) => console.log(error));
+  }, []);
+
+  const [signalsCount, setSignalsCount] = useState("0");
+  useEffect(() => {
+    storeSignals();
+
+    const id = setInterval(function () {
+      storeSignals();
+    }, REQUEST_INTERVAL);
+    return () => {
+      clearInterval(id);
+    };
+  }, []);
+
+  const storeSignals = () => {
+    api
+      .getSignalsCount()
+      .then((result) => {
+        let num = result.toLocaleString();
+        setSignalsCount(num);
+      })
+      .catch((error) => console.log(error));
+  };
+
+  return (
+    <div className={classes.paper}>
+      <Grid container className={classes.root} spacing={2}>
+        <Grid item md={6}>
+          <Paper className={classes.grafanaContainer} style={{ height: 150 }}>
+            <h1 className={classes.datascopeContainerValue}>{carsCount}</h1>
+            <h2 className={classes.datascopeContainerText}>Cars</h2>
+          </Paper>
+        </Grid>
+
+        <Grid item md={6}>
+          <Paper className={classes.grafanaContainer} style={{ height: 150 }}>
+            <h1 className={classes.datascopeContainerValue}>{signalsCount}</h1>
+            <h2 className={classes.datascopeContainerText}>
+              Signals Collected
+            </h2>
+          </Paper>
+        </Grid>
+
+        <Grid item md={12}>
+          <Paper className={classes.grafanaContainer}>
+            <ResponsiveIFrame
+              classes={classes}
+              src="https://grafana.fiskerdps.com/d-solo/1VTVJ_qGk/dashboard?orgId=2&refresh=30s&panelId=12"
+              title="Signals Time Series"
+            />
+          </Paper>
+        </Grid>
+      </Grid>
+      <Button
+        style={{ marginTop: 10 }}
+        aria-label="create"
+        color="primary"
+        component={Link}
+        href="https://grafana.fiskerdps.com"
+        rel="noopener"
+        target="_blank"
+      >
+        <CreateIcon fontSize="large" />
+        Go to Grafana
+      </Button>
+    </div>
+  );
+};
+
+export default Datascope;
diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx
index 5b4d7c3..ff649f4 100644
--- a/src/components/Home/index.jsx
+++ b/src/components/Home/index.jsx
@@ -4,38 +4,24 @@ import useStyles from "../useStyles";
 
 import { useUserContext } from "../Contexts/UserContext";
 import { useStatusContext } from "../Contexts/StatusContext";
-import { parsePayload } from "../../utils/jwt";
 import VehicleMap from "../VehicleMap";
-
-const DEFAULT_GREETING = "Welcome";
-
-const getGreeting = (token) => {
-  if (!token || !token.idToken || !token.idToken.jwtToken)
-    return DEFAULT_GREETING;
-
-  const payload = parsePayload(token.idToken.jwtToken);
-
-  if (!payload || !payload.given_name) return DEFAULT_GREETING;
-
-  return `Welcome ${payload.given_name}!`;
-};
+import { getName } from "../../utils/jwt";
 
 const Home = () => {
   const classes = useStyles();
   const { token } = useUserContext();
-  const greeting = getGreeting(token);
-  const { setTitle } = useStatusContext();
-
+  const { setTitle, setSitePath } = useStatusContext();
 
   useEffect(() => {
     setTitle("Home");
+    setSitePath([]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return (
     <div className={classes.paper}>
       <Typography className={classes.homePageTitle} component="h1" variant="h5">
-        {greeting}
+        Welcome {getName(token)}!
       </Typography>
       <VehicleMap />
     </div>
diff --git a/src/components/Layouts/MenuDrawer.jsx b/src/components/Layouts/MenuDrawer.jsx
index 31594e4..6a19ead 100644
--- a/src/components/Layouts/MenuDrawer.jsx
+++ b/src/components/Layouts/MenuDrawer.jsx
@@ -1,26 +1,26 @@
 import React from "react";
 import clsx from "clsx";
-import Drawer from "@material-ui/core/Drawer";
-import AppBar from "@material-ui/core/AppBar";
-import Toolbar from "@material-ui/core/Toolbar";
-import Typography from "@material-ui/core/Typography";
-import Divider from "@material-ui/core/Divider";
+import {
+  Container,
+  Drawer,
+  AppBar,
+  Toolbar,
+  Typography,
+  Divider,
+} from "@material-ui/core";
 
 import SideMenu from "./SideMenu";
 import useStyles from "../useStyles";
 import { useUserContext } from "../Contexts/UserContext";
 import { useStatusContext } from "../Contexts/StatusContext";
-import { Button, Container } from "@material-ui/core";
+import UserMenu from "./UserMenu";
+import SiteBreadcrumbs from "../Controls/SiteBreadCrumbs";
 import logo from "../../assets/fisker-badge.svg";
 
 export default function MenuDrawer({ children }) {
   const classes = useStyles();
-  const { title } = useStatusContext();
-  const { signOut, token } = useUserContext();
-
-  const onSignOut = () => {
-    document.location = signOut();
-  };
+  const { title, sitePath } = useStatusContext();
+  const { token } = useUserContext();
 
   return (
     <div className={classes.root}>
@@ -31,17 +31,14 @@ export default function MenuDrawer({ children }) {
         })}
       >
         <Toolbar>
-          <Typography variant="h6" noWrap>
-            {title}
-          </Typography>
+          <div>
+            <Typography variant="h6" noWrap>
+              {title}
+            </Typography>
+            <SiteBreadcrumbs path={sitePath} className={classes.breadcrumbs} />
+          </div>
           {token !== null && (
-            <Button
-              color="inherit"
-              onClick={onSignOut}
-              className={classes.rightToolbar}
-            >
-              Sign Out
-            </Button>
+            <UserMenu color="inherit" className={classes.rightToolbar} />
           )}
         </Toolbar>
       </AppBar>
diff --git a/src/components/Layouts/SideMenu.jsx b/src/components/Layouts/SideMenu.jsx
index 59fcadb..44aebda 100644
--- a/src/components/Layouts/SideMenu.jsx
+++ b/src/components/Layouts/SideMenu.jsx
@@ -4,46 +4,89 @@ import ListItemLink from "../ListItemLink";
 import ListItemExternalLink from "../ListItemExternalLink";
 import { useUserContext } from "../Contexts/UserContext";
 import { Roles, hasRole } from "../../utils/roles";
+import HomeIcon from "@material-ui/icons/Home";
+import CommuteIcon from "@material-ui/icons/Commute";
+import CloudDownloadIcon from "@material-ui/icons/CloudDownload";
+import AssessmentIcon from "@material-ui/icons/Assessment";
 
 const menuData = [
   {
     label: "Home",
     to: "/home",
+    icon: <HomeIcon />,
     roles: [],
   },
   {
-    label: "Dashboard",
-    to: "/dashboard",
-    roles: [Roles.CREATE, Roles.READ],
-  },
-  {
-    label: "Deploy Packages",
+    label: "Deployments",
     to: "/packages",
+    icon: <CloudDownloadIcon />,
     roles: [Roles.CREATE, Roles.READ],
   },
   {
-    label: "Create Package",
-    to: "/package-create",
-    roles: [Roles.CREATE],
-  },
-  {
-    label: "View Vehicles",
+    label: "Vehicles",
     to: "/vehicles",
+    icon: <CommuteIcon />,
+    roles: [Roles.CREATE],
+  },
+  {
+    label: "Datascope",
+    to: "/datascope",
+    icon: <AssessmentIcon />,
     roles: [Roles.CREATE, Roles.READ],
-  },
-  {
-    label: "Add Vehicle",
-    to: "/vehicle-add",
-    roles: [Roles.CREATE],
-  },
-  {
-    label: "Send Command",
-    to: "/vehicles-command",
-    roles: [Roles.CREATE],
+    submenus: [
+      {
+        label: "Battery",
+        to: "/datascope/battery",
+      },
+      {
+        label: "Diagnostics",
+        url: "https://grafana.fiskerdps.com",
+      },
+    ],
   },
 ];
 
-export default function SideMenu() {
+const MenuItem = ({ item, children }) => {
+  return (
+    <li>
+      {item.to && (
+        <ListItemLink primary={item.label} to={item.to} icon={item.icon} />
+      )}
+      {item.url && (
+        <ListItemExternalLink
+          primary={item.label}
+          url={item.url}
+          icon={item.icon}
+        />
+      )}
+      {children}
+    </li>
+  );
+};
+
+const ExpandableSideMenuItem = ({ item }) => {
+  /*
+  const [expanded, setExpanded] = useState(true);
+  const clickHandler = (e) => {
+    setExpanded(!expanded);
+  };
+  */
+
+  return (
+    <>
+      <span>
+        <MenuItem item={item}></MenuItem>
+      </span>
+      <ul style={{ marginLeft: 50 }}>
+        {item.submenus.map((subitem, index) => (
+          <MenuItem key={`submenu-${index}`} item={subitem} />
+        ))}
+      </ul>
+    </>
+  );
+};
+
+const SideMenu = () => {
   const { groups } = useUserContext();
   const menu = menuData.reduce((result, item) => {
     if (hasRole(item.roles, groups)) {
@@ -55,14 +98,14 @@ export default function SideMenu() {
 
   return (
     <List>
-      {menu.map((item, index) => (
-        <li key={index}>
-          {item.to && <ListItemLink primary={item.label} to={item.to} />}
-          {item.url && (
-            <ListItemExternalLink primary={item.label} url={item.url} />
-          )}
-        </li>
-      ))}
+      {menu.map((item, index) => {
+        const key = `menu-${index}`;
+        if (item.submenus)
+          return <ExpandableSideMenuItem key={key} item={item} />;
+        return <MenuItem key={key} item={item} />;
+      })}
     </List>
   );
-}
+};
+
+export default SideMenu;
diff --git a/src/components/Layouts/UserMenu/index.jsx b/src/components/Layouts/UserMenu/index.jsx
new file mode 100644
index 0000000..a4da3a4
--- /dev/null
+++ b/src/components/Layouts/UserMenu/index.jsx
@@ -0,0 +1,48 @@
+import React, { useState } from "react";
+import { Button, Fade, Menu, MenuItem } from "@material-ui/core";
+
+import { useUserContext } from "../../Contexts/UserContext";
+import { getName } from "../../../utils/jwt";
+
+const UserMenu = (props) => {
+  const { signOut, token } = useUserContext();
+  const [anchorEl, setAnchorEl] = useState(null);
+  const open = Boolean(anchorEl);
+
+  const handleClick = (event) => {
+    setAnchorEl(event.currentTarget);
+  };
+
+  const handleClose = () => {
+    setAnchorEl(null);
+  };
+
+  const handleSignOut = () => {
+    document.location = signOut();
+  };
+
+  return (
+    <div {...props}>
+      <Button
+        aria-controls="fade-menu"
+        aria-haspopup="true"
+        onClick={handleClick}
+        color="inherit"
+      >
+        {getName(token)}
+      </Button>
+      <Menu
+        id="fade-menu"
+        anchorEl={anchorEl}
+        keepMounted
+        open={open}
+        onClose={handleClose}
+        TransitionComponent={Fade}
+      >
+        <MenuItem onClick={handleSignOut}>Sign out</MenuItem>
+      </Menu>
+    </div>
+  );
+};
+
+export default UserMenu;
diff --git a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
index f09857f..f36fe51 100644
--- a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
+++ b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
@@ -16,6 +16,20 @@ exports[`SideMenu Authenticated 1`] = `
           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"
           >
@@ -30,28 +44,6 @@ exports[`SideMenu Authenticated 1`] = `
           />
         </a>
       </li>
-      <li>
-        <a
-          aria-disabled="false"
-          class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-          href="/dashboard"
-          role="button"
-          tabindex="0"
-        >
-          <div
-            class="MuiListItemText-root"
-          >
-            <span
-              class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
-            >
-              Dashboard
-            </span>
-          </div>
-          <span
-            class="MuiTouchRipple-root"
-          />
-        </a>
-      </li>
       <li>
         <a
           aria-disabled="false"
@@ -61,34 +53,26 @@ exports[`SideMenu Authenticated 1`] = `
           tabindex="0"
         >
           <div
-            class="MuiListItemText-root"
+            class="MuiListItemIcon-root"
           >
-            <span
-              class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root"
+              focusable="false"
+              viewBox="0 0 24 24"
             >
-              Deploy Packages
-            </span>
+              <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>
-          <span
-            class="MuiTouchRipple-root"
-          />
-        </a>
-      </li>
-      <li>
-        <a
-          aria-disabled="false"
-          class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-          href="/package-create"
-          role="button"
-          tabindex="0"
-        >
           <div
             class="MuiListItemText-root"
           >
             <span
               class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
             >
-              Create Package
+              Deployments
             </span>
           </div>
           <span
@@ -105,34 +89,26 @@ exports[`SideMenu Authenticated 1`] = `
           tabindex="0"
         >
           <div
-            class="MuiListItemText-root"
+            class="MuiListItemIcon-root"
           >
-            <span
-              class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+            <svg
+              aria-hidden="true"
+              class="MuiSvgIcon-root"
+              focusable="false"
+              viewBox="0 0 24 24"
             >
-              View Vehicles
-            </span>
+              <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>
-          <span
-            class="MuiTouchRipple-root"
-          />
-        </a>
-      </li>
-      <li>
-        <a
-          aria-disabled="false"
-          class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-          href="/vehicle-add"
-          role="button"
-          tabindex="0"
-        >
           <div
             class="MuiListItemText-root"
           >
             <span
               class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
             >
-              Add Vehicle
+              Vehicles
             </span>
           </div>
           <span
@@ -140,28 +116,95 @@ exports[`SideMenu Authenticated 1`] = `
           />
         </a>
       </li>
-      <li>
-        <a
-          aria-disabled="false"
-          class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
-          href="/vehicles-command"
-          role="button"
-          tabindex="0"
-        >
-          <div
-            class="MuiListItemText-root"
+      <span>
+        <li>
+          <a
+            aria-disabled="false"
+            class="MuiButtonBase-root MuiListItem-root MuiListItem-gutters MuiListItem-button"
+            href="/datascope"
+            role="button"
+            tabindex="0"
           >
-            <span
-              class="MuiTypography-root MuiListItemText-primary MuiTypography-body1 MuiTypography-displayBlock"
+            <div
+              class="MuiListItemIcon-root"
             >
-              Send Command
-            </span>
-          </div>
-          <span
-            class="MuiTouchRipple-root"
-          />
-        </a>
-      </li>
+              <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 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
+            href="https://grafana.fiskerdps.com"
+            rel="noopener"
+            role="button"
+            style="text-decoration: inherit;"
+            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>
@@ -183,6 +226,20 @@ exports[`SideMenu Unauthenticated 1`] = `
           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"
           >
diff --git a/src/components/Manifest/Create/index.jsx b/src/components/Manifest/Create/index.jsx
index d79a571..1bb6aac 100644
--- a/src/components/Manifest/Create/index.jsx
+++ b/src/components/Manifest/Create/index.jsx
@@ -20,7 +20,7 @@ import { logger } from "../../../services/monitoring";
 import ECUFilesList from "../ECUFilesList";
 
 const FileTemplate = {
-  name: "",
+  name: "AGS",
   part_number: "",
   update_version: "1.0.0",
 };
@@ -90,7 +90,7 @@ const UploadProgress = (props) => {
 const MainForm = () => {
   const { createManifest, cancelUpload, busy } = useManifestsContext();
   const { token } = useUserContext();
-  const { setMessage, setTitle } = useStatusContext();
+  const { setMessage, setTitle, setSitePath } = useStatusContext();
   const [redirect, setRedirect] = useState(null);
   const [fileIndex, setFileIndex] = useState(0);
   const [ecuFiles, setECUFiles] = useState([]);
@@ -113,7 +113,16 @@ const MainForm = () => {
   };
 
   useEffect(() => {
-    setTitle("Create Package");
+    setTitle("Create Deployments");
+    setSitePath([
+      {
+        label: "Deployments",
+        link: "/packages",
+      },
+      {
+        label: "Create Deployments",
+      },
+    ]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -236,7 +245,7 @@ const MainForm = () => {
             className={classes.submit}
             onClick={onSubmit}
           >
-            "Submit"
+            Submit
           </Button>
         )}
       </form>
diff --git a/src/components/Manifest/Deploy/index.jsx b/src/components/Manifest/Deploy/index.jsx
index 9cd0bdf..f2d7bc2 100644
--- a/src/components/Manifest/Deploy/index.jsx
+++ b/src/components/Manifest/Deploy/index.jsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { useParams, Redirect } from "react-router";
 import { Button, Grid, Typography } from "@material-ui/core";
+
 import {
   ManifestsProvider,
   useManifestsContext,
@@ -27,7 +28,7 @@ const MainForm = () => {
       idToken: { jwtToken: token },
     },
   } = useUserContext();
-  const { setMessage, setTitle } = useStatusContext();
+  const { setMessage, setTitle, setSitePath } = useStatusContext();
   const [manifestName, setManifestName] = useState("");
   const [version, setVersion] = useState("");
   const [createDate, setCreateDate] = useState("");
@@ -93,7 +94,17 @@ const MainForm = () => {
   }, [token]);
 
   useEffect(() => {
-    setTitle(`Deploy ${manifestName} ${version}`);
+    const title = `Deploy ${manifestName} ${version}`;
+    setTitle(title);
+    setSitePath([
+      {
+        label: "Deployments",
+        link: "/packages",
+      },
+      {
+        label: title,
+      },
+    ]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [manifestName, version]);
 
diff --git a/src/components/Manifest/ECUFilesList/index.jsx b/src/components/Manifest/ECUFilesList/index.jsx
index ed5e528..05c7608 100644
--- a/src/components/Manifest/ECUFilesList/index.jsx
+++ b/src/components/Manifest/ECUFilesList/index.jsx
@@ -1,5 +1,6 @@
 import React from "react";
 import SubList from "../../Controls/SubList";
+import ECUDropDrop from "../../Controls/ECUDropDown";
 
 const ECUFilesList = ({ data, onChange }) => {
   const options = [
@@ -11,6 +12,7 @@ const ECUFilesList = ({ data, onChange }) => {
     {
       label: "ECU",
       field: "name",
+      control: ECUDropDrop,
     },
     {
       label: "Part Number",
diff --git a/src/components/Manifest/List/index.jsx b/src/components/Manifest/List/index.jsx
index da326e7..a63b95a 100644
--- a/src/components/Manifest/List/index.jsx
+++ b/src/components/Manifest/List/index.jsx
@@ -10,6 +10,7 @@ import {
   Toolbar,
   Tooltip,
 } from "@material-ui/core";
+import AddCircleIcon from "@material-ui/icons/AddCircle";
 import SendIcon from "@material-ui/icons/Send";
 import VisibilityIcon from "@material-ui/icons/Visibility";
 import DeleteIcon from "@material-ui/icons/Delete";
@@ -64,7 +65,7 @@ const MainForm = () => {
   const [search, setSearch] = useState("");
   const { getManifests, deleteManifest, manifests, totalManifests } =
     useManifestsContext();
-  const { setMessage, setTitle } = useStatusContext();
+  const { setMessage, setTitle, setSitePath } = useStatusContext();
   const {
     token: {
       idToken: { jwtToken: token },
@@ -86,7 +87,8 @@ const MainForm = () => {
   };
 
   useEffect(() => {
-    setTitle("Deploy Packages");
+    setTitle("Deployments");
+    setSitePath([]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -184,6 +186,9 @@ const MainForm = () => {
   return (
     <div className={classes.paper} style={{ height: 700, width: "100%" }}>
       <Toolbar className={classes.tableToolbar}>
+        <Link to="/package-create" className={classes.labelInline}>
+          <AddCircleIcon fontSize="large" />
+        </Link>
         <SearchField classes={classes} onSearch={handleSearch} />
       </Toolbar>
       <Table>
diff --git a/src/components/Manifest/ReleaseNotesList/index.jsx b/src/components/Manifest/ReleaseNotesList/index.jsx
deleted file mode 100644
index 216ca3b..0000000
--- a/src/components/Manifest/ReleaseNotesList/index.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from "react";
-import SubList from "../../Controls/SubList";
-
-const ReleaseNotesList = ({ data, onChange }) => {
-  const options = [
-    {
-      label: "ID",
-      field: "data_id",
-      readonly: true,
-    },
-    {
-      label: "Locale",
-      field: "locale",
-    },
-    {
-      label: "URL",
-      field: "url",
-    },
-    {
-      label: "",
-      delete: true,
-    },
-  ];
-
-  return <SubList data={data} options={options} onChange={onChange} />;
-};
-
-export default ReleaseNotesList;
diff --git a/src/components/Manifest/Status/index.jsx b/src/components/Manifest/Status/index.jsx
index 0006e15..b1bc624 100644
--- a/src/components/Manifest/Status/index.jsx
+++ b/src/components/Manifest/Status/index.jsx
@@ -39,7 +39,7 @@ const MainForm = () => {
     startMonitor,
     stopMonitor,
   } = useCarUpdatesContext();
-  const { setMessage, setTitle } = useStatusContext();
+  const { setMessage, setTitle, setSitePath } = useStatusContext();
   const {
     token: {
       idToken: { jwtToken: token },
@@ -60,7 +60,18 @@ const MainForm = () => {
 
   useEffect(() => {
     if (!manifests || manifests.length === 0) return;
-    setTitle(`Manifest ${manifests[0].name} ${manifests[0].version}`);
+    const title = `Manifest ${manifests[0].name} ${manifests[0].version}`;
+    setTitle(title);
+    setSitePath([
+      {
+        label: "Deployments",
+        link: "/packages",
+      },
+      {
+        label: title,
+      },
+    ]);
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [manifests]);
 
diff --git a/src/components/Routes/SiteRoutes.jsx b/src/components/Routes/SiteRoutes.jsx
index 4ff714c..47613a2 100644
--- a/src/components/Routes/SiteRoutes.jsx
+++ b/src/components/Routes/SiteRoutes.jsx
@@ -10,13 +10,12 @@ 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 UpdatePackageEdit = React.lazy(() => import("../UpdatePackages/Edit"));
 const CarUpdatesDeploy = React.lazy(() => import("../CarUpdates/Deploy"));
 const CarUpdatesStatus = React.lazy(() => import("../CarUpdates/Status"));
 const CarUpdates = React.lazy(() => import("../Cars/Status"));
-const VehiclesList = React.lazy(() => import("../Cars/List"));
 const SendCommandBulk = React.lazy(() => import("../Cars/SendCommandBulk"));
-const Dashboard = React.lazy(() => import("../Dashboard"));
+const Datascope = React.lazy(() => import("../Datascope/Home"));
+const BatteryDatascope = React.lazy(() => import("../Datascope/Battery"));
 const Manifests = React.lazy(() => import("../Manifest/List"));
 const ManifestDeploy = React.lazy(() => import("../Manifest/Deploy"));
 const ManifestStatus = React.lazy(() => import("../Manifest/Status"));
@@ -41,14 +40,6 @@ const SiteRoutes = () => {
           type={TYPES.PROTECTED}
           token={token}
         />
-        <AuthRoute
-          path="/update/:id"
-          render={() => <UpdatePackageEdit />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.CREATE]}
-        />
         <AuthRoute
           path="/carupdate-deploy/:packageid"
           render={() => <CarUpdatesDeploy />}
@@ -67,11 +58,11 @@ const SiteRoutes = () => {
         />
         <AuthRoute
           path="/vehicles"
-          render={() => <VehiclesList />}
+          render={() => <SendCommandBulk />}
           type={TYPES.PROTECTED}
           token={token}
           groups={groups}
-          roles={[Roles.READ, Roles.CREATE]}
+          roles={[Roles.CREATE]}
         />
         <AuthRoute
           path="/vehicle-add"
@@ -90,16 +81,16 @@ const SiteRoutes = () => {
           roles={[Roles.READ, Roles.CREATE]}
         />
         <AuthRoute
-          path="/vehicles-command"
-          render={() => <SendCommandBulk />}
+          path="/datascope/battery"
+          render={() => <BatteryDatascope />}
           type={TYPES.PROTECTED}
           token={token}
           groups={groups}
-          roles={[Roles.CREATE]}
+          roles={[Roles.READ, Roles.CREATE]}
         />
         <AuthRoute
-          path="/dashboard"
-          render={() => <Dashboard />}
+          path="/datascope"
+          render={() => <Datascope />}
           type={TYPES.PROTECTED}
           token={token}
           groups={groups}
diff --git a/src/components/UpdatePackages/Create/Create.test.js b/src/components/UpdatePackages/Create/Create.test.js
deleted file mode 100644
index cf3799c..0000000
--- a/src/components/UpdatePackages/Create/Create.test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-jest.mock("../../Contexts/UserContext");
-jest.mock("../../Contexts/FileUploadContext");
-jest.mock("../../Contexts/VehicleContext");
-
-import { BrowserRouter } from "react-router-dom";
-import { render, cleanup, waitFor } from "@testing-library/react";
-import FileUploadForm from "./index";
-import { setToken } from "../../Contexts/UserContext";
-import { StatusProvider } from "../../Contexts/StatusContext";
-import { TEST_AUTH_OBJECT } from "../../../utils/testing"
-
-describe("File Upload Form", () => {
-  it("Should render", async () => {
-    setToken(TEST_AUTH_OBJECT);
-    const { container } = render(<StatusProvider><BrowserRouter><FileUploadForm /></BrowserRouter></StatusProvider>);
-    await waitFor(() => {});
-    expect(container).toMatchSnapshot();
-    cleanup();
-  })
-})
\ No newline at end of file
diff --git a/src/components/UpdatePackages/Create/__snapshots__/Create.test.js.snap b/src/components/UpdatePackages/Create/__snapshots__/Create.test.js.snap
deleted file mode 100644
index e8219e4..0000000
--- a/src/components/UpdatePackages/Create/__snapshots__/Create.test.js.snap
+++ /dev/null
@@ -1,250 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`File Upload Form Should render 1`] = `
-<div>
-  <div
-    data-testid="mocked-fileuploadprovider"
-  >
-    <div
-      class="makeStyles-paper-3"
-    >
-      <form
-        action="{onSubmit}"
-        class="makeStyles-form-5"
-        novalidate=""
-      >
-        <div
-          class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
-        >
-          <label
-            class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
-            data-shrink="false"
-            for="packagename"
-            id="packagename-label"
-          >
-            Package name
-            <span
-              aria-hidden="true"
-              class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
-            >
-               
-              *
-            </span>
-          </label>
-          <div
-            class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
-          >
-            <input
-              aria-invalid="false"
-              class="MuiInputBase-input MuiOutlinedInput-input"
-              id="packagename"
-              maxlength="255"
-              name="packagename"
-              required=""
-              type="text"
-              value=""
-            />
-            <fieldset
-              aria-hidden="true"
-              class="PrivateNotchedOutline-root-40 MuiOutlinedInput-notchedOutline"
-            >
-              <legend
-                class="PrivateNotchedOutline-legendLabelled-42"
-              >
-                <span>
-                  Package name
-                   *
-                </span>
-              </legend>
-            </fieldset>
-          </div>
-        </div>
-        <div
-          class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
-        >
-          <label
-            class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
-            data-shrink="false"
-            for="version"
-            id="version-label"
-          >
-            Version
-            <span
-              aria-hidden="true"
-              class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
-            >
-               
-              *
-            </span>
-          </label>
-          <div
-            class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
-          >
-            <input
-              aria-invalid="false"
-              class="MuiInputBase-input MuiOutlinedInput-input"
-              id="version"
-              maxlength="255"
-              name="version"
-              required=""
-              type="text"
-              value=""
-            />
-            <fieldset
-              aria-hidden="true"
-              class="PrivateNotchedOutline-root-40 MuiOutlinedInput-notchedOutline"
-            >
-              <legend
-                class="PrivateNotchedOutline-legendLabelled-42"
-              >
-                <span>
-                  Version
-                   *
-                </span>
-              </legend>
-            </fieldset>
-          </div>
-        </div>
-        <div
-          class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
-        >
-          <label
-            class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
-            data-shrink="false"
-            for="description"
-            id="description-label"
-          >
-            Description
-            <span
-              aria-hidden="true"
-              class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
-            >
-               
-              *
-            </span>
-          </label>
-          <div
-            class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-multiline MuiOutlinedInput-multiline"
-          >
-            <textarea
-              aria-invalid="false"
-              class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputMultiline MuiOutlinedInput-inputMultiline"
-              id="description"
-              maxlength="5120"
-              name="description"
-              placeholder="Package description"
-              required=""
-              rows="4"
-            />
-            <fieldset
-              aria-hidden="true"
-              class="PrivateNotchedOutline-root-40 MuiOutlinedInput-notchedOutline"
-            >
-              <legend
-                class="PrivateNotchedOutline-legendLabelled-42"
-              >
-                <span>
-                  Description
-                   *
-                </span>
-              </legend>
-            </fieldset>
-          </div>
-        </div>
-        <div
-          class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
-        >
-          <label
-            class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined Mui-required Mui-required"
-            data-shrink="false"
-            for="releasenotes"
-            id="releasenotes-label"
-          >
-            Release Notes URL
-            <span
-              aria-hidden="true"
-              class="MuiFormLabel-asterisk MuiInputLabel-asterisk"
-            >
-               
-              *
-            </span>
-          </label>
-          <div
-            class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
-          >
-            <input
-              aria-invalid="false"
-              class="MuiInputBase-input MuiOutlinedInput-input"
-              id="releasenotes"
-              maxlength="1024"
-              name="releasenotes"
-              placeholder="Release Notes URL"
-              required=""
-              type="text"
-              value=""
-            />
-            <fieldset
-              aria-hidden="true"
-              class="PrivateNotchedOutline-root-40 MuiOutlinedInput-notchedOutline"
-            >
-              <legend
-                class="PrivateNotchedOutline-legendLabelled-42"
-              >
-                <span>
-                  Release Notes URL
-                   *
-                </span>
-              </legend>
-            </fieldset>
-          </div>
-        </div>
-        <div
-          class="MuiDropzoneArea-root"
-          tabindex="0"
-        >
-          <input
-            accept=""
-            autocomplete="off"
-            style="display: none;"
-            tabindex="-1"
-            type="file"
-          />
-          <div
-            class="MuiDropzoneArea-textContainer"
-          >
-            <p
-              class="MuiTypography-root MuiDropzoneArea-text MuiTypography-h5"
-            >
-              Drag and drop a file here or click
-            </p>
-            <svg
-              aria-hidden="true"
-              class="MuiSvgIcon-root MuiDropzoneArea-icon"
-              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.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"
-              />
-            </svg>
-          </div>
-        </div>
-        <button
-          class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-6 MuiButton-containedPrimary MuiButton-fullWidth"
-          tabindex="0"
-          type="submit"
-        >
-          <span
-            class="MuiButton-label"
-          >
-            Submit
-          </span>
-          <span
-            class="MuiTouchRipple-root"
-          />
-        </button>
-      </form>
-    </div>
-  </div>
-</div>
-`;
diff --git a/src/components/UpdatePackages/Create/index.jsx b/src/components/UpdatePackages/Create/index.jsx
deleted file mode 100644
index 2272d2e..0000000
--- a/src/components/UpdatePackages/Create/index.jsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import React, { useEffect, useRef, useState } from "react";
-import { Redirect } from "react-router";
-import { Button, TextField } from "@material-ui/core";
-import { DropzoneArea } from "material-ui-dropzone";
-
-import { useUserContext } from "../../Contexts/UserContext";
-import { useStatusContext } from "../../Contexts/StatusContext";
-import {
-  useFileUploadContext,
-  FileUploadProvider,
-} from "../../Contexts/FileUploadContext";
-import ModalProgressBar from "../../ModalProgressBar";
-import useStyles from "../../useStyles";
-import { logger } from "../../../services/monitoring";
-
-const FileUploadZone = ({ classes, token }) => {
-  const { setFiles } = useFileUploadContext();
-  const { setMessage } = useStatusContext();
-
-  return (
-    <>
-      <DropzoneArea
-        id="dropzone"
-        showPreviews={true}
-        showPreviewsInDropzone={false}
-        useChipsForPreview
-        previewGridProps={{ container: { spacing: 1, direction: "row" } }}
-        previewChipProps={{ classes: { root: classes.previewChip } }}
-        previewText="Selected files"
-        maxFileSize={1e9}
-        filesLimit={1}
-        showAlerts={false}
-        onChange={(files) => setFiles(files)}
-        onDelete={(files) => setFiles(files)}
-        onDropRejected={(files) => {
-          setMessage(`Rejected ${files[0].name} too large`);
-        }}
-      />
-      <ModalProgressBar />
-    </>
-  );
-};
-
-const MainForm = () => {
-  const { uploading, upload, files, cancel } = useFileUploadContext();
-  const { token } = useUserContext();
-  const { setMessage, setTitle } = useStatusContext();
-  const [redirect, setRedirect] = useState(null);
-  const classes = useStyles();
-  const packagenameEl = useRef(null);
-  const versionEl = useRef(null);
-  const descEl = useRef(null);
-  const releasenotesEl = useRef(null);
-
-  useEffect(() => {
-    setTitle("Create Update Package");
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  const onSubmit = async (event) => {
-    try {
-      event.preventDefault();
-      const {
-        idToken: { jwtToken: authToken },
-      } = token;
-      const formData = {
-        packagename: packagenameEl.current.value,
-        version: versionEl.current.value,
-        description: descEl.current.value,
-        releasenotes: releasenotesEl.current.value,
-      };
-      const result = await upload(formData, authToken, files);
-
-      if (!result || result.error) return;
-
-      cancel();
-      setMessage(`Package uploaded`);
-      setRedirect(`/carupdate-deploy/${result.id}`);
-    } catch (e) {
-      setMessage(e.message);
-      logger.warn(e.stack);
-    }
-  };
-
-  if (redirect && redirect.length > 0) {
-    return <Redirect to={redirect} />;
-  }
-
-  return (
-    <div className={classes.paper}>
-      <form className={classes.form} noValidate action="{onSubmit}">
-        <TextField
-          id="packagename"
-          name="packagename"
-          label="Package name"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "255",
-          }}
-          required
-          fullWidth
-          inputRef={packagenameEl}
-        />
-        <TextField
-          id="version"
-          name="version"
-          label="Version"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "255",
-          }}
-          required
-          fullWidth
-          inputRef={versionEl}
-        />
-        <TextField
-          id="description"
-          name="description"
-          label="Description"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "5120",
-          }}
-          required
-          fullWidth
-          multiline
-          rows={4}
-          placeholder="Package description"
-          inputRef={descEl}
-        />
-        <TextField
-          id="releasenotes"
-          name="releasenotes"
-          label="Release Notes URL"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "1024",
-          }}
-          required
-          fullWidth
-          placeholder="Release Notes URL"
-          inputRef={releasenotesEl}
-        />
-        <FileUploadZone classes={classes} />
-        <Button
-          type="submit"
-          disabled={uploading}
-          fullWidth
-          variant="contained"
-          color="primary"
-          className={classes.submit}
-          onClick={onSubmit}
-        >
-          {uploading ? "Uploading..." : "Submit"}
-        </Button>
-      </form>
-    </div>
-  );
-};
-
-export default function FileUploadForm() {
-  return (
-    <FileUploadProvider>
-      <MainForm />
-    </FileUploadProvider>
-  );
-}
diff --git a/src/components/UpdatePackages/Edit/index.jsx b/src/components/UpdatePackages/Edit/index.jsx
deleted file mode 100644
index e86283f..0000000
--- a/src/components/UpdatePackages/Edit/index.jsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useParams } from "react-router";
-import { Button, TextField } from "@material-ui/core";
-
-import {
-  UpdatesProvider,
-  useUpdatesContext,
-} from "../../Contexts/UpdatesContext";
-import { useUserContext } from "../../Contexts/UserContext";
-import { useStatusContext } from "../../Contexts/StatusContext";
-import useStyles from "../../useStyles";
-import { tsLocalDateTimeString } from "../../../utils/dates";
-import { logger } from "../../../services/monitoring";
-
-const MainForm = () => {
-  const { id } = useParams();
-  const { getPackages, updatePackage, packages, busy } = useUpdatesContext();
-  const {
-    token: {
-      idToken: { jwtToken: token },
-    },
-  } = useUserContext();
-  const { setMessage, setTitle } = useStatusContext();
-  const [packageName, setPackageName] = useState("");
-  const [version, setVersion] = useState("");
-  const [link, setLink] = useState("");
-  const [description, setDescription] = useState("");
-  const [releaseNotesLink, setReleaseNotesLink] = useState("");
-  const [createDate, setCreateDate] = useState("");
-  const classes = useStyles();
-  const onSubmit = async (event) => {
-    try {
-      event.preventDefault();
-      const data = {
-        id: parseInt(id),
-        package_name: packageName,
-        version,
-        link,
-        desc: description,
-        release_notes: releaseNotesLink,
-      };
-      await updatePackage(data, token);
-      setMessage(`Updated ${packageName} ${version}`);
-    } catch (e) {
-      setMessage(e.message);
-      logger.warn(e.stack);
-    }
-  };
-  const getData = async () => {
-    try {
-      getPackages({ id: parseInt(id) }, token);
-    } catch (e) {
-      setMessage(e.message);
-      logger.warn(e.stack);
-    }
-  };
-  const handleChange = (event) => {
-    const field = event.target.id;
-    const value = event.target.value;
-
-    if (field === "packagename") {
-      setPackageName(value);
-    } else if (field === "version") {
-      setVersion(value);
-    } else if (field === "link") {
-      setLink(value);
-    } else if (field === "description") {
-      setDescription(value);
-    } else if (field === "releasenotes") {
-      setReleaseNotesLink(value);
-    }
-  };
-
-  useEffect(() => {
-    setTitle(`Edit Update Package ${id}`);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useEffect(() => {
-    getData();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [token]);
-
-  useEffect(() => {
-    if (!packages || packages.length === 0) return;
-    var data = packages[0];
-
-    setPackageName(data.package_name);
-    setVersion(data.version);
-    setLink(data.link);
-    setDescription(data.desc || "");
-    setReleaseNotesLink(data.release_notes || "");
-    setCreateDate(tsLocalDateTimeString(data.timestamp));
-  }, [packages]);
-
-  return (
-    <div className={classes.paper}>
-      <form className={classes.form} noValidate action="{onSubmit}">
-        <TextField
-          label="Create Date"
-          variant="filled"
-          margin="normal"
-          inputProps={{
-            readOnly: true,
-            maxLength: "1024",
-          }}
-          value={createDate}
-          fullWidth
-        />
-        <TextField
-          id="packagename"
-          name="packagename"
-          label="Package name"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "255",
-          }}
-          value={packageName}
-          onChange={handleChange}
-          required
-          fullWidth
-        />
-        <TextField
-          id="version"
-          name="version"
-          label="Version"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "255",
-          }}
-          value={version}
-          onChange={handleChange}
-          required
-          fullWidth
-        />
-        <TextField
-          id="link"
-          name="link"
-          label="Package link"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "1024",
-          }}
-          value={link}
-          onChange={handleChange}
-          required
-          fullWidth
-        />
-        <TextField
-          id="description"
-          name="description"
-          label="Description"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "5120",
-          }}
-          value={description}
-          onChange={handleChange}
-          fullWidth
-          multiline
-          rows={4}
-          placeholder="Package description"
-        />
-        <TextField
-          id="releasenotes"
-          name="releasenotes"
-          label="Release Notes URL"
-          variant="outlined"
-          margin="normal"
-          inputProps={{
-            maxLength: "1024",
-          }}
-          value={releaseNotesLink}
-          onChange={handleChange}
-          fullWidth
-          placeholder="Release Notes URL"
-        />
-        <Button
-          type="submit"
-          disabled={busy}
-          fullWidth
-          variant="contained"
-          color="primary"
-          className={classes.submit}
-          onClick={onSubmit}
-        >
-          {busy ? "Updating..." : "Submit"}
-        </Button>
-      </form>
-    </div>
-  );
-};
-
-const UpdatePackageEditForm = () => (
-  <UpdatesProvider>
-    <MainForm />
-  </UpdatesProvider>
-);
-
-export default UpdatePackageEditForm;
diff --git a/src/components/UpdatePackages/List/index.jsx b/src/components/UpdatePackages/List/index.jsx
deleted file mode 100644
index 79df2e0..0000000
--- a/src/components/UpdatePackages/List/index.jsx
+++ /dev/null
@@ -1,244 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { Link } from "react-router-dom";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableFooter,
-  TablePagination,
-  TableRow,
-  Toolbar,
-  Tooltip,
-} from "@material-ui/core";
-import SendIcon from "@material-ui/icons/Send";
-import VisibilityIcon from "@material-ui/icons/Visibility";
-import DeleteIcon from "@material-ui/icons/Delete";
-import useStyles from "../../useStyles";
-import {
-  UpdatesProvider,
-  useUpdatesContext,
-} from "../../Contexts/UpdatesContext";
-import { useUserContext } from "../../Contexts/UserContext";
-import { useStatusContext } from "../../Contexts/StatusContext";
-import { LocalDateTimeString } from "../../../utils/dates";
-import { Roles, hasRole } from "../../../utils/roles";
-import TableHeaderSortable from "../../Table/HeaderSortable";
-import SearchField from "../../Controls/SearchField";
-import { logger } from "../../../services/monitoring";
-import ECUList from "../../Controls/ECUList";
-
-const tableColumns = [
-  {
-    id: "id",
-    label: "ID",
-  },
-  {
-    id: "package_name",
-    label: "Name",
-  },
-  {
-    id: "version",
-    label: "Version",
-  },
-  {
-    id: "created_at",
-    label: "Created",
-  },
-  {
-    id: "",
-    label: "Actions",
-  },
-];
-
-const UpdatePackagesList = () => {
-  const classes = useStyles();
-  const [pageSize, setPageSize] = useState(10);
-  const [pageIndex, setPageIndex] = useState(0);
-  const [orderBy, setOrderBy] = useState("id");
-  const [order, setOrder] = useState("desc");
-  const [search, setSearch] = useState("");
-  const { getPackages, deletePackage, packages, totalPackages } =
-    useUpdatesContext();
-  const {
-    token: {
-      idToken: { jwtToken: token },
-    },
-    groups,
-  } = useUserContext();
-  const { setMessage, setTitle } = useStatusContext();
-
-  useEffect(() => {
-    setTitle("Deploy Packages");
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useEffect(() => {
-    getPackages(
-      {
-        limit: pageSize,
-        offset: pageSize * pageIndex,
-        order: `${orderBy} ${order}`,
-        search,
-      },
-      token
-    );
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [pageIndex, pageSize, token, orderBy, order, search]);
-
-  const handleChangePageIndex = (event, newIndex) => {
-    setPageIndex(newIndex);
-  };
-
-  const handleChangePageSize = (event) => {
-    setPageSize(parseInt(event.target.value, 10));
-    setPageIndex(0);
-  };
-
-  const handleSort = (event, property) => {
-    if (property === orderBy) {
-      if (order === "asc") {
-        setOrder("desc");
-      } else {
-        setOrder("asc");
-      }
-    } else {
-      setOrderBy(property);
-      setOrder("asc");
-    }
-  };
-
-  const handleSearch = (search) => {
-    setSearch(search);
-  };
-
-  const onDelete = async (package_id) => {
-    try {
-      await deletePackage(parseInt(package_id), token);
-    } catch (e) {
-      setMessage(e.message);
-      logger.warn(e.stack);
-    }
-  };
-
-  const Actions = (row) => {
-    let actions = [];
-    if (hasRole([Roles.CREATE, Roles.READ], groups)) {
-      actions.push({
-        tip: `Status "${row.package_name} ${row.version}"`,
-        link: `/carupdate-status/${row.id}`,
-        icon: (
-          <VisibilityIcon
-            aria-label={`Status ${row.package_name} ${row.version}`}
-          />
-        ),
-      });
-    }
-    if (hasRole([Roles.CREATE], groups)) {
-      actions = actions.concat([
-        {
-          tip: `Deploy "${row.package_name} ${row.version}"`,
-          link: `/carupdate-deploy/${row.id}`,
-          icon: (
-            <SendIcon
-              aria-label={`Deploy ${row.package_name} ${row.version}`}
-            />
-          ),
-        },
-        {
-          tip: `Delete "${row.package_name} ${row.version}"`,
-          id: row.id,
-          icon: (
-            <DeleteIcon
-              aria-label={`Delete ${row.package_name} ${row.version}`}
-            />
-          ),
-        },
-      ]);
-    }
-
-    if (actions.length === 0) return "No actions";
-
-    return actions.map((action) => {
-      if (action.link != null) {
-        return (
-          <Tooltip key={action.link} title={action.tip}>
-            <Link to={action.link} style={{ margin: 5 }}>
-              {action.icon}
-            </Link>
-          </Tooltip>
-        );
-      } else {
-        return (
-          <Tooltip key={`delete-${action.id}`} title={action.tip}>
-            <Link to="#" onClick={() => onDelete(action.id)}>
-              {action.icon}
-            </Link>
-          </Tooltip>
-        );
-      }
-    });
-  };
-
-  return (
-    <div className={classes.paper} style={{ height: 700, width: "100%" }}>
-      <Toolbar className={classes.tableToolbar}>
-        <SearchField classes={classes} onSearch={handleSearch} />
-      </Toolbar>
-      <Table>
-        <TableHeaderSortable
-          classes={classes}
-          orderBy={orderBy}
-          order={order}
-          columnData={tableColumns}
-          onSortRequest={handleSort}
-        />
-        <TableBody>
-          {packages.map((row) => (
-            <TableRow key={row.id}>
-              <TableCell align="center">{row.id}</TableCell>
-              <TableCell align="center">
-                {row.package_name}
-                {row.ecu_list && (
-                  <>
-                    <br />
-                    <ECUList list={row.ecu_list} search={search} />
-                  </>
-                )}
-              </TableCell>
-              <TableCell align="center">{row.version}</TableCell>
-              <TableCell align="center">
-                {LocalDateTimeString(row.created)}
-              </TableCell>
-              <TableCell align="center">{Actions(row)}</TableCell>
-            </TableRow>
-          ))}
-        </TableBody>
-        <TableFooter>
-          <TableRow>
-            <TablePagination
-              rowsPerPageOptions={[5, 10, 25, 100]}
-              colSpan={5}
-              count={totalPackages}
-              rowsPerPage={pageSize}
-              page={pageIndex}
-              SelectProps={{
-                inputProps: { "aria-label": "rows per page" },
-                native: true,
-              }}
-              onPageChange={handleChangePageIndex}
-              onRowsPerPageChange={handleChangePageSize}
-            />
-          </TableRow>
-        </TableFooter>
-      </Table>
-    </div>
-  );
-};
-
-const UpdatePackagesForm = () => (
-  <UpdatesProvider>
-    <UpdatePackagesList />
-  </UpdatesProvider>
-);
-
-export default UpdatePackagesForm;
diff --git a/src/components/VehicleMap/index.jsx b/src/components/VehicleMap/index.jsx
index 617a4c5..6ea4ab3 100644
--- a/src/components/VehicleMap/index.jsx
+++ b/src/components/VehicleMap/index.jsx
@@ -7,8 +7,8 @@ import { Button } from "@material-ui/core";
 import { useUserContext } from "../Contexts/UserContext";
 import { useVehicleContext, VehicleProvider } from "../Contexts/VehicleContext";
 import { VehiclePopUp } from "./popup";
-import GreenCarIcon from "../../assets/green-car.png";
-import RedCarIcon from "../../assets/red-car.png";
+import GreenMarkerIcon from "../../assets/green-marker.png";
+import GrayMarkerIcon from "../../assets/gray-marker.png";
 
 const Component = () => {
   const classes = useStyles();
@@ -51,17 +51,17 @@ const Component = () => {
   }
 
   const centerAroundMarkers = (markers) => {
-    if (markers == null) {
-      markers = []
-    }
-    const coord = markers.reduce((coord, marker) => {
-      coord[0] += marker[0] / markers.length;
-      coord[1] += marker[1] / markers.length;
-      return coord;
-    }, [0, 0])
+    // if (markers == null) {
+    //   markers = []
+    // }
+    // const coord = markers.reduce((coord, marker) => {
+    //   coord[0] += marker[0] / markers.length;
+    //   coord[1] += marker[1] / markers.length;
+    //   return coord;
+    // }, [0, 0])
 
-    setCenter(coord);
-    setZoom(4);
+    setCenter([37.0902, -95.7129]);
+    setZoom(4.5);
   }
 
   const [connections, setConnections] = useState({});
@@ -109,17 +109,15 @@ const Component = () => {
   };
 
   function getCarIcon(vin) {
-    let icon = RedCarIcon;
+    let icon = GrayMarkerIcon;
 
     if (connections[vin]) {
-      icon = GreenCarIcon;
-    } else {
-      icon = RedCarIcon;
+      icon = GreenMarkerIcon;
     }
 
     return new L.Icon({
       iconUrl: icon,
-      iconAnchor: [15, 0]
+      iconAnchor: [24, 42]
     });
   }
 
diff --git a/src/components/useStyles.jsx b/src/components/useStyles.jsx
index d74230e..a653a66 100644
--- a/src/components/useStyles.jsx
+++ b/src/components/useStyles.jsx
@@ -202,6 +202,35 @@ const useStyles = makeStyles((theme) => ({
     width: "100%",
     textAlign: "right",
   },
+  breadcrumbs: {
+    fontSize: "8px",
+  },
+  addButton: {
+    fontSize: "large",
+    position: "relative",
+    top: 100,
+    left: 100,
+  },
+  batteryGrid: {},
+  batteryForm: {
+    alignItems: "stretch",
+    flexDirection: "column",
+  },
+  grafanaContainer: {
+    alignContent: "stretch",
+    alignItems: "center",
+    display: "flex",
+    flexDirection: "column",
+    justifyContent: "center",
+    padding: 15,
+    paddingBottom: 20,
+  },
+  datascopeContainerText: {
+    margin: 0,
+  },
+  datascopeContainerValue: {
+    margin: 0,
+  },
 }));
 
 export default useStyles;
diff --git a/src/services/__mocks__/grafana.js b/src/services/__mocks__/grafana.js
new file mode 100644
index 0000000..4424256
--- /dev/null
+++ b/src/services/__mocks__/grafana.js
@@ -0,0 +1,19 @@
+const grafanaAPI = {
+    getCarsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20countDistinct(vin)%20as%20count%0AFROM%20default.vehicle_data%20FORMAT%20JSON`, {
+        method: "GET",
+        headers: Object.assign({ "Content-Type": "application/json" }),
+    })
+        .then(fetchRespHandler)
+        .then(result => result.data[0].count)
+        .catch(error => console.log(error)),
+
+    getSignalsCount: async () => fetch(`${API_ENDPOINT}/?query=SELECT%20count()%20as%20count%0AFROM%20default.vehicle_signal%20FORMAT%20JSON`, {
+        method: "GET",
+        headers: Object.assign({ "Content-Type": "application/json" }),
+    })
+        .then(fetchRespHandler)
+        .then(result => result.data[0].count)
+        .catch(error => console.log(error)),
+};
+
+export default vehiclesAPI;
diff --git a/src/services/grafana.js b/src/services/grafana.js
new file mode 100644
index 0000000..8376f2c
--- /dev/null
+++ b/src/services/grafana.js
@@ -0,0 +1,6 @@
+const grafanaAPI = {
+    getCarsCount: async () => 500,
+    getSignalsCount: async () => 1234567890,
+};
+
+export default grafanaAPI;
diff --git a/src/utils/jwt.js b/src/utils/jwt.js
index 9ff1297..f2572e9 100644
--- a/src/utils/jwt.js
+++ b/src/utils/jwt.js
@@ -1,3 +1,5 @@
+const DEFAULT_GREETING = "Human";
+
 export const parsePayload = (token) => {
   if (!token) return null;
   const parts = token.split(".");
@@ -12,3 +14,14 @@ export const decode = (payload) => {
   }
   return atob(payload);
 };
+
+export const getName = (token) => {
+  if (!token || !token.idToken || !token.idToken.jwtToken)
+    return DEFAULT_GREETING;
+
+  const payload = parsePayload(token.idToken.jwtToken);
+
+  if (!payload || !payload.given_name) return DEFAULT_GREETING;
+
+  return payload.given_name;
+};