diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index a541b5e7..38c05567 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -9,7 +9,7 @@ import ProjectRepository, {
   TasksRepository,
 } from "../../repositories/ProjectRepository";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
-import { MANAGE_PROJECT_INFRA } from "../../utils/constants";
+import { MANAGE_PROJECT_INFRA, MANAGE_TASK } from "../../utils/constants";
 import InfraTable from "./Infrastructure/InfraTable";
 import {
   cacheData,
@@ -34,6 +34,7 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
   const { projects_Details, refetch, loading } = useProjectDetails(data?.id);
   const [ project, setProject ] = useState( projects_Details );
   const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
+  const ManageTask = useHasUserPermission(MANAGE_TASK)
   const [showModalFloor, setshowModalFloor] = useState(false);
   const [showModalWorkArea, setshowModalWorkArea] = useState(false);
   const [showModalTask, setshowModalTask] = useState(false);
@@ -87,13 +88,12 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
             <div className="align-items-center">
               <div className="row ">
                 <div
-                  className={`col-12 text-end mb-1 ${
-                    !ManageInfra && "d-none"
-                  } `}
+                  className={`col-12 text-end mb-1 `}
                 >
-                  <button
+                  {ManageInfra && (<>
+                    <button
                     type="button"
-                    className="link-button link-button-sm m-1 btn-primary"
+                    className="link-button btn btn-xs rounded-md link-button-sm m-1 btn-primary"
                     onClick={()=>setshowModalBuilding(true)}
                   >
                    <i className="bx bx-plus-circle me-2"></i>
@@ -101,7 +101,7 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
                   </button>
                   <button
                     type="button"
-                    className="link-button m-1 btn-primary"
+                    className="link-button btn btn-xs rounded-md m-1 btn-primary"
                     onClick={()=>setshowModalFloor(true)}
                   >
                     <i className="bx bx-plus-circle me-2"></i>
@@ -109,20 +109,21 @@ const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
                   </button>
                   <button
                     type="button"
-                    className="link-button m-1 btn-primary"
+                    className="link-button btn btn-xs rounded-md m-1 btn-primary"
                     onClick={() => setshowModalWorkArea(true)}
                   >
                     <i className="bx bx-plus-circle me-2"></i>
                     Manage Work Areas
-                  </button>
-                  <button
+                  </button></>)}
+                
+                  {(ManageTask || ManageInfra) && (<button
                     type="button"
-                    className="link-button m-1 btn-primary"
+                    className="link-button btn btn-xs rounded-md m-1 btn-primary"
                     onClick={()=>setshowModalTask(true)}
                   >
                     <i className="bx bx-plus-circle me-2"></i>
                     Create Tasks
-                  </button>
+                  </button>)}
                 </div>
               </div>
               <div className="row ">
diff --git a/src/components/Project/ProjectNav.jsx b/src/components/Project/ProjectNav.jsx
index 3839d4b0..f3e6de97 100644
--- a/src/components/Project/ProjectNav.jsx
+++ b/src/components/Project/ProjectNav.jsx
@@ -5,11 +5,15 @@ import {
   DIRECTORY_ADMIN,
   DIRECTORY_MANAGER,
   DIRECTORY_USER,
+  MANAGE_PROJECT_INFRA,
+  MANAGE_TASK,
   VIEW_PROJECT_INFRA,
 } from "../../utils/constants";
 
 const ProjectNav = ({ onPillClick, activePill }) => {
   const HasViewInfraStructure = useHasUserPermission(VIEW_PROJECT_INFRA);
+  const HasManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA);
+  const HasManageTask = useHasUserPermission(MANAGE_TASK)
   const DirAdmin = useHasUserPermission(DIRECTORY_ADMIN);
   const DireManager = useHasUserPermission(DIRECTORY_MANAGER);
   const DirUser = useHasUserPermission(DIRECTORY_USER);
@@ -21,7 +25,7 @@ const ProjectNav = ({ onPillClick, activePill }) => {
       key: "infra",
       icon: "bx bx-grid-alt",
       label: "Infrastructure",
-      hidden: !HasViewInfraStructure,
+      hidden: !(HasViewInfraStructure || HasManageInfra || HasManageTask),
     },
     {
       key: "directory",