Merge pull request 'develop' (#29 ) from develop into main

Reviewed-on: #29
Merge branch 'main' into develop
2026-01-13 16:11:33 +00:00 · 2026-01-13 16:11:22 +00:00 · 2026-01-13 16:10:32 +00:00 · 2026-01-13 16:10:05 +00:00 · 2026-01-12 15:13:42 +00:00 · 2026-01-12 15:13:14 +00:00
77 changed files with 2729 additions and 633 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "bayiq-ui",
  "private": true,
-  "version": "0.0.0",
+  "version": "1.0.6",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -21,13 +21,15 @@
    "clsx": "^2.1.1",
    "formik": "^2.4.9",
    "konva": "^10.0.11",
+    "rc-slider": "^11.1.9",
    "react": "^19.2.0",
    "react-dom": "^19.2.0",
    "react-konva": "^19.2.0",
    "react-modal": "^3.16.3",
    "react-tabs": "^6.1.0",
    "react-use-websocket": "3.0.0",
-    "sonner": "^2.0.7"
+    "sonner": "^2.0.7",
+    "use-debounce": "^10.0.6"
  },
  "devDependencies": {
    "@eslint/js": "^9.39.1",
--- a/src/app/config/cameraConfig.ts
+++ b/src/app/config/cameraConfig.ts
@@ -0,0 +1,12 @@
+// Camera configuration - add more cameras here as needed
+export const CAMERA_IDS = ["A", "B", "C"] as const;
+
+export type CameraID = (typeof CAMERA_IDS)[number];
+
+export const DEFAULT_REGIONS = [
+  { name: "Bay 1", brushColour: "#ff0000" },
+  { name: "Bay 2", brushColour: "#00ff00" },
+  { name: "Bay 3", brushColour: "#0400ff" },
+  { name: "Bay 4", brushColour: "#ffff00" },
+  { name: "Bay 5", brushColour: "#fc35db" },
+];
--- a/src/app/config/wsconfig.ts
+++ b/src/app/config/wsconfig.ts
@@ -1,5 +1,10 @@
+import { CAMBASE_WS } from "../../utils/config";
+
 export const wsConfig = {
-  infoBar: "ws://100.115.125.56/websocket-infobar",
+  infoBar: `${CAMBASE_WS}/websocket-infobar`,
+  cameraFeedA: `${CAMBASE_WS}/websocket-CameraA-live-video`,
+  cameraFeedB: `${CAMBASE_WS}/websocket-CameraB-live-video`,
+  cameraFeedC: `${CAMBASE_WS}/websocket-CameraC-live-video`,
 };

 export type SocketKey = keyof typeof wsConfig;
--- a/src/app/context/WebSocketContext.ts
+++ b/src/app/context/WebSocketContext.ts
@@ -1,15 +1,23 @@
 import { createContext, useContext } from "react";
 import { ReadyState } from "react-use-websocket";
-import type { InfoBarData } from "../../types/types";
+import type { CameraZoomData, InfoBarData } from "../../types/types";

 type InfoSocketState = {
  data: InfoBarData | null;
  readyState: ReadyState;
  sendJson: (msg: unknown) => void;
+  send?: (msg: string) => void;
+};
+
+type CameraSocketState = {
+  data: CameraZoomData | null;
+  readyState: ReadyState;
+  send: (msg: string) => void;
 };

 export type WebSocketConextValue = {
  info: InfoSocketState;
+  cameraFeed: CameraSocketState;
 };

 export const WebsocketContext = createContext<WebSocketConextValue | null>(null);
@@ -21,3 +29,4 @@ const useWebSocketContext = () => {
 };

 export const useInfoSocket = () => useWebSocketContext().info;
+export const useCameraFeedSocket = () => useWebSocketContext().cameraFeed;
--- a/src/app/providers/CameraFeedProvider.tsx
+++ b/src/app/providers/CameraFeedProvider.tsx
@@ -1,9 +1,46 @@
-import { useReducer, type ReactNode } from "react";
+import { useEffect, useReducer, type ReactNode } from "react";
 import { CameraFeedContext } from "../context/CameraFeedContext";
 import { initialState, reducer } from "../reducers/cameraFeedReducer";
+import { useBlackBoard } from "../../hooks/useBlackBoard";
+import type { CameraFeedState } from "../../types/types";
+
+import { CAMERA_IDS } from "../config/cameraConfig";
+import CameraZoomFetcher from "./CameraZoomFetcher";

 export const CameraFeedProvider = ({ children }: { children: ReactNode }) => {
+  const { blackboardMutation } = useBlackBoard();
+
  const [state, dispatch] = useReducer(reducer, initialState);

-  return <CameraFeedContext.Provider value={{ state, dispatch }}>{children}</CameraFeedContext.Provider>;
+  useEffect(() => {
+    const fetchBlackBoardData = async () => {
+      const result = await blackboardMutation.mutateAsync({
+        operation: "VIEW",
+        path: "cameraFeed",
+      });
+      if (!result?.result || typeof result.result === "string") return;
+      const cameraFeedData: CameraFeedState = result.result;
+      const recontructedState = {
+        ...cameraFeedData,
+        paintedCells: CAMERA_IDS.reduce(
+          (acc, id) => {
+            acc[id] = new Map(cameraFeedData.paintedCells[id]);
+            return acc;
+          },
+          {} as typeof cameraFeedData.paintedCells,
+        ),
+      };
+      dispatch({ type: "SET_CAMERA_FEED_DATA", cameraState: recontructedState });
+    };
+    fetchBlackBoardData();
+  }, []);
+
+  return (
+    <CameraFeedContext.Provider value={{ state, dispatch }}>
+      {CAMERA_IDS.map((cameraId) => (
+        <CameraZoomFetcher key={cameraId} cameraId={cameraId} dispatch={dispatch} />
+      ))}
+      {children}
+    </CameraFeedContext.Provider>
+  );
 };
--- a/src/app/providers/CameraZoomFetcher.tsx
+++ b/src/app/providers/CameraZoomFetcher.tsx
@@ -0,0 +1,38 @@
+import { useEffect } from "react";
+import { useCameraZoom } from "../../features/cameras/hooks/useCameraZoom";
+import type { CameraFeedAction } from "../../types/types";
+import type { CameraID } from "../config/cameraConfig";
+
+type CameraZoomFetcherProps = {
+  cameraId: CameraID;
+  dispatch: (action: CameraFeedAction) => void;
+};
+
+const CameraZoomFetcher = ({ cameraId, dispatch }: CameraZoomFetcherProps) => {
+  const { cameraZoomQuery } = useCameraZoom(cameraId);
+
+  useEffect(() => {
+    const fetchZoomLevel = async () => {
+      const result = await cameraZoomQuery.refetch();
+
+      if (result?.data) {
+        const currentZoomLevel = result?.data["propPhysCurrent"].value;
+        const minLevel = result?.data["propPhysMin"].value;
+        const maxLevel = result?.data["propPhysMax"].value;
+
+        const normalizedZoomLevel = ((currentZoomLevel - minLevel) / (maxLevel - minLevel)).toFixed(2);
+
+        dispatch({
+          type: "SET_ZOOM_LEVEL",
+          payload: { cameraFeedID: cameraId, zoomLevel: parseFloat(normalizedZoomLevel) },
+        });
+      }
+    };
+
+    fetchZoomLevel();
+  }, [cameraId]);
+
+  return null;
+};
+
+export default CameraZoomFetcher;
--- a/src/app/providers/WebSocketProvider.tsx
+++ b/src/app/providers/WebSocketProvider.tsx
@@ -2,15 +2,29 @@ import { useEffect, useMemo, useState, type ReactNode } from "react";
 import { WebsocketContext, type WebSocketConextValue } from "../context/WebSocketContext";
 import useWebSocket from "react-use-websocket";
 import { wsConfig } from "../config/wsconfig";
-import type { InfoBarData } from "../../types/types";
+import type { CameraZoomData, InfoBarData } from "../../types/types";
+import { CAMERA_IDS } from "../config/cameraConfig";
+import { CAMBASE_WS } from "../../utils/config";
+import { useCameraFeedContext } from "../context/CameraFeedContext";

 type WebSocketProviderProps = {
  children: ReactNode;
 };

 export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
+  const { state } = useCameraFeedContext();
  const [systemData, setSystemData] = useState<InfoBarData | null>(null);
+  const [socketData, setSocketData] = useState<CameraZoomData | null>(null);
  const infoSocket = useWebSocket(wsConfig.infoBar, { share: true, shouldReconnect: () => true });
+  const sockets = CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = `${CAMBASE_WS}/websocket-Camera${id}-live-video`;
+      return acc;
+    },
+    {} as Record<string, string>,
+  );
+  const cameraFeedID = state.cameraFeedID;
+  const cameraFeed = useWebSocket(sockets[cameraFeedID], { share: true, shouldReconnect: () => true });

  useEffect(() => {
    async function parseData() {
@@ -19,9 +33,15 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
        const data = JSON.parse(text);
        setSystemData(data);
      }
+      if (cameraFeed.lastMessage) {
+        const message = cameraFeed.lastMessage;
+        const data = await message?.data.text();
+        const parsedData: CameraZoomData = JSON.parse(data || "");
+        setSocketData(parsedData);
+      }
    }
    parseData();
-  }, [infoSocket.lastMessage]);
+  }, [cameraFeed.lastMessage, infoSocket.lastMessage]);

  const value = useMemo<WebSocketConextValue>(
    () => ({
@@ -30,8 +50,21 @@ export const WebSocketProvider = ({ children }: WebSocketProviderProps) => {
        readyState: infoSocket.readyState,
        sendJson: infoSocket.sendJsonMessage,
      },
+      cameraFeed: {
+        data: socketData,
+        readyState: cameraFeed.readyState,
+
+        send: cameraFeed.sendMessage,
+      },
    }),
-    [infoSocket.readyState, infoSocket.sendJsonMessage, systemData],
+    [
+      cameraFeed.readyState,
+      cameraFeed.sendMessage,
+      infoSocket.readyState,
+      infoSocket.sendJsonMessage,
+      socketData,
+      systemData,
+    ],
  );

  return <WebsocketContext.Provider value={value}>{children}</WebsocketContext.Provider>;
--- a/src/app/reducers/cameraFeedReducer.ts
+++ b/src/app/reducers/cameraFeedReducer.ts
@@ -1,42 +1,39 @@
 import type { CameraFeedAction, CameraFeedState, PaintedCell } from "../../types/types";
+import { CAMERA_IDS, DEFAULT_REGIONS, type CameraID } from "../config/cameraConfig";

 export const initialState: CameraFeedState = {
-  cameraFeedID: "A",
-  paintedCells: {
-    A: new Map<string, PaintedCell>(),
-    B: new Map<string, PaintedCell>(),
-    C: new Map<string, PaintedCell>(),
-  },
-  regionsByCamera: {
-    A: [
-      { name: "Region 1", brushColour: "#ff0000" },
-      { name: "Region 2", brushColour: "#00ff00" },
-      { name: "Region 3", brushColour: "#0400ff" },
-      { name: "Region 4", brushColour: "#ffff00" },
-      { name: "Region 5", brushColour: "#fc35db" },
-    ],
-    B: [
-      { name: "Region 1", brushColour: "#ff0000" },
-      { name: "Region 2", brushColour: "#00ff00" },
-      { name: "Region 3", brushColour: "#0400ff" },
-      { name: "Region 4", brushColour: "#ffff00" },
-      { name: "Region 5", brushColour: "#fc35db" },
-    ],
-    C: [
-      { name: "Region 1", brushColour: "#ff0000" },
-      { name: "Region 2", brushColour: "#00ff00" },
-      { name: "Region 3", brushColour: "#0400ff" },
-      { name: "Region 4", brushColour: "#ffff00" },
-      { name: "Region 5", brushColour: "#fc35db" },
-    ],
-  },
+  cameraFeedID: CAMERA_IDS[0],
+  brushSize: 1,
+  paintedCells: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = new Map<string, PaintedCell>();
+      return acc;
+    },
+    {} as Record<string, Map<string, PaintedCell>>,
+  ),
+  regionsByCamera: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = DEFAULT_REGIONS;
+      return acc;
+    },
+    {} as Record<string, { name: string; brushColour: string }[]>,
+  ),

  selectedRegionIndex: 0,
-  modeByCamera: {
-    A: "painter",
-    B: "painter",
-    C: "painter",
-  },
+  modeByCamera: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = "painter";
+      return acc;
+    },
+    {} as Record<CameraID, string>,
+  ),
+  zoomLevel: CAMERA_IDS.reduce(
+    (acc, id) => {
+      acc[id] = 0;
+      return acc;
+    },
+    {} as Record<CameraID, number>,
+  ),
 };

 export function reducer(state: CameraFeedState, action: CameraFeedAction) {
@@ -98,7 +95,28 @@ export function reducer(state: CameraFeedState, action: CameraFeedAction) {
          [state.cameraFeedID]: new Map<string, PaintedCell>(),
        },
      };
+    case "SET_CAMERA_FEED_DATA":
+      return {
+        ...action.cameraState,
+      };
+    case "RESET_CAMERA_FEED":
+      return {
+        ...initialState,
+      };
+    case "SET_ZOOM_LEVEL":
+      return {
+        ...state,
+        zoomLevel: {
+          ...state.zoomLevel,
+          [action.payload.cameraFeedID]: action.payload.zoomLevel,
+        },
+      };

+    case "SET_BRUSH_SIZE":
+      return {
+        ...state,
+        brushSize: action.payload.brushSize,
+      };
    default:
      return state;
  }
--- a/src/features/cameras/components/CameraGrid.tsx
+++ b/src/features/cameras/components/CameraGrid.tsx
@@ -4,16 +4,33 @@ import VideoFeedGridPainter from "./Video/VideoFeedGridPainter";
 import CameraSettings from "./CameraSettings/CameraSettings";

 import PlatePatch from "./PlatePatch/SightingPatch";
+import ResetAllModal from "./CameraSettings/resetAllModal/ResetAllModal";

 const CameraGrid = () => {
  const [tabIndex, setTabIndex] = useState(0);
+  const [isResetModalOpen, setIsResetModalOpen] = useState(false);

  return (
-    <div className="grid grid-cols-1 md:grid-cols-5 md:grid-rows-5 max-h-screen">
-      <VideoFeedGridPainter />
-      <CameraSettings tabIndex={tabIndex} setTabIndex={setTabIndex} />
-      <PlatePatch />
-    </div>
+    <>
+      <div className="grid grid-cols-1 md:grid-cols-3 md:gap-4 p-4">
+        <div className="col-span-2 flex flex-col gap-4">
+          <div className="">
+            <VideoFeedGridPainter />
+          </div>
+          <div className="overflow-hidden">
+            <PlatePatch />
+          </div>
+        </div>
+        <CameraSettings
+          tabIndex={tabIndex}
+          setTabIndex={setTabIndex}
+          isResetAllModalOpen={isResetModalOpen}
+          handleClose={() => setIsResetModalOpen(false)}
+          setIsResetModalOpen={setIsResetModalOpen}
+        />
+      </div>
+      <ResetAllModal isResetAllModalOpen={isResetModalOpen} handleClose={() => setIsResetModalOpen(false)} />
+    </>
  );
 };

--- a/src/features/cameras/components/CameraSettings/CameraPanel.tsx
+++ b/src/features/cameras/components/CameraSettings/CameraPanel.tsx
@@ -1,14 +1,19 @@
 import { Tabs, Tab, TabList, TabPanel } from "react-tabs";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
 import RegionSelector from "./RegionSelector";
+import CameraControls from "./cameraControls/CameraControls";

 type CameraPanelProps = {
  tabIndex: number;
+  isResetAllModalOpen: boolean;
+  handleClose: () => void;
+  setIsResetModalOpen: React.Dispatch<React.SetStateAction<boolean>>;
 };

-const CameraPanel = ({ tabIndex }: CameraPanelProps) => {
+const CameraPanel = ({ tabIndex, isResetAllModalOpen, handleClose, setIsResetModalOpen }: CameraPanelProps) => {
  const { state, dispatch } = useCameraFeedContext();
+  const [subTabIndex, setSubTabIndex] = useState(0);
  const cameraFeedID = state.cameraFeedID;
  const regions = state.regionsByCamera[cameraFeedID];

@@ -24,6 +29,7 @@ const CameraPanel = ({ tabIndex }: CameraPanelProps) => {
          return "B";
        case 2:
          return "C";
+        //Add more cases if more cameras are added
        default:
          return "A";
      }
@@ -34,25 +40,25 @@ const CameraPanel = ({ tabIndex }: CameraPanelProps) => {
  }, [dispatch, tabIndex]);

  return (
-    <Tabs>
+    <Tabs onSelect={(index) => setSubTabIndex(index)}>
      <TabList>
        <Tab>Target Detection</Tab>
        <Tab>Camera Controls</Tab>
      </TabList>
-
      <TabPanel>
        <RegionSelector
          regions={regions}
          selectedRegionIndex={selectedRegionIndex}
          mode={mode}
          cameraFeedID={cameraFeedID}
+          isResetAllModalOpen={isResetAllModalOpen}
+          handleClose={handleClose}
+          setIsResetModalOpen={setIsResetModalOpen}
+          subTabIndex={subTabIndex}
        />
      </TabPanel>
      <TabPanel>
-        <div className="p-4">
-          <h2 className="text-lg font-semibold mb-4">Camera Controls</h2>
-          <p>Controls for camera {cameraFeedID} will go here.</p>
-        </div>
+        <CameraControls cameraFeedID={cameraFeedID} subTabIndex={subTabIndex} />
      </TabPanel>
    </Tabs>
  );
--- a/src/features/cameras/components/CameraSettings/CameraSettings.tsx
+++ b/src/features/cameras/components/CameraSettings/CameraSettings.tsx
@@ -2,34 +2,44 @@ import Card from "../../../../ui/Card";
 import { Tab, Tabs, TabList, TabPanel } from "react-tabs";
 import "react-tabs/style/react-tabs.css";
 import CameraPanel from "./CameraPanel";
+import { CAMERA_IDS } from "../../../../app/config/cameraConfig";

 type CameraSettingsProps = {
  setTabIndex: (tabIndex: number) => void;
  tabIndex: number;
+  isResetAllModalOpen: boolean;
+  handleClose: () => void;
+  setIsResetModalOpen: React.Dispatch<React.SetStateAction<boolean>>;
 };

-const CameraSettings = ({ tabIndex, setTabIndex }: CameraSettingsProps) => {
+const CameraSettings = ({
+  setTabIndex,
+  isResetAllModalOpen,
+  handleClose,
+  setIsResetModalOpen,
+}: CameraSettingsProps) => {
  return (
-    <Card className="p-4 col-span-2 row-span-5 col-start-3 md:col-span-3 md:row-span-5 overflow-auto">
+    <Card className="p-4 w-full h-full ">
      <Tabs
        selectedTabClassName="bg-gray-300 text-gray-900 font-semibold border-none rounded-sm mb-1"
        className="react-tabs"
        onSelect={(index) => setTabIndex(index)}
      >
        <TabList>
-          <Tab>Camera A</Tab>
-          <Tab>Camera B</Tab>
-          <Tab>Camera C</Tab>
+          {CAMERA_IDS.map((id) => (
+            <Tab key={id}>Camera {id}</Tab>
+          ))}
        </TabList>
-        <TabPanel>
-          <CameraPanel tabIndex={tabIndex} />
-        </TabPanel>
-        <TabPanel>
-          <CameraPanel tabIndex={tabIndex} />
-        </TabPanel>
-        <TabPanel>
-          <CameraPanel tabIndex={tabIndex} />
-        </TabPanel>
+        {CAMERA_IDS.map((id, index) => (
+          <TabPanel key={id}>
+            <CameraPanel
+              tabIndex={index}
+              isResetAllModalOpen={isResetAllModalOpen}
+              handleClose={handleClose}
+              setIsResetModalOpen={setIsResetModalOpen}
+            />
+          </TabPanel>
+        ))}
      </Tabs>
    </Card>
  );
--- a/src/features/cameras/components/CameraSettings/RegionSelector.tsx
+++ b/src/features/cameras/components/CameraSettings/RegionSelector.tsx
@@ -2,31 +2,69 @@ import type { ColourData, PaintedCell, Region } from "../../../../types/types";
 import ColourPicker from "./ColourPicker";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
 import { useColourDectection } from "../../hooks/useColourDetection";
+import { useBlackBoard } from "../../../../hooks/useBlackBoard";
+import { toast } from "sonner";
+import { useCameraFeedSocket } from "../../../../app/context/WebSocketContext";
+import type { CameraID } from "../../../../app/config/cameraConfig";
+import { useEffect } from "react";
+import SliderComponent from "../../../../ui/SliderComponent";

 type RegionSelectorProps = {
  regions: Region[];
  selectedRegionIndex: number;
  mode: string;
-  cameraFeedID: "A" | "B" | "C";
+  cameraFeedID: CameraID;
+  isResetAllModalOpen: boolean;
+  handleClose: () => void;
+  setIsResetModalOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  subTabIndex?: number;
 };

-const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: RegionSelectorProps) => {
+const RegionSelector = ({
+  regions,
+  selectedRegionIndex,
+  mode,
+  cameraFeedID,
+  isResetAllModalOpen,
+  subTabIndex,
+  setIsResetModalOpen,
+}: RegionSelectorProps) => {
  const { colourMutation } = useColourDectection();
  const { state, dispatch } = useCameraFeedContext();
+  const { blackboardMutation } = useBlackBoard();
  const paintedCells = state.paintedCells[cameraFeedID];
+  const brushSize = state.brushSize;
+  const cameraSocket = useCameraFeedSocket();
+  useEffect(() => {
+    if (subTabIndex === 0) {
+      dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID, mode: "painter" } });
+    }
+  }, [cameraFeedID, dispatch, subTabIndex]);
+
+  const getCurrentSocket = () => {
+    switch (cameraFeedID) {
+      case "A":
+        return cameraSocket;
+      case "B":
+        return cameraSocket;
+      case "C":
+        return cameraSocket;
+    }
+  };
+
+  const socket = getCurrentSocket();
+
+  const getMagnificationLevel = () => {
+    const test = socket?.data;
+    if (!socket?.data) return null;
+    if (!test || !test.magnificationLevel) return "1x";
+    return test?.magnificationLevel;
+  };

  const handleChange = (e: { target: { value: string } }) => {
    dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID: cameraFeedID, mode: e.target.value } });
  };

-  const handleAddRegionClick = () => {
-    const regionName = `Region ${regions.length + 1}`;
-    dispatch({
-      type: "ADD_NEW_REGION",
-      payload: { cameraFeedID: cameraFeedID, regionName: regionName, brushColour: "#ffffff" },
-    });
-  };
-
  const handleResetRegion = () => {
    dispatch({
      type: "RESET_PAINTED_CELLS",
@@ -34,13 +72,6 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
    });
  };

-  const handleRemoveClick = () => {
-    dispatch({
-      type: "REMOVE_REGION",
-      payload: { cameraFeedID: cameraFeedID, regionName: regions[selectedRegionIndex].name },
-    });
-  };
-
  const handleModeChange = (newMode: string) => {
    dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID: cameraFeedID, mode: newMode } });
  };
@@ -58,14 +89,34 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
    });
  };

+  const handleAddRegionClick = () => {
+    const regionName = `Bay ${regions.length + 1}`;
+    dispatch({
+      type: "ADD_NEW_REGION",
+      payload: { cameraFeedID: cameraFeedID, regionName: regionName, brushColour: "#ffffff" },
+    });
+  };
+
+  const handleRemoveClick = () => {
+    dispatch({
+      type: "REMOVE_REGION",
+      payload: { cameraFeedID: cameraFeedID, regionName: regions[selectedRegionIndex].name },
+    });
+  };
+
+  const openResetModal = () => {
+    if (isResetAllModalOpen) return;
+    setIsResetModalOpen(true);
+  };
+
  const handleSaveclick = () => {
    const regions: ColourData[] = [];
-    const test = Array.from(paintedCells.entries());
-    const region1 = test.filter(([, cell]) => cell.region.name === "Region 1");
-    const region2 = test.filter(([, cell]) => cell.region.name === "Region 2");
-    const region3 = test.filter(([, cell]) => cell.region.name === "Region 3");
-    const region4 = test.filter(([, cell]) => cell.region.name === "Region 4");
-    const region5 = test.filter(([, cell]) => cell.region.name === "Region 5");
+    const paintedCellsArray = Array.from(paintedCells.entries());
+    const region1 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 1");
+    const region2 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 2");
+    const region3 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 3");
+    const region4 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 4");
+    const region5 = paintedCellsArray.filter(([, cell]) => cell.region.name === "Bay 5");
    const region1Data = {
      id: 1,
      cells: region1.map(([key]) => [parseInt(key.split("-")[1]), parseInt(key.split("-")[0])]),
@@ -103,104 +154,189 @@ const RegionSelector = ({ regions, selectedRegionIndex, mode, cameraFeedID }: Re
    }

    colourMutation.mutate({ cameraFeedID, regions: regions });
+
+    // Convert map to plain object for blackboard
+    const serializableState = {
+      ...state,
+      paintedCells: {
+        A: Array.from(state.paintedCells.A.entries()),
+        B: Array.from(state.paintedCells.B.entries()),
+        C: Array.from(state.paintedCells.C.entries()),
+      },
+    };
+    blackboardMutation.mutate({ operation: "INSERT", path: `cameraFeed`, value: serializableState });
+    toast.success("Region data saved successfully!");
  };

  return (
-    <div className="grid grid-cols-1 md:grid-cols-2 md:grid-rows-2 gap-4">
-      <div className="p-2 border border-gray-600 rounded-lg flex flex-col">
-        <h2 className="text-2xl mb-2">Tools</h2>
-        <div className="flex flex-col">
-          <label
-            htmlFor="paintMode"
-            className={`p-4 border rounded-lg  mb-2
+    <div className="flex flex-col gap-4 h-full overflow-y-auto mt-[5%]">
+      <div className="flex flex-col md:flex-row gap-3">
+        <div className="p-2 border border-gray-600 rounded-lg flex flex-col h-[10%] w-full">
+          <h2 className="text-2xl mb-2">Tools</h2>
+          <div className="flex flex-col gap-2">
+            <label
+              htmlFor="paintMode"
+              className={`p-4 border rounded-lg  mb-2
            ${mode === "painter" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
            hover:bg-[#202b36] hover:cursor-pointer`}
-          >
-            <input
-              id="paintMode"
-              type="radio"
-              onChange={handleChange}
-              checked={mode === "painter"}
-              value="painter"
-              className="sr-only"
-            />
-            <span className="text-xl">Paint mode</span>
-          </label>
-          <label
-            htmlFor="eraseMode"
-            className={`p-4 border rounded-lg  mb-2
+            >
+              <input
+                id="paintMode"
+                type="radio"
+                onChange={handleChange}
+                checked={mode === "painter"}
+                value="painter"
+                className="sr-only"
+              />
+              <span className="text-xl">Paint mode</span>
+            </label>
+            <label
+              htmlFor="eraseMode"
+              className={`p-4 border rounded-lg  mb-2
            ${mode === "eraser" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
            hover:bg-[#202b36] hover:cursor-pointer`}
-          >
-            <input
-              id="eraseMode"
-              type="radio"
-              onChange={handleChange}
-              checked={mode === "eraser"}
-              value={"eraser"}
-              className="sr-only"
-            />
-            <span className="text-xl">Erase mode</span>
-          </label>
+            >
+              <input
+                id="eraseMode"
+                type="radio"
+                onChange={handleChange}
+                checked={mode === "eraser"}
+                value={"eraser"}
+                className="sr-only"
+              />
+              <span className="text-xl">Erase mode</span>
+            </label>
+            <div className="flex flex-col border border-gray-600 rounded-lg p-4">
+              <span className="text-lg mb-2">
+                {mode === "painter" ? "Brush" : "Eraser"} Size: {brushSize}
+              </span>
+              <SliderComponent
+                id="brushSize"
+                onChange={(value) => dispatch({ type: "SET_BRUSH_SIZE", payload: { brushSize: value as number } })}
+                value={brushSize}
+                min={1}
+                max={5}
+                step={1}
+              />
+            </div>
+            <label
+              htmlFor="magnifyMode"
+              className={`p-4 border rounded-lg  mb-2
+            ${mode === "magnify" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
+            hover:bg-[#202b36] hover:cursor-pointer`}
+            >
+              <input
+                id="magnifyMode"
+                type="radio"
+                onChange={handleChange}
+                checked={mode === "magnify"}
+                value="magnify"
+                className="sr-only"
+              />
+              <div className="flex flex-col space-y-3">
+                <span className="text-xl">Magnifier</span>
+                {mode === "magnify" && <small className={`text-gray-400 italic`}>Use mouse to magnify the image</small>}
+              </div>
+            </label>
+            <label
+              htmlFor="zoomMode"
+              className={`p-4 border rounded-lg  mb-2
+            ${mode === "zoom" ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"}
+            hover:bg-[#202b36] hover:cursor-pointer`}
+            >
+              <input
+                id="zoomMode"
+                type="radio"
+                onChange={handleChange}
+                checked={mode === "zoom"}
+                value="zoom"
+                className="sr-only"
+              />
+              <div className="flex flex-col space-y-3">
+                <span className="text-xl">Digital Zoom mode</span>
+                <pre className="text-xs text-gray-400">{`Current Zoom: ${getMagnificationLevel()}`}</pre>
+                {mode === "zoom" && <small className={`text-gray-400 italic`}>Click image to digitally zoom</small>}
+              </div>
+            </label>
+          </div>
        </div>
-      </div>
-      <div className="p-2 border border-gray-600 rounded-lg flex flex-col">
-        <h2 className="text-2xl mb-2">Region Select</h2>
-        <>
-          {regions?.map((region, idx) => {
-            const isSelected = selectedRegionIndex === idx;
-            const inputId = `region-${idx}`;
-            return (
-              <label
-                htmlFor={inputId}
-                key={region.name}
-                className={`items-center p-4 m-1 rounded-xl border flex flex-row justify-between
+
+        <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
+          <h2 className="text-2xl mb-2">Bay Select</h2>
+          <>
+            {regions?.map((region, idx) => {
+              const isSelected = selectedRegionIndex === idx;
+              const inputId = `region-${idx}`;
+              return (
+                <label
+                  htmlFor={inputId}
+                  key={region.name}
+                  className={`items-center p-4 m-1 rounded-xl border flex flex-row justify-between
                  ${isSelected ? "border-gray-400 bg-[#202b36]" : "bg-[#253445] border-gray-700"} hover:bg-[#202b36] hover:cursor-pointer`}
-              >
-                <div className="flex flex-row gap-4 items-center">
-                  <input
-                    type="radio"
-                    checked={isSelected}
-                    id={inputId}
-                    name="region"
-                    className="sr-only"
-                    onChange={() => {
-                      handleModeChange("painter");
-                      handleRegionSelect(idx);
-                    }}
+                >
+                  <div className="flex flex-row gap-4 items-center">
+                    <input
+                      type="radio"
+                      checked={isSelected}
+                      id={inputId}
+                      name="region"
+                      className="sr-only"
+                      onChange={() => {
+                        handleModeChange("painter");
+                        handleRegionSelect(idx);
+                      }}
+                    />
+                    <span className="text-xl">{region.name}</span>
+                  </div>
+                  <ColourPicker
+                    colour={region.brushColour}
+                    setColour={(c: string) => handleRegionColourChange(idx, c)}
                  />
-                  <span className="text-xl">{region.name}</span>
-                </div>
-                <ColourPicker colour={region.brushColour} setColour={(c: string) => handleRegionColourChange(idx, c)} />
-                <div></div>
-              </label>
-            );
-          })}
-        </>
-        <div className=" mx-auto flex flex-row gap-4  mt-4">
-          <button className="border border-blue-900 bg-blue-700 px-4 py-1 rounded-md" onClick={handleAddRegionClick}>
-            Add Region
-          </button>
-          <button className="border border-red-900 bg-red-700 px-4 py-1 rounded-md" onClick={handleRemoveClick}>
-            Remove Region
-          </button>
+                  <div></div>
+                </label>
+              );
+            })}
+          </>
+          <div className="flex flex-col gap-4  mt-4">
+            <button
+              className="border border-blue-900 bg-blue-700 px-4 py-1 rounded-md hover:bg-blue-800 hover:cursor-pointer"
+              onClick={handleAddRegionClick}
+            >
+              Add Bay
+            </button>
+            <button
+              className="border border-red-900 bg-red-700 px-4 py-1 rounded-md hover:bg-red-800 hover:cursor-pointer"
+              onClick={handleRemoveClick}
+            >
+              Remove Bay
+            </button>
+          </div>
        </div>
      </div>

-      <div className="p-2 border border-gray-600 rounded-lg flex flex-col md:col-span-2 h-50">
-        <div className="flex flex-col">
-          <h2 className="text-2xl mb-2">Actions</h2>
+      <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full">
+        <h2 className="text-2xl mb-2">Actions</h2>
+        <div className="flex flex-col gap-4 justify-center">
+          <div className="grid grid-cols-2 gap-2">
+            <button
+              onClick={handleSaveclick}
+              className="mt-2 px-4 py-2 border border-blue-600 rounded-md text-white bg-blue-600 w-full hover:bg-blue-700 hover:cursor-pointer"
+            >
+              Save Region
+            </button>
+            <button
+              onClick={handleResetRegion}
+              className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full hover:bg-red-700 hover:cursor-pointer"
+            >
+              Reset Region
+            </button>
+          </div>
+
          <button
-            onClick={handleSaveclick}
-            className="mt-2 px-4 py-2 border border-blue-600 rounded-md text-white bg-blue-600 w-full md:w-[40%] hover:bg-blue-700 hover:cursor-pointer"
+            onClick={openResetModal}
+            className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full hover:bg-red-700 hover:cursor-pointer"
          >
-            Save Region
-          </button>
-          <button
-            onClick={handleResetRegion}
-            className="mt-2 px-4 py-2 border border-red-600 rounded-md text-white bg-red-600 w-full md:w-[40%] hover:bg-red-700 hover:cursor-pointer"
-          >
-            Reset Region
+            Reset All
          </button>
        </div>
      </div>
--- a/src/features/cameras/components/CameraSettings/cameraControls/CameraControls.tsx
+++ b/src/features/cameras/components/CameraSettings/cameraControls/CameraControls.tsx
@@ -0,0 +1,73 @@
+import { useEffect } from "react";
+import type { CameraID } from "../../../../../app/config/cameraConfig";
+import { useCameraFeedContext } from "../../../../../app/context/CameraFeedContext";
+import SliderComponent from "../../../../../ui/SliderComponent";
+import { useCameraZoom } from "../../../hooks/useCameraZoom";
+import { useDebouncedCallback } from "use-debounce";
+
+type CameraControlsProps = {
+  cameraFeedID: CameraID;
+  subTabIndex?: number;
+};
+
+const CameraControls = ({ cameraFeedID, subTabIndex }: CameraControlsProps) => {
+  const { state, dispatch } = useCameraFeedContext();
+  const { cameraZoomMutation, cameraZoomQuery } = useCameraZoom(cameraFeedID);
+
+  const zoomLevel = state.zoomLevel ? state.zoomLevel[cameraFeedID] : 0;
+  const currentZoomLevel = cameraZoomQuery.data ? cameraZoomQuery.data["propPhysCurrent"].value : 0;
+  const minLevel = cameraZoomQuery.data ? cameraZoomQuery.data["propPhysMin"].value : 0;
+  const maxLevel = cameraZoomQuery.data ? cameraZoomQuery.data["propPhysMax"].value : 0;
+
+  const normalizedZoomLevel = ((currentZoomLevel - minLevel) / (maxLevel - minLevel)).toFixed(2);
+  useEffect(() => {
+    if (subTabIndex === 1) {
+      dispatch({ type: "CHANGE_MODE", payload: { cameraFeedID, mode: "controller" } });
+    }
+  }, [cameraFeedID, dispatch, subTabIndex]);
+
+  const debouncedMutation = useDebouncedCallback(async (value) => {
+    await cameraZoomMutation.mutateAsync({
+      cameraFeedID,
+      zoomLevel: value as number,
+    });
+  }, 1000);
+
+  const handleChange = (value: number | number[]) => {
+    const newZoom = value as number;
+    dispatch({
+      type: "SET_ZOOM_LEVEL",
+      payload: { cameraFeedID: cameraFeedID, zoomLevel: newZoom },
+    });
+    debouncedMutation(newZoom);
+  };
+
+  const handleOneShotClick = () => {
+    debouncedMutation(normalizedZoomLevel);
+  };
+
+  return (
+    <div>
+      <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full mt-[5%]">
+        <h2 className="text-2xl mb-4">Camera {cameraFeedID}</h2>
+        <div className="w-[70%] ">
+          <label htmlFor="zoom">Zoom {zoomLevel}</label>
+          <SliderComponent id="zoom" onChange={handleChange} value={zoomLevel} min={0} max={1} step={0.1} />
+        </div>
+      </div>
+
+      <div className="p-2 border border-gray-600 rounded-lg flex flex-col w-full mt-[5%]">
+        <h2>One Shot</h2>
+        <button
+          type="button"
+          className="p-2 bg-gray-500 rounded-xl w-[40%] mt-2 hover:bg-gray-700 cursor-pointer"
+          onClick={handleOneShotClick}
+        >
+          One Shot
+        </button>
+      </div>
+    </div>
+  );
+};
+
+export default CameraControls;
--- a/src/features/cameras/components/CameraSettings/resetAllModal/ResetAllModal.tsx
+++ b/src/features/cameras/components/CameraSettings/resetAllModal/ResetAllModal.tsx
@@ -0,0 +1,55 @@
+import { toast } from "sonner";
+import { useCameraFeedContext } from "../../../../../app/context/CameraFeedContext";
+import { useBlackBoard } from "../../../../../hooks/useBlackBoard";
+import ModalComponent from "../../../../../ui/ModalComponent";
+
+type ResetAllModalProps = {
+  isResetAllModalOpen: boolean;
+  handleClose: () => void;
+};
+
+const ResetAllModal = ({ isResetAllModalOpen, handleClose }: ResetAllModalProps) => {
+  const { state, dispatch } = useCameraFeedContext();
+  const { blackboardMutation } = useBlackBoard();
+
+  const handleResetAll = async () => {
+    dispatch({ type: "RESET_CAMERA_FEED" });
+
+    handleClose();
+    const result = await blackboardMutation.mutateAsync({
+      operation: "INSERT",
+      path: `cameraFeed`,
+      value: state,
+    });
+    //  Need endpoint to reset all target detection painted cells
+    if (result?.reason === "OK") {
+      toast.success("All camera settings have been reset to default values.");
+    }
+  };
+  return (
+    <ModalComponent isModalOpen={isResetAllModalOpen} close={handleClose}>
+      <div>
+        <h2 className="text-xl font-bold mb-4">Reset All Camera Settings</h2>
+        <p className="mb-4">
+          Are you sure you want to reset all camera settings to their default values? This action cannot be undone.
+        </p>
+        <div className="flex justify-end gap-4">
+          <button
+            onClick={handleResetAll}
+            className="bg-red-600 text-white px-4 py-2 rounded hover:bg-red-700 hover:cursor-pointer"
+          >
+            Reset
+          </button>
+          <button
+            onClick={handleClose}
+            className="bg-gray-600 text-white px-4 py-2 rounded hover:bg-gray-700 hover:cursor-pointer  "
+          >
+            Cancel
+          </button>
+        </div>
+      </div>
+    </ModalComponent>
+  );
+};
+
+export default ResetAllModal;
--- a/src/features/cameras/components/PlatePatch/SightingEntryTable.tsx
+++ b/src/features/cameras/components/PlatePatch/SightingEntryTable.tsx
@@ -1,43 +1,96 @@
+import { useState } from "react";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
 import type { DecodeReading } from "../../../../types/types";
 import { useSightingEntryAndExit } from "../../hooks/useSightingEntryAndExit";

+import PlatePatchModal from "./platePatchModal/PlatePatchModal";
+
 const SightingEntryTable = () => {
  const { state } = useCameraFeedContext();
+  const [isPlatePatchModalOpen, setIsPlatePatchModalOpen] = useState(false);
+  const [currentPatch, setCurrentPatch] = useState<DecodeReading | null>(null);
  const cameraFeedID = state.cameraFeedID;
  const { entryQuery } = useSightingEntryAndExit(cameraFeedID);

  const isLoading = entryQuery?.isFetching;
  const readings = entryQuery?.data?.decodes;

+  const handleRowClick = (reading: DecodeReading) => {
+    setCurrentPatch(reading);
+    setIsPlatePatchModalOpen(true);
+  };
+
  if (isLoading) return <span className="text-slate-500">Loading Sighting data…</span>;
  return (
-    <div className="border border-gray-600 rounded-lg overflow-hidden m-2">
-      <div className="overflow-y-auto ">
-        <table className="w-full text-left text-sm">
-          <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
-            <tr>
-              <th className="px-4 py-3 font-semibold">VRM</th>
-              <th className="px-4 py-3 font-semibold">Lane ID</th>
-              <th className="px-4 py-3 font-semibold text-center">Seen Count</th>
-              <th className="px-4 py-3 font-semibold">First Seen</th>
-              <th className="px-4 py-3 font-semibold">Last Seen</th>
-            </tr>
-          </thead>
-          <tbody className="divide-y divide-gray-700">
-            {readings?.map((reading: DecodeReading) => (
-              <tr className="hover:bg-gray-800/30 transition-colors" key={reading?.id}>
-                <td className="px-4 py-3 font-mono font-semibold text-blue-400 text-lg">{reading?.vrm}</td>
-                <td className="px-4 py-3 text-gray-300">{reading?.laneID}</td>
-                <td className="px-4 py-3 text-center text-gray-300">{reading?.seenCount}</td>
-                <td className="px-4 py-3 text-gray-400 text-md">{reading?.firstSeenTimeHumane}</td>
-                <td className="px-4 py-3 text-gray-400 text-md">{reading?.lastSeenTimeHumane}</td>
+    <>
+      <div className="border border-gray-600 rounded-lg m-2">
+        {/* Desktop Table */}
+        <div className="hidden md:block overflow-y-auto">
+          <table className="w-full text-left text-sm">
+            <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
+              <tr>
+                <th className="px-4 py-3 font-semibold">VRM</th>
+                <th className="px-4 py-3 font-semibold">Bay ID</th>
+                <th className="px-4 py-3 font-semibold text-center">Seen Count</th>
+                <th className="px-4 py-3 font-semibold">First Seen</th>
+                <th className="px-4 py-3 font-semibold">Last Seen</th>
              </tr>
-            ))}
-          </tbody>
-        </table>
+            </thead>
+            <tbody className="divide-y divide-gray-700">
+              {readings?.map((reading: DecodeReading) => (
+                <tr
+                  className="hover:bg-gray-800/30 transition-colors hover:cursor-pointer"
+                  key={reading?.id}
+                  onClick={() => handleRowClick(reading)}
+                >
+                  <td className="px-4 py-3 font-mono font-semibold text-blue-400 text-lg">{reading?.vrm}</td>
+                  <td className="px-4 py-3 text-gray-300">{reading?.laneID}</td>
+                  <td className="px-4 py-3 text-center text-gray-300">{reading?.seenCount}</td>
+                  <td className="px-4 py-3 text-gray-400 text-md">{reading?.firstSeenTimeHumane}</td>
+                  <td className="px-4 py-3 text-gray-400 text-md">{reading?.lastSeenTimeHumane}</td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+
+        {/* Mobile */}
+        <div className="md:hidden overflow-y-auto space-y-3 p-3">
+          {readings?.map((reading: DecodeReading) => (
+            <div
+              key={reading?.id}
+              className="bg-gray-800/30 rounded-lg p-4 space-y-2 border border-gray-700 hover:border-gray-600 transition-colors"
+              onClick={() => handleRowClick(reading)}
+            >
+              <div className="flex justify-between items-start">
+                <span className="font-mono font-semibold text-blue-400 text-xl">{reading?.vrm}</span>
+                <span className="text-gray-400 text-sm">Bay {reading?.laneID}</span>
+              </div>
+              <div className="flex justify-between text-sm">
+                <span className="text-gray-400">Seen Count:</span>
+                <span className="text-gray-300 font-semibold">{reading?.seenCount}</span>
+              </div>
+              <div className="pt-2 border-t border-gray-700 space-y-1 text-xs">
+                <div className="flex justify-between">
+                  <span className="text-gray-500">First Seen:</span>
+                  <span className="text-gray-400">{reading?.firstSeenTimeHumane}</span>
+                </div>
+                <div className="flex justify-between">
+                  <span className="text-gray-500">Last Seen:</span>
+                  <span className="text-gray-400">{reading?.lastSeenTimeHumane}</span>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
      </div>
-    </div>
+      <PlatePatchModal
+        isPlatePatchModalOpen={isPlatePatchModalOpen}
+        handleClose={() => setIsPlatePatchModalOpen(false)}
+        currentPatch={currentPatch}
+        direction={"entry"}
+      />
+    </>
  );
 };

--- a/src/features/cameras/components/PlatePatch/SightingExitTable.tsx
+++ b/src/features/cameras/components/PlatePatch/SightingExitTable.tsx
@@ -1,8 +1,12 @@
+import { useState } from "react";
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
 import type { DecodeReading } from "../../../../types/types";
 import { useSightingEntryAndExit } from "../../hooks/useSightingEntryAndExit";
+import PlatePatchModal from "./platePatchModal/PlatePatchModal";

 const SightingExitTable = () => {
+  const [isPlatePatchModalOpen, setIsPlatePatchModalOpen] = useState(false);
+  const [currentPatch, setCurrentPatch] = useState<DecodeReading | null>(null);
  const { state } = useCameraFeedContext();
  const cameraFeedID = state.cameraFeedID;
  const { exitQuery } = useSightingEntryAndExit(cameraFeedID);
@@ -10,34 +14,82 @@ const SightingExitTable = () => {
  const isLoading = exitQuery?.isFetching;
  const readings = exitQuery?.data?.decodes;

+  const handleRowClick = (reading: DecodeReading) => {
+    setCurrentPatch(reading);
+    setIsPlatePatchModalOpen(true);
+  };
+
  if (isLoading) return <span className="text-slate-500">Loading Sighting data…</span>;
  return (
-    <div className="border border-gray-600 rounded-lg overflow-hidden m-2">
-      <div className="overflow-y-auto ">
-        <table className="w-full text-left text-sm">
-          <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
-            <tr>
-              <th className="px-4 py-3 font-semibold">VRM</th>
-              <th className="px-4 py-3 font-semibold">Lane ID</th>
-              <th className="px-4 py-3 font-semibold text-center">Seen Count</th>
-              <th className="px-4 py-3 font-semibold">First Seen</th>
-              <th className="px-4 py-3 font-semibold">Last Seen</th>
-            </tr>
-          </thead>
-          <tbody className="divide-y divide-gray-700">
-            {readings?.map((reading: DecodeReading) => (
-              <tr className="hover:bg-gray-800/30 transition-colors" key={reading?.id}>
-                <td className="px-4 py-3 font-mono font-semibold text-red-400 text-lg">{reading?.vrm}</td>
-                <td className="px-4 py-3 text-gray-300">{reading?.laneID}</td>
-                <td className="px-4 py-3 text-center text-gray-300">{reading?.seenCount}</td>
-                <td className="px-4 py-3 text-gray-400 text-md">{reading?.firstSeenTimeHumane}</td>
-                <td className="px-4 py-3 text-gray-400 text-md">{reading?.lastSeenTimeHumane}</td>
+    <>
+      <div className="border border-gray-600 rounded-lg m-2">
+        {/* Desktop Table */}
+        <div className="hidden md:block overflow-y-auto">
+          <table className="w-full text-left text-sm">
+            <thead className="bg-gray-700/50 text-gray-200 sticky top-0">
+              <tr>
+                <th className="px-4 py-3 font-semibold">VRM</th>
+                <th className="px-4 py-3 font-semibold">Bay ID</th>
+                <th className="px-4 py-3 font-semibold text-center">Seen Count</th>
+                <th className="px-4 py-3 font-semibold">First Seen</th>
+                <th className="px-4 py-3 font-semibold">Last Seen</th>
              </tr>
-            ))}
-          </tbody>
-        </table>
+            </thead>
+            <tbody className="divide-y divide-gray-700">
+              {readings?.map((reading: DecodeReading) => (
+                <tr
+                  className="hover:bg-gray-800/30 transition-colors hover:cursor-pointer"
+                  key={reading?.id}
+                  onClick={() => handleRowClick(reading)}
+                >
+                  <td className="px-4 py-3 font-mono font-semibold text-red-400 text-lg">{reading?.vrm}</td>
+                  <td className="px-4 py-3 text-gray-300">{reading?.laneID}</td>
+                  <td className="px-4 py-3 text-center text-gray-300">{reading?.seenCount}</td>
+                  <td className="px-4 py-3 text-gray-400 text-md">{reading?.firstSeenTimeHumane}</td>
+                  <td className="px-4 py-3 text-gray-400 text-md">{reading?.lastSeenTimeHumane}</td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+
+        {/* Mobile Cards */}
+        <div className="md:hidden overflow-y-auto space-y-3 p-3">
+          {readings?.map((reading: DecodeReading) => (
+            <div
+              key={reading?.id}
+              className="bg-gray-800/30 rounded-lg p-4 space-y-2 border border-gray-700 hover:border-gray-600 transition-colors"
+              onClick={() => handleRowClick(reading)}
+            >
+              <div className="flex justify-between items-start">
+                <span className="font-mono font-semibold text-red-400 text-xl">{reading?.vrm}</span>
+                <span className="text-gray-400 text-sm">Bay {reading?.laneID}</span>
+              </div>
+              <div className="flex justify-between text-sm">
+                <span className="text-gray-400">Seen Count:</span>
+                <span className="text-gray-300 font-semibold">{reading?.seenCount}</span>
+              </div>
+              <div className="pt-2 border-t border-gray-700 space-y-1 text-xs">
+                <div className="flex justify-between">
+                  <span className="text-gray-500">First Seen:</span>
+                  <span className="text-gray-400">{reading?.firstSeenTimeHumane}</span>
+                </div>
+                <div className="flex justify-between">
+                  <span className="text-gray-500">Last Seen:</span>
+                  <span className="text-gray-400">{reading?.lastSeenTimeHumane}</span>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
      </div>
-    </div>
+      <PlatePatchModal
+        isPlatePatchModalOpen={isPlatePatchModalOpen}
+        handleClose={() => setIsPlatePatchModalOpen(false)}
+        currentPatch={currentPatch}
+        direction={"exit"}
+      />
+    </>
  );
 };

--- a/src/features/cameras/components/PlatePatch/SightingPatch.tsx
+++ b/src/features/cameras/components/PlatePatch/SightingPatch.tsx
@@ -6,9 +6,9 @@ import SightingExitTable from "./SightingExitTable";

 const PlatePatch = () => {
  return (
-    <Card className="md:row-start-4 md:col-span-2 p-4 h-[190%]">
+    <Card className="p-4 w-full max-h-[600px] flex flex-col md:w-[95%]">
      <CardHeader title="Entry / Exit" />
-      <Tabs>
+      <Tabs defaultIndex={1} className="flex-1 flex flex-col">
        <TabList>
          <Tab>Entry Sightings</Tab>
          <Tab>Exit Sightings</Tab>
--- a/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModal.tsx
+++ b/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModal.tsx
@@ -0,0 +1,20 @@
+import type { DecodeReading } from "../../../../../types/types";
+import ModalComponent from "../../../../../ui/ModalComponent";
+import PlatePatchModalContent from "./PlatePatchModalContent";
+
+type PlatePatchModalProps = {
+  isPlatePatchModalOpen: boolean;
+  handleClose: () => void;
+  currentPatch: DecodeReading | null;
+  direction?: "entry" | "exit";
+};
+
+const PlatePatchModal = ({ isPlatePatchModalOpen, handleClose, currentPatch, direction }: PlatePatchModalProps) => {
+  return (
+    <ModalComponent isModalOpen={isPlatePatchModalOpen} close={handleClose}>
+      <PlatePatchModalContent currentPatch={currentPatch} direction={direction} />
+    </ModalComponent>
+  );
+};
+
+export default PlatePatchModal;
--- a/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModalContent.tsx
+++ b/src/features/cameras/components/PlatePatch/platePatchModal/PlatePatchModalContent.tsx
@@ -0,0 +1,64 @@
+import type { DecodeReading } from "../../../../../types/types";
+
+type PlatePatchModalContentProps = {
+  currentPatch: DecodeReading | null;
+  direction?: "entry" | "exit";
+};
+
+const PlatePatchModalContent = ({ currentPatch, direction }: PlatePatchModalContentProps) => {
+  const imageSrc = `data:image/png;base64,${currentPatch?.plate || ""}`;
+  const imageUrl = currentPatch ? imageSrc : "";
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between border-b border-gray-600 pb-3">
+        <h2
+          className={`font-mono font-bold text-3xl tracking-wide
+          ${direction === "entry" ? "text-blue-400" : "text-red-400"}`}
+        >
+          {currentPatch?.vrm}
+        </h2>
+        <span
+          className={`px-3 py-1 rounded-full text-xs font-semibold uppercase
+          ${direction === "entry" ? "bg-blue-500/20 text-blue-400" : "bg-red-500/20 text-red-400"}`}
+        >
+          {direction === "entry" ? "Entry" : "Exit"}
+        </span>
+      </div>
+
+      <div className="border border-gray-600 rounded-2xl">
+        <div className="flex  bg-gray-800/50 rounded-lg p-4">
+          <img
+            src={imageUrl}
+            alt={`${direction === "entry" ? "Entry" : "Exit"} Image for ${currentPatch?.vrm || "N/A"}`}
+            className="rounded-lg border border-gray-600 max-w-full h-auto shadow-lg"
+          />
+        </div>
+
+        <div className="grid grid-cols-2 gap-4 bg-gray-800/30 rounded-lg p-4">
+          <div className="space-y-1">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">Bay ID</p>
+            <p className="text-gray-200 font-semibold text-lg">{currentPatch?.laneID || "N/A"}</p>
+          </div>
+
+          <div className="space-y-1">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">Seen Count</p>
+            <p className="text-gray-200 font-semibold text-lg">{currentPatch?.seenCount || "N/A"}</p>
+          </div>
+
+          <div className="space-y-1 col-span-2">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">First Seen</p>
+            <p className="text-gray-300 text-sm">{currentPatch?.firstSeenTimeHumane || "N/A"}</p>
+          </div>
+
+          <div className="space-y-1 col-span-2">
+            <p className="text-gray-400 text-xs uppercase tracking-wider">Last Seen</p>
+            <p className="text-gray-300 text-sm">{currentPatch?.lastSeenTimeHumane || "N/A"}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PlatePatchModalContent;
--- a/src/features/cameras/components/Video/VideoFeedGridPainter.tsx
+++ b/src/features/cameras/components/Video/VideoFeedGridPainter.tsx
@@ -2,8 +2,11 @@ import { useEffect, useRef, useState, type RefObject } from "react";
 import { Stage, Layer, Image, Shape } from "react-konva";
 import type { KonvaEventObject } from "konva/lib/Node";
 import { useCreateVideoSnapshot } from "../../hooks/useGetvideoSnapshots";
-
 import { useCameraFeedContext } from "../../../../app/context/CameraFeedContext";
+import { useCameraFeedSocket } from "../../../../app/context/WebSocketContext";
+import { ReadyState } from "react-use-websocket";
+import { toast } from "sonner";
+import type { CameraID } from "../../../../app/config/cameraConfig";

 const BACKEND_WIDTH = 640;
 const BACKEND_HEIGHT = 360;
@@ -16,19 +19,63 @@ const gap = 0;
 const VideoFeedGridPainter = () => {
  const { state } = useCameraFeedContext();
  const cameraFeedID = state.cameraFeedID;
-  const paintedCells = state.paintedCells[cameraFeedID];
+  const paintedCells = state?.paintedCells?.[cameraFeedID];
  const regions = state.regionsByCamera[cameraFeedID];
  const selectedRegionIndex = state.selectedRegionIndex;
  const mode = state.modeByCamera[cameraFeedID];
+  const brushSize = state.brushSize;
+
  const { latestBitmapRef, isloading } = useCreateVideoSnapshot();
  const [stageSize, setStageSize] = useState({ width: BACKEND_WIDTH, height: BACKEND_HEIGHT });
  const isDrawingRef = useRef(false);
+  const [scale, setScale] = useState(1);
+  const [position, setPosition] = useState({ x: 0, y: 0 });
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const stageRef = useRef<any>(null);
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const paintLayerRef = useRef<any>(null);

  const currentScale = stageSize.width / BACKEND_WIDTH;
  const size = BACKEND_CELL_SIZE * currentScale;

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const paintLayerRef = useRef<any>(null);
+  const cameraSocket = useCameraFeedSocket();
+
+  const getCurrentSocket = () => {
+    switch (cameraFeedID) {
+      case "A":
+        return cameraSocket;
+      case "B":
+        return cameraSocket;
+      case "C":
+        return cameraSocket;
+    }
+  };
+
+  const handleZoomClick = (e: KonvaEventObject<MouseEvent>, cameraFeedID: CameraID) => {
+    if (mode !== "zoom") return;
+    const socket = getCurrentSocket();
+    const stage = e.target.getStage();
+    const coords = stage?.getPointerPosition();
+    if (!coords || !socket) return;
+
+    const newX = coords.x / stageSize.width;
+    const newY = coords.y / stageSize.height;
+
+    // Check if WebSocket is connected
+    if (socket.readyState !== ReadyState.OPEN) {
+      toast.error(`Camera ${cameraFeedID} WebSocket is not connected`);
+      return;
+    }
+
+    try {
+      socket.send(`ZOOM=${newX.toFixed(2)},${newY.toFixed(2)}`);
+    } catch (error) {
+      console.error("WebSocket send error:", error);
+      toast.error(`Failed to send command to Camera ${cameraFeedID}`);
+    }
+  };

  const draw = (bmp: RefObject<ImageBitmap | null>): ImageBitmap | null => {
    if (!bmp || !bmp.current) {
@@ -40,62 +87,104 @@ const VideoFeedGridPainter = () => {

  const image = draw(latestBitmapRef);

-  const paintCell = (x: number, y: number) => {
+  const paintCell = (x: number, y: number, brushSize: number) => {
+    if (mode === "controller" || mode === "zoom" || mode === "magnify") return;
    const col = Math.floor(x / (size + gap));
    const row = Math.floor(y / (size + gap));
+    const radius = Math.floor(brushSize / 2);

    if (row < 0 || row >= rows || col < 0 || col >= cols) return;

    const activeRegion = regions[selectedRegionIndex];
    if (!activeRegion) return;

-    const key = `${row}-${col}`;
    const currentColour = regions[selectedRegionIndex].brushColour;

-    const map = paintedCells;
-    const existing = map.get(key);
-
-    if (mode === "eraser") {
-      if (map.has(key)) {
-        map.delete(key);
-        paintLayerRef.current?.batchDraw();
+    for (let r = row - radius; r <= row + radius; r++) {
+      for (let c = col - radius; c <= col + radius; c++) {
+        if (r < 0 || r >= rows || c < 0 || c >= cols) continue;
+        const key = `${r}-${c}`;
+        const map = paintedCells;
+        const existing = map.get(key);
+        if (mode === "eraser") {
+          if (map.has(key)) {
+            map.delete(key);
+            paintLayerRef.current?.batchDraw();
+          }
+          continue;
+        }
+        if (existing && existing.colour === currentColour) continue;
+        map.set(key, { colour: currentColour, region: activeRegion });
      }
-      return;
    }

-    if (existing && existing.colour === currentColour) return;
-
-    map.set(key, { colour: currentColour, region: activeRegion });
-
    paintLayerRef.current?.batchDraw();
  };

  const handleStageMouseDown = (e: KonvaEventObject<MouseEvent>) => {
-    if (!regions[selectedRegionIndex]) return;
+    if (!regions[selectedRegionIndex] || mode === "magnify" || mode === "zoom") return;
    isDrawingRef.current = true;
    const pos = e.target.getStage()?.getPointerPosition();
-    if (pos) paintCell(pos.x, pos.y);
+    if (pos) paintCell(pos.x, pos.y, brushSize);
  };

  const handleStageMouseMove = (e: KonvaEventObject<MouseEvent>) => {
-    if (!isDrawingRef.current) return;
+    if (!isDrawingRef.current || mode === "magnify") return;
    if (!regions[selectedRegionIndex]) return;
    const pos = e.target.getStage()?.getPointerPosition();
-    if (pos) paintCell(pos.x, pos.y);
+    if (pos) paintCell(pos.x, pos.y, brushSize);
  };

  const handleStageMouseUp = () => {
    isDrawingRef.current = false;
  };

+  const handleMouseEnter = () => {
+    if (mode !== "magnify") return;
+    setScale(2);
+  };
+  const handleMouseLeave = () => {
+    document.body.style.cursor = "default";
+    setScale(1);
+    setPosition({ x: 0, y: 0 });
+  };
+  const handleMouseMove = (e: KonvaEventObject<MouseEvent>) => {
+    if (scale === 1) return;
+
+    const stage = e.target.getStage();
+    if (!stage) return;
+
+    const pointerPosition = stage.getPointerPosition();
+    if (!pointerPosition) return;
+
+    const newX = stageSize.width / 2 - pointerPosition.x * scale;
+    const newY = stageSize.height / 2 - pointerPosition.y * scale;
+
+    const maxX = 0;
+    const minX = stageSize.width - stageSize.width * scale;
+    const maxY = 0;
+    const minY = stageSize.height - stageSize.height * scale;
+
+    setPosition({
+      x: Math.max(minX, Math.min(maxX, newX)),
+      y: Math.max(minY, Math.min(maxY, newY)),
+    });
+  };
+
  useEffect(() => {
    const handleResize = () => {
      const width = window.innerWidth;

      const aspectRatio = BACKEND_WIDTH / BACKEND_HEIGHT;
-      const newWidth = width * 0.39;
-      const newHeight = newWidth / aspectRatio;
-      setStageSize({ width: newWidth, height: newHeight });
+      if (width < 768) {
+        const newWidth = width * 0.8;
+        const newHeight = newWidth / aspectRatio;
+        setStageSize({ width: newWidth, height: newHeight });
+      } else {
+        const newWidth = width * 0.6;
+        const newHeight = newWidth / aspectRatio;
+        setStageSize({ width: newWidth, height: newHeight });
+      }
    };

    handleResize();
@@ -106,46 +195,64 @@ const VideoFeedGridPainter = () => {

  if (image === null || isloading) return <span className="text-slate-500">Loading Video feed…</span>;
  return (
-    <div
-      className={`mt-4.5 row-span-1 col-span-2 ${mode === "painter" ? "hover:cursor-crosshair" : ""} ${
-        mode === "eraser" ? "hover:cursor-pointer" : ""
-      }`}
-    >
+    <div>
      <Stage
+        ref={stageRef}
        width={stageSize.width}
        height={stageSize.height}
        onMouseDown={handleStageMouseDown}
        onMouseMove={handleStageMouseMove}
        onMouseUp={handleStageMouseUp}
        onMouseLeave={handleStageMouseUp}
+        className={`max-w-[55%] md:row-span-3 md:col-span-3 ${mode === "painter" ? "hover:cursor-crosshair" : ""} ${
+          mode === "eraser" ? "hover:cursor-pointer" : ""
+        } ${mode === "zoom" ? "hover:cursor-zoom-in" : ""}`}
      >
-        <Layer>
-          <Image image={image} width={stageSize.width} height={stageSize.height} classname={"rounded-lg"} />
+        <Layer
+          scaleX={scale}
+          scaleY={scale}
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+          onMouseMove={handleMouseMove}
+          x={position.x}
+          y={position.y}
+        >
+          <Image
+            image={image}
+            width={stageSize.width}
+            height={stageSize.height}
+            classname={"rounded-lg"}
+            onClick={(e) => handleZoomClick(e, cameraFeedID)}
+            cornerRadius={10}
+          />
        </Layer>

        <Layer ref={paintLayerRef} opacity={0.6}>
-          <Shape
-            sceneFunc={(ctx, shape) => {
-              const cells = paintedCells;
-              cells.forEach((cell, key) => {
-                const [rowStr, colStr] = key.split("-");
-                const row = Number(rowStr);
-                const col = Number(colStr);
+          {mode === "painter" || mode === "eraser" ? (
+            <Shape
+              sceneFunc={(ctx, shape) => {
+                const cells = paintedCells;
+                if (!cells || cells.size === 0 || !paintLayerRef.current) return;
+                cells?.forEach((cell, key) => {
+                  const [rowStr, colStr] = key.split("-");
+                  const row = Number(rowStr);
+                  const col = Number(colStr);

-                const x = col * (size + gap);
-                const y = row * (size + gap);
+                  const x = col * (size + gap);
+                  const y = row * (size + gap);

-                ctx.beginPath();
-                ctx.rect(x, y, size, size);
-                ctx.fillStyle = cell.colour;
-                ctx.fill();
-              });
+                  ctx.beginPath();
+                  ctx.rect(x, y, size, size);
+                  ctx.fillStyle = cell.colour;
+                  ctx.fill();
+                });

-              ctx.fillStrokeShape(shape);
-            }}
-            width={stageSize.width}
-            height={stageSize.height}
-          />
+                ctx.fillStrokeShape(shape);
+              }}
+              width={stageSize.width}
+              height={stageSize.height}
+            />
+          ) : null}
        </Layer>
      </Stage>
    </div>
--- a/src/features/cameras/hooks/useCameraZoom.ts
+++ b/src/features/cameras/hooks/useCameraZoom.ts
@@ -0,0 +1,51 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { CameraZoomConfig } from "../../../types/types";
+import type { CameraID } from "../../../app/config/cameraConfig";
+
+const fetchZoomLevel = async (cameraFeedID: string) => {
+  const response = await fetch(`${CAMBASE}/api/fetch-config?id=Camera${cameraFeedID}-onvif-controller`);
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+const postZoomLevel = async (zoomConfig: CameraZoomConfig) => {
+  const fields = [
+    { property: "propPhysCurrent", value: zoomConfig.zoomLevel },
+    { property: "propCameraHost", value: "192.168.0.101" },
+    { property: "propCameraPort", value: 80 },
+    { property: "propCameraUsername", value: "administrator" },
+    { property: "propCameraPassword", value: "MAV12345" },
+  ];
+  const zoomPayload = {
+    id: `Camera${zoomConfig.cameraFeedID}-onvif-controller`,
+    fields,
+  };
+  const response = await fetch(
+    `${CAMBASE}/Camera${zoomConfig.cameraFeedID}-camera-control?command=setAbsoluteZoom&zoomLevel=${zoomConfig.zoomLevel}`,
+    {
+      method: "POST",
+      body: JSON.stringify(zoomPayload),
+    },
+  );
+
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+export const useCameraZoom = (cameraFeedID: CameraID) => {
+  const cameraZoomQuery = useQuery({
+    queryKey: ["cameraZoom", cameraFeedID],
+    queryFn: () => fetchZoomLevel(cameraFeedID),
+  });
+
+  const cameraZoomMutation = useMutation({
+    mutationKey: ["postCameraZoom"],
+    mutationFn: (zoomConfig: CameraZoomConfig) => postZoomLevel(zoomConfig),
+  });
+  return { cameraZoomQuery, cameraZoomMutation };
+};
--- a/src/features/cameras/hooks/useGetVideoFeed.ts
+++ b/src/features/cameras/hooks/useGetVideoFeed.ts
@@ -1,8 +1,9 @@
 import { useQuery } from "@tanstack/react-query";
 import { CAMBASE } from "../../../utils/config";
+import type { CameraID } from "../../../app/config/cameraConfig";

-const getfeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
-  const response = await fetch(`${CAMBASE}TargetDetectionColour${cameraFeedID}-preview`, {
+const targetDectionFeed = async (cameraFeedID: CameraID | null) => {
+  const response = await fetch(`${CAMBASE}/TargetDetectionColour${cameraFeedID}-preview`, {
    signal: AbortSignal.timeout(300000),
    cache: "no-store",
  });
@@ -12,12 +13,31 @@ const getfeed = async (cameraFeedID: "A" | "B" | "C" | null) => {
  return response.blob();
 };

-export const useGetVideoFeed = (cameraFeedID: "A" | "B" | "C" | null) => {
-  const videoQuery = useQuery({
+const getVideoFeed = async (cameraFeedID: CameraID | null) => {
+  const response = await fetch(`${CAMBASE}/Camera${cameraFeedID}-preview`, {
+    signal: AbortSignal.timeout(300000),
+    cache: "no-store",
+  });
+  if (!response.ok) {
+    throw new Error(`Cannot reach endpoint (${response.status})`);
+  }
+  return response.blob();
+};
+
+export const useGetVideoFeed = (cameraFeedID: CameraID | null, mode: string) => {
+  const targetDetectionQuery = useQuery({
    queryKey: ["getfeed", cameraFeedID],
-    queryFn: () => getfeed(cameraFeedID),
+    queryFn: () => targetDectionFeed(cameraFeedID),
    refetchInterval: 500,
+    enabled: mode !== "magnify" && mode !== "zoom",
  });

-  return { videoQuery };
+  const videoFeedQuery = useQuery({
+    queryKey: ["videoQuery", cameraFeedID, mode],
+    queryFn: () => getVideoFeed(cameraFeedID),
+    refetchInterval: 500,
+    enabled: mode === "magnify" || mode === "zoom",
+  });
+
+  return { targetDetectionQuery, videoFeedQuery };
 };
--- a/src/features/cameras/hooks/useGetvideoSnapshots.ts
+++ b/src/features/cameras/hooks/useGetvideoSnapshots.ts
@@ -5,18 +5,30 @@ import { useCameraFeedContext } from "../../../app/context/CameraFeedContext";
 export const useCreateVideoSnapshot = () => {
  const { state } = useCameraFeedContext();
  const cameraFeedID = state?.cameraFeedID;
+  const mode = state.modeByCamera[cameraFeedID];
  const latestBitmapRef = useRef<ImageBitmap | null>(null);
-  const { videoQuery } = useGetVideoFeed(cameraFeedID);
+  const { targetDetectionQuery, videoFeedQuery } = useGetVideoFeed(cameraFeedID, mode);

-  const snapShot = videoQuery?.data;
-  const isloading = videoQuery.isPending;
+  let snapShot = targetDetectionQuery?.data;
+  const isloading = targetDetectionQuery.isPending;
+
+  const videoSnapShot = videoFeedQuery?.data;
+  const isVideoLoading = videoFeedQuery.isPending;
+
+  if ((isVideoLoading === false && videoSnapShot && mode === "magnify") || mode === "zoom") {
+    snapShot = videoSnapShot;
+  }

  useEffect(() => {
    async function createBitmap() {
      if (!snapShot) return;

      try {
-        const bitmap = await createImageBitmap(snapShot);
+        const bitmap = await createImageBitmap(snapShot, {
+          resizeWidth: 720,
+          resizeHeight: 1080,
+          resizeQuality: "high",
+        });
        if (!bitmap) return;
        latestBitmapRef.current = bitmap;
      } catch (error) {
--- a/src/features/dashboard/components/CameraStatus.tsx
+++ b/src/features/dashboard/components/CameraStatus.tsx
@@ -1,37 +0,0 @@
-import type { SystemHealthStatus } from "../../../types/types";
-import Card from "../../../ui/Card";
-import StatusIndicators from "../../../ui/StatusIndicators";
-import { capitalize } from "../../../utils/utils";
-import CameraStatusGridItem from "./CameraStatusGridItem";
-
-type CameraStatusProps = {
-  title: string;
-  category: SystemHealthStatus[];
-};
-
-const CameraStatus = ({ title, category }: CameraStatusProps) => {
-  const isAllGood = category?.every((status) => status.tags.includes("RUNNING"));
-  // check if some are down
-  // check if all are down
-  //check if offline
-  return (
-    <Card className="p-4">
-      <div className="border-b border-gray-600">
-        <h3 className="text-lg flex flex-row items-center">
-          {isAllGood ? <StatusIndicators status={"bg-green-500"} /> : <StatusIndicators status={"bg-amber-500"} />}
-          {capitalize(title)}
-        </h3>
-        <p className="text-sm text-slate-300">{isAllGood ? "All systems running" : "Some systems down"}</p>
-      </div>
-      {category && category?.length <= 0 ? (
-        <p className=" text-gray-500">Loading Camera health...</p>
-      ) : (
-        <div>
-          <CameraStatusGridItem title={title} statusCategory={category} />
-        </div>
-      )}
-    </Card>
-  );
-};
-
-export default CameraStatus;
--- a/src/features/dashboard/components/CameraStatusGridItem.tsx
+++ b/src/features/dashboard/components/CameraStatusGridItem.tsx
@@ -1,38 +0,0 @@
-import { useState } from "react";
-import type { SystemHealthStatus } from "../../../types/types";
-import { capitalize } from "../../../utils/utils";
-import SystemHealthModal from "./systemHealthModal/SystemHealthModal";
-
-type CameraStatusGridItemProps = {
-  title: string;
-  statusCategory: SystemHealthStatus[];
-};
-
-const CameraStatusGridItem = ({ title, statusCategory }: CameraStatusGridItemProps) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const isAllGood = statusCategory?.every((status) => status.tags.includes("RUNNING"));
-
-  const handleClick = () => {
-    setIsOpen(false);
-  };
-  return (
-    <>
-      <div
-        className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241] hover:cursor-pointer m-2 h-70"
-        onClick={() => setIsOpen(true)}
-      >
-        <h3 className="text-lg flex flex-row items-center">{capitalize(title)}</h3>
-        <p className="text-sm text-slate-300">{isAllGood ? "Click to view module status" : "Some systems down"}</p>
-      </div>
-      <SystemHealthModal
-        isSystemHealthModalOpen={isOpen}
-        handleClose={handleClick}
-        statusCategory={statusCategory}
-        title={title}
-        isAllGood={isAllGood}
-      />
-    </>
-  );
-};
-
-export default CameraStatusGridItem;
--- a/src/features/dashboard/components/DashboardGrid.tsx
+++ b/src/features/dashboard/components/DashboardGrid.tsx
@@ -1,8 +1,9 @@
 import type { SystemHealthStatus } from "../../../types/types";
 import { useGetSystemHealth } from "../hooks/useGetSystemHealth";
-import CameraStatus from "./CameraStatus";
-import SystemOverview from "./SystemOverview";
-import SystemStatusCard from "./SystemStatusCard";
+import CameraStatus from "./cameraStatus/CameraStatus";
+import SystemHealthCard from "./systemHealth/SystemHealthCard";
+import SystemStatusCard from "./systemStatus/SystemStatusCard";
+import { CAMERA_IDS } from "../../../app/config/cameraConfig";

 const DashboardGrid = () => {
  const { query } = useGetSystemHealth();
@@ -26,30 +27,35 @@ const DashboardGrid = () => {
      channelA: [],
      channelB: [],
      channelC: [],
+      // todo: check if more cameras will be added later
      default: [],
    },
  );

-  const categoryA = statusCategories?.channelA ?? [];
-  const categoryB = statusCategories?.channelB ?? [];
-  const categoryC = statusCategories?.channelC ?? [];
-
  return (
-    <div className="grid grid-cols-1 md:grid-rows-2 md:grid-cols-2">
-      <SystemStatusCard />
-      <SystemOverview
-        startTime={startTime}
-        uptime={uptime}
-        statuses={statuses}
-        isLoading={isLoading}
-        isError={isError}
-        dateUpdatedAt={dateUpdatedAt}
-        refetch={refetch}
-      />
-      <div className="grid grid-cols-1 md:col-span-2 md:grid-cols-3">
-        <CameraStatus title="Camera A" category={categoryA} />
-        <CameraStatus title="Camera B" category={categoryB} />
-        <CameraStatus title="Camera C" category={categoryC} />
+    <div className="grid grid-cols-1 md:grid-rows-2 md:grid-cols-2 gap-4">
+      <div className="grid grid-cols-1 md:grid-rows-0 md:grid-cols-2 gap-4 md:col-span-2">
+        <SystemStatusCard />
+        <SystemHealthCard
+          startTime={startTime}
+          uptime={uptime}
+          statuses={statuses}
+          isLoading={isLoading}
+          isError={isError}
+          dateUpdatedAt={dateUpdatedAt}
+          refetch={refetch}
+        />
+      </div>
+
+      <div className="grid grid-cols-1 md:col-span-2 md:grid-cols-[repeat(3,1fr)] gap-x-4">
+        {CAMERA_IDS.map((cameraID) => (
+          <CameraStatus
+            key={cameraID}
+            title={`Camera ${cameraID}`}
+            category={statusCategories?.[`channel${cameraID}`] ?? []}
+            isError={isError}
+          />
+        ))}
      </div>
    </div>
  );
--- a/src/features/dashboard/components/SystemStatusCard.tsx
+++ b/src/features/dashboard/components/SystemStatusCard.tsx
@@ -1,30 +0,0 @@
-import { useInfoSocket } from "../../../app/context/WebSocketContext";
-import Card from "../../../ui/Card";
-import CardHeader from "../../../ui/CardHeader";
-import StatusItemCPU from "./StatusItems/StatusItemCPU";
-import StatusItemLocal from "./StatusItems/StatusItemLocal";
-import StatusItemThreads from "./StatusItems/StatusItemThreads";
-import StatusItemUTC from "./StatusItems/StatusItemUTC";
-
-const SystemStatusCard = () => {
-  const { data: stats } = useInfoSocket();
-
-  return (
-    <Card className="p-4">
-      <CardHeader title="System Status" />
-      {stats ? (
-        <div className="grid grid-cols-2 grid-rows-2 gap-4 col-span-2">
-          <StatusItemUTC statusInfoItem={stats["system-clock-utc"]} description={"UTC Time"} />
-          <StatusItemLocal statusInfoItem={stats["system-clock-local"]} description={"Local Time"} />
-          <StatusItemCPU statusInfoItem={stats["memory-cpu-status"]} description={"CPU"} />
-          <StatusItemThreads statusInfoItem={stats["thread-count"]} description={"Threads"} />
-        </div>
-      ) : (
-        <span className="text-slate-500">Loading system status…</span>
-      )}
-      <div className="text-sm flex gap-4"></div>
-    </Card>
-  );
-};
-
-export default SystemStatusCard;
--- a/src/features/dashboard/components/cameraStatus/CameraStatus.tsx
+++ b/src/features/dashboard/components/cameraStatus/CameraStatus.tsx
@@ -0,0 +1,54 @@
+import type { SystemHealthStatus } from "../../../../types/types";
+import Card from "../../../../ui/Card";
+import StatusIndicators from "../../../../ui/StatusIndicators";
+import { capitalize } from "../../../../utils/utils";
+import CameraStatusGridItem from "./CameraStatusGridItem";
+
+type CameraStatusProps = {
+  title: string;
+  category: SystemHealthStatus[];
+  isError?: boolean;
+};
+
+const CameraStatus = ({ title, category, isError }: CameraStatusProps) => {
+  const isAllGood =
+    category &&
+    category.length > 0 &&
+    category.every((status) => {
+      const allowedTags = ["RUNNING", "VIDEO-PLAYING"];
+      return status.tags.every((tag) => allowedTags.includes(tag));
+    });
+
+  return (
+    <Card className="p-4">
+      <div className="border-b border-gray-600">
+        <h3 className="text-lg flex flex-row items-center">
+          {isError ? (
+            <StatusIndicators status={"bg-red-500"} />
+          ) : isAllGood ? (
+            <StatusIndicators status={"bg-green-500"} />
+          ) : (
+            <StatusIndicators status={"bg-amber-500"} />
+          )}
+          {capitalize(title)}
+        </h3>
+        {isError ? (
+          <p className="text-sm text-red-500">Error loading camera health.</p>
+        ) : isAllGood ? (
+          <p className="text-sm text-green-500">All systems running</p>
+        ) : (
+          <p className="text-sm text-amber-500">Some systems down</p>
+        )}
+      </div>
+      {category && category?.length <= 0 ? (
+        <p className=" text-gray-500">Loading Camera health...</p>
+      ) : (
+        <div>
+          <CameraStatusGridItem title={title} statusCategory={category} />
+        </div>
+      )}
+    </Card>
+  );
+};
+
+export default CameraStatus;
--- a/src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx
+++ b/src/features/dashboard/components/cameraStatus/CameraStatusGridItem.tsx
@@ -0,0 +1,59 @@
+import { useState } from "react";
+import type { SystemHealthStatus } from "../../../../types/types";
+
+import SystemHealthModal from "../systemHealth/systemHealthModal/SystemHealthModal";
+import Badge from "../../../../ui/Badge";
+
+type CameraStatusGridItemProps = {
+  title: string;
+  statusCategory: SystemHealthStatus[];
+};
+
+const CameraStatusGridItem = ({ title, statusCategory }: CameraStatusGridItemProps) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const isAllGood = statusCategory?.every((status) => {
+    const allowedTags = ["RUNNING", "VIDEO-PLAYING"];
+    return status.tags.every((tag) => allowedTags.includes(tag));
+  });
+
+  const downItems = statusCategory?.filter((status) => {
+    return status.tags.some((tag) => tag !== "RUNNING" && tag !== "VIDEO-PLAYING");
+  });
+
+  const handleClick = () => {
+    setIsOpen(false);
+  };
+  return (
+    <>
+      <div
+        className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241] hover:cursor-pointer m-2 h-70"
+        onClick={() => setIsOpen(true)}
+      >
+        <p className="text-sm text-slate-300">
+          {isAllGood ? (
+            "Click to view module status"
+          ) : (
+            <>
+              <ul>
+                {downItems.map((item) => (
+                  <li key={item.id} className="flex justify-between mb-2">
+                    <span>{item.id}</span> <Badge text={item.tags[0]} />
+                  </li>
+                ))}
+              </ul>
+            </>
+          )}
+        </p>
+      </div>
+      <SystemHealthModal
+        isSystemHealthModalOpen={isOpen}
+        handleClose={handleClick}
+        statusCategory={statusCategory}
+        title={title}
+        isAllGood={isAllGood}
+      />
+    </>
+  );
+};
+
+export default CameraStatusGridItem;
--- a/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx
+++ b/src/features/dashboard/components/statusGridItem/StatusGridItem.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
 import type { SystemHealthStatus } from "../../../../types/types";
 import StatusIndicators from "../../../../ui/StatusIndicators";
 import { capitalize } from "../../../../utils/utils";
-import SystemHealthModal from "../systemHealthModal/SystemHealthModal";
+import SystemHealthModal from "../systemHealth/systemHealthModal/SystemHealthModal";

 type StatusGridItemProps = {
  title: string;
@@ -11,7 +11,8 @@ type StatusGridItemProps = {

 const StatusGridItem = ({ title, statusCategory }: StatusGridItemProps) => {
  const [isOpen, setIsOpen] = useState(false);
-  const isAllGood = statusCategory.every((status) => status.tags.includes("RUNNING"));
+  const isAllGood =
+    statusCategory && statusCategory.length > 0 && statusCategory.every((status) => status.tags.includes("RUNNING"));

  const handleClick = () => {
    setIsOpen(false);
@@ -20,7 +21,7 @@ const StatusGridItem = ({ title, statusCategory }: StatusGridItemProps) => {
  return (
    <>
      <div
-        className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241] hover:cursor-pointer"
+        className="flex flex-col border border-gray-600 p-4 rounded-lg hover:bg-[#233241] hover:cursor-pointer"
        onClick={() => setIsOpen(true)}
      >
        <h3 className="text-lg flex flex-row items-center">
--- a/src/features/dashboard/components/systemHealth/SystemHealth.tsx
+++ b/src/features/dashboard/components/systemHealth/SystemHealth.tsx
@@ -1,5 +1,5 @@
-import type { SystemHealthStatus } from "../../../types/types";
-import StatusGridItem from "./statusGridItem/StatusGridItem";
+import type { SystemHealthStatus } from "../../../../types/types";
+import StatusGridItem from "../statusGridItem/StatusGridItem";

 type SystemHealthProps = {
  startTime: string;
@@ -38,20 +38,20 @@ const SystemHealth = ({ startTime, uptime, statuses, isLoading, isError, dateUpd
    return <span className="text-slate-500">Loading system health…</span>;
  }
  return (
-    <div className="h-100 md:h-75 overflow-y-auto flex flex-col gap-4">
-      <div className="p-2 border-b border-gray-600 grid grid-cols-2 justify-between">
-        <div className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241]">
+    <div className="relative h-100 md:h-75 overflow-y-auto flex flex-col gap-4">
+      <div className="p-2 border-gray-600 grid grid-cols-1 md:grid-cols-2 gap-2 justify-between">
+        <div className="flex flex-col border border-gray-600 p-4 rounded-lg hover:bg-[#233241]">
          <h3 className="text-lg">Start Time</h3> <span className="text-slate-300">{startTime}</span>
        </div>
-        <div className="flex flex-col border border-gray-600 p-4 rounded-lg mr-4 hover:bg-[#233241]">
+        <div className="flex flex-col border border-gray-600 p-4 rounded-lg hover:bg-[#233241]">
          <h3 className="text-lg">Up Time</h3> <span className="text-slate-300">{uptime}</span>
        </div>
      </div>
      <div className="overflow-auto gap-4">
        <StatusGridItem title={"Modules"} statusCategory={categoryDefault} />
      </div>
-      <div className="border-t border-gray-500">
-        <small className="italic text-gray-400">{`Last refeshed ${updatedDate}`}</small>
+      <div className="absolute bottom-0 left-0 border-t border-gray-500 w-full">
+        <small className="italic text-gray-400 ">{`Last refeshed ${updatedDate}`}</small>
      </div>
    </div>
  );
--- a/src/features/dashboard/components/systemHealth/SystemHealthCard.tsx
+++ b/src/features/dashboard/components/systemHealth/SystemHealthCard.tsx
@@ -1,9 +1,9 @@
 import { faArrowsRotate } from "@fortawesome/free-solid-svg-icons";
-import Card from "../../../ui/Card";
-import CardHeader from "../../../ui/CardHeader";
+import Card from "../../../../ui/Card";
+import CardHeader from "../../../../ui/CardHeader";

 import SystemHealth from "./SystemHealth";
-import type { SystemHealthStatus } from "../../../types/types";
+import type { SystemHealthStatus } from "../../../../types/types";

 type SystemOverviewProps = {
  startTime: string;
@@ -15,7 +15,7 @@ type SystemOverviewProps = {
  refetch: () => void;
 };

-const SystemOverview = ({
+const SystemHealthCard = ({
  startTime,
  uptime,
  statuses,
@@ -25,7 +25,7 @@ const SystemOverview = ({
  refetch,
 }: SystemOverviewProps) => {
  return (
-    <Card className="p-4">
+    <Card className="p-4 ">
      <CardHeader title="System Health" refetch={refetch} icon={faArrowsRotate} />
      <SystemHealth
        startTime={startTime}
@@ -39,4 +39,4 @@ const SystemOverview = ({
  );
 };

-export default SystemOverview;
+export default SystemHealthCard;
--- a/src/features/dashboard/components/systemHealth/systemHealthModal/SystemHealthModal.tsx
+++ b/src/features/dashboard/components/systemHealth/systemHealthModal/SystemHealthModal.tsx
@@ -1,8 +1,8 @@
-import type { SystemHealthStatus } from "../../../../types/types";
-import Badge from "../../../../ui/Badge";
-import ModalComponent from "../../../../ui/ModalComponent";
-import StatusIndicators from "../../../../ui/StatusIndicators";
-import { capitalize } from "../../../../utils/utils";
+import type { SystemHealthStatus } from "../../../../../types/types";
+import Badge from "../../../../../ui/Badge";
+import ModalComponent from "../../../../../ui/ModalComponent";
+import StatusIndicators from "../../../../../ui/StatusIndicators";
+import { capitalize } from "../../../../../utils/utils";

 type SystemHealthModalProps = {
  isSystemHealthModalOpen: boolean;
--- a/src/features/dashboard/components/systemStatus/StatusItems/DownloadLogButton.tsx
+++ b/src/features/dashboard/components/systemStatus/StatusItems/DownloadLogButton.tsx
@@ -0,0 +1,50 @@
+import { faDownload } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useDownloadLogFiles } from "../../../hooks/useDownloadLogFiles";
+import { toast } from "sonner";
+
+const DownloadLogButton = () => {
+  const { downloadLogFilesQuery } = useDownloadLogFiles();
+  const isLoading = downloadLogFilesQuery?.isFetching;
+
+  const handleDownloadClick = async () => {
+    try {
+      const blob = await downloadLogFilesQuery?.refetch().then((res) => res.data);
+      if (!blob) {
+        throw new Error("No log file data received");
+      }
+      const url = window.URL.createObjectURL(new Blob([blob]));
+      const link = document.createElement("a");
+      if (!link) {
+        throw new Error("Failed to create download link");
+      } else {
+        link.href = url;
+        link.setAttribute("download", "FlexiAI-0.log");
+        document.body.appendChild(link);
+        link.click();
+        link.parentNode?.removeChild(link);
+        window.URL.revokeObjectURL(url);
+      }
+    } catch (error: unknown) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+      toast.error(errorMessage);
+    }
+  };
+
+  return (
+    <button
+      className="p-3 border border-gray-700 rounded-lg hover:bg-[#233241] hover:cursor-pointer"
+      onClick={handleDownloadClick}
+    >
+      <div className="flex flex-row gap-2 items-center">
+        <span className="font-bold text-xl bg-slate-700 p-1 px-2 rounded-md">
+          <FontAwesomeIcon icon={faDownload} />
+        </span>
+        <p className="text-lg">{"Download Log Files"}</p>
+      </div>
+      <p className="text-slate-400 italic text-start">{isLoading ? "Downloading..." : "View logs"}</p>
+    </button>
+  );
+};
+
+export default DownloadLogButton;
--- a/src/features/dashboard/components/systemStatus/StatusItems/StatusItemCPU.tsx
+++ b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemCPU.tsx
--- a/src/features/dashboard/components/systemStatus/StatusItems/StatusItemLocal.tsx
+++ b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemLocal.tsx
--- a/src/features/dashboard/components/systemStatus/StatusItems/StatusItemThreads.tsx
+++ b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemThreads.tsx
--- a/src/features/dashboard/components/systemStatus/StatusItems/StatusItemUTC.tsx
+++ b/src/features/dashboard/components/systemStatus/StatusItems/StatusItemUTC.tsx
--- a/src/features/dashboard/components/systemStatus/StatusItems/StatusReads.tsx
+++ b/src/features/dashboard/components/systemStatus/StatusItems/StatusReads.tsx
@@ -0,0 +1,48 @@
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faChartSimple } from "@fortawesome/free-solid-svg-icons";
+
+type StatusReadsProps = {
+  reads: {
+    totalPending: number;
+    totalActive: number;
+    totalSent: number;
+    totalReceived: number;
+    totalLost: number;
+    sanityCheck: boolean;
+    sanityCheckFormula: string;
+  };
+  isReadsLoading?: boolean;
+};
+
+const StatusReads = ({ reads, isReadsLoading }: StatusReadsProps) => {
+  const totalPending = reads?.totalPending ?? 0;
+  const totalActive = reads?.totalActive ?? 0;
+  const totalSent = reads?.totalSent ?? 0;
+  const totalLost = reads?.totalLost ?? 0;
+  const totalReceived = reads?.totalReceived ?? 0;
+
+  if (isReadsLoading) {
+    return <p className="text-slate-400">Loading reads…</p>;
+  }
+  return (
+    <div className="p-3 border border-gray-700 rounded-lg hover:bg-[#233241]">
+      <div className="flex flex-row gap-2 items-center">
+        <span className="font-bold text-xl bg-slate-700 p-1 px-2 rounded-md">
+          <FontAwesomeIcon icon={faChartSimple} />
+        </span>
+
+        <p className="text-lg">Reads</p>
+      </div>
+
+      <div className="text-slate-400 mt-1">
+        Pending: <span className="text-yellow-500">{totalPending}</span> | Active:{" "}
+        <span className="text-cyan-500">{totalActive}</span> | Lost: <span className="text-red-500">{totalLost}</span>
+        <br />
+        Sent / Received: <span className="text-blue-500">{totalSent}</span> |{" "}
+        <span className="text-green-500">{totalReceived}</span>
+      </div>
+    </div>
+  );
+};
+
+export default StatusReads;
--- a/src/features/dashboard/components/systemStatus/SystemStatusCard.tsx
+++ b/src/features/dashboard/components/systemStatus/SystemStatusCard.tsx
@@ -0,0 +1,49 @@
+import { useEffect } from "react";
+import { useInfoSocket } from "../../../../app/context/WebSocketContext";
+import Card from "../../../../ui/Card";
+import CardHeader from "../../../../ui/CardHeader";
+import DownloadLogButton from "./StatusItems/DownloadLogButton";
+import StatusItemLocal from "./StatusItems/StatusItemLocal";
+import StatusItemUTC from "./StatusItems/StatusItemUTC";
+import StatusReads from "./StatusItems/StatusReads";
+import { useGetStore } from "../../hooks/useGetStore";
+
+const SystemStatusCard = () => {
+  const { data: stats } = useInfoSocket();
+  const { storeQuery } = useGetStore();
+
+  const reads = storeQuery?.data;
+  const isReadsLoading = storeQuery?.isFetching;
+  const isError = storeQuery?.isError || !storeQuery?.data;
+
+  useEffect(() => {
+    storeQuery.refetch();
+  }, [reads]);
+
+  if (isError) {
+    return (
+      <Card className="p-4">
+        <CardHeader title="System Status" />
+        <span className="text-red-500">Error loading system status.</span>
+      </Card>
+    );
+  }
+  return (
+    <Card className="p-4 ">
+      <CardHeader title="System Status" />
+      {stats ? (
+        <div className="grid grid-cols-2 grid-rows-2 gap-4 col-span-2">
+          <StatusItemUTC statusInfoItem={stats["system-clock-utc"]} description={"UTC Time"} />
+          <StatusItemLocal statusInfoItem={stats["system-clock-local"]} description={"Local Time"} />
+          <DownloadLogButton />
+          <StatusReads reads={reads} isReadsLoading={isReadsLoading} />
+        </div>
+      ) : (
+        <span className="text-slate-500">Loading system status…</span>
+      )}
+      <div className="text-sm flex gap-4"></div>
+    </Card>
+  );
+};
+
+export default SystemStatusCard;
--- a/src/features/dashboard/hooks/useDownloadLogFiles.ts
+++ b/src/features/dashboard/hooks/useDownloadLogFiles.ts
@@ -0,0 +1,20 @@
+import { useQuery } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+
+const getDownloadLogFiles = async () => {
+  const response = await fetch(`${CAMBASE}/LogView/download?filename=FlexiAI-0.log`);
+  if (!response.ok) {
+    throw new Error("Failed to download log files");
+  }
+  return response.blob();
+};
+
+export const useDownloadLogFiles = () => {
+  const downloadLogFilesQuery = useQuery({
+    queryKey: ["downloadLogFiles"],
+    queryFn: getDownloadLogFiles,
+    enabled: false,
+  });
+
+  return { downloadLogFilesQuery };
+};
--- a/src/features/dashboard/hooks/useGetStore.ts
+++ b/src/features/dashboard/hooks/useGetStore.ts
@@ -0,0 +1,19 @@
+import { useQuery } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+
+const getStoreData = async () => {
+  const response = await fetch(`${CAMBASE}/Store0/diagnostics-json`);
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+export const useGetStore = () => {
+  const storeQuery = useQuery({
+    queryKey: ["storeData"],
+    queryFn: getStoreData,
+    // refetchInterval: 10 * 60 * 1000,
+  });
+  return { storeQuery };
+};
--- a/src/features/dashboard/hooks/useGetSystemHealth.ts
+++ b/src/features/dashboard/hooks/useGetSystemHealth.ts
@@ -11,6 +11,7 @@ export const useGetSystemHealth = () => {
  const query = useQuery({
    queryKey: ["fetchSystemData"],
    queryFn: fetchData,
+    refetchInterval: 300000,
  });
  return { query };
 };
--- a/src/features/output/components/BearerTypeFields.tsx
+++ b/src/features/output/components/BearerTypeFields.tsx
@@ -4,7 +4,7 @@ import type { FormTypes } from "../../../types/types";
 const BearerTypeFields = () => {
  useFormikContext<FormTypes>();
  return (
-    <div className="flex flex-row justify-between">
+    <div className="flex flex-col md:flex-row space-y-4  justify-between">
      <label htmlFor="format" className="text-xl">
        Format
      </label>
--- a/src/features/output/components/ChannelCard.tsx
+++ b/src/features/output/components/ChannelCard.tsx
@@ -10,7 +10,7 @@ const ChannelCard = () => {
  const { bearerQuery } = useGetBearerConfig(values?.format?.toLowerCase() || "json");
  const outputData = bearerQuery?.data;
  return (
-    <Card className="p-4 h-150 md:h-full">
+    <Card className="p-4 h-full">
      <CardHeader title={`Channel (${values?.format})`} />
      <ChannelFields
        errors={errors}
@@ -21,9 +21,9 @@ const ChannelCard = () => {
      />
      <button
        type="submit"
-        className="w-full md:w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
+        className="w-full md:w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
      >
-        {"Save Changes"}
+        {"Save Settings"}
      </button>
    </Card>
  );
--- a/src/features/output/components/ChannelFields.tsx
+++ b/src/features/output/components/ChannelFields.tsx
@@ -1,4 +1,4 @@
-import { Field } from "formik";
+import { Field, FieldArray } from "formik";
 import type { FormTypes, InitialValuesFormErrors, OutputDataResponse } from "../../../types/types";
 import { useEffect, useMemo } from "react";
 import { useOptionalConstants } from "../hooks/useOptionalConstants";
@@ -17,6 +17,7 @@ type ChannelFieldsProps = {
 const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }: ChannelFieldsProps) => {
  const { optionalConstantsQuery } = useOptionalConstants(outputData?.id?.split("-")[1] || "");
  const optionalConstants = optionalConstantsQuery?.data;
+
  const channelFieldsObject = useMemo(() => {
    return {
      connectTimeoutSeconds: outputData?.propConnectTimeoutSeconds?.value || "5",
@@ -51,7 +52,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
    <div className="flex flex-col gap-4 p-4">
      {values.format.toLowerCase() !== "ftp" ? (
        <>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="backoffice" className="block mb-2 font-medium">
              Back Office URL
            </label>
@@ -63,7 +64,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="username" className="block mb-2 font-medium">
              Username
            </label>
@@ -75,7 +76,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="password">Password</label>
            <Field
              name={"password"}
@@ -85,7 +86,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="readTimeoutSeconds">Read Timeout Seconds</label>
            <Field
              name={"readTimeoutSeconds"}
@@ -95,7 +96,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400  rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="connectTimeoutSeconds">Connect Timeout Seconds</label>
            <Field
              name={"connectTimeoutSeconds"}
@@ -104,7 +105,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              className={`p-1.5 border border-gray-400 rounded-lg w-full md:w-60`}
            />
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="overviewQuality">Overview quality and scale</label>
            <Field
              name={"overviewQuality"}
@@ -117,7 +118,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              <option value={"LOW"}>Low</option>
            </Field>
          </div>
-          <div className="flex flex-row justify-between">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
            <label htmlFor="cropSizeFactor">Crop Size Factor</label>
            <Field
              name={"cropSizeFactor"}
@@ -137,7 +138,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                <h2 className="font-bold">{values.format} Constants</h2>
              </div>

-              <div className="flex flex-row justify-between">
+              <div className="flex flex-col md:flex-row space-y-4 justify-between">
                <label htmlFor="SCID">Source ID / Camera ID</label>
                <Field
                  name={"SCID"}
@@ -149,7 +150,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                  } rounded-lg w-full md:w-60`}
                />
              </div>
-              <div className="flex flex-row justify-between">
+              <div className="flex flex-col md:flex-row space-y-4 justify-between">
                <label htmlFor="timestampSource">Timestamp Source</label>
                <Field
                  name={"timestampSource"}
@@ -158,10 +159,10 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                  className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
                >
                  <option value={"UTC"}>UTC</option>
-                  <option value={"local"}>Local</option>
+                  <option value={"LOCAL"}>Local</option>
                </Field>
              </div>
-              <div className="flex flex-row justify-between">
+              <div className="flex flex-col md:flex-row space-y-4 justify-between">
                <label htmlFor="GPSFormat">GPS Format</label>
                <Field
                  name={"GPSFormat"}
@@ -181,7 +182,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                <div className="border-b border-gray-500 my-3">
                  <h2 className="font-bold">{values.format} Constants</h2>
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="FFID">Feed ID / Force ID</label>
                  <Field
                    name={"FFID"}
@@ -193,7 +194,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    } rounded-lg w-full md:w-60`}
                  />
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="SCID">Source ID / Camera ID</label>
                  <Field
                    name={"SCID"}
@@ -205,7 +206,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    } rounded-lg w-full md:w-60`}
                  />
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="timestampSource">Timestamp Source</label>
                  <Field
                    name={"timestampSource"}
@@ -217,7 +218,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    <option value={"LOCAL"}>Local</option>
                  </Field>
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="GPSFormat">GPS Format</label>
                  <Field
                    name={"GPSFormat"}
@@ -234,7 +235,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                <div className="border-b border-gray-500 my-3">
                  <h2 className="font-bold">{values.format} Lane ID Config</h2>
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="LID1">Lane ID 1 (Camera A)</label>
                  <Field
                    name={"LID1"}
@@ -246,7 +247,7 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
                    } rounded-lg w-full md:w-60`}
                  />
                </div>
-                <div className="flex flex-row justify-between">
+                <div className="flex flex-col md:flex-row space-y-4 justify-between">
                  <label htmlFor="LID2">Lane ID 2 (Camera B)</label>
                  <Field
                    name={"LID2"}
@@ -261,6 +262,57 @@ const ChannelFields = ({ errors, touched, values, outputData, onSetFieldValue }:
              </div>
            </>
          )}
+          <div className="border-b border-gray-500 my-3">
+            <h2 className="font-bold">Custom Fields</h2>
+          </div>
+          <div className="items-center mb-4">
+            <FieldArray name="customFields">
+              {(arrayHelpers) => (
+                <>
+                  {values?.customFields?.map((_, index) => {
+                    // if (!field.value) return null;
+                    return (
+                      <div
+                        key={index}
+                        className="flex flex-col md:flex-row space-y-4 md:space-y-0 justify-between items-center mb-4 gap-2"
+                      >
+                        <Field
+                          name={`customFields.${index}.label`}
+                          className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+                          placeholder={`Custom Field ${index + 1} Label`}
+                        />
+                        <Field
+                          name={`customFields.${index}.value`}
+                          className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+                          placeholder={`Custom Field ${index + 1} Value`}
+                          autoComplete="off"
+                        />
+                      </div>
+                    );
+                  })}
+                  <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <button
+                      type="button"
+                      onClick={() => arrayHelpers.push({ label: "", value: "" })}
+                      className={`border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer ${values?.customFields && values?.customFields?.length >= 6 ? "opacity-50 cursor-not-allowed" : ""}`}
+                      disabled={values?.customFields && values?.customFields?.length >= 6}
+                    >
+                      Add Custom Field
+                    </button>
+                    {values?.customFields && values?.customFields?.length > 0 && (
+                      <button
+                        type="button"
+                        onClick={() => arrayHelpers.pop()}
+                        className="border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer"
+                      >
+                        Remove Custom Field
+                      </button>
+                    )}
+                  </div>
+                </>
+              )}
+            </FieldArray>
+          </div>
        </>
      ) : (
        <></>
--- a/src/features/output/components/OSD/OSDFieldToggle.tsx
+++ b/src/features/output/components/OSD/OSDFieldToggle.tsx
@@ -0,0 +1,27 @@
+import { Field } from "formik";
+
+type OSDFieldToggleProps = {
+  value: string;
+  label: string;
+};
+
+const OSDFieldToggle = ({ value, label }: OSDFieldToggleProps) => {
+  const spacesWords = (label: string) => {
+    if (label.includes("VRM")) return label.replace("VRM", " VRM");
+    return label.replace(/([A-Z])/g, " $1").trim();
+  };
+
+  return (
+    <label className="flex items-center gap-3 cursor-pointer select-none w-full justify-between">
+      <span className="text-lg">{spacesWords(label)}</span>
+      <Field id={value} type="checkbox" name={value} className="sr-only peer" />
+      <div
+        className="relative w-10 h-5 rounded-full bg-gray-300 transition peer-checked:bg-blue-500 after:content-[''] 
+      after:absolute after:top-0.5 after:left-0.5 after:w-4 after:h-4 after:rounded-full after:bg-white after:shadow after:transition 
+      after:duration-300 peer-checked:after:translate-x-5"
+      />
+    </label>
+  );
+};
+
+export default OSDFieldToggle;
--- a/src/features/output/components/OSD/OSDFields.tsx
+++ b/src/features/output/components/OSD/OSDFields.tsx
@@ -0,0 +1,81 @@
+import { Field, useFormikContext } from "formik";
+import { useOSDConfig } from "../../hooks/useOSDConfig";
+import OSDFieldToggle from "./OSDFieldToggle";
+import type { OSDConfigFields } from "../../../../types/types";
+import { toast } from "sonner";
+
+type OSDFieldsProps = {
+  isOSDLoading: boolean;
+};
+
+const OSDFields = ({ isOSDLoading }: OSDFieldsProps) => {
+  const { osdMutation } = useOSDConfig();
+  const { values } = useFormikContext<OSDConfigFields>();
+
+  const validOSDKeys: Array<keyof OSDConfigFields> = [
+    "includeVRM",
+    "includeMotion",
+    "includeTimeStamp",
+    "includeCameraName",
+    "overlayPosition",
+    "OSDTimestampFormat",
+  ];
+
+  const includeKeys = validOSDKeys.filter((key) => key.includes("include") && typeof values[key] === "boolean");
+
+  const handleSubmit = async (values: OSDConfigFields) => {
+    const result = await osdMutation.mutateAsync(values);
+    if (result?.id) {
+      toast.success("OSD Config updated successfully");
+    }
+  };
+
+  if (isOSDLoading) {
+    return <div>Loading OSD Options...</div>;
+  }
+
+  return (
+    <div>
+      <div className="flex flex-col space-y-4">
+        <div className="p-4 border border-gray-600 rounded-lg flex flex-col space-y-4">
+          <div className="flex flex-col space-y-4">
+            {includeKeys.map((key) => (
+              <OSDFieldToggle key={key} value={key} label={key.replace("include", "Include ")} />
+            ))}
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="overlayPosition">Overlay Position</label>
+            <Field
+              as="select"
+              name="overlayPosition"
+              className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
+            >
+              <option value="Top">Top</option>
+              <option value="Bottom">Bottom</option>
+            </Field>
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="OSDTimestampFormat">OSD Timestamp Format</label>
+            <Field
+              as="select"
+              name="OSDTimestampFormat"
+              className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
+            >
+              <option value="UTC">UTC</option>
+              <option value="LOCAL">Local</option>
+            </Field>
+          </div>
+          <button
+            type="button"
+            onClick={() => handleSubmit(values)}
+            className="w-full md:w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
+          >
+            Save Settings
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default OSDFields;
--- a/src/features/output/components/OSD/OSDOptionsCard.tsx
+++ b/src/features/output/components/OSD/OSDOptionsCard.tsx
@@ -0,0 +1,32 @@
+import Card from "../../../../ui/Card";
+import CardHeader from "../../../../ui/CardHeader";
+import PayloadOptions from "../PayloadOptions/PayloadOptions";
+import OSDFields from "./OSDFields";
+import { Tab, TabList, TabPanel, Tabs } from "react-tabs";
+import "react-tabs/style/react-tabs.css";
+
+type OSDOptionsCardProps = {
+  isOSDLoading: boolean;
+};
+
+const OSDOptionsCard = ({ isOSDLoading }: OSDOptionsCardProps) => {
+  return (
+    <Card className="p-4 flex-1">
+      <CardHeader title="OSD Payload Options" />
+      <Tabs>
+        <TabList>
+          <Tab>OSD Settings</Tab>
+          <Tab>Payload Settings</Tab>
+        </TabList>
+        <TabPanel>
+          <OSDFields isOSDLoading={isOSDLoading} />
+        </TabPanel>
+        <TabPanel>
+          <PayloadOptions />
+        </TabPanel>
+      </Tabs>
+    </Card>
+  );
+};
+
+export default OSDOptionsCard;
--- a/src/features/output/components/OutputForms.tsx
+++ b/src/features/output/components/OutputForms.tsx
@@ -5,12 +5,26 @@ import type { BearerTypeFields, FormTypes, OptionalBOF2Constants, OptionalUTMCCo
 import { usePostBearerConfig } from "../hooks/useBearer";
 import { useDispatcherConfig } from "../hooks/useDispatcherConfig";
 import { useOptionalConstants } from "../hooks/useOptionalConstants";
+import { useCustomFields } from "../hooks/useCustomFields";
+import OSDOptionsCard from "./OSD/OSDOptionsCard";
+import { useOSDConfig } from "../hooks/useOSDConfig";

 const OutputForms = () => {
  const { bearerMutation } = usePostBearerConfig();
  const { dispatcherQuery, dispatcherMutation } = useDispatcherConfig();
+  const { customFieldsQuery, customFieldsMutation } = useCustomFields();
+  const { osdQuery } = useOSDConfig();

  const isLoading = dispatcherQuery?.isLoading;
+  const isOSDLoading = osdQuery?.isLoading;
+
+  const includeVRM = osdQuery?.data?.propIncludeVRM?.value.toLowerCase() === "true";
+  const includeMotion = osdQuery?.data?.propIncludeMotion?.value.toLowerCase() === "true";
+  const includeTimeStamp = osdQuery?.data?.propIncludeTimestamp?.value.toLowerCase() === "true";
+  const includeCameraName = osdQuery?.data?.propIncludeCameraName?.value.toLowerCase() === "true";
+  const overlayPosition = osdQuery?.data?.propOverlayPosition?.value;
+  const OSDTimestampFormat = osdQuery?.data?.propTimestampFormat?.value;
+
  const format = dispatcherQuery?.data?.propFormat?.value;
  const { optionalConstantsQuery, optionalConstantsMutation } = useOptionalConstants(format?.toLowerCase());
  const FFID = optionalConstantsQuery?.data?.propFeedIdentifier?.value;
@@ -18,6 +32,29 @@ const OutputForms = () => {
  const timestampSource = optionalConstantsQuery?.data?.propTimeZoneType?.value;
  const gpsFormat = optionalConstantsQuery?.data?.propGpsFormat?.value;

+  const customFieldLabel1 = customFieldsQuery?.data?.propCustomFieldName1?.value;
+  const customFieldLabel2 = customFieldsQuery?.data?.propCustomFieldName2?.value;
+  const customFieldLabel3 = customFieldsQuery?.data?.propCustomFieldName3?.value;
+  const customFieldLabel4 = customFieldsQuery?.data?.propStringName4?.value;
+  const customFieldLabel5 = customFieldsQuery?.data?.propStringName5?.value;
+  const customFieldLabel6 = customFieldsQuery?.data?.propStringName6?.value;
+
+  const customFieldValues1 = customFieldsQuery?.data?.propCustomFieldValue1?.value;
+  const customFieldValues2 = customFieldsQuery?.data?.propCustomFieldValue2?.value;
+  const customFieldValues3 = customFieldsQuery?.data?.propCustomFieldValue3?.value;
+  const customFieldValues4 = customFieldsQuery?.data?.propStringValue4?.value;
+  const customFieldValues5 = customFieldsQuery?.data?.propStringValue5?.value;
+  const customFieldValues6 = customFieldsQuery?.data?.propStringValue6?.value;
+
+  const initialCustomFields = [
+    { label: customFieldLabel1 || "", value: customFieldValues1 || "" },
+    { label: customFieldLabel2 || "", value: customFieldValues2 || "" },
+    { label: customFieldLabel3 || "", value: customFieldValues3 || "" },
+    { label: customFieldLabel4 || "", value: customFieldValues4 || "" },
+    { label: customFieldLabel5 || "", value: customFieldValues5 || "" },
+    { label: customFieldLabel6 || "", value: customFieldValues6 || "" },
+  ].filter((field) => field.label && field.value);
+
  const inititalValues: FormTypes = {
    format: format ?? "JSON",
    enabled: true,
@@ -41,6 +78,50 @@ const OutputForms = () => {
    LID2: "",

    // ftp - fields
+
+    //custom fields
+    customFields: initialCustomFields,
+
+    // OSD Options
+    includeVRM: includeVRM ?? false,
+    includeMotion: includeMotion ?? false,
+    includeTimeStamp: includeTimeStamp ?? false,
+    includeCameraName: includeCameraName ?? false,
+    overlayPosition: overlayPosition ?? "Top",
+    OSDTimestampFormat: OSDTimestampFormat ?? "UTC",
+
+    // payload ooptions
+    includeMac: false,
+    includeSaFID: false,
+    includeCharHeight: false,
+    includeConfidence: false,
+    includeCorrectSpacing: false,
+    includeDecodeID: false,
+    includeDirection: false,
+    includeFrameHeight: false,
+    includeFrameID: false,
+    includeFrameTimeRef: false,
+    includeFrameWidth: false,
+    includeHorizSlew: false,
+    inclduePlate: false,
+    includeNightModeAction: false,
+    includeOverview: false,
+    includePlateSecondary: false,
+    includePlateTrack: false,
+    includePlateTrackSecondary: false,
+    includePreferredCountry: false,
+    includeRawReads: false,
+    includeRawREADSSecondary: false,
+    includeRef: false,
+    includeSeenCount: false,
+    includeRepeatedPlate: false,
+    includeSerialCount: false,
+    includeTraceCount: false,
+    includeTrack: false,
+    includeTrackSecondary: false,
+    includeVertSlew: false,
+    includeVRMSecondary: false,
+    includeHotListMatches: false,
  };

  const handleSubmit = async (values: FormTypes) => {
@@ -86,6 +167,11 @@ const OutputForms = () => {
        await optionalConstantsMutation.mutateAsync(optionalUTMCFields);
      }
    }
+    if (values.customFields && values.customFields.length > 0) {
+      const customFields = [...values.customFields];
+
+      await customFieldsMutation.mutateAsync(customFields);
+    }
  };

  if (isLoading) {
@@ -94,8 +180,11 @@ const OutputForms = () => {

  return (
    <Formik initialValues={inititalValues} onSubmit={handleSubmit} enableReinitialize>
-      <Form className="grid grid-cols-1 md:grid-cols-2">
-        <BearerTypeCard />
+      <Form className="grid grid-cols-1 md:grid-cols-2 gap-4 h-[50%]">
+        <div>
+          <BearerTypeCard />
+          <OSDOptionsCard isOSDLoading={isOSDLoading} />
+        </div>
        <ChannelCard />
      </Form>
    </Formik>
--- a/src/features/output/components/PayloadOptions/PayloadOptions.tsx
+++ b/src/features/output/components/PayloadOptions/PayloadOptions.tsx
@@ -0,0 +1,56 @@
+import { useFormikContext } from "formik";
+import type { PayloadConfigFields } from "../../../../types/types";
+import PayloadOptionsToggle from "./PayloadOptionsToggle";
+
+const PayloadOptions = () => {
+  const { values } = useFormikContext<PayloadConfigFields>();
+
+  const validPayloadKeys: Array<keyof PayloadConfigFields> = [
+    "includeMac",
+    "includeSaFID",
+    "includeCharHeight",
+    "includeConfidence",
+    "includeCorrectSpacing",
+    "includeDecodeID",
+    "includeDirection",
+    "includeFrameHeight",
+    "includeFrameID",
+    "includeFrameTimeRef",
+    "includeFrameWidth",
+    "includeHorizSlew",
+    "inclduePlate",
+    "includeNightModeAction",
+    "includeOverview",
+    "includePlateSecondary",
+    "includePlateTrack",
+  ];
+
+  const includeKeys = validPayloadKeys.filter((key) => key.includes("include") && typeof values[key] === "boolean");
+
+  const handleSubmit = async (values: PayloadConfigFields) => {
+    console.log("Payload Config Submitted:", values);
+  };
+
+  return (
+    <div className="">
+      <div className="flex flex-col space-y-4">
+        <div className="p-4 border border-gray-600 rounded-lg flex flex-col space-y-4">
+          <div className="flex flex-col space-y-4 h-100 overflow-y-auto p-3">
+            {includeKeys.map((key, index) => (
+              <PayloadOptionsToggle key={index} label={key} value={key} />
+            ))}
+          </div>
+          <button
+            type="button"
+            onClick={() => handleSubmit(values)}
+            className="w-full md:w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
+          >
+            Save Settings
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PayloadOptions;
--- a/src/features/output/components/PayloadOptions/PayloadOptionsToggle.tsx
+++ b/src/features/output/components/PayloadOptions/PayloadOptionsToggle.tsx
@@ -0,0 +1,22 @@
+import { Field } from "formik";
+
+type PayloadOptionsToggleProps = {
+  label: string;
+  value: string;
+};
+
+const PayloadOptionsToggle = ({ label, value }: PayloadOptionsToggleProps) => {
+  return (
+    <label className="flex items-center gap-3 cursor-pointer select-none w-full justify-between">
+      <span className="text-lg">{label}</span>
+      <Field id={value} type="checkbox" name={value} className="sr-only peer" />
+      <div
+        className="relative w-10 h-5 rounded-full bg-gray-300 transition peer-checked:bg-blue-500 after:content-[''] 
+         after:absolute after:top-0.5 after:left-0.5 after:w-4 after:h-4 after:rounded-full after:bg-white after:shadow after:transition 
+         after:duration-300 peer-checked:after:translate-x-5"
+      />
+    </label>
+  );
+};
+
+export default PayloadOptionsToggle;
--- a/src/features/output/hooks/useCustomFields.ts
+++ b/src/features/output/hooks/useCustomFields.ts
@@ -0,0 +1,65 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { CustomFieldConfig } from "../../../types/types";
+
+const fetchCustomFields = async () => {
+  const response = await fetch(`${CAMBASE}/api/fetch-config?id=SightingAmmend0-custom-fields`);
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+const postCustomFields = async (customFieldConfig: CustomFieldConfig[]) => {
+  const fields = [];
+
+  for (const customField of customFieldConfig) {
+    if (customField.value)
+      if (customFieldConfig.indexOf(customField) > 2) {
+        fields.push({
+          property: `propStringName${customFieldConfig.indexOf(customField) + 1}`,
+          value: customField.label,
+        });
+        fields.push({
+          property: `propStringValue${customFieldConfig.indexOf(customField) + 1}`,
+          value: customField.value,
+        });
+      } else {
+        fields.push(
+          {
+            property: `propCustomFieldName${customFieldConfig.indexOf(customField) + 1}`,
+            value: customField.label,
+          },
+          {
+            property: `propCustomFieldValue${customFieldConfig.indexOf(customField) + 1}`,
+            value: customField.value,
+          },
+        );
+      }
+  }
+  const customFieldConfigPayload = {
+    id: "SightingAmmend0-custom-fields",
+    fields,
+  };
+
+  const response = await fetch(`${CAMBASE}/api/update-config`, {
+    method: "POST",
+    body: JSON.stringify(customFieldConfigPayload),
+  });
+  if (!response.ok) throw new Error("Network response was not ok");
+  return response.json();
+};
+
+export const useCustomFields = () => {
+  const customFieldsQuery = useQuery({
+    queryKey: ["customFields"],
+    queryFn: fetchCustomFields,
+  });
+
+  const customFieldsMutation = useMutation({
+    mutationKey: ["customFieldsMutation"],
+    mutationFn: postCustomFields,
+  });
+
+  return { customFieldsQuery, customFieldsMutation };
+};
--- a/src/features/output/hooks/useOSDConfig.ts
+++ b/src/features/output/hooks/useOSDConfig.ts
@@ -0,0 +1,52 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { OSDConfigFields } from "../../../types/types";
+
+const fetchOSDConfig = async () => {
+  const response = await fetch(`${CAMBASE}/api/fetch-config?id=SightingAmmend0-overlay`);
+
+  if (!response.ok) {
+    throw new Error("Network response was not ok");
+  }
+  return response.json();
+};
+
+const postOSDConfig = async (data: OSDConfigFields) => {
+  const fields = [
+    { property: "propIncludeVRM", value: data.includeVRM },
+    { property: "propIncludeMotion", value: data.includeMotion },
+    { property: "propIncludeTimestamp", value: data.includeTimeStamp },
+    { property: "propIncludeCameraName", value: data.includeCameraName },
+    { property: "propOverlayPosition", value: data.overlayPosition },
+    { property: "propTimestampFormat", value: data.OSDTimestampFormat },
+  ];
+
+  const osdConfigPayload = {
+    id: "SightingAmmend0-overlay",
+    fields: fields,
+  };
+
+  const response = await fetch(`${CAMBASE}/api/update-config`, {
+    method: "POST",
+    body: JSON.stringify(osdConfigPayload),
+  });
+
+  if (!response.ok) {
+    throw new Error("Failed to post OSD Config");
+  }
+  return response.json();
+};
+
+export const useOSDConfig = () => {
+  const osdQuery = useQuery({
+    queryKey: ["osdConfig"],
+    queryFn: fetchOSDConfig,
+  });
+
+  const osdMutation = useMutation({
+    mutationFn: postOSDConfig,
+    mutationKey: ["postOSDConfig"],
+  });
+
+  return { osdQuery, osdMutation };
+};
--- a/src/features/output/hooks/usePayloadConfig.ts
+++ b/src/features/output/hooks/usePayloadConfig.ts
@@ -0,0 +1,16 @@
+import { useQuery } from "@tanstack/react-query";
+
+const fetchPayloadConfig = async () => {
+  const response = await fetch("/api/payload-config");
+  if (!response.ok) throw new Error("Failed to fetch payload config");
+  return response.json();
+};
+
+export const usePayloadCongfig = () => {
+  const payloadConfigQuery = useQuery({
+    queryKey: ["payloadConfig"],
+    queryFn: fetchPayloadConfig,
+  });
+
+  return { payloadConfigQuery };
+};
--- a/src/features/settings/components/SystemConfig.tsx
+++ b/src/features/settings/components/SystemConfig.tsx
@@ -1,11 +1,15 @@
-import { Formik, Form, Field } from "formik";
+import { Formik, Form, Field, FieldArray } from "formik";
 import { useSystemSettings } from "../hooks/useSystemSettings";
-import type { SystemSettings } from "../../../types/types";
+import type { NetworkConfig, SystemSettings } from "../../../types/types";
 import { toast } from "sonner";
+import { useGetNetworkConfig } from "../hooks/useGetNetworkConfig";

 const SystemConfig = () => {
  const { systemSettingsQuery, systemSettingsMutation } = useSystemSettings();
+  const { networkConfigQuery, networkConfigMutation } = useGetNetworkConfig();

+  const isLoading = networkConfigMutation?.isPending || networkConfigMutation?.isPending;
+  const isGettingLoading = systemSettingsQuery?.isLoading || networkConfigQuery?.isLoading;
  const timeZoneOptions = systemSettingsQuery?.data?.propLocalTimeZone?.accepted;
  const timeZoneOpts = timeZoneOptions?.split(",").map((option: string) => option.trim().replace(/\[|\]/g, ""));
  const timeSourceOptions = systemSettingsQuery?.data?.propTimeSource?.accepted;
@@ -15,8 +19,11 @@ const SystemConfig = () => {
  const SNTPServer = systemSettingsQuery?.data?.propSNTPServer?.value;
  const SNTPInterval = systemSettingsQuery?.data?.propSNTPIntervalMinutes?.value;
  const timeSource = systemSettingsQuery?.data?.propTimeSource?.value;
-  // const primaryServer = systemSettingsQuery?.data?.propPrimaryDNSServer?.value;
-  // const secondaryServer = systemSettingsQuery?.data?.propSecondaryDNSServer?.value;
+  const primaryServer = networkConfigQuery?.data?.propNameServerPrimary?.value;
+  const secondaryServer = networkConfigQuery?.data?.propNameServerSecondary?.value;
+  const ipAddress = networkConfigQuery?.data?.propHost?.value;
+  const subnetMask = networkConfigQuery?.data?.propNetmask?.value;
+  const gateway = networkConfigQuery?.data?.propGateway?.value;

  const initialValues = {
    deviceName: deviceName ?? "",
@@ -25,107 +32,200 @@ const SystemConfig = () => {
    SNTPServer: SNTPServer ?? "",
    SNTPInterval: SNTPInterval ?? 60,
    SNTPIntervalMinutes: SNTPInterval ?? 60,
-    primaryServer: "",
-    secondaryServer: "",
+    primaryServer: primaryServer ?? "",
+    secondaryServer: secondaryServer ?? "",
    timeSource: timeSource ?? "",
+    ipAddress: ipAddress ?? "",
+    subnetMask: subnetMask ?? "",
+    gateway: gateway ?? "",
+    customFields: [],
  };

-  const handleSubmit = async (values: SystemSettings) => {
+  const handleSubmit = async (values: SystemSettings & NetworkConfig) => {
    const result = await systemSettingsMutation.mutateAsync(values);
-    console.log(result);
-    if (result.id) {
+    const networkResult = await networkConfigMutation.mutateAsync({
+      ipAddress: values.ipAddress,
+      subnetMask: values.subnetMask,
+      gateway: values.gateway,
+      primaryServer: values.primaryServer,
+      secondaryServer: values.secondaryServer,
+    });
+
+    if (result.id && networkResult.id) {
      toast.success("System settings updated successfully");
+    } else {
+      toast.error("Failed to update system settings");
    }
  };

+  if (isGettingLoading) {
+    return <div>Loading...</div>;
+  }
+
  return (
    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
-      <Form>
-        <div className="flex flex-row justify-between items-center mb-4">
-          <label htmlFor="deviceName">Device Name</label>
-          <Field
-            name="deviceName"
-            type="text"
-            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
-            placeholder="Enter device name"
-            autoComplete="off"
-          />
-        </div>
-        <div className="flex flex-row justify-between items-center mb-4">
-          <label htmlFor="timeZone">Timezone</label>
-          <Field
-            name="timeZone"
-            as="select"
-            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs bg-[#253445] "
-            autoComplete="off"
+      {({ values }) => (
+        <Form className="flex flex-col space-y-4">
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="deviceName">Device Name</label>
+            <Field
+              name="deviceName"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter device name"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="timeZone">Timezone</label>
+            <Field
+              name="timeZone"
+              as="select"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs bg-[#253445] "
+              autoComplete="off"
+            >
+              {timeZoneOpts?.map((option: string) => (
+                <option key={option} value={option}>
+                  {option}
+                </option>
+              ))}
+            </Field>
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="timeSource">Time Source</label>
+            <Field
+              name="timeSource"
+              as="select"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs bg-[#253445] "
+              autoComplete="off"
+            >
+              {timeSourceOpts?.map((option: string) => (
+                <option key={option} value={option}>
+                  {option}
+                </option>
+              ))}
+            </Field>
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="SNTPServer">SNTP Server</label>
+            <Field
+              name="SNTPServer"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter SNTP server"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="SNTPInterval">SNTP Interval</label>
+            <Field
+              name="SNTPInterval"
+              type="number"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter SNTP interval"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="subnetMask">Subnet Mask</label>
+            <Field
+              name="subnetMask"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter subnet mask"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="ipAddress">IP Address</label>
+            <Field
+              name="ipAddress"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter IP address"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="gateway">Gateway</label>
+            <Field
+              name="gateway"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter gateway"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="primaryServer">Primary DNS Server</label>
+            <Field
+              name="primaryServer"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter primary DNS server"
+              autoComplete="off"
+            />
+          </div>
+          <div className="flex flex-col md:flex-row space-y-4 justify-between">
+            <label htmlFor="secondaryServer">Secondary DNS Server</label>
+            <Field
+              name="secondaryServer"
+              type="text"
+              className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+              placeholder="Enter secondary DNS server"
+              autoComplete="off"
+            />
+          </div>
+          <div className="border-b border-gray-500 my-3">
+            <h2 className="font-bold">Custom Fields</h2>
+          </div>
+          <div className="items-center mb-4">
+            <FieldArray name="customFields">
+              {(arrayHelpers) => (
+                <>
+                  {values.customFields.map((_, index) => (
+                    <div key={index} className="flex flex-row justify-between items-center mb-4">
+                      <label htmlFor={`customFields.${index}`} className="mr-2">
+                        Custom Field {index + 1}
+                      </label>
+                      <Field
+                        name={`customFields.${index}`}
+                        key={index}
+                        className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
+                        placeholder={`Enter Custom Field ${index + 1}`}
+                        autoComplete="off"
+                      />
+                    </div>
+                  ))}
+                  <button
+                    type="button"
+                    onClick={() => arrayHelpers.push("")}
+                    className="mr-2 border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer"
+                  >
+                    Add Custom Field
+                  </button>
+                  {values.customFields.length > 0 && (
+                    <button
+                      type="button"
+                      onClick={() => arrayHelpers.pop()}
+                      className="border p-2 rounded-lg hover:bg-gray-700 hover:cursor-pointer"
+                    >
+                      Remove Custom Field
+                    </button>
+                  )}
+                </>
+              )}
+            </FieldArray>
+          </div>
+          <button
+            type="submit"
+            className="w-full md:w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
+            disabled={isLoading}
          >
-            {timeZoneOpts?.map((option: string) => (
-              <option key={option} value={option}>
-                {option}
-              </option>
-            ))}
-          </Field>
-        </div>
-        <div className="flex flex-row justify-between items-center mb-4">
-          <label htmlFor="timeSource">Time Source</label>
-          <Field
-            name="timeSource"
-            as="select"
-            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs bg-[#253445] "
-            autoComplete="off"
-          >
-            {timeSourceOpts?.map((option: string) => (
-              <option key={option} value={option}>
-                {option}
-              </option>
-            ))}
-          </Field>
-        </div>
-
-        <div className="flex flex-row justify-between items-center mb-4">
-          <label htmlFor="SNTPServer">SNTP Server</label>
-          <Field
-            name="SNTPServer"
-            type="text"
-            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
-            placeholder="Enter SNTP server"
-            autoComplete="off"
-          />
-        </div>
-        <div className="flex flex-row justify-between items-center mb-4">
-          <label htmlFor="SNTPInterval">SNTP Interval</label>
-          <Field
-            name="SNTPInterval"
-            type="number"
-            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
-            placeholder="Enter SNTP interval"
-            autoComplete="off"
-          />
-        </div>
-        <div className="flex flex-row justify-between items-center mb-4">
-          <label htmlFor="primaryServer">Primary DNS Server</label>
-          <Field
-            name="primaryServer"
-            type="text"
-            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
-            placeholder="Enter primary DNS server"
-            autoComplete="off"
-          />
-        </div>
-        <div className="flex flex-row justify-between items-center mb-4">
-          <label htmlFor="secondaryServer">Secondary DNS Server</label>
-          <Field
-            name="secondaryServer"
-            type="text"
-            className="p-2 border border-gray-400 rounded-lg w-full max-w-xs"
-            placeholder="Enter secondary DNS server"
-            autoComplete="off"
-          />
-        </div>
-        <button type="submit" className="px-4 py-2 bg-green-700 text-white rounded-lg">
-          Save Settings
-        </button>
-      </Form>
+            {isLoading ? "Saving..." : "Save Settings"}
+          </button>
+        </Form>
+      )}
    </Formik>
  );
 };
--- a/src/features/settings/hooks/useGetNetworkConfig.ts
+++ b/src/features/settings/hooks/useGetNetworkConfig.ts
@@ -0,0 +1,49 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../../../utils/config";
+import type { NetworkConfig } from "../../../types/types";
+
+const fetchNetworkConfig = async () => {
+  const response = await fetch(`${CAMBASE}/api/fetch-config?id=GLOBAL--NetworkConfig`);
+  if (!response.ok) throw new Error("Network response was not ok");
+  return response.json();
+};
+
+const postNetworkConfig = async (networkConfig: NetworkConfig) => {
+  const fields = [
+    { property: "propNetmask", value: networkConfig.subnetMask },
+    { property: "propHost", value: networkConfig.ipAddress },
+    { property: "propGateway", value: networkConfig.gateway },
+  ];
+
+  if (networkConfig.primaryServer !== undefined) {
+    fields.push({ property: "propNameServerPrimary", value: networkConfig.primaryServer });
+  }
+  if (networkConfig.secondaryServer !== undefined) {
+    fields.push({ property: "propNameServerSecondary", value: networkConfig.secondaryServer });
+  }
+  const networkConfigPayload = {
+    id: "GLOBAL--NetworkConfig",
+    fields,
+  };
+
+  const respones = await fetch(`${CAMBASE}/api/update-config?id=GLOBAL--NetworkConfig`, {
+    method: "POST",
+    body: JSON.stringify(networkConfigPayload),
+  });
+  if (!respones.ok) throw new Error("Network response was not ok");
+  return respones.json();
+};
+
+export const useGetNetworkConfig = () => {
+  const networkConfigQuery = useQuery({
+    queryKey: ["networkConfig"],
+    queryFn: fetchNetworkConfig,
+  });
+
+  const networkConfigMutation = useMutation({
+    mutationKey: ["networkConfigMutation"],
+    mutationFn: postNetworkConfig,
+  });
+
+  return { networkConfigQuery, networkConfigMutation };
+};
--- a/src/hooks/useBlackBoard.ts
+++ b/src/hooks/useBlackBoard.ts
@@ -0,0 +1,35 @@
+import { useQuery, useMutation } from "@tanstack/react-query";
+import { CAMBASE } from "../utils/config";
+import type { BlackBoardOptions } from "../types/types";
+
+const fetchBlackBoardData = async () => {
+  const response = await fetch(`${CAMBASE}/api/blackboard`);
+  if (!response.ok) {
+    throw new Error("Failed to fetch blackboard data");
+  }
+  return response.json();
+};
+
+const viewBlackBoardData = async (options: BlackBoardOptions) => {
+  const response = await fetch(`${CAMBASE}/api/blackboard`, {
+    method: "POST",
+    body: JSON.stringify(options),
+  });
+  if (!response.ok) {
+    throw new Error("Failed to view blackboard data");
+  }
+  return response.json();
+};
+
+export const useBlackBoard = () => {
+  const blackboardQuery = useQuery({
+    queryKey: ["blackboardData"],
+    queryFn: fetchBlackBoardData,
+  });
+
+  const blackboardMutation = useMutation({
+    mutationKey: ["viewBlackBoardData"],
+    mutationFn: (options: BlackBoardOptions) => viewBlackBoardData(options),
+  });
+  return { blackboardQuery, blackboardMutation };
+};
--- a/src/hooks/useGetVersions.ts
+++ b/src/hooks/useGetVersions.ts
@@ -0,0 +1,17 @@
+import { useQuery } from "@tanstack/react-query";
+import { CAMBASE } from "../utils/config";
+
+const fetchVersions = async () => {
+  const response = await fetch(`${CAMBASE}/api/versions`);
+  if (!response.ok) throw new Error("Cannot get Versions");
+  return response.json();
+};
+
+export const useGetVersions = () => {
+  const versionsQuery = useQuery({
+    queryKey: ["getversions"],
+    queryFn: fetchVersions,
+  });
+
+  return { versionsQuery };
+};
--- a/src/index.css
+++ b/src/index.css
@@ -5,3 +5,33 @@ body {
  color: #fff;
  font-family: Arial, Helvetica, sans-serif;
 }
+
+/* Modal animations */
+.ReactModal__Overlay {
+  opacity: 0;
+  transition: opacity 200ms ease-in-out;
+}
+
+.ReactModal__Overlay--after-open {
+  opacity: 1;
+}
+
+.ReactModal__Overlay--before-close {
+  opacity: 0;
+}
+
+.ReactModal__Content {
+  transform: scale(0.9) translateY(-20px);
+  opacity: 0;
+  transition: all 200ms ease-in-out;
+}
+
+.ReactModal__Content--after-open {
+  transform: scale(1) translateY(0);
+  opacity: 1;
+}
+
+.ReactModal__Content--before-close {
+  transform: scale(0.9) translateY(-20px);
+  opacity: 0;
+}
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -6,7 +6,10 @@ import { AppProviders } from "./app/providers/AppProviders";
 import "./index.css";
 import Modal from "react-modal";

-const router = createRouter({ routeTree });
+const router = createRouter({
+  routeTree,
+  basepath: "/bayiq",
+});

 Modal.setAppElement("#root");

--- a/src/routeTree.gen.ts
+++ b/src/routeTree.gen.ts
@@ -11,7 +11,7 @@
 import { Route as rootRouteImport } from './routes/__root'
 import { Route as SettingsRouteImport } from './routes/settings'
 import { Route as OutputRouteImport } from './routes/output'
-import { Route as BaywatchRouteImport } from './routes/baywatch'
+import { Route as CamerasRouteImport } from './routes/cameras'
 import { Route as AboutRouteImport } from './routes/about'
 import { Route as IndexRouteImport } from './routes/index'

@@ -25,9 +25,9 @@ const OutputRoute = OutputRouteImport.update({
  path: '/output',
  getParentRoute: () => rootRouteImport,
 } as any)
-const BaywatchRoute = BaywatchRouteImport.update({
-  id: '/baywatch',
-  path: '/baywatch',
+const CamerasRoute = CamerasRouteImport.update({
+  id: '/cameras',
+  path: '/cameras',
  getParentRoute: () => rootRouteImport,
 } as any)
 const AboutRoute = AboutRouteImport.update({
@@ -44,14 +44,14 @@ const IndexRoute = IndexRouteImport.update({
 export interface FileRoutesByFullPath {
  '/': typeof IndexRoute
  '/about': typeof AboutRoute
-  '/baywatch': typeof BaywatchRoute
+  '/cameras': typeof CamerasRoute
  '/output': typeof OutputRoute
  '/settings': typeof SettingsRoute
 }
 export interface FileRoutesByTo {
  '/': typeof IndexRoute
  '/about': typeof AboutRoute
-  '/baywatch': typeof BaywatchRoute
+  '/cameras': typeof CamerasRoute
  '/output': typeof OutputRoute
  '/settings': typeof SettingsRoute
 }
@@ -59,22 +59,22 @@ export interface FileRoutesById {
  __root__: typeof rootRouteImport
  '/': typeof IndexRoute
  '/about': typeof AboutRoute
-  '/baywatch': typeof BaywatchRoute
+  '/cameras': typeof CamerasRoute
  '/output': typeof OutputRoute
  '/settings': typeof SettingsRoute
 }
 export interface FileRouteTypes {
  fileRoutesByFullPath: FileRoutesByFullPath
-  fullPaths: '/' | '/about' | '/baywatch' | '/output' | '/settings'
+  fullPaths: '/' | '/about' | '/cameras' | '/output' | '/settings'
  fileRoutesByTo: FileRoutesByTo
-  to: '/' | '/about' | '/baywatch' | '/output' | '/settings'
-  id: '__root__' | '/' | '/about' | '/baywatch' | '/output' | '/settings'
+  to: '/' | '/about' | '/cameras' | '/output' | '/settings'
+  id: '__root__' | '/' | '/about' | '/cameras' | '/output' | '/settings'
  fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
  IndexRoute: typeof IndexRoute
  AboutRoute: typeof AboutRoute
-  BaywatchRoute: typeof BaywatchRoute
+  CamerasRoute: typeof CamerasRoute
  OutputRoute: typeof OutputRoute
  SettingsRoute: typeof SettingsRoute
 }
@@ -95,11 +95,11 @@ declare module '@tanstack/react-router' {
      preLoaderRoute: typeof OutputRouteImport
      parentRoute: typeof rootRouteImport
    }
-    '/baywatch': {
-      id: '/baywatch'
-      path: '/baywatch'
-      fullPath: '/baywatch'
-      preLoaderRoute: typeof BaywatchRouteImport
+    '/cameras': {
+      id: '/cameras'
+      path: '/cameras'
+      fullPath: '/cameras'
+      preLoaderRoute: typeof CamerasRouteImport
      parentRoute: typeof rootRouteImport
    }
    '/about': {
@@ -122,7 +122,7 @@ declare module '@tanstack/react-router' {
 const rootRouteChildren: RootRouteChildren = {
  IndexRoute: IndexRoute,
  AboutRoute: AboutRoute,
-  BaywatchRoute: BaywatchRoute,
+  CamerasRoute: CamerasRoute,
  OutputRoute: OutputRoute,
  SettingsRoute: SettingsRoute,
 }
--- a/src/routes/baywatch.tsx
+++ b/src/routes/baywatch.tsx
@@ -1,14 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
 import CameraGrid from "../features/cameras/components/CameraGrid";

-export const Route = createFileRoute("/baywatch")({
+export const Route = createFileRoute("/cameras")({
  component: RouteComponent,
 });

 function RouteComponent() {
-  return (
-    <div>
-      <CameraGrid />
-    </div>
-  );
+  return <CameraGrid />;
 }
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -6,9 +6,5 @@ export const Route = createFileRoute("/")({
 });

 function HomePage() {
-  return (
-    <div>
-      <DashboardGrid />
-    </div>
-  );
+  return <DashboardGrid />;
 }
--- a/src/routes/output.tsx
+++ b/src/routes/output.tsx
@@ -6,9 +6,5 @@ export const Route = createFileRoute("/output")({
 });

 function RouteComponent() {
-  return (
-    <div>
-      <OutputForms />
-    </div>
-  );
+  return <OutputForms />;
 }
--- a/src/routes/settings.tsx
+++ b/src/routes/settings.tsx
@@ -6,9 +6,5 @@ export const Route = createFileRoute("/settings")({
 });

 function RouteComponent() {
-  return (
-    <div>
-      <Settings />
-    </div>
-  );
+  return <Settings />;
 }
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -1,3 +1,5 @@
+import type { CameraID } from "../app/config/cameraConfig";
+
 export type WebSocketContextValue = {
  connected: boolean;
  send?: (msg: unknown) => void;
@@ -11,6 +13,10 @@ export type InfoBarData = {
  "thread-count": string;
 };

+export type CameraZoomData = {
+  magnificationLevel: string;
+};
+
 export type StatusIndicator = "neutral-quaternary" | "dark" | "info" | "success" | "warning" | "danger";
 export type Region = {
  name: string;
@@ -56,6 +62,15 @@ export type OptionalLaneIDs = {
  LID3?: string;
 };

+export type CustomField = {
+  label: string;
+  value: string;
+};
+
+export type CustomFields = {
+  customFields?: CustomField[];
+};
+
 export type InitialValuesFormErrors = {
  backOfficeURL?: string;
  username?: string;
@@ -64,7 +79,60 @@ export type InitialValuesFormErrors = {
  readTimeoutSeconds?: string;
 };

-export type FormTypes = BearerTypeFields & OptionalConstants & OptionalLaneIDs;
+export type OSDConfigFields = {
+  includeVRM: boolean;
+  includeMotion: boolean;
+  includeTimeStamp: boolean;
+  includeCameraName: boolean;
+  overlayPosition: "Top" | "Bottom" | "Left" | "Right";
+  OSDTimestampFormat: "UTC" | "LOCAL";
+};
+
+export type PayloadConfigFields = {
+  includeMac: boolean;
+  includeSaFID: boolean;
+  includeCameraName: boolean;
+  includeCharHeight: boolean;
+  includeConfidence: boolean;
+  includeCorrectSpacing: boolean;
+  includeDecodeID: boolean;
+  includeDirection: boolean;
+  includeFrameHeight: boolean;
+  includeFrameID: boolean;
+  includeFrameTimeRef: boolean;
+  includeFrameWidth: boolean;
+  includeHorizSlew: boolean;
+  includeMotion: boolean;
+  inclduePlate: boolean;
+  includeNightModeAction: boolean;
+  includeOverview: boolean;
+  includePlateSecondary: boolean;
+  includePlateTrack: boolean;
+  includePlateTrackSecondary: boolean;
+  includePreferredCountry: boolean;
+  includeRawReads: boolean;
+  includeRawREADSSecondary: boolean;
+  includeRef: boolean;
+  includeSeenCount: boolean;
+  includeRepeatedPlate: boolean;
+  includeSerialCount: boolean;
+  includeTimeStamp: boolean;
+  includeTraceCount: boolean;
+  includeTrack: boolean;
+  includeTrackSecondary: boolean;
+  includeVertSlew: boolean;
+  includeVRM: boolean;
+  includeVRMSecondary: boolean;
+  includeHotListMatches: boolean;
+};
+
+export type FormTypes = BearerTypeFields &
+  OptionalConstants &
+  OptionalLaneIDs &
+  CustomFields &
+  OSDConfigFields &
+  PayloadConfigFields;
+
 type FieldProperty = {
  datatype: string;
  value: string;
@@ -106,52 +174,58 @@ export type OptionalBOF2LaneIDs = {
 };

 export type CameraFeedState = {
-  cameraFeedID: "A" | "B" | "C";
-  paintedCells: {
-    A: Map<string, PaintedCell>;
-    B: Map<string, PaintedCell>;
-    C: Map<string, PaintedCell>;
-  };
-  regionsByCamera: {
-    A: Region[];
-    B: Region[];
-    C: Region[];
-  };
+  cameraFeedID: CameraID;
+  brushSize: number;
+  paintedCells: Record<CameraID, Map<string, PaintedCell>>;
+
+  regionsByCamera: Record<CameraID, Region[]>;
  selectedRegionIndex: number;
-  modeByCamera: {
-    A: string;
-    B: string;
-    C: string;
-  };
+  modeByCamera: Record<CameraID, string>;

  tabIndex?: number;
+  zoomLevel: Record<CameraID, number>;
 };

 export type CameraFeedAction =
  | {
      type: "SET_CAMERA_FEED";
-      payload: "A" | "B" | "C";
+      payload: CameraID;
    }
  | {
      type: "CHANGE_MODE";
-      payload: { cameraFeedID: "A" | "B" | "C"; mode: string };
+      payload: { cameraFeedID: CameraID; mode: string };
    }
  | { type: "SET_SELECTED_REGION_INDEX"; payload: number }
  | {
      type: "SET_SELECTED_REGION_COLOUR";
-      payload: { cameraFeedID: "A" | "B" | "C"; regionName: string; newColour: string };
+      payload: { cameraFeedID: CameraID; regionName: string; newColour: string };
    }
  | {
      type: "ADD_NEW_REGION";
-      payload: { cameraFeedID: "A" | "B" | "C"; regionName: string; brushColour: string };
+      payload: { cameraFeedID: CameraID; regionName: string; brushColour: string };
    }
  | {
      type: "REMOVE_REGION";
-      payload: { cameraFeedID: "A" | "B" | "C"; regionName: string };
+      payload: { cameraFeedID: CameraID; regionName: string };
    }
  | {
      type: "RESET_PAINTED_CELLS";
-      payload: { cameraFeedID: "A" | "B" | "C"; paintedCells: Map<string, PaintedCell> };
+      payload: { cameraFeedID: CameraID; paintedCells: Map<string, PaintedCell> };
+    }
+  | {
+      type: "SET_CAMERA_FEED_DATA";
+      cameraState: CameraFeedState;
+    }
+  | {
+      type: "RESET_CAMERA_FEED";
+    }
+  | {
+      type: "SET_ZOOM_LEVEL";
+      payload: { cameraFeedID: CameraID; zoomLevel: number };
+    }
+  | {
+      type: "SET_BRUSH_SIZE";
+      payload: { brushSize: number };
    };

 export type DecodeReading = {
@@ -164,6 +238,7 @@ export type DecodeReading = {
  duplicate?: true;
  firstSeenTimeHumane: string;
  lastSeenTimeHumane: string;
+  plate?: string;
 };

 export type ColourData = {
@@ -172,7 +247,7 @@ export type ColourData = {
 };

 export type ColourDetectionPayload = {
-  cameraFeedID: "A" | "B" | "C";
+  cameraFeedID: CameraID;
  regions: ColourData[];
 };

@@ -182,6 +257,38 @@ export type SystemSettings = {
  timeSource: string;
  SNTPServer: string;
  SNTPIntervalMinutes: number;
+};
+
+export type NetworkConfig = {
+  ipAddress: string;
+  subnetMask: string;
+  gateway: string;
  primaryServer?: string;
  secondaryServer?: string;
 };
+
+export type CustomFieldConfig = {
+  label: string;
+  value: string;
+};
+
+export type BlackBoardOptions = {
+  operation?: string;
+  path?: string;
+  value?: object | string | number | (string | number)[] | null;
+};
+
+export type CameraZoomConfig = { cameraFeedID: string; zoomLevel: number };
+
+export type versionInfo = {
+  version: string;
+  revision: string;
+  buildtime: string;
+  appname: string;
+  MAC: string;
+  timeStamp: number;
+  UUID: string;
+  proquint: string;
+  "Serial No.": string;
+  "Model No.": string;
+};
--- a/src/ui/Card.tsx
+++ b/src/ui/Card.tsx
@@ -10,7 +10,7 @@ const Card = ({ children, className }: CardProps) => {
  return (
    <div
      className={clsx(
-        "bg-[#253445] rounded-lg mt-4 mx-2 shadow-2xl overflow-x-hidden md:row-span-1 px-2 border border-gray-600 ",
+        "bg-[#253445] rounded-lg mt-4 shadow-2xl overflow-x-hidden md:row-span-1 px-2 border border-gray-600 ",
        className,
      )}
    >
--- a/src/ui/DevModal.tsx
+++ b/src/ui/DevModal.tsx
@@ -0,0 +1,76 @@
+import type { versionInfo } from "../types/types";
+import ModalComponent from "./ModalComponent";
+
+type DevModalProps = {
+  isDevModalOpen: boolean;
+  handleClose: () => void;
+  data: versionInfo;
+};
+
+const DevModal = ({ isDevModalOpen, handleClose, data }: DevModalProps) => {
+  const uiName = __APP_NAME__;
+  const uiVersion = __APP_VERSION__;
+  const commitID = __GIT_COMMIT__;
+  const commitTimeStamp = __GIT_TIMESTAMP__;
+
+  return (
+    <ModalComponent isModalOpen={isDevModalOpen} close={handleClose}>
+      <div className="space-y-6">
+        <div className="border-b border-gray-600 pb-3">
+          <h2 className="text-2xl font-bold text-gray-100">System Information</h2>
+          <p className="text-sm text-gray-400 mt-1">Application version details</p>
+        </div>
+        <div className="space-y-3">
+          <h3 className="text-sm font-semibold text-gray-400 uppercase tracking-wide">Frontend (UI)</h3>
+          <div className="bg-gray-800/50 rounded-lg p-4 space-y-3">
+            <div className="flex justify-between items-center border-b border-gray-700 pb-2">
+              <span className="text-gray-400 text-sm">Name</span>
+              <span className="text-gray-200 font-mono font-semibold">{uiName}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">Version</span>
+              <span className="text-gray-200 font-mono font-semibold">{uiVersion}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">Revision (Commit ID)</span>
+              <span className="bg-[#233241] p-2 rounded-md text-gray-200 font-mono text-sm">{commitID}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">Build Time</span>
+              <span className="text-gray-200 font-mono text-sm">{commitTimeStamp}</span>
+            </div>
+          </div>
+        </div>
+        <div className="space-y-3">
+          <h3 className="text-sm font-semibold text-gray-400 uppercase tracking-wide">Backend</h3>
+          <div className="bg-gray-800/50 rounded-lg p-4 space-y-3">
+            <div className="flex justify-between items-center border-b border-gray-700 pb-2">
+              <span className="text-gray-400 text-sm"> Name</span>
+              <span className="text-gray-200 font-mono font-semibold">{data?.appname || "N/A"}</span>
+            </div>
+            <div className="flex justify-between items-center pb-2">
+              <span className="text-gray-400 text-sm">Version</span>
+              <span className="text-gray-200 font-mono font-semibold">{data?.version || "N/A"}</span>
+            </div>
+            <div className="flex justify-between items-center  pb-2">
+              <span className="text-gray-400 text-sm">Revision (Commit ID)</span>
+              <span className="bg-[#233241] p-2 rounded-md text-gray-200 font-mono text-sm">
+                {data?.revision || "N/A"}
+              </span>
+            </div>
+            <div className="flex justify-between items-center  pb-2">
+              <span className="text-gray-400 text-sm">Build Time</span>
+              <span className="text-gray-200 font-mono text-sm">{data?.buildtime || "N/A"}</span>
+            </div>
+            <div className="flex justify-between items-center">
+              <span className="text-gray-400 text-sm">MAC Address</span>
+              <span className="text-gray-200 font-mono text-sm">{data?.MAC || "N/A"}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </ModalComponent>
+  );
+};
+
+export default DevModal;
--- a/src/ui/Footer.tsx
+++ b/src/ui/Footer.tsx
@@ -1,11 +1,25 @@
+import { useState } from "react";
 import Logo from "/MAV.svg";
+import DevModal from "./DevModal";
+import { useGetVersions } from "../hooks/useGetVersions";

 const Footer = () => {
+  const [isDevModalOpen, setDevModalOpen] = useState(false);
+  const { versionsQuery } = useGetVersions();
+
+  const versionData = versionsQuery?.data;
+
+  const handleClick = () => {
+    setDevModalOpen(true);
+  };
  return (
-    <footer className="bg-gray-900 border-t border-gray-700 text-white py-5 text-left p-8 h-30 mt-5 flex flex-col space-y-4 ">
-      <img src={Logo} alt="Logo" width={100} height={100} />
-      <p className="text-sm">{new Date().getFullYear()} MAV Systems &copy; All rights reserved.</p>
-    </footer>
+    <>
+      <footer className="bg-gray-900 border-t border-gray-700 text-white py-5 text-left p-8 h-30 mt-5 flex flex-col space-y-4 ">
+        <img src={Logo} alt="Logo" width={100} height={100} onClick={handleClick} />
+        <p className="text-sm">{new Date().getFullYear()} MAV Systems &copy; All rights reserved.</p>
+      </footer>
+      <DevModal isDevModalOpen={isDevModalOpen} handleClose={() => setDevModalOpen(false)} data={versionData} />
+    </>
  );
 };

--- a/src/ui/Header.tsx
+++ b/src/ui/Header.tsx
@@ -1,15 +1,29 @@
+import { useState } from "react";
 import { Link } from "@tanstack/react-router";
 import Logo from "/MAV.svg";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faBars } from "@fortawesome/free-solid-svg-icons";

 const Header = () => {
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const toggleMenu = () => {
+    setIsMenuOpen(!isMenuOpen);
+  };
  return (
-    <header className="bg-[#253445] p-4 flex border-b border-gray-500 justify-between items-center">
-      <div className="w-28">
-        <Link to={"/"}>
-          <img src={Logo} alt="Logo" width={150} height={150} />
-        </Link>
+    <nav className="bg-[#253445] p-4 flex border-b border-gray-500 justify-between items-center md:flex-row flex-col">
+      <div className="flex flex-row justify-between w-full items-center">
+        <div className="w-28">
+          <Link to={"/"} onClick={() => setIsMenuOpen(false)}>
+            <img src={Logo} alt="Logo" width={150} height={150} />
+          </Link>
+        </div>
+
+        <div className="hover:cursor-pointer md:hidden" onClick={toggleMenu}>
+          <FontAwesomeIcon icon={faBars} />
+        </div>
      </div>
-      <div className="flex gap-4 text-lg items-center">
+
+      <div className="md:flex hidden gap-4 text-lg items-center">
        <Link
          to="/"
          className="[&.active]:font-bold [&.active]:bg-gray-700 p-2 rounded-lg flex items-center gap-2 hover:bg-gray-700"
@@ -19,7 +33,7 @@ const Header = () => {
        </Link>

        <Link
-          to="/baywatch"
+          to="/cameras"
          className="[&.active]:font-bold [&.active]:bg-gray-700 p-2 rounded-lg flex items-center gap-2 hover:bg-gray-700"
        >
          Cameras
@@ -37,7 +51,26 @@ const Header = () => {
          Settings
        </Link>
      </div>
-    </header>
+      {/* mobile menu */}
+      {isMenuOpen && (
+        <div className="md:hidden flex flex-col w-full mt-4 gap-4 text-lg items-end">
+          <Link to="/" className="" onClick={toggleMenu}>
+            {/* <FontAwesomeIcon icon={faGaugeHigh} /> */}
+            Dashboard
+          </Link>
+          <Link to="/cameras" className="" onClick={toggleMenu}>
+            {/* <FontAwesomeIcon icon={faGaugeHigh} /> */}
+            Cameras
+          </Link>
+          <Link to="/output" className="" onClick={toggleMenu}>
+            Output
+          </Link>
+          <Link to="/settings" className="" onClick={toggleMenu}>
+            Settings
+          </Link>
+        </div>
+      )}
+    </nav>
  );
 };

--- a/src/ui/ModalComponent.tsx
+++ b/src/ui/ModalComponent.tsx
@@ -11,9 +11,26 @@ const ModalComponent = ({ isModalOpen, children, close }: ModalComponentProps) =
    <Modal
      isOpen={isModalOpen}
      onRequestClose={close}
-      className="bg-[#1e2a38] p-6 rounded-lg shadow-lg w-[95%] mt-[2%] md:w-[40%] z-100 overflow-y-auto border border-gray-600"
+      className="bg-[#1e2a38] p-6 rounded-lg shadow-lg w-[95%] mt-[2%] md:w-[40%] z-100 overflow-y-auto border border-gray-600 max-h-[90%]"
      overlayClassName="fixed inset-0 bg-[#1e2a38]/70 flex justify-center items-start z-100"
+      closeTimeoutMS={200}
+      style={{
+        overlay: {
+          transition: "opacity 200ms ease-in-out",
+        },
+        content: {
+          transition: "all 200ms ease-in-out",
+        },
+      }}
    >
+      <div className="flex justify-end">
+        <button
+          onClick={close}
+          className="bg-gray-700 hover:bg-gray-600 text-white font-bold py-2 px-4 rounded-lg mb-4 hover:cursor-pointer"
+        >
+          Close
+        </button>
+      </div>
      {children}
    </Modal>
  );
--- a/src/ui/SliderComponent.tsx
+++ b/src/ui/SliderComponent.tsx
@@ -0,0 +1,24 @@
+import Slider from "rc-slider";
+import "rc-slider/assets/index.css";
+
+type SliderComponentProps = {
+  id: string;
+  onChange: (value: number | number[]) => void;
+  value?: number;
+  min?: number;
+  max?: number;
+  step?: number;
+};
+
+const SliderComponent = ({ id, onChange, value = 0, min = 0, max = 100, step = 1 }: SliderComponentProps) => {
+  const handleChange = (val: number | number[]) => {
+    onChange(val);
+  };
+  return (
+    <>
+      <Slider id={id} onChange={handleChange} value={value} min={min} max={max} step={step} />
+    </>
+  );
+};
+
+export default SliderComponent;
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -1 +1,9 @@
-export const CAMBASE = import.meta.env.VITE_BASEURL;
+export const cambase = import.meta.env.VITE_BASEURL;
+
+export const CAMBASEWS = import.meta.env.VITE_BASE_WS;
+
+const environment = import.meta.env.MODE;
+
+export const CAMBASE = environment === "development" ? cambase : window.location.origin;
+
+export const CAMBASE_WS = environment === "development" ? CAMBASEWS : window.location.origin.replace(/^http/, "ws");
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -0,0 +1,6 @@
+/// <reference types="vite/client" />
+
+declare const __APP_NAME__: string;
+declare const __APP_VERSION__: string;
+declare const __GIT_COMMIT__: string;
+declare const __GIT_TIMESTAMP__: string;
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -2,13 +2,38 @@ import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 import { tanstackRouter } from "@tanstack/router-plugin/vite";
+import pkg from "./package.json";
+import { execSync } from "child_process";
+
+const gitCommitHash = (() => {
+  try {
+    return execSync("git rev-parse --short HEAD").toString().trim();
+  } catch {
+    return "unknown";
+  }
+})();
+
+const gitCommitTimeStamp = (() => {
+  try {
+    return execSync("git log -1 --format=%cd --date=iso").toString().trim();
+  } catch {
+    return "unknown";
+  }
+})();

 // https://vite.dev/config/
 export default defineConfig({
+  base: "/bayiq",
+  define: {
+    __APP_NAME__: JSON.stringify(pkg.name),
+    __APP_VERSION__: JSON.stringify(pkg.version),
+    __GIT_COMMIT__: JSON.stringify(gitCommitHash),
+    __GIT_TIMESTAMP__: JSON.stringify(gitCommitTimeStamp),
+  },
  plugins: [
    tanstackRouter({
      target: "react",
-      autoCodeSplitting: true,
+      autoCodeSplitting: false,
    }),
    react(),
    tailwindcss(),
@@ -21,4 +46,11 @@ export default defineConfig({
      },
    },
  },
+  build: {
+    rollupOptions: {
+      output: {
+        manualChunks: undefined,
+      },
+    },
+  },
 });
--- a/yarn.lock
+++ b/yarn.lock
@@ -226,6 +226,11 @@
    "@babel/plugin-transform-modules-commonjs" "^7.27.1"
    "@babel/plugin-transform-typescript" "^7.28.5"

+"@babel/runtime@^7.10.1", "@babel/runtime@^7.18.3":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
+  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
+
 "@babel/template@^7.27.2":
  version "7.27.2"
  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
@@ -1314,6 +1319,11 @@ chokidar@^3.6.0:
  optionalDependencies:
    fsevents "~2.3.2"

+classnames@^2.2.5:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
+  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
+
 clsx@^2.0.0, clsx@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
@@ -2142,6 +2152,23 @@ queue-microtask@^1.2.2:
  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==

+rc-slider@^11.1.9:
+  version "11.1.9"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-11.1.9.tgz#d872130fbf4ec51f28543d62e90451091d6f5208"
+  integrity sha512-h8IknhzSh3FEM9u8ivkskh+Ef4Yo4JRIY2nj7MrH6GQmrwV6mcpJf5/4KgH5JaVI1H3E52yCdpOlVyGZIeph5A==
+  dependencies:
+    "@babel/runtime" "^7.10.1"
+    classnames "^2.2.5"
+    rc-util "^5.36.0"
+
+rc-util@^5.36.0:
+  version "5.44.4"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.44.4.tgz#89ee9037683cca01cd60f1a6bbda761457dd6ba5"
+  integrity sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    react-is "^18.2.0"
+
 react-dom@^19.2.0:
  version "19.2.0"
  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.0.tgz#00ed1e959c365e9a9d48f8918377465466ec3af8"
@@ -2159,6 +2186,11 @@ react-is@^16.13.1, react-is@^16.7.0:
  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==

+react-is@^18.2.0:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+
 react-konva@^19.2.0:
  version "19.2.0"
  resolved "https://registry.yarnpkg.com/react-konva/-/react-konva-19.2.0.tgz#b4cc5d73cd6d642569e4df36a0139996c3dcf8e6"
@@ -2461,6 +2493,11 @@ uri-js@^4.2.2:
  dependencies:
    punycode "^2.1.0"

+use-debounce@^10.0.6:
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-10.0.6.tgz#e05060a5e561432ec740c653698f3eb162bd28ec"
+  integrity sha512-C5OtPyhAZgVoteO9heXMTdW7v/IbFI+8bSVKYCJrSmiWWCLsbUxiBSp4t9v0hNBTGY97bT72ydDIDyGSFWfwXg==
+
 use-sync-external-store@^1.6.0:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
Author	SHA1	Message	Date
TobaOjo	a6235a6844	Merge pull request 'develop' (#29 ) from develop into main Reviewed-on: #29	2026-01-13 16:11:33 +00:00
TobaOjo	9520aa5dac	Merge branch 'main' into develop	2026-01-13 16:11:22 +00:00
TobaOjo	00ca9441b9	Merge pull request 'Implemented brush size feature in camera feed settings' (#32 ) from feature/brushsize into develop Reviewed-on: #32	2026-01-13 16:10:32 +00:00
Toba Ojo	1243ce2098	Implemented brush size feature in camera feed settings	2026-01-13 16:10:05 +00:00
TobaOjo	845d603ae3	Merge pull request 'develop' (#28 ) from develop into main Reviewed-on: #28	2026-01-12 15:13:42 +00:00
TobaOjo	1653d9f0d4	Merge pull request 'bugfix/zoomchangeAndOneShot' (#31 ) from bugfix/zoomchangeAndOneShot into develop Reviewed-on: #31	2026-01-12 15:13:14 +00:00
Toba Ojo	eb5eb69c28	- added zoom options per camera and oneshot button - enhanced to remove painting when in zoom mode	2026-01-12 15:10:40 +00:00
Toba Ojo	61c85fdc3f	updated version	2025-12-23 15:00:09 +00:00
Toba Ojo	7877173f56	Add corner radius to video feed layer for improved aesthetics	2025-12-23 14:58:27 +00:00
TobaOjo	eb3f441a24	Merge pull request 'develop' (#30 ) from develop into main Reviewed-on: #30	2025-12-19 11:12:12 +00:00
TobaOjo	bf77d6001a	Merge pull request 'bugfix/minor-issues-2' (#27 ) from bugfix/minor-issues-2 into develop Reviewed-on: #27	2025-12-19 11:10:54 +00:00
Toba Ojo	0bdc8b25a8	- updated version	2025-12-19 11:09:58 +00:00
Toba Ojo	dfc14575a8	- removed console.logs	2025-12-19 09:42:07 +00:00
Toba Ojo	b328d25bc7	Add OSD and Payload configuration components with toggle functionality	2025-12-18 13:38:27 +00:00
TobaOjo	b79da7048e	Merge pull request 'enhancement/dynamiccameraFeed' (#26 ) from enhancement/dynamiccameraFeed into develop Reviewed-on: #26	2025-12-18 09:58:35 +00:00
Toba Ojo	dab49fd99c	Refactored routing components for better organization and maintainability	2025-12-17 16:07:01 +00:00
Toba Ojo	775fce7900	Refactor camera feed handling to support dynamic camera IDs and improve context management	2025-12-17 14:19:23 +00:00
TobaOjo	cc8b3a5691	Merge pull request 'more accurate system status' (#25 ) from bugfix/dashboard into develop Reviewed-on: #25	2025-12-17 09:46:26 +00:00
Toba Ojo	71ce2a9f91	- removed console.log - fixed issue for more extensive check into tags to be more accurate	2025-12-17 09:44:14 +00:00
Toba Ojo	3fbafbbcc7	- minor bugfixes - added developer modal for viewing app data	2025-12-12 12:18:17 +00:00
TobaOjo	b38fbe132b	Merge pull request 'develop' (#24 ) from develop into main Reviewed-on: #24	2025-12-12 08:33:36 +00:00
TobaOjo	9489fe2d6a	Merge branch 'main' into develop	2025-12-12 08:33:27 +00:00
Toba Ojo	3353ad6f8b	- updated paths and code splitting config	2025-12-12 08:32:06 +00:00
Toba Ojo	d1995f0a9f	- updated main endpoint end point and added flexibility for camera navigation	2025-12-11 10:52:13 +00:00
Toba Ojo	e395777ae9	- added modal for entry and exit sightings and plate patches	2025-12-10 22:32:30 +00:00
TobaOjo	ba93753df7	Merge pull request 'feature/ws-Camera' (#23 ) from feature/ws-Camera into develop Reviewed-on: #23	2025-12-10 14:09:24 +00:00
Toba Ojo	eb45eabde9	- improved magnification level text - removed magnification level	2025-12-10 14:08:44 +00:00
Toba Ojo	10e2644666	- improved zoom while clicking on on image to zoom	2025-12-10 13:09:07 +00:00
Toba Ojo	0ff43d975d	- added digital zoom functionality on fixed location via web sockets	2025-12-10 10:30:32 +00:00
TobaOjo	f0f311f316	Merge pull request 'develop' (#22 ) from develop into main Reviewed-on: #22	2025-12-09 15:54:52 +00:00
Toba Ojo	c73c5f4187	- adjusted button on settings	2025-12-09 15:53:20 +00:00
TobaOjo	0378667fe3	Merge pull request '- Enhanced responsiveness and layout adjustments across various components' (#21 ) from enhancement/responsive into develop Reviewed-on: #21	2025-12-09 14:09:06 +00:00
Toba Ojo	632962aeaf	- Enhanced responsiveness and layout adjustments across various components	2025-12-09 14:07:51 +00:00
TobaOjo	e6f4131c1e	Merge pull request 'Add zoom mode functionality and refactor video feed hooks' (#20 ) from feature/digitalZoom into develop Reviewed-on: #20	2025-12-09 13:04:10 +00:00
TobaOjo	06fe99b550	Merge branch 'develop' into feature/digitalZoom	2025-12-09 13:04:03 +00:00
TobaOjo	328c61cf98	Merge pull request '- implement camera zoom controls and state management' (#19 ) from feature/cameraControls-2 into develop Reviewed-on: #19	2025-12-09 13:03:42 +00:00
TobaOjo	a9f6c4a4ad	Merge branch 'develop' into feature/cameraControls-2	2025-12-09 13:03:34 +00:00
TobaOjo	59e09b7a8d	Merge pull request '- need endpoint for include and exclude' (#18 ) from feature/includeoption into develop Reviewed-on: #18	2025-12-09 13:03:08 +00:00
Toba Ojo	c6a336389b	Add zoom mode functionality and refactor video feed hooks - Implemented zoom mode in RegionSelector for digital zooming. - Updated VideoFeedGridPainter to handle zoom interactions. - Refactored useGetVideoFeed to support target detection and video feed queries based on mode. - Enhanced useCreateVideoSnapshot to manage snapshots during zoom mode.	2025-12-09 12:39:03 +00:00
Toba Ojo	b93b446614	- implement camera zoom controls and state management	2025-12-09 08:47:21 +00:00
Toba Ojo	a563a3c341	- need endpoint for include and exclude	2025-12-08 12:50:14 +00:00
TobaOjo	fa33b012cc	Merge pull request '- added reset all modal and integrate with camera settings' (#17 ) from feature/resetAll into develop Reviewed-on: #17	2025-12-08 11:50:14 +00:00
Toba Ojo	eefa98f03a	- added reset all modal and integrate with camera settings	2025-12-08 11:49:12 +00:00
TobaOjo	8b3bff8a45	Merge pull request '- added camera black board fetch and post' (#16 ) from feature/blackboard into develop Reviewed-on: #16	2025-12-08 11:03:47 +00:00
Toba Ojo	1628048ac5	- added camera black board fetch and post - region selector can save settings and painted regions and fetch on load - will add reset all	2025-12-08 10:59:46 +00:00
Toba Ojo	7cda7d5887	- general fixes across the app - minor fixes - code clean up and improvements	2025-12-08 09:03:04 +00:00
TobaOjo	4c53c04767	Merge pull request '- added OSD configuration components and hooks for managing overlay settings' (#15 ) from feature/osdOverlayOptions into develop Reviewed-on: #15	2025-12-06 21:17:24 +00:00
Toba Ojo	8a5a4f5c67	- added OSD configuration components and hooks for managing overlay settings	2025-12-06 21:16:11 +00:00
Toba Ojo	f0587a2b43	- improved layouts across app - adjusted card spacing	2025-12-05 17:01:57 +00:00
Toba Ojo	9e89193747	- finally fixed custom imput to match what is on backend on sighting amend endpoint	2025-12-05 12:53:42 +00:00
Toba Ojo	9208470e53	- addressing feedback	2025-12-04 19:14:14 +00:00
TobaOjo	3af4e585e7	Merge pull request '- added formik custom fields to settings and output' (#14 ) from enhancement/customFields into develop Reviewed-on: #14	2025-12-04 09:55:18 +00:00
Toba Ojo	7f9923167e	- added formik custom fields to settings and output	2025-12-03 19:51:02 +00:00
TobaOjo	018203b203	Merge pull request '- improved statuses acress dashboard and child cards' (#13 ) from enhancement/statusIndicators into develop Reviewed-on: #13	2025-12-03 16:06:14 +00:00
Toba Ojo	173b1d0e51	- improved statuses acress dashboard and child cards	2025-12-03 16:05:06 +00:00
TobaOjo	9b35deaf12	Merge pull request '- Enhance layout and responsiveness of camera components' (#12 ) from enhancement/videoFeed into develop Reviewed-on: #12	2025-12-03 13:42:43 +00:00
Toba Ojo	59bcb3c45b	- Enhance layout and responsiveness of camera components - update system health hook for periodic refetching	2025-12-03 13:39:18 +00:00
TobaOjo	10590e5658	Merge pull request 'enhancement/dashboardFeedback' (#11 ) from enhancement/dashboardFeedback into develop Reviewed-on: #11	2025-12-03 10:58:07 +00:00
Toba Ojo	f7964d4fc0	- added download button - added reads for number plate sightings	2025-12-03 10:46:36 +00:00
Toba Ojo	2a4afc7eae	- organised file structure for dashboard	2025-12-02 14:10:06 +00:00
TobaOjo	1810fc04b5	Merge pull request 'feature/settingsPage' (#10 ) from feature/settingsPage into develop Reviewed-on: #10	2025-12-02 13:54:56 +00:00