diff --git a/src/components/Project/pmsInfrastructure/BuildingTable.jsx b/src/components/Project/pmsInfrastructure/BuildingTable.jsx
new file mode 100644
index 00000000..cf4e4afa
--- /dev/null
+++ b/src/components/Project/pmsInfrastructure/BuildingTable.jsx
@@ -0,0 +1,35 @@
+import React from "react";
+
+import FloorTable from "./FloorTable";
+import { useSelectedProject } from "../../../slices/apiDataManager";
+import { useProjectInfra } from "../../../hooks/useProjects";
+import { PmsGrid } from "../../../services/pmsGrid";
+
+export default function BuildingTable() {
+    const project = useSelectedProject()
+    
+    const {projectInfra} = useProjectInfra(project,null)
+  const columns = [
+    { key: "buildingName", title: "Building", sortable: true,},
+    { key: "plannedWork", title: "Planned Work" },
+    { key: "completedWork", title: "Completed Work" },
+    { key: "percentage", title: "Completion %" },
+  ];
+
+  return (
+    <PmsGrid
+      columns={columns}
+      data={projectInfra}
+      rowKey="id"
+      features={{
+        expand: true,
+        pinning: true,
+        resizing: true,
+        selection: true,
+      }}
+      renderExpanded={(building) => (
+        <FloorTable floors={building.floors} />
+      )}
+    />
+  );
+}
diff --git a/src/components/Project/pmsInfrastructure/FloorTable.jsx b/src/components/Project/pmsInfrastructure/FloorTable.jsx
new file mode 100644
index 00000000..f7694b04
--- /dev/null
+++ b/src/components/Project/pmsInfrastructure/FloorTable.jsx
@@ -0,0 +1,28 @@
+import React from "react";
+import WorkAreaTable from "./WorkAreaTable";
+import { PmsGrid } from "../../../services/pmsGrid";
+
+export default function FloorTable({ floors }) {
+  const columns = [
+    { key: "floorName", title: "Floor", sortable: true,  },
+    { key: "plannedWork", title: "Planned Work" },
+    { key: "completedWork", title: "Completed Work" },
+    { key: "percentage", title: "Completion %" },
+  ];
+
+  return (
+    <PmsGrid
+      columns={columns}
+      data={floors}
+      rowKey="id"
+      features={{
+        expand: true,
+        pinning: true,
+        resizing: true,
+      }}
+      renderExpanded={(floor) => (
+        <WorkAreaTable workAreas={floor.workAreas} />
+      )}
+    />
+  );
+}
diff --git a/src/components/Project/pmsInfrastructure/WorkAreaTable.jsx b/src/components/Project/pmsInfrastructure/WorkAreaTable.jsx
new file mode 100644
index 00000000..dc923cff
--- /dev/null
+++ b/src/components/Project/pmsInfrastructure/WorkAreaTable.jsx
@@ -0,0 +1,39 @@
+import React, { useState, useEffect } from "react";
+import { PmsGrid } from "../../../services/pmsGrid";
+// import { GridService } from "./gridService";
+// import TaskTable from "./TaskTable";
+
+export default function WorkAreaTable({ workAreas }) {
+  const [taskData, setTaskData] = useState({}); // workAreaId → tasks
+
+  const columns = [
+    { key: "areaName", title: "Work Area", },
+    { key: "plannedWork", title: "Planned Work" },
+    { key: "completedWork", title: "Completed Work" },
+    { key: "percentage", title: "Completion %" },
+  ];
+
+//   const loadTasks = async (workAreaId) => {
+//     if (!taskData[workAreaId]) {
+//       const res = await GridService.getTasksByWorkArea(workAreaId);
+//       setTaskData((prev) => ({ ...prev, [workAreaId]: res }));
+//     }
+//   };
+
+  return (
+    <PmsGrid
+      columns={columns}
+      data={workAreas}
+      rowKey="id"
+      features={{
+        expand: true,
+        pinning: true,
+        resizing: true,
+      }}
+    //   renderExpanded={(area) => {
+    //     loadTasks(area.id);
+    //     return <TaskTable tasks={taskData[area.id]} />;
+    //   }}
+    />
+  );
+}
diff --git a/src/pages/project/ProjectDetails.jsx b/src/pages/project/ProjectDetails.jsx
index d6fbd55d..fe22d913 100644
--- a/src/pages/project/ProjectDetails.jsx
+++ b/src/pages/project/ProjectDetails.jsx
@@ -24,6 +24,7 @@ import { useProjectAccess } from "../../hooks/useProjectAccess";
 
 import "./ProjectDetails.css";
 import ProjectOrganizations from "../../components/Project/ProjectOrganizations";
+import BuildingTable from "../../components/Project/pmsInfrastructure/BuildingTable";
 
 const ProjectDetails = () => {
   const projectId = useSelectedProject();
@@ -88,7 +89,7 @@ const ProjectDetails = () => {
       case "teams":
         return <Teams />;
       case "infra":
-        return <ProjectInfra data={projects_Details} onDataChange={refetch} />;
+        return <BuildingTable/>
       case "workplan":
         return <WorkPlan data={projects_Details} onDataChange={refetch} />;
       case "directory":
diff --git a/src/services/pmsGrid/BasicTable.jsx b/src/services/pmsGrid/BasicTable.jsx
index 872912a2..550f35eb 100644
--- a/src/services/pmsGrid/BasicTable.jsx
+++ b/src/services/pmsGrid/BasicTable.jsx
@@ -738,7 +738,7 @@ export default function DemoBOQGrid() {
             reorder: true,
             columnVisibility: true,
             pageSizeSelector: true,
-            // groupByKey: "category",
+            // groupByKey: "status",
             aggregation: true,
             expand: true,
             maxHeight: "70vh",
@@ -753,11 +753,7 @@ export default function DemoBOQGrid() {
                 icon: "bx-trash text-danger",
                 onClick: (row) => console.log("Delete", row),
               },
-              {
-                label: "View",
-                icon: "bx-show text-info",
-                onClick: (row) => console.log("View ", row),
-              },
+           
             ],
           }}
           renderExpanded={(row) => (
diff --git a/src/services/pmsGrid/PmsGrid.jsx b/src/services/pmsGrid/PmsGrid.jsx
index d554b4ad..2645f042 100644
--- a/src/services/pmsGrid/PmsGrid.jsx
+++ b/src/services/pmsGrid/PmsGrid.jsx
@@ -170,6 +170,7 @@ export default function PmsGrid({
                 Export CSV
               </button>
             )}
+     
           </div>
         </div>
         <div className="col-4 ">
@@ -235,10 +236,8 @@ export default function PmsGrid({
                   />
                 </th>
               )}
-                  {features.expand && (
-                <th
-                  className="text-center ticky-action-column"
-                >
+              {features.expand && (
+                <th className="text-center ticky-action-column">
                   <input
                     type="checkbox"
                     className="form-check-input mx-3"
@@ -270,7 +269,7 @@ export default function PmsGrid({
                     key={col.key}
                     draggable={features.reorder}
                     onDragStart={(e) => onDragStart(e, col.key)}
-                    onDragOver={(e)=> e.preventDefault()}
+                    onDragOver={(e) => e.preventDefault()}
                     onDrop={(e) => onDrop(e, col.key)}
                     className={`pms-col-header vs-th ${
                       col.pinned ? `pinned pinned-${col.pinned}` : ""
@@ -356,6 +355,7 @@ export default function PmsGrid({
                           (features.selection ? 1 : 0) +
                           (features.actions ? 1 : 0)
                         }
+                        className="text-start"
                       >
                         <strong>{g.key}</strong>
                         {features.aggregation &&
@@ -406,128 +406,127 @@ export default function PmsGrid({
   );
 
   // render a single row (function hoisted so it can reference visibleColumns)
- function renderRow(row) {
-  const isSelected = selected.has(row[rowKey]);
-  const isExpanded = expanded.has(row[rowKey]);
+  function renderRow(row) {
+    const isSelected = selected.has(row[rowKey]);
+    const isExpanded = expanded.has(row[rowKey]);
 
-  return (
-    <React.Fragment key={row[rowKey]}>
-      <tr>
-        {/*  Selection checkbox (always left) */}
-        {features.selection && (
-          <td className="text-center align-middle p-2">
-            <input
-              type="checkbox"
-              className="form-check-input"
-              checked={isSelected}
-              onChange={() => toggleSelect(row[rowKey])}
-            />
-          </td>
-        )}
-
-        {/*  Expand toggle next to selection */}
-        {features.expand && (
-          <td className="text-center align-middle p-2">
-            <button
-              type="button"
-              className="btn btn-link p-0 border-0 text-secondary"
-              onClick={() => toggleExpand(row[rowKey])}
-            >
-              <i
-                className={`bx ${
-                  isExpanded ? "bxs-chevron-up" : "bxs-chevron-down"
-                } bx-sm`}
-              ></i>
-            </button>
-          </td>
-        )}
-
-        {/*  Data columns */}
-        {visibleColumns.map((col) => {
-          const style = {
-            minWidth: col.width || 120,
-            width: col.width || undefined,
-          };
-
-          if (col.pinned) style.position = "sticky";
-          if (col.pinned === "left")
-            style.left = `${getLeftOffset(colState, col.key)}px`;
-          if (col.pinned === "right")
-            style.right = `${getRightOffset(colState, col.key)}px`;
-
-          return (
-            <td
-              key={col.key}
-              style={style}
-              className={`${col.className ?? ""} ${
-                col.pinned
-                  ? "pinned-left px-3 bg-white pms-grid td pinned"
-                  : "px-3"
-              }`}
-            >
-              {col.render ? col.render(row) : row[col.key] ?? ""}
+    return (
+      <React.Fragment key={row[rowKey]}>
+        <tr>
+          {/*  Selection checkbox (always left) */}
+          {features.selection && (
+            <td className="text-center align-middle p-2">
+              <input
+                type="checkbox"
+                className="form-check-input"
+                checked={isSelected}
+                onChange={() => toggleSelect(row[rowKey])}
+              />
             </td>
-          );
-        })}
+          )}
 
-        {/*   Actions column (always right) */}
-        {features.actions && (
-          <td
-            className="text-center sticky-action-column bg-white td-lastChild"
-            style={{
-              position: "sticky",
-              right: 0,
-              zIndex: 2,
-              width: "1%",
-              whiteSpace: "nowrap",
-            }}
-          >
-            <div
-              className="d-inline-flex justify-content-center align-items-center gap-2"
-              style={{ minWidth: "fit-content", padding: "0 4px" }}
+          {/*  Expand toggle next to selection */}
+          {features.expand && (
+            <td className="text-center align-middle p-2">
+              <button
+                type="button"
+                className="btn btn-link p-0 border-0 text-secondary"
+                onClick={() => toggleExpand(row[rowKey])}
+              >
+                <i
+                  className={`bx ${
+                    isExpanded ? "bxs-chevron-up" : "bxs-chevron-down"
+                  } bx-sm`}
+                ></i>
+              </button>
+            </td>
+          )}
+
+          {/*  Data columns */}
+          {visibleColumns.map((col) => {
+            const style = {
+              minWidth: col.width || 120,
+              width: col.width || undefined,
+            };
+
+            if (col.pinned) style.position = "sticky";
+            if (col.pinned === "left")
+              style.left = `${getLeftOffset(colState, col.key)}px`;
+            if (col.pinned === "right")
+              style.right = `${getRightOffset(colState, col.key)}px`;
+
+            return (
+              <td
+                key={col.key}
+                style={style}
+                className={`${col.className ?? ""} ${
+                  col.pinned
+                    ? "pinned-left px-3 bg-white pms-grid td pinned"
+                    : "px-3"
+                }`}
+              >
+                {col.render ? col.render(row) : row[col.key] ?? ""}
+              </td>
+            );
+          })}
+
+          {/*   Actions column (always right) */}
+          {features.actions && (
+            <td
+              className="text-center sticky-action-column bg-white td-lastChild"
+              style={{
+                position: "sticky",
+                right: 0,
+                zIndex: 2,
+                width: "1%",
+                whiteSpace: "nowrap",
+              }}
             >
-              {Array.isArray(features.actions)
-                ? features.actions.map((act, i) => (
-                    <button
-                      key={i}
-                      type="button"
-                      className="btn btn-link p-0 border-0"
-                      title={act.label}
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        act.onClick && act.onClick(row);
-                      }}
-                    >
-                      <i className={`bx ${act.icon}`} />
-                    </button>
-                  ))
-                : typeof features.actions === "function"
-                ? features.actions(row, toggleExpand)
-                : null}
-            </div>
-          </td>
-        )}
-      </tr>
-
-      {/* 🔹 5. Expanded row content (full width) */}
-      {isExpanded && renderExpanded && (
-        <tr className="table-active">
-          <td
-            colSpan={
-              visibleColumns.length +
-              (features.selection ? 1 : 0) +
-              (features.expand ? 1 : 0) +
-              (features.actions ? 1 : 0)
-            }
-          >
-            {renderExpanded(row)}
-          </td>
+              <div
+                className="d-inline-flex justify-content-center align-items-center gap-2"
+                style={{ minWidth: "fit-content", padding: "0 4px" }}
+              >
+                {Array.isArray(features.actions)
+                  ? features.actions.map((act, i) => (
+                      <button
+                        key={i}
+                        type="button"
+                        className="btn btn-link p-0 border-0"
+                        title={act.label}
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          act.onClick && act.onClick(row);
+                        }}
+                      >
+                        <i className={`bx ${act.icon}`} />
+                      </button>
+                    ))
+                  : typeof features.actions === "function"
+                  ? features.actions(row, toggleExpand)
+                  : null}
+              </div>
+            </td>
+          )}
         </tr>
-      )}
-    </React.Fragment>
-  );
-}
 
+        {/* 🔹 5. Expanded row content (full width) */}
+        {isExpanded && renderExpanded && (
+          <tr className="table-active">
+            <td
+              colSpan={
+                visibleColumns.length +
+                (features.selection ? 1 : 0) +
+                (features.expand ? 1 : 0) +
+                (features.actions ? 1 : 0)
+              }
+            >
+              {renderExpanded(row)}
+            </td>
+          </tr>
+        )}
+      </React.Fragment>
+    );
+  }
 }
 
 // small helpers to compute sticky offsets