diff --git a/src/components/Activities/InfraPlanning.jsx b/src/components/Activities/InfraPlanning.jsx
index b38316d7..b87b7fe2 100644
--- a/src/components/Activities/InfraPlanning.jsx
+++ b/src/components/Activities/InfraPlanning.jsx
@@ -8,76 +8,97 @@ import WorkAreaModel from "../Project/Infrastructure/WorkAreaModel";
 import TaskModel from "../Project/Infrastructure/TaskModel";
 import ProjectRepository from "../../repositories/ProjectRepository";
 import Breadcrumb from "../../components/common/Breadcrumb";
-import {useProjectDetails, useProjects} from "../../hooks/useProjects";
-import {useHasUserPermission} from "../../hooks/useHasUserPermission";
-import {MANAGE_PROJECT_INFRA} from "../../utils/constants";
-import {useDispatch, useSelector} from "react-redux";
-import {useProfile} from "../../hooks/useProfile";
-import {refreshData, setProjectId} from "../../slices/localVariablesSlice";
+import { useProjectDetails, useProjects } from "../../hooks/useProjects";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import { MANAGE_PROJECT_INFRA } from "../../utils/constants";
+import { useDispatch, useSelector } from "react-redux";
+import { useProfile } from "../../hooks/useProfile";
+import { refreshData, setProjectId } from "../../slices/localVariablesSlice";
 import InfraTable from "../Project/Infrastructure/InfraTable";
 
 
-const InfraPlanning = () =>
-{
-  const {profile: LoggedUser} = useProfile()
+const InfraPlanning = () => {
+  const { profile: LoggedUser } = useProfile()
   const dispatch = useDispatch()
-  const {projects,loading:project_listLoader,error:projects_error} = useProjects()
+  const { projects, loading: project_listLoader, error: projects_error } = useProjects()
 
-  const selectedProject = useSelector((store)=>store.localVariables.projectId)
-  const ManageInfra = useHasUserPermission( MANAGE_PROJECT_INFRA )
-  const {projects_Details, loading: project_deatilsLoader, error: project_error,refetch} = useProjectDetails( selectedProject )
-  const reloadedData = useSelector( ( store ) => store.localVariables.reload )
- 
-  useEffect( () =>
-  {
+  const selectedProject = useSelector((store) => store.localVariables.projectId)
+  const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA)
+  const { projects_Details, loading: project_deatilsLoader, error: project_error, refetch } = useProjectDetails(selectedProject)
+  const reloadedData = useSelector((store) => store.localVariables.reload)
+
+  useEffect(() => {
     dispatch(setProjectId(projects[0]?.id))
-  }, [ projects ] )
-  
-   useEffect( () =>
-   {
-     if (reloadedData)
-     {
-       refetch()
-       dispatch( refreshData( false ) )
-     }
+  }, [projects])
 
-   },[reloadedData])
+  useEffect(() => {
+    if (reloadedData) {
+      refetch()
+      dispatch(refreshData(false))
+    }
+
+  }, [reloadedData])
 
   return (
     <div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4">
-    <div className="card">
-      <div className="card-body" style={{ padding: "0.5rem" }}>
-        <div className="align-items-center">
+      <div className="card">
+        <div className="card-body" style={{ padding: "0.5rem" }}>
+          <div className="align-items-center">
             <div className="row ">
               <div className="col-sm-3 col-8 text-start mb-1">
-                   <select name="DataTables_Table_0_length"
-                                aria-controls="DataTables_Table_0"
-                                className="form-select form-select-sm"
-                                value={selectedProject}
-                                onChange={(e)=>dispatch(setProjectId(e.target.value))}
-                                aria-label=""
-                   >
-                                 {(project_listLoader || projects.length < 0) && <option value="Loading..." disabled>Loading...</option>  }
-                  
-                                 {!project_listLoader && projects?.map((project)=>(
-                                     <option key={project.id} value={project.id}>{project.name}</option>
-                                  ))} 
-                      </select>
+                {project_listLoader ? (
+                  <select
+                    name="project_select"
+                    className="form-select form-select-sm"
+                    value=""
+                    disabled
+                  >
+                    <option value="">Loading Projects...</option>
+                  </select>
+                ) : projects.length === 0 ? (
+                  <input
+                    type="text"
+                    className="form-control form-control-sm text-danger"
+                    value="No projects assigned."
+                    readOnly
+                  />
+                ) : projects.length === 1 ? (
+                  <input
+                    type="text"
+                    className="form-control form-control-sm"
+                    value={projects[0].name}
+                    readOnly
+                  />
+                ) : (
+                  <select
+                    name="project_select"
+                    className="form-select form-select-sm"
+                    value={selectedProject || ""}
+                    onChange={(e) => dispatch(setProjectId(e.target.value))}
+                  >
+                    {projects.map((project) => (
+                      <option value={project.id} key={project.id}>
+                        {project.name}
+                      </option>
+                    ))}
+                  </select>
+                )}
+
               </div>
 
-          </div>
+            </div>
             <div className="row ">
-              {project_deatilsLoader && ( <p>Loading...</p> )}
-              {( !project_deatilsLoader && projects_Details?.buildings.length === 0 ) && ( <p>No Result Found</p> )}
-              
+              {project_deatilsLoader && (<p>Loading...</p>)}
+              {(!project_deatilsLoader && projects_Details?.buildings.length === 0) && (<p>No Result Found</p>)}
 
-              
-              {(!project_deatilsLoader && projects_Details?.buildings?.length > 0) && (<InfraTable buildings={projects_Details?.buildings}/>)}
+
+
+              {(!project_deatilsLoader && projects_Details?.buildings?.length > 0) && (<InfraTable buildings={projects_Details?.buildings} />)}
+            </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
   );
 };
 
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index fc06cde3..c0276b53 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -240,40 +240,61 @@ const DailyTask = () => {
                   DateDifference="6"
                   dateFormat="DD-MM-YYYY"
                 />
-                {/* FilterIcon component now manages its own filter states and logic */}
                 <FilterIcon
-                  taskListData={TaskList} // Pass the raw TaskList to FilterIcon
-                  onApplyFilters={setFilters} // Callback to receive the filtered states from FilterIcon
+                  taskListData={TaskList} 
+                  onApplyFilters={setFilters} 
                   currentSelectedBuilding={filters.selectedBuilding}
                   currentSelectedFloors={filters.selectedFloors}
                   currentSelectedActivities={filters.selectedActivities}
-                  // You can pass the project_loading state here if you want to disable filter during project load
-                  // isProjectLoading={project_loading}
                 />
               </div>
-              <div className="col-md-4 col-12 text-center mb-2 mb-md-0">
-                <select
-                  name="project_select"
-                  aria-controls="DataTables_Table_0"
-                  className="form-select form-select-sm"
-                  value={selectedProject || ""}
-                  onChange={handleProjectChange}
-                  aria-label="Select Project"
-                  disabled={project_loading} // Disable dropdown while projects are loading
-                >
-                  {project_loading && (
+               <div className="col-md-4 col-12 text-center mb-2 mb-md-0">
+                {project_loading ? (
+                  <select
+                    name="project_select"
+                    aria-controls="DataTables_Table_0"
+                    className="form-select form-select-sm"
+                    value={selectedProject || ""}
+                    onChange={handleProjectChange}
+                    aria-label="Select Project"
+                    disabled={true} 
+                  >
                     <option value="" disabled>
                       Loading Projects...
                     </option>
-                  )}
-                  {!project_loading &&
-                    projects &&
-                    projects?.map((project) => (
+                  </select>
+                ) : projects.length === 0 ? (
+                  <input
+                    type="text"
+                    className="form-control form-control-sm " 
+                    value="No projects assigned."
+                    readOnly
+                    aria-label="No projects assigned"
+                  />
+                ) : projects.length === 1 ? (
+                  <input
+                    type="text"
+                    className="form-control form-control-sm"
+                    value={projects[0].name}
+                    readOnly
+                    aria-label="Assigned Project"
+                  />
+                ) : (
+                  <select
+                    name="project_select"
+                    aria-controls="DataTables_Table_0"
+                    className="form-select form-select-sm"
+                    value={selectedProject || ""}
+                    onChange={handleProjectChange}
+                    aria-label="Select Project"
+                  >
+                    {projects?.map((project) => (
                       <option value={project.id} key={project.id}>
                         {project.name}
                       </option>
                     ))}
-                </select>
+                  </select>
+                )}
               </div>
             </div>
             <div className="table-responsive text-nowrap mt-3">