diff --git a/package.json b/package.json
index 26f9972..1f588fb 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "VITE_AUTH0_CLIENT_ID=5pUCkl2SfogkWmM244UDcLEUOp8EFdHd VITE_AUTH0_AUDIENCE=api.brandxtech.ca VITE_APP_API_URL=https://api.brandxtech.ca/v1 VITE_APP_WS_URL=ws://api.brandxtech.ca/v1/live vite",
     "start-local": "VITE_AUTH0_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_APP_API_URL=http://localhost:50052/v1 VITE_APP_WS_URL=ws://localhost:50052/v1/live VITE_APP_BILLING_URL=http://localhost:50053/v1 VITE_APP_RECLUSE_URL=http://localhost:50054/v1 VITE_APP_GITLAB_URL=http://localhost:50055/v1 vite",
     "start-dev": "VITE_AUTH0_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 VITE_APP_API_URL=https://bxt-dev.api.adaptiveagriculture.ca/v1 VITE_AUTH0_CLIENT_DOMAIN=brandxtech.auth0.com VITE_AUTH0_AUDIENCE=bxt-dev.api.adaptiveagriculture.ca VITE_AUTH0_DEV_CLIENT_ID=dzJTpqIeMA4Rwk4xujtwPbAO3TY32bM1 vite",
-    "start-staging": "VITE_AUTH0_CLIENT_ID=3ib460VvLwdeyse5iUSQfxkVdQaUmphP VITE_AUTH0_AUDIENCE=stagingapi.brandxtech.ca VITE_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com VITE_APP_API_URL=https://stagingapi.brandxtech.ca/v1 VITE_APP_WS_URL=ws://stagingapi.brandxtech.ca/v1/live VITE_APP_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com VITE_APP_AUTH0_AUDIENCE=stagingapi.brandxtech.ca vite",
+    "start-staging": "VITE_LOCAL_STAGING=true VITE_AUTH0_CLIENT_ID=3ib460VvLwdeyse5iUSQfxkVdQaUmphP VITE_AUTH0_AUDIENCE=stagingapi.brandxtech.ca VITE_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com VITE_APP_API_URL=https://stagingapi.brandxtech.ca/v1 VITE_APP_WS_URL=ws://stagingapi.brandxtech.ca/v1/live VITE_APP_AUTH0_CLIENT_DOMAIN=adaptivestaging.us.auth0.com VITE_APP_AUTH0_AUDIENCE=stagingapi.brandxtech.ca vite",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
     "preview": "vite preview",
diff --git a/src/pages/DeviceSupport.tsx b/src/pages/DeviceSupport.tsx
index 4cccac6..20bf476 100644
--- a/src/pages/DeviceSupport.tsx
+++ b/src/pages/DeviceSupport.tsx
@@ -15,6 +15,7 @@ import DeviceActions from "device/DeviceActions";
 import { cloneDeep } from "lodash";
 import { FindAvailablePositions } from "pbHelpers/DeviceAvailability";
 import LoadingScreen from "app/LoadingScreen";
+import DeviceOverview from "device/DeviceOverview";
 
 interface TabPanelProps {
   children?: React.ReactNode;
@@ -190,10 +191,9 @@ export default function DeviceSupport() {
 		<PageContainer>
 			<Grid container justifyContent={"space-between"}>
 				<Grid>
-				<SmartBreadcrumb deviceName={device.name()} state={{devicePageData: devicePageData}} />
+					<SmartBreadcrumb deviceName={device.name()} state={{devicePageData: devicePageData}} />
 				</Grid>
 				<Grid>
-					
 					<DeviceActions
 						device={device}
 						isPaused={false}
@@ -210,6 +210,8 @@ export default function DeviceSupport() {
 				</Grid>
 			</Grid>
       {/* <SmartBreadcrumb deviceName={device.name()} state={{devicePageData: devicePageData}} /> */}
+			<DeviceOverview device={device} components={devicePageData.components}/>
+			<br/>
 			<Tabs
 				style={{ position: "sticky" }}
 				value={tabNumber}
diff --git a/src/services/whiteLabel.ts b/src/services/whiteLabel.ts
index 22de3bf..34b2fec 100644
--- a/src/services/whiteLabel.ts
+++ b/src/services/whiteLabel.ts
@@ -276,7 +276,7 @@ export function getWhitelabel(): WhiteLabel {
   if (window.location.origin.includes("bxt-dev")) {
     return BXT_WHITE_LABEL;
   }
-  if (window.location.origin.includes("staging")) {
+  if (window.location.origin.includes("staging") || import.meta.env.VITE_LOCAL_STAGING=='true') {
     return STAGING_WHITELABEL;
   }
   const whiteLabelKeys = Array.from(whitelabels.keys());