diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index 229bdf2b..53dc3710 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -1,24 +1,24 @@
 import React from "react";
 import { useSelector } from "react-redux";
-import {
-    useDashboardProjectsCardData,
-    useDashboardTeamsCardData,
-    useDashboardTasksCardData,
-    useAttendanceOverviewData
-} from "../../hooks/useDashboard_Data";
+// import {
+//     useDashboardProjectsCardData,
+//     useDashboardTeamsCardData,
+//     useDashboardTasksCardData,
+//     useAttendanceOverviewData
+// } from "../../hooks/useDashboard_Data";
 
-import Projects from "./Projects";
-import Teams from "./Teams";
-import TasksCard from "./Tasks";
-import ProjectCompletionChart from "./ProjectCompletionChart";
-import ProjectProgressChart from "./ProjectProgressChart";
-import ProjectOverview from "../Project/ProjectOverview";
+// import Projects from "./Projects";
+// import Teams from "./Teams";
+// import TasksCard from "./Tasks";
+// import ProjectCompletionChart from "./ProjectCompletionChart";
+// import ProjectProgressChart from "./ProjectProgressChart";
+// import ProjectOverview from "../Project/ProjectOverview";
 import AttendanceOverview from "./AttendanceChart";
 
 const Dashboard = () => {
-    const { projectsCardData } = useDashboardProjectsCardData();
-    const { teamsCardData } = useDashboardTeamsCardData();
-    const { tasksCardData } = useDashboardTasksCardData();
+    // const { projectsCardData } = useDashboardProjectsCardData();
+    // const { teamsCardData } = useDashboardTeamsCardData();
+    // const { tasksCardData } = useDashboardTasksCardData();
 
     // Get the selected project ID from Redux store
     const projectId = useSelector((store) => store.localVariables.projectId);
diff --git a/src/components/Directory/ListViewContact.jsx b/src/components/Directory/ListViewContact.jsx
index 68eb13b5..bc8a296e 100644
--- a/src/components/Directory/ListViewContact.jsx
+++ b/src/components/Directory/ListViewContact.jsx
@@ -188,7 +188,7 @@ const ListViewContact = ({ data, Pagination, isLoading }) => {
                     <tr style={{ height: "200px" }}>
                       <td
                         colSpan={contactList.length + 1}
-                        className="text-center align-middle"
+                        className="text-center align-middle border-0"
                       >
                         No contacts found
                       </td>
@@ -201,9 +201,7 @@ const ListViewContact = ({ data, Pagination, isLoading }) => {
               )}
             </div>
           )}
-          {data?.length === 0 && !isLoading && (
-            <div className="text-center"> No Expense Found</div>
-          )}
+         
         </div>
       </div>
     </>
diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx
index 007c83a8..25056f77 100644
--- a/src/components/Layout/Header.jsx
+++ b/src/components/Layout/Header.jsx
@@ -246,7 +246,7 @@ const Header = () => {
         )}
 
         <ul className="navbar-nav flex-row align-items-center ms-md-auto">
-          {HasManageProjectPermission && (
+          {/* {HasManageProjectPermission && ( */}
             <li className="nav-item navbar-dropdown dropdown-user dropdown">
               <button
                 className="btn btn-sm btn-primary"
@@ -257,7 +257,7 @@ const Header = () => {
                 <span className="d-none d-md-inline-block">Create Project</span>
               </button>
             </li>
-          )}
+          {/* )} */}
           <li className="nav-item navbar-dropdown dropdown-user dropdown">
             <a
               aria-label="dropdown profile avatar"
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx
index 6be7cb2b..509a9329 100644
--- a/src/pages/authentication/LoginPage.jsx
+++ b/src/pages/authentication/LoginPage.jsx
@@ -41,21 +41,24 @@ const LoginPage = () => {
           password: data.password,
         };
         const response = await AuthRepository.login(userCredential);
-        if (data.rememberMe) {
-          localStorage.setItem("jwtToken", response.data.token);
-          localStorage.setItem("refreshToken", response.data.refreshToken);
-        } else {
-          sessionStorage.setItem("jwtToken", response.data.token);
-          sessionStorage.setItem("refreshToken", response.data.refreshToken);
-        }
+        // if (data.rememberMe) {
+        //   localStorage.setItem("jwtToken", response.data.token);
+        //   localStorage.setItem("refreshToken", response.data.refreshToken);
+        // } else {
+        //   sessionStorage.setItem("jwtToken", response.data.token);
+        //   sessionStorage.setItem("refreshToken", response.data.refreshToken);
+        // }
         setLoading(false);
-        navigate("/auth/switch/org");
+                  localStorage.setItem("jwtToken", response.data.token);
+          localStorage.setItem("refreshToken", response.data.refreshToken);
+        navigate("/dashboard",{ replace: true });
       } else {
         await AuthRepository.sendOTP({ email: data.username });
         showToast("OTP has been sent to your email.", "success");
         localStorage.setItem("otpUsername", data.username);
         localStorage.setItem("otpSentTime", now.toString());
-        navigate("/auth/login-otp");
+        // navigate("/auth/login-otp");
+         navigate("/dashboard",{ replace: true });
       }
     } catch (err) {
       showToast("Invalid username or password.", "error");
diff --git a/src/pages/project/ProjectDetails.jsx b/src/pages/project/ProjectDetails.jsx
index 79a630ed..e741e0f3 100644
--- a/src/pages/project/ProjectDetails.jsx
+++ b/src/pages/project/ProjectDetails.jsx
@@ -36,7 +36,7 @@ const ProjectDetails = () => {
     refetch,
   } = useProjectDetails(projectId);
 
-  const { canView, loading: permsLoading } = useProjectAccess(projectId);
+  // const { canView, loading: permsLoading } = useProjectAccess(projectId);
 
   useEffect(() => {
     if (!projectId && projectNames.length > 0) {
@@ -70,7 +70,7 @@ const ProjectDetails = () => {
     localStorage.setItem("lastActiveProjectTab", pillKey);
   };
 
-  if (projectLoading || permsLoading || !projects_Details) {
+  if (projectLoading ||  !projects_Details) {
     return <Loader />;
   }