diff --git a/apps/edr-freight-web/backoffice/src/App.tsx b/apps/edr-freight-web/backoffice/src/App.tsx
index fa2798f5c..a176855f4 100644
--- a/apps/edr-freight-web/backoffice/src/App.tsx
+++ b/apps/edr-freight-web/backoffice/src/App.tsx
@@ -83,7 +83,6 @@ import TrainScheduleTrackPage from "./pages/trainScheduling/TrainScheduleTrackPa
 import TrainSchedulingGlobalRulesPage from "./pages/trainScheduling/TrainSchedulingGlobalRulesPage";
 import TradeAccessPage from "./pages/configuration/TradeAccessPage";
 import ExchangeRateSettingsCard from "./pages/settings/ExchangeRateSettingsCard";
-import ContractValidityPeriodsPage from "./pages/configuration/ContractValidityPeriodsPage";
 import FirstMilePage from "./pages/operations/FirstMilePage";
 import LastMilePage from "./pages/operations/LastMilePage";
 import TrainDetailPage from "./pages/trains/TrainDetailPage";
@@ -211,12 +210,43 @@ const App = () => {
       {/* Landing is per-user: /dashboard/overview is gated on overview:view, so
           a fixed target strands anyone without that key on a blank page. */}
       <Route path="/" element={<Navigate to={landingPath} replace />} />
-      <Route path="/dashboard" element={<Navigate to={landingPath} replace />} />
+      <Route
+        path="/dashboard"
+        element={<Navigate to={landingPath} replace />}
+      />
       <Route path="/dashboard" element={<DashboardShell />}>
-        <Route path="overview" element={<RequirePermission permission={FREIGHT_PERMS.overview.view}><OverviewPage /></RequirePermission>} />
-        <Route path="reports" element={<RequirePermission permission={FREIGHT_PERMS.reports.view}><ReportsIndexRedirect /></RequirePermission>} />
-        <Route path="reports/:reportKey" element={<RequirePermission permission={FREIGHT_PERMS.reports.view}><ReportPage /></RequirePermission>} />
-        <Route path="audit-logs" element={<RequirePermission permission={FREIGHT_PERMS.auditLog.view}><AuditLogsPage /></RequirePermission>} />
+        <Route
+          path="overview"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.overview.view}>
+              <OverviewPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="reports"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.reports.view}>
+              <ReportsIndexRedirect />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="reports/:reportKey"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.reports.view}>
+              <ReportPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="audit-logs"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.auditLog.view}>
+              <AuditLogsPage />
+            </RequirePermission>
+          }
+        />
         {/* Dev/testing page for the mock AI booking assistant. */}
         <Route
           path="ai-booking-mock-test"
@@ -228,7 +258,14 @@ const App = () => {
         />
         <Route path="profile" element={<MyProfilePage />} />
 
-        <Route path="booking-requests" element={<RequirePermission permission={FREIGHT_PERMS.bookings.view}><BookingRequestsPage /></RequirePermission>} />
+        <Route
+          path="booking-requests"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+              <BookingRequestsPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="payments"
           element={
@@ -237,7 +274,14 @@ const App = () => {
             </RequirePermission>
           }
         />
-        <Route path="support" element={<RequirePermission permission={FREIGHT_PERMS.support.agentView}><SupportInboxPage /></RequirePermission>} />
+        <Route
+          path="support"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.support.agentView}>
+              <SupportInboxPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="customers"
           element={
@@ -278,7 +322,14 @@ const App = () => {
             </RequirePermission>
           }
         />
-        <Route path="booking-requests/new" element={<RequirePermission permission={FREIGHT_PERMS.bookings.view}><NewBookingPage /></RequirePermission>} />
+        <Route
+          path="booking-requests/new"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.bookings.view}>
+              <NewBookingPage />
+            </RequirePermission>
+          }
+        />
         <Route
           path="wagon-cancellations"
           element={
@@ -487,25 +538,195 @@ const App = () => {
           path="bookings/:id/milestones"
           element={<BookingMilestonesRedirect />}
         />
-        <Route path="warehouses" element={<RequirePermission permission={FREIGHT_PERMS.warehouses.view}><WarehouseListPage /></RequirePermission>} />
-        <Route path="warehouses/:id" element={<RequirePermission permission={FREIGHT_PERMS.warehouses.view}><WarehouseDetailPage /></RequirePermission>} />
-        <Route path="warehouse-inventory" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><WarehouseInventoryPage /></RequirePermission>} />
-        <Route path="import-warehouse" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ImportWarehouseFlowPage /></RequirePermission>} />
-        <Route path="export-warehouse" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ExportWarehouseFlowPage /></RequirePermission>} />
-        <Route path="arrival-queue" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ArrivalQueuePage /></RequirePermission>} />
-        <Route path="loading-queue" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><LoadingQueuePage /></RequirePermission>} />
-        <Route path="intercity" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><IntercityPage /></RequirePermission>} />
-        <Route path="trucks-on-site" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><TrucksOnSitePage /></RequirePermission>} />
-        <Route path="import-trucks" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ImportTrucksPage /></RequirePermission>} />
-        <Route path="container-returns" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ContainerReturnsPage /></RequirePermission>} />
-        <Route path="loaded-inventory" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><LoadedInventoryPage /></RequirePermission>} />
-        <Route path="dispatch-queue" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><DispatchQueuePage /></RequirePermission>} />
-        <Route path="export-djibouti-unloading" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><ExportDjiboutiUnloadingQueuePage /></RequirePermission>} />
-        <Route path="interchange-documents" element={<RequirePermission permission={FREIGHT_PERMS.interchangeDocuments.view}><InterchangeDocumentsPage /></RequirePermission>} />
-        <Route path="inventory-inquiry" element={<RequirePermission permission={FREIGHT_PERMS.warehouseInventory.view}><InventoryInquiryPage /></RequirePermission>} />
-        <Route path="warehouse-rules" element={<RequirePermission permission={[FREIGHT_PERMS.warehouseAllocationRules.view, FREIGHT_PERMS.warehouseFeeRules.view]}><WarehouseRulesPage /></RequirePermission>} />
-        <Route path="warehouse-fee-invoices" element={<RequirePermission permission={FREIGHT_PERMS.warehouseFeeInvoices.view}><WarehouseInvoicesPage /></RequirePermission>} />
-        <Route path="warehouse-dashboard" element={<RequirePermission permission={FREIGHT_PERMS.warehouseDashboard.view}><WarehouseDashboardPage /></RequirePermission>} />
+        <Route
+          path="warehouses"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.warehouses.view}>
+              <WarehouseListPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="warehouses/:id"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.warehouses.view}>
+              <WarehouseDetailPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="warehouse-inventory"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <WarehouseInventoryPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="import-warehouse"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <ImportWarehouseFlowPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="export-warehouse"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <ExportWarehouseFlowPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="arrival-queue"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <ArrivalQueuePage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="loading-queue"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <LoadingQueuePage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="intercity"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <IntercityPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="trucks-on-site"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <TrucksOnSitePage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="import-trucks"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <ImportTrucksPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="container-returns"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <ContainerReturnsPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="loaded-inventory"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <LoadedInventoryPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="dispatch-queue"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <DispatchQueuePage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="export-djibouti-unloading"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <ExportDjiboutiUnloadingQueuePage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="interchange-documents"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.interchangeDocuments.view}
+            >
+              <InterchangeDocumentsPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="inventory-inquiry"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseInventory.view}
+            >
+              <InventoryInquiryPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="warehouse-rules"
+          element={
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.warehouseAllocationRules.view,
+                FREIGHT_PERMS.warehouseFeeRules.view,
+              ]}
+            >
+              <WarehouseRulesPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="warehouse-fee-invoices"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseFeeInvoices.view}
+            >
+              <WarehouseInvoicesPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="warehouse-dashboard"
+          element={
+            <RequirePermission
+              permission={FREIGHT_PERMS.warehouseDashboard.view}
+            >
+              <WarehouseDashboardPage />
+            </RequirePermission>
+          }
+        />
 
         <Route
           path="operations/train-scheduling"
@@ -784,7 +1005,9 @@ const App = () => {
         <Route
           path="file-settings"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.settings.fileUpload.view}>
+            <RequirePermission
+              permission={FREIGHT_PERMS.settings.fileUpload.view}
+            >
               <FileUploadSettingsPage />
             </RequirePermission>
           }
@@ -792,7 +1015,9 @@ const App = () => {
         <Route
           path="dropdown-settings"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.settings.dropdown.view}>
+            <RequirePermission
+              permission={FREIGHT_PERMS.settings.dropdown.view}
+            >
               <DropdownSettingsPage />
             </RequirePermission>
           }
@@ -807,9 +1032,7 @@ const App = () => {
         <Route
           path="stamp-settings"
           element={
-            <RequirePermission
-              permission={FREIGHT_PERMS.settings.stamp.view}
-            >
+            <RequirePermission permission={FREIGHT_PERMS.settings.stamp.view}>
               <CompanyStampSettingsPage />
             </RequirePermission>
           }
@@ -878,7 +1101,9 @@ const App = () => {
         <Route
           path="configuration/exchange-rate"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.settings.exchangeRate.view}>
+            <RequirePermission
+              permission={FREIGHT_PERMS.settings.exchangeRate.view}
+            >
               <div className="p-4">
                 <ExchangeRateSettingsCard />
               </div>
@@ -946,4 +1171,3 @@ function LegacyGlEthiopiaClearanceRedirect() {
 }
 
 export default App;
-
diff --git a/apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx b/apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx
index 4548dc134..7114fa129 100644
--- a/apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/layout/sidebar-sections.tsx
@@ -55,518 +55,519 @@ export const buildSidebarSections = (
   demoItems: SidebarItem[],
   reportItems: SidebarItem[] = [],
 ): SidebarSection[] => [
-  {
-    title: "Main menu",
-    items: [
-      {
-        label: "Overview",
-        href: "/dashboard/overview",
-        icon: <LayoutDashboard />,
-        permission: FREIGHT_PERMS.overview.view,
-      },
-      {
-        label: "Reports",
-        href: "/dashboard/reports",
-        icon: <BarChart3 />,
-        permission: FREIGHT_PERMS.reports.view,
-        // Populated from the live GET /reports catalog (already permission-
-        // filtered server-side) — no report key is ever hand-listed here.
-        ...(reportItems.length ? { children: reportItems } : {}),
-      },
-      {
-        label: "Customers",
-        href: "/dashboard/customers",
-        icon: <Building2 />,
-        permission: FREIGHT_PERMS.customers.view,
-      },
-      {
-        label: "Contracts",
-        href: "/dashboard/contract-requests",
-        icon: <FileSignature />,
-        permission: FREIGHT_PERMS.contracts.view,
-      },
-      {
-        label: "Bookings",
-        href: "/dashboard/booking-requests",
-        icon: <FileText />,
-        permission: FREIGHT_PERMS.bookings.view,
-      },
-      {
-        label: "Wagon cancellations",
-        href: "/dashboard/wagon-cancellations",
-        icon: <XCircle />,
-        permission: FREIGHT_PERMS.bookings.wagonCancellationView,
-      },
-      // Operations hub: per-shipment clearance-document review for services
-      // WITHOUT customs clearing (self-clearance) — bookings only.
-      {
-        label: "Clearance Documents",
-        href: "/dashboard/contracts/clearance-documents",
-        icon: <ShieldCheck />,
-        permission: FREIGHT_PERMS.contracts.opsClearanceReview,
-      },
-      {
-        label: "Payments",
-        href: "/dashboard/payments",
-        icon: <Wallet />,
-        permission: FREIGHT_PERMS.payments.view,
-      },
-      {
-        label: "Invoices",
-        href: "/dashboard/invoices",
-        icon: <Receipt />,
-        permission: FREIGHT_PERMS.invoices.view,
-      },
-      {
-        label: "USD Payments",
-        href: "/dashboard/usd-payments",
-        icon: <Landmark />,
-        permission: FREIGHT_PERMS.invoices.view,
-      },
-      {
-        label: "Support",
-        href: "/dashboard/support",
-        icon: <LifeBuoy />,
-        permission: FREIGHT_PERMS.support.agentView,
-      },
-      ...demoItems,
-    ],
-  },
-  {
-    // title: "Port & Terminal",
-    items: [
-      {
-        label: "Operations",
-        icon: <Settings />,
-        children: [
-          {
-            label: "Clearance",
-            href: "/dashboard/contracts/clearance",
-            icon: <ShieldCheck />,
-            permission: [
-              FREIGHT_PERMS.contracts.clearanceReview,
-              FREIGHT_PERMS.contracts.clearanceEtActions,
-            ],
-          },
-          // {
-          //   label: "Shipment Requests",
-          //   href: "/dashboard/shipment-requests",
-          //   icon: <Send />,
-          //   permission: FREIGHT_PERMS.contracts.createBooking,
-          // },
-          // Operations Path A queue: per-booking self-clearance review for
-          // GENERAL non-customs booking instances (and legacy self-clear bookings).
-          // {
-          //   label: "Self-Clearance Review",
-          //   href: "/dashboard/contracts/ops-clearance",
-          //   icon: <ShieldCheck />,
-          //   permission: FREIGHT_PERMS.contracts.opsClearanceReview,
-          // },
-          {
-            label: "GL Djibouti Clearance",
-            href: "/dashboard/gl-djibouti/clearance",
-            icon: <Ship />,
-            permission: FREIGHT_PERMS.contracts.clearanceDjActions,
-          },
-          {
-            label: "Train Schedules",
-            href: "/dashboard/operations/train-scheduling-v2",
-            icon: <Train />,
-            permission: FREIGHT_PERMS.trainScheduling.view,
-          },
-          {
-            label: "Batch Board",
-            href: "/dashboard/operations/batch-board",
-            icon: <LayoutGrid />,
-            permission: FREIGHT_PERMS.trainScheduling.view,
-          },
-          {
-            label: "First Mile",
-            href: "/dashboard/operations/first-mile",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.firstMile.view,
-          },
-          {
-            label: "Last Mile",
-            href: "/dashboard/operations/last-mile",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.lastMile.view,
-          },
-        ],
-      },
-      {
-        label: "Fleet Management",
-        icon: <Truck />,
-        children: [
-          {
-            label: "Fleet Dashboard",
-            href: "/dashboard/fleet-dashboard",
-            icon: <LayoutDashboard />,
-            permission: FREIGHT_PERMS.fleetDashboard.view,
-          },
-          {
-            label: "Routes",
-            href: "/dashboard/routes",
-            icon: <Network />,
-            permission: FREIGHT_PERMS.routes.view,
-          },
-          {
-            label: "Locomotives",
-            href: "/dashboard/locomotives",
-            icon: <Train />,
-            permission: FREIGHT_PERMS.locomotives.view,
-          },
-          {
-            label: "Train Builder",
-            href: "/dashboard/train-builder",
-            icon: <Hammer />,
-            permission: FREIGHT_PERMS.trains.view,
-          },
+    {
+      title: "Main menu",
+      items: [
+        {
+          label: "Overview",
+          href: "/dashboard/overview",
+          icon: <LayoutDashboard />,
+          permission: FREIGHT_PERMS.overview.view,
+        },
+        {
+          label: "Customers",
+          href: "/dashboard/customers",
+          icon: <Building2 />,
+          permission: FREIGHT_PERMS.customers.view,
+        },
+        {
+          label: "Contracts",
+          href: "/dashboard/contract-requests",
+          icon: <FileSignature />,
+          permission: FREIGHT_PERMS.contracts.view,
+        },
+        {
+          label: "Bookings",
+          href: "/dashboard/booking-requests",
+          icon: <FileText />,
+          permission: FREIGHT_PERMS.bookings.view,
+        },
+        {
+          label: "Wagon cancellations",
+          href: "/dashboard/wagon-cancellations",
+          icon: <XCircle />,
+          permission: FREIGHT_PERMS.bookings.wagonCancellationView,
+        },
+        // Operations hub: per-shipment clearance-document review for services
+        // WITHOUT customs clearing (self-clearance) — bookings only.
+        {
+          label: "Clearance Documents",
+          href: "/dashboard/contracts/clearance-documents",
+          icon: <ShieldCheck />,
+          permission: FREIGHT_PERMS.contracts.opsClearanceReview,
+        },
+        {
+          label: "Payments",
+          href: "/dashboard/payments",
+          icon: <Wallet />,
+          permission: FREIGHT_PERMS.payments.view,
+        },
+        {
+          label: "Invoices",
+          href: "/dashboard/invoices",
+          icon: <Receipt />,
+          permission: FREIGHT_PERMS.invoices.view,
+        },
+        {
+          label: "USD Payments",
+          href: "/dashboard/usd-payments",
+          icon: <Landmark />,
+          permission: FREIGHT_PERMS.invoices.view,
+        },
+        {
+          label: "Support",
+          href: "/dashboard/support",
+          icon: <LifeBuoy />,
+          permission: FREIGHT_PERMS.support.agentView,
+        },
+        ...demoItems,
+      ],
+    },
+    {
+      // title: "Port & Terminal",
+      items: [
+        {
+          label: "Operations",
+          icon: <Settings />,
+          children: [
+            {
+              label: "Clearance",
+              href: "/dashboard/contracts/clearance",
+              icon: <ShieldCheck />,
+              permission: [
+                FREIGHT_PERMS.contracts.clearanceReview,
+                FREIGHT_PERMS.contracts.clearanceEtActions,
+              ],
+            },
+            // {
+            //   label: "Shipment Requests",
+            //   href: "/dashboard/shipment-requests",
+            //   icon: <Send />,
+            //   permission: FREIGHT_PERMS.contracts.createBooking,
+            // },
+            // Operations Path A queue: per-booking self-clearance review for
+            // GENERAL non-customs booking instances (and legacy self-clear bookings).
+            // {
+            //   label: "Self-Clearance Review",
+            //   href: "/dashboard/contracts/ops-clearance",
+            //   icon: <ShieldCheck />,
+            //   permission: FREIGHT_PERMS.contracts.opsClearanceReview,
+            // },
+            {
+              label: "GL Djibouti Clearance",
+              href: "/dashboard/gl-djibouti/clearance",
+              icon: <Ship />,
+              permission: FREIGHT_PERMS.contracts.clearanceDjActions,
+            },
+            {
+              label: "Train Schedules",
+              href: "/dashboard/operations/train-scheduling-v2",
+              icon: <Train />,
+              permission: FREIGHT_PERMS.trainScheduling.view,
+            },
+            {
+              label: "Batch Board",
+              href: "/dashboard/operations/batch-board",
+              icon: <LayoutGrid />,
+              permission: FREIGHT_PERMS.trainScheduling.view,
+            },
+            {
+              label: "First Mile",
+              href: "/dashboard/operations/first-mile",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.firstMile.view,
+            },
+            {
+              label: "Last Mile",
+              href: "/dashboard/operations/last-mile",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.lastMile.view,
+            },
+          ],
+        },
+        {
+          label: "Fleet Management",
+          icon: <Truck />,
+          children: [
+            {
+              label: "Fleet Dashboard",
+              href: "/dashboard/fleet-dashboard",
+              icon: <LayoutDashboard />,
+              permission: FREIGHT_PERMS.fleetDashboard.view,
+            },
+            {
+              label: "Routes",
+              href: "/dashboard/routes",
+              icon: <Network />,
+              permission: FREIGHT_PERMS.routes.view,
+            },
+            {
+              label: "Locomotives",
+              href: "/dashboard/locomotives",
+              icon: <Train />,
+              permission: FREIGHT_PERMS.locomotives.view,
+            },
+            {
+              label: "Train Builder",
+              href: "/dashboard/train-builder",
+              icon: <Hammer />,
+              permission: FREIGHT_PERMS.trains.view,
+            },
 
-          // {
-          //   label: "Wagon types",
-          //   href: "/dashboard/wagon-types",
-          //   icon: <Boxes />,
-          // },
-          {
-            label: "Wagons",
-            href: "/dashboard/wagons",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.wagons.view,
-          },
-          {
-            label: "Wagon Transfers",
-            href: "/dashboard/wagon-transfers",
-            icon: <ArrowLeftRight />,
-            permission: [
-              FREIGHT_PERMS.wagons.transferView,
-              FREIGHT_PERMS.wagons.view,
-            ],
-          },
-          {
-            label: "Vehicles",
-            href: "/dashboard/vehicles",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.vehicles.view,
-          },
-          {
-            label: "Drivers",
-            href: "/dashboard/drivers",
-            icon: <Users />,
-            permission: FREIGHT_PERMS.drivers.view,
-          },
-          {
-            label: "Track Vehicles",
-            href: "/dashboard/tracking",
-            icon: <MapPin />,
-            permission: FREIGHT_PERMS.tracking.view,
-          },
-          {
-            label: "Fuel Purchases",
-            href: "/dashboard/fuel-purchases",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.fuel.view,
-          },
-          {
-            label: "Fuel Analytics",
-            href: "/dashboard/fuel-stats",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.fuel.view,
-          },
-          {
-            label: "Maintenance",
-            href: "/dashboard/maintenance",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.maintenance.view,
-          },
-          {
-            label: "Work Orders",
-            href: "/dashboard/work-orders",
-            icon: <SlidersHorizontal />,
-            permission: FREIGHT_PERMS.maintenance.view,
-          },
-          {
-            label: "Compliance & Alerts",
-            href: "/dashboard/compliance",
-            icon: <ShieldCheck />,
-            permission: FREIGHT_PERMS.compliance.view,
-          },
-          {
-            label: "Incidents",
-            href: "/dashboard/incidents",
-            icon: <FileText />,
-            // No dedicated backend key exists for incidents yet. Not part of
-            // the fleet.view/admin fallback cleanup — removing fleet.view
-            // here with nothing to replace it would lock the page to
-            // super-admin only, so it stays as the sole (if coarse) gate.
-            permission: FREIGHT_PERMS.fleet.view,
-          },
-          {
-            label: "Procurement",
-            href: "/dashboard/procurement",
-            icon: <Package />,
-            permission: FREIGHT_PERMS.procurement.view,
-          },
-          {
-            label: "Financial Reports",
-            href: "/dashboard/financial-reports",
-            icon: <Wallet />,
-            permission: FREIGHT_PERMS.fleetReports.view,
-          },
-          // {
-          //   label: "Containers",
-          //   href: "/dashboard/containers",
-          //   icon: <Container />,
-          // },
-          // {
-          //   label: "Cargoes",
-          //   href: "/dashboard/cargoes",
-          //   icon: <Package />,
-          // },
-        ],
-      },
-      {
-        label: "Imports",
-        href: "/dashboard/import-warehouse",
-        icon: <PackageOpen />,
-        permission: FREIGHT_PERMS.warehouseInventory.view,
-        children: [
-          {
-            label: "Import Overview",
-            href: "/dashboard/import-warehouse",
-            icon: <PackageOpen />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Arrival Queue",
-            href: "/dashboard/arrival-queue",
-            icon: <PackageOpen />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Import Trucks",
-            href: "/dashboard/import-trucks",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Container Returns",
-            href: "/dashboard/container-returns",
-            icon: <Container />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Terminal Inventory",
-            href: "/dashboard/warehouse-inventory?direction=IMPORT",
-            icon: <Package />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Inventory Inquiry",
-            href: "/dashboard/inventory-inquiry",
-            icon: <Boxes />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-        ],
-      },
-      {
-        label: "Exports",
-        href: "/dashboard/export-warehouse",
-        icon: <Truck />,
-        permission: FREIGHT_PERMS.warehouseInventory.view,
-        children: [
-          {
-            label: "Export Overview",
-            href: "/dashboard/export-warehouse",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Loading Queue",
-            href: "/dashboard/loading-queue",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Loaded Inventory",
-            href: "/dashboard/loaded-inventory",
-            icon: <PackageCheck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Dispatch Queue",
-            href: "/dashboard/dispatch-queue",
-            icon: <Send />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Djibouti Unloading",
-            href: "/dashboard/export-djibouti-unloading",
-            icon: <PackageOpen />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Interchange Documents",
-            href: "/dashboard/interchange-documents",
-            icon: <FileText />,
-            permission: FREIGHT_PERMS.interchangeDocuments.view,
-          },
-          {
-            label: "Terminal Inventory",
-            href: "/dashboard/warehouse-inventory?direction=EXPORT",
-            icon: <Package />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-        ],
-      },
-      {
-        label: "Intercity",
-        href: "/dashboard/intercity",
-        icon: <TrainFront />,
-        permission: FREIGHT_PERMS.trainScheduling.view,
-        children: [
-          {
-            label: "Intercity Cargo",
-            href: "/dashboard/intercity",
-            icon: <TrainFront />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-        ],
-      },
-      {
-        label: "Warehouse Management",
-        icon: <Container />,
-        children: [
-          {
-            label: "Warehouse Dashboard",
-            href: "/dashboard/warehouse-dashboard",
-            icon: <LayoutDashboard />,
-            permission: FREIGHT_PERMS.warehouseDashboard.view,
-          },
-          {
-            // Yard-wide, not per-direction: the gate sees import and export
-            // trucks at the same barrier.
-            label: "Trucks on Site",
-            href: "/dashboard/trucks-on-site",
-            icon: <Truck />,
-            permission: FREIGHT_PERMS.warehouseInventory.view,
-          },
-          {
-            label: "Warehouses",
-            href: "/dashboard/warehouses",
-            icon: <Container />,
-            permission: FREIGHT_PERMS.warehouses.view,
-          },
-          {
-            label: "Allocation & Fees",
-            href: "/dashboard/warehouse-rules",
-            icon: <SlidersHorizontal />,
-            permission: [
-              FREIGHT_PERMS.warehouseAllocationRules.view,
-              FREIGHT_PERMS.warehouseFeeRules.view,
-            ],
-          },
-          {
-            label: "Fee Invoices",
-            href: "/dashboard/warehouse-fee-invoices",
-            icon: <Wallet />,
-            permission: FREIGHT_PERMS.warehouseFeeInvoices.view,
-          },
-        ],
-      },
-    ],
-  },
-  {
-    title: "Freight configuration",
-    mutedTitle: true,
-    items: [
-      {
-        label: "File settings",
-        href: "/dashboard/file-settings",
-        icon: <Paperclip />,
-        permission: FREIGHT_PERMS.settings.fileUpload.view,
-      },
-      {
-        label: "Dropdown settings",
-        href: "/dashboard/dropdown-settings",
-        icon: <Settings />,
-        permission: FREIGHT_PERMS.settings.dropdown.view,
-      },
-      {
-        // One entry, one stamp. The former "Stamp settings" entry here pointed
-        // at the per-officer teeter (ማህተም), not a company seal — it moved to
-        // /user-management/teeter-and-signature.
-        label: "Company stamp",
-        href: "/dashboard/stamp-settings",
-        icon: <Stamp />,
-        permission: FREIGHT_PERMS.settings.stamp.view,
-      },
-      {
-        label: "Contract templates",
-        href: "/dashboard/contract-templates",
-        icon: <ScrollText />,
-        // `view` opens the page; `read` alone is API-only and shows no menu.
-        permission: FREIGHT_PERMS.settings.contractTemplates.view,
-      },
-      {
-        label: "Portal content",
-        href: "/dashboard/portal-content",
-        icon: <BookOpen />,
-        permission: [
-          FREIGHT_PERMS.settings.supportContent.view,
-          FREIGHT_PERMS.settings.supportContent.manage,
-        ],
-      },
-      {
-        label: "Audit logs",
-        href: "/dashboard/audit-logs",
-        icon: <History />,
-        permission: FREIGHT_PERMS.auditLog.view,
-      },
-      {
-        label: "Configuration",
-        href: "/dashboard/configuration",
-        icon: <Boxes />,
-        children: [
-          ...getCategorySidebarChildren("configuration"),
-          {
-            label: "Train scheduling rules",
-            href: "/dashboard/configuration/train-scheduling-rules",
-            permission: FREIGHT_PERMS.trainScheduling.rulesManage,
-          },
-          {
-            label: "Trade access",
-            href: "/dashboard/configuration/trade-access",
-            permission: FREIGHT_PERMS.tradeAccess.view,
-          },
-          {
-            label: "Exchange rate",
-            href: "/dashboard/configuration/exchange-rate",
-            permission: FREIGHT_PERMS.settings.exchangeRate.view,
-          },
-        ],
-      },
-      {
-        label: "Rules",
-        href: "/dashboard/rules",
-        icon: <SlidersHorizontal />,
-        children: getCategorySidebarChildren("rules"),
-      },
+            // {
+            //   label: "Wagon types",
+            //   href: "/dashboard/wagon-types",
+            //   icon: <Boxes />,
+            // },
+            {
+              label: "Wagons",
+              href: "/dashboard/wagons",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.wagons.view,
+            },
+            {
+              label: "Wagon Transfers",
+              href: "/dashboard/wagon-transfers",
+              icon: <ArrowLeftRight />,
+              permission: [
+                FREIGHT_PERMS.wagons.transferView,
+                FREIGHT_PERMS.wagons.view,
+              ],
+            },
+            {
+              label: "Vehicles",
+              href: "/dashboard/vehicles",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.vehicles.view,
+            },
+            {
+              label: "Drivers",
+              href: "/dashboard/drivers",
+              icon: <Users />,
+              permission: FREIGHT_PERMS.drivers.view,
+            },
+            {
+              label: "Track Vehicles",
+              href: "/dashboard/tracking",
+              icon: <MapPin />,
+              permission: FREIGHT_PERMS.tracking.view,
+            },
+            {
+              label: "Fuel Purchases",
+              href: "/dashboard/fuel-purchases",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.fuel.view,
+            },
+            {
+              label: "Fuel Analytics",
+              href: "/dashboard/fuel-stats",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.fuel.view,
+            },
+            {
+              label: "Maintenance",
+              href: "/dashboard/maintenance",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.maintenance.view,
+            },
+            {
+              label: "Work Orders",
+              href: "/dashboard/work-orders",
+              icon: <SlidersHorizontal />,
+              permission: FREIGHT_PERMS.maintenance.view,
+            },
+            {
+              label: "Compliance & Alerts",
+              href: "/dashboard/compliance",
+              icon: <ShieldCheck />,
+              permission: FREIGHT_PERMS.compliance.view,
+            },
+            {
+              label: "Incidents",
+              href: "/dashboard/incidents",
+              icon: <FileText />,
+              // No dedicated backend key exists for incidents yet. Not part of
+              // the fleet.view/admin fallback cleanup — removing fleet.view
+              // here with nothing to replace it would lock the page to
+              // super-admin only, so it stays as the sole (if coarse) gate.
+              permission: FREIGHT_PERMS.fleet.view,
+            },
+            {
+              label: "Procurement",
+              href: "/dashboard/procurement",
+              icon: <Package />,
+              permission: FREIGHT_PERMS.procurement.view,
+            },
+            {
+              label: "Financial Reports",
+              href: "/dashboard/financial-reports",
+              icon: <Wallet />,
+              permission: FREIGHT_PERMS.fleetReports.view,
+            },
+            // {
+            //   label: "Containers",
+            //   href: "/dashboard/containers",
+            //   icon: <Container />,
+            // },
+            // {
+            //   label: "Cargoes",
+            //   href: "/dashboard/cargoes",
+            //   icon: <Package />,
+            // },
+          ],
+        },
+        {
+          label: "Imports",
+          href: "/dashboard/import-warehouse",
+          icon: <PackageOpen />,
+          permission: FREIGHT_PERMS.warehouseInventory.view,
+          children: [
+            {
+              label: "Import Overview",
+              href: "/dashboard/import-warehouse",
+              icon: <PackageOpen />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Arrival Queue",
+              href: "/dashboard/arrival-queue",
+              icon: <PackageOpen />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Import Trucks",
+              href: "/dashboard/import-trucks",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Container Returns",
+              href: "/dashboard/container-returns",
+              icon: <Container />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Terminal Inventory",
+              href: "/dashboard/warehouse-inventory?direction=IMPORT",
+              icon: <Package />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Inventory Inquiry",
+              href: "/dashboard/inventory-inquiry",
+              icon: <Boxes />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+          ],
+        },
+        {
+          label: "Exports",
+          href: "/dashboard/export-warehouse",
+          icon: <Truck />,
+          permission: FREIGHT_PERMS.warehouseInventory.view,
+          children: [
+            {
+              label: "Export Overview",
+              href: "/dashboard/export-warehouse",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Loading Queue",
+              href: "/dashboard/loading-queue",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Loaded Inventory",
+              href: "/dashboard/loaded-inventory",
+              icon: <PackageCheck />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Dispatch Queue",
+              href: "/dashboard/dispatch-queue",
+              icon: <Send />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Djibouti Unloading",
+              href: "/dashboard/export-djibouti-unloading",
+              icon: <PackageOpen />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Interchange Documents",
+              href: "/dashboard/interchange-documents",
+              icon: <FileText />,
+              permission: FREIGHT_PERMS.interchangeDocuments.view,
+            },
+            {
+              label: "Terminal Inventory",
+              href: "/dashboard/warehouse-inventory?direction=EXPORT",
+              icon: <Package />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+          ],
+        },
+        {
+          label: "Intercity",
+          href: "/dashboard/intercity",
+          icon: <TrainFront />,
+          permission: FREIGHT_PERMS.trainScheduling.view,
+          children: [
+            {
+              label: "Intercity Cargo",
+              href: "/dashboard/intercity",
+              icon: <TrainFront />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+          ],
+        },
+        {
+          label: "Warehouse Management",
+          icon: <Container />,
+          children: [
+            {
+              label: "Warehouse Dashboard",
+              href: "/dashboard/warehouse-dashboard",
+              icon: <LayoutDashboard />,
+              permission: FREIGHT_PERMS.warehouseDashboard.view,
+            },
+            {
+              // Yard-wide, not per-direction: the gate sees import and export
+              // trucks at the same barrier.
+              label: "Trucks on Site",
+              href: "/dashboard/trucks-on-site",
+              icon: <Truck />,
+              permission: FREIGHT_PERMS.warehouseInventory.view,
+            },
+            {
+              label: "Warehouses",
+              href: "/dashboard/warehouses",
+              icon: <Container />,
+              permission: FREIGHT_PERMS.warehouses.view,
+            },
+            {
+              label: "Allocation & Fees",
+              href: "/dashboard/warehouse-rules",
+              icon: <SlidersHorizontal />,
+              permission: [
+                FREIGHT_PERMS.warehouseAllocationRules.view,
+                FREIGHT_PERMS.warehouseFeeRules.view,
+              ],
+            },
+            {
+              label: "Fee Invoices",
+              href: "/dashboard/warehouse-fee-invoices",
+              icon: <Wallet />,
+              permission: FREIGHT_PERMS.warehouseFeeInvoices.view,
+            },
+          ],
+        },
 
-      {
-        label: "Staff",
-        href: "/user-management",
-        icon: <Users />,
-        permission: [
-          FREIGHT_PERMS.admin,
-          FREIGHT_PERMS.staff.roles.view,
-          FREIGHT_PERMS.staff.employeeRegistration.view,
-          FREIGHT_PERMS.staff.roleAssignment.view,
-        ],
-      },
-    ],
-  },
-];
+        {
+          label: "Reports",
+          href: "/dashboard/reports",
+          icon: <BarChart3 />,
+          permission: FREIGHT_PERMS.reports.view,
+          // Populated from the live GET /reports catalog (already permission-
+          // filtered server-side) — no report key is ever hand-listed here.
+          ...(reportItems.length ? { children: reportItems } : {}),
+        },
+      ],
+    },
+    {
+      title: "Freight configuration",
+      mutedTitle: true,
+      items: [
+        {
+          label: "File settings",
+          href: "/dashboard/file-settings",
+          icon: <Paperclip />,
+          permission: FREIGHT_PERMS.settings.fileUpload.view,
+        },
+        {
+          label: "Dropdown settings",
+          href: "/dashboard/dropdown-settings",
+          icon: <Settings />,
+          permission: FREIGHT_PERMS.settings.dropdown.view,
+        },
+        {
+          // One entry, one stamp. The former "Stamp settings" entry here pointed
+          // at the per-officer teeter (ማህተም), not a company seal — it moved to
+          // /user-management/teeter-and-signature.
+          label: "Company stamp",
+          href: "/dashboard/stamp-settings",
+          icon: <Stamp />,
+          permission: FREIGHT_PERMS.settings.stamp.view,
+        },
+        {
+          label: "Contract templates",
+          href: "/dashboard/contract-templates",
+          icon: <ScrollText />,
+          // `view` opens the page; `read` alone is API-only and shows no menu.
+          permission: FREIGHT_PERMS.settings.contractTemplates.view,
+        },
+        {
+          label: "Portal content",
+          href: "/dashboard/portal-content",
+          icon: <BookOpen />,
+          permission: [
+            FREIGHT_PERMS.settings.supportContent.view,
+            FREIGHT_PERMS.settings.supportContent.manage,
+          ],
+        },
+        {
+          label: "Audit logs",
+          href: "/dashboard/audit-logs",
+          icon: <History />,
+          permission: FREIGHT_PERMS.auditLog.view,
+        },
+        {
+          label: "Configuration",
+          href: "/dashboard/configuration",
+          icon: <Boxes />,
+          children: [
+            ...getCategorySidebarChildren("configuration"),
+            {
+              label: "Train scheduling rules",
+              href: "/dashboard/configuration/train-scheduling-rules",
+              permission: FREIGHT_PERMS.trainScheduling.rulesManage,
+            },
+            {
+              label: "Trade access",
+              href: "/dashboard/configuration/trade-access",
+              permission: FREIGHT_PERMS.tradeAccess.view,
+            },
+            {
+              label: "Exchange rate",
+              href: "/dashboard/configuration/exchange-rate",
+              permission: FREIGHT_PERMS.settings.exchangeRate.view,
+            },
+          ],
+        },
+        {
+          label: "Rules",
+          href: "/dashboard/rules",
+          icon: <SlidersHorizontal />,
+          children: getCategorySidebarChildren("rules"),
+        },
+
+        {
+          label: "Staff",
+          href: "/user-management",
+          icon: <Users />,
+          permission: [
+            FREIGHT_PERMS.admin,
+            FREIGHT_PERMS.staff.roles.view,
+            FREIGHT_PERMS.staff.employeeRegistration.view,
+            FREIGHT_PERMS.staff.roleAssignment.view,
+          ],
+        },
+      ],
+    },
+  ];
 
 /**
  * Keep only items the user is permitted to see; drop now-empty sections.