diff --git a/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx b/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx
index 5ec4a9ac8..46c2b634e 100644
--- a/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/ruleEngine/ruleEngineFormat.tsx
@@ -85,6 +85,15 @@ export const formatCell = (value: unknown, format?: ColumnFormat): ReactNode =>
     );
   }
 
+  if (format === "text") {
+    return <Text size="sm">{String(value)}</Text>;
+  }
+
+  if (format === "number") {
+    const num = Number(value);
+    return <Text size="sm">{Number.isNaN(num) ? String(value) : num.toLocaleString()}</Text>;
+  }
+
   if (format === "date") {
     const d = new Date(String(value));
     if (Number.isNaN(d.getTime())) return <Text size="sm">{String(value)}</Text>;
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
index 880e7e6c9..4742f0c8b 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx
@@ -377,8 +377,18 @@ const FleetResourcePage = () => {
           </Box>
 
           {viewMode === "table" ? (
-            <Box style={{ overflowX: "auto", width: "100%", minWidth: 0, WebkitOverflowScrolling: "touch" }}>
-              <div style={{ minWidth: "max-content", display: "inline-block", width: "100%" }}>
+            <Box style={{
+              overflowX: "auto",
+              width: "100%",
+              minWidth: 0,
+              WebkitOverflowScrolling: "touch",
+              display: "block"
+            }}>
+              <div style={{
+                minWidth: "100%",
+                display: "table",
+                width: "100%"
+              }}>
                 <DataTable
                 columns={columns}
                 data={pagedRows}