diff --git a/public/assets/vendor/css/core.css b/public/assets/vendor/css/core.css
index 5acc33c5..48163eb5 100644
--- a/public/assets/vendor/css/core.css
+++ b/public/assets/vendor/css/core.css
@@ -18613,7 +18613,7 @@ li:not(:first-child) .dropdown-item,
   min-height: 70vh !important;
 }
 
-.modal-min-h-{
+.modal-min-h{
    min-height: 60vh !important;
 }
 
diff --git a/src/components/Project/Team/TeamAssignToProject.jsx b/src/components/Project/Team/TeamAssignToProject.jsx
index 0bab7756..3a1bb856 100644
--- a/src/components/Project/Team/TeamAssignToProject.jsx
+++ b/src/components/Project/Team/TeamAssignToProject.jsx
@@ -66,7 +66,7 @@ const TeamAssignToProject = ({ closeModal }) => {
         </div>
       </div>
 
-      <div className="row modal-min-h" >
+      <div >
         <TeamEmployeeList
           organizationId={selectedOrg}
           searchTerm={searchText}
diff --git a/src/components/Project/Team/TeamEmployeeList.jsx b/src/components/Project/Team/TeamEmployeeList.jsx
index 920d1f6f..a800df3f 100644
--- a/src/components/Project/Team/TeamEmployeeList.jsx
+++ b/src/components/Project/Team/TeamEmployeeList.jsx
@@ -118,7 +118,7 @@ const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => {
       status: true,
     }));
 
-    handleAssignEmployee({ payload });
+    handleAssignEmployee({ payload,actionType:"assign"} );
 
     setEmployees((prev) =>
       prev.map((emp) => ({
@@ -154,9 +154,9 @@ if (employees.length === 0) {
 
 
   return (
-    <div className="h-auto">
-      <table className="table">
-        <thead>
+    <div className=" position-relative">
+      <table className="table" style={{ maxHeight: "80px", overflowY: "auto" }}>
+        <thead className=" position-sticky top-0">
           <tr>
             <th>Employee</th>
             <th>Service</th>
@@ -231,7 +231,7 @@ if (employees.length === 0) {
           ))}
         </tbody>
       </table>
-      <div className="d-flex justify-content-end mt-3 gap-5">
+      <div className="position-sticky bottom-0 bg-white  d-flex justify-content-end gap-3 z-25 ">
         <button
           type="button"
           className="btn btn-sm btn-label-secondary"
diff --git a/src/components/Project/Team/Teams.jsx b/src/components/Project/Team/Teams.jsx
index e9802765..81921bd9 100644
--- a/src/components/Project/Team/Teams.jsx
+++ b/src/components/Project/Team/Teams.jsx
@@ -64,27 +64,25 @@ const Teams = () => {
     isError,
   } = useManageProjectAllocation({
     onSuccessCallback: () => {
-      setRemovingEmployeeId(null);
-      setDeleteEmplyee(null);
-      closeDeleteModal();
+      setSelectedEmployee(null);
     },
     onErrorCallback: () => {
-      closeDeleteModal();
+      setSelectedEmployee(null);
     },
   });
 
   const handleDelete = (employee) => {
     let payload = [
       {
-        employeeId: employee.employeeId,
-        jobRoleId: employee.jobRoleId,
+        employeeId: employee?.employeeId,
+        jobRoleId: employee?.jobRoleId,
         projectId: selectedProject,
-        serviceId: selectedService,
+        serviceId: employee?.serviceId,
         status: false,
       },
     ];
 
-    submitAllocations({ payload: payload });
+    submitAllocations({ payload: payload, actionType: "remove" });
   };
   const getJobRole = (jobRoleId) => {
     if (loading) return "Loading...";
@@ -228,7 +226,7 @@ const Teams = () => {
             </div>
           </div>
 
-          <div className="table-responsive text-nowrap">
+          <div className="table-responsive text-nowrap modal-min-h">
             {employeeLodaing && <p>Loading..</p>}
             {projectEmployees && projectEmployees.length > 0 && (
               <table className="table ">
@@ -317,13 +315,15 @@ const Teams = () => {
                 </tbody>
               </table>
             )}
-            {/* {!employeeLodaing && filteredEmployees.length === 0 && (
-              <div className="text-center text-muted py-3">
-                {activeEmployee
-                  ? "No active employees assigned to the project"
-                  : "No inactive employees assigned to the project"}
+            {!employeeLodaing && filteredEmployees.length === 0 && (
+              <div className="text-center text-muted py-3  d-flex justify-content-center align-items-center py-12">
+                <p>
+                  {!activeEmployee
+                    ? "No active employees assigned to the project"
+                    : "No inactive employees assigned to the project"}
+                </p>
               </div>
-            )} */}
+            )}
           </div>
         </div>
       </div>
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index d6b19b1a..c71f3d2a 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -414,7 +414,7 @@ export const useManageProjectAllocation = ({
         queryKey: ["empListByProjectAllocated"],
       });
       queryClient.removeQueries({ queryKey: ["projectEmployees"] });
-      if (variables?.added) {
+      if (variables.actionType === "assign") {
         showToast("Employee Assigned Successfully", "success");
       } else {
         showToast("Removed Employee Successfully", "success");