diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx
index 7a7dfb38..0b050068 100644
--- a/src/components/Project/Infrastructure/WorkItem.jsx
+++ b/src/components/Project/Infrastructure/WorkItem.jsx
@@ -119,6 +119,9 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
       showToast(message, "error");
     }
   };
+
+  const PlannedWork = NewWorkItem?.workItem?.plannedWork || workItem?.plannedWork;
+  const CompletedWork = NewWorkItem?.workItem?.completedWork ?? workItem?.completedWork;
   return (
     <>
       {isModalOpen && (
@@ -233,56 +236,65 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
             ></div>
           </div>
         </td>
-        <td className="d-md-table-cell">
-          <div className="dropdown">
-            {!projectId && ManageTasks && (
-              <button
-                aria-label="Modify"
-                type="button"
-                className="btn p-0"
-                data-bs-toggle="modal"
-                data-bs-target="#project-modal"
-                onClick={openModal}
-              >
-                <span className="badge  badge-md bg-label-primary me-1">
-                  Assign
-                </span>
-              </button>
-            )}
-            {ManageInfra && (
-              <>
-                <button
-                  aria-label="Modify"
-                  type="button"
-                  className="btn p-0 dropdown-toggle hide-arrow"
-                  onClick={showModal1}
-                >
-                  <i
-                    className="bx bxs-edit me-2 text-primary"
-                    data-bs-toggle="tooltip"
-                    data-bs-placement="top"
-                    title="Edit Activity"
-                    data-bs-original-title="Edit Activity"
-                  ></i>
-                </button>
-                <button
-                  aria-label="Delete"
-                  type="button"
-                  className="btn p-0 dropdown-toggle hide-arrow"
-                  onClick={showModalDelete}
-                >
-                  <i
-                    className="bx bx-trash me-1 text-danger"
-                    data-bs-toggle="tooltip"
-                    data-bs-placement="top"
-                    title="Delete Activity"
-                    data-bs-original-title="Delete Activity"
-                  ></i>
-                </button>
-              </>
-            )}
-          </div>
-        </td>
+ <td className="text-end align-middle">
+  <div className="dropdown w-auto d-inline-flex align-items-center gap-1">
+    {/* Reserve space for Assign button */}
+    <div style={{ width: 'auto', minWidth: '60px' }}>
+      {(!projectId && ManageTasks) && (PlannedWork !== CompletedWork) ? (
+        <button
+          aria-label="Modify"
+          type="button"
+          className="btn p-0"
+          data-bs-toggle="modal"
+          data-bs-target="#project-modal"
+          onClick={openModal}
+        >
+          <span className="badge badge-md bg-label-primary me-1">Assign</span>
+        </button>
+      ) : (
+        // Hidden placeholder to preserve layout
+        <span className="invisible">
+          <span className="badge badge-md bg-label-primary me-1">Assign</span>
+        </span>
+      )}
+    </div>
+
+    {/* Edit and Delete buttons */}
+    {ManageInfra && (
+      <>
+        <button
+          aria-label="Modify"
+          type="button"
+          className="btn p-0"
+          onClick={showModal1}
+        >
+          <i
+            className="bx bxs-edit me-2 text-primary"
+            data-bs-toggle="tooltip"
+            data-bs-placement="top"
+            title="Edit Activity"
+          ></i>
+        </button>
+        <button
+          aria-label="Delete"
+          type="button"
+          className="btn p-0"
+          onClick={showModalDelete}
+        >
+          <i
+            className="bx bx-trash me-1 text-danger"
+            data-bs-toggle="tooltip"
+            data-bs-placement="top"
+            title="Delete Activity"
+          ></i>
+        </button>
+      </>
+    )}
+  </div>
+</td>
+
+
+
       </tr>
     </>
   );