diff --git a/src/components/Charts/LineChart.jsx b/src/components/Charts/LineChart.jsx
index 1dc1b1ac..6eb4840c 100644
--- a/src/components/Charts/LineChart.jsx
+++ b/src/components/Charts/LineChart.jsx
@@ -117,7 +117,7 @@ const LineChart = ({
 
 
   return (
-    <div className="w-full overflow-x-auto">
+    <div className="w-full overflow-x-false">
       <ReactApexChart
         options={chartOptions}
         series={seriesData}
diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx
index df1f2bc1..629f9e39 100644
--- a/src/components/Project/Infrastructure/WorkItem.jsx
+++ b/src/components/Project/Infrastructure/WorkItem.jsx
@@ -31,7 +31,9 @@ const WorkItem = ({
   forWorkArea,
   deleteHandleTask,
 }) => {
-  const { projectId } = useParams();
+  // const { projectId } = useParams();
+const isTaskPlanning = /^\/activities\/task$/.test(location.pathname);
+
   const [itemName, setItemName] = useState("");
   const [NewWorkItem, setNewWorkItem] = useState();
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -244,7 +246,7 @@ const WorkItem = ({
           <td className="text-end align-items-middle border-top">
             {/* Desktop (md and up): inline icons */}
             <div className="d-none d-md-flex justify-content-end gap-1 px-2">
-              {!projectId &&
+              {isTaskPlanning &&
                 ManageAndAssignTak &&
                 PlannedWork !== CompletedWork && (
                   <i
@@ -284,7 +286,7 @@ const WorkItem = ({
               ></i>
 
               <ul className="dropdown-menu dropdown-menu-start">
-                {!projectId &&
+                {isTaskPlanning &&
                   ManageAndAssignTak &&
                   PlannedWork !== CompletedWork && (
                     <li>
diff --git a/src/components/Project/ProjectNav.jsx b/src/components/Project/ProjectNav.jsx
index 4c852585..821c22ee 100644
--- a/src/components/Project/ProjectNav.jsx
+++ b/src/components/Project/ProjectNav.jsx
@@ -26,7 +26,7 @@ const ProjectNav = ({ onPillClick, activePill }) => {
         </li>
         <li className="nav-item">
           <a
-            className={`nav-link ${activePill === "teams" ? "active" : ""}fs-6`}
+            className={`nav-link ${activePill === "teams" ? "active" : ""} fs-6`}
             href="#"
             onClick={(e) => {
               e.preventDefault(); 
@@ -53,7 +53,7 @@ const ProjectNav = ({ onPillClick, activePill }) => {
           <a
             className={`nav-link ${
               activePill === "imagegallary" ? "active" : ""
-            }fs-6`}
+            } fs-6`}
             href="#"
             onClick={(e) => {
               e.preventDefault(); // Prevent page reload
diff --git a/src/components/Project/Teams.jsx b/src/components/Project/Teams.jsx
index 263f3f41..25e3eda8 100644
--- a/src/components/Project/Teams.jsx
+++ b/src/components/Project/Teams.jsx
@@ -7,7 +7,7 @@ import Avatar from "../common/Avatar";
 import moment from "moment";
 
 import ProjectRepository from "../../repositories/ProjectRepository";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { changeMaster } from "../../slices/localVariablesSlice";
 import useMaster from "../../hooks/masterHook/useMaster";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
@@ -18,7 +18,8 @@ import {useEmployeesByProjectAllocated, useManageProjectAllocation} from "../../
 
 const Teams = () =>
 {
-  const {projectId} = useParams()
+  // const {projectId} = useParams()
+  const projectId = useSelector((store)=>store.localVariables.projectId)
   const dispatch = useDispatch();
 
   const { data, loading } = useMaster();
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index 7de8d506..f4e6c58c 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -266,7 +266,8 @@ const AttendancePage = () => {
           <div className="tab-content attedanceTabs py-0 px-1 px-sm-3">
             {activeTab === "all" && (
               <>
-                <div className="tab-pane fade show active py-0">
+                {!attLoading && (
+                  <div className="tab-pane fade show active py-0">
                   <Attendance
                     attendance={filteredAttendance}
                     handleModalData={handleModalData}
@@ -275,6 +276,7 @@ const AttendancePage = () => {
                     showOnlyCheckout={ShowPending}
                   />
                 </div>
+                )}
                 {!attLoading && filteredAttendance?.length === 0 && (
                   <p>
                     {" "}