diff --git a/Client/src/Components/DashboardMenu/index.jsx b/Client/src/Components/DashboardMenu/index.jsx
index 6206261d5..2363352c1 100644
--- a/Client/src/Components/DashboardMenu/index.jsx
+++ b/Client/src/Components/DashboardMenu/index.jsx
@@ -8,6 +8,7 @@ import AllInclusiveIcon from "../../assets/Images/Icon-link-gray.png";
 import SettingsIcon from "../../assets/Images/Icon-setting-gray.png";
 import React, { useState, useEffect } from "react";
 import { useNavigate, useLocation } from "react-router-dom";
+import pathMap from "../../Utils/PathMap";
 
 /**
  * @component
@@ -38,35 +39,35 @@ function DashboardMenu() {
         "Monitors",
         "/monitors",
         activeButton === "/monitors",
-        () => handleClick("Monitors", "/monitors")
+        () => handleClick(pathMap["/monitors"], "/monitors")
       )}
       {DashboardMenuButton(
         Incidents,
         "Incidents",
         "/incidents",
         activeButton === "/incidents",
-        () => handleClick("Incidents", "/incidents")
+        () => handleClick(pathMap["/incidents"], "/incidents")
       )}
       {DashboardMenuButton(
         SensorsIcon,
         "Status Pages",
         "/status",
         activeButton === "/status",
-        () => handleClick("Status Pages", "/status")
+        () => handleClick(pathMap["/status"], "/status")
       )}
       {DashboardMenuButton(
         AllInclusiveIcon,
         "Integrations",
         "/integrations",
         activeButton === "/integrations",
-        () => handleClick("Integrations", "/integrations")
+        () => handleClick(pathMap["/integrations"], "/integrations")
       )}
       {DashboardMenuButton(
         SettingsIcon,
         "Settings",
         "/settings",
         activeButton === "/settings",
-        () => handleClick("Settings", "/settings")
+        () => handleClick(pathMap["/settings"], "/settings")
       )}
     </div>
   );
diff --git a/Client/src/Utils/PathMap.js b/Client/src/Utils/PathMap.js
new file mode 100644
index 000000000..2a86c17f7
--- /dev/null
+++ b/Client/src/Utils/PathMap.js
@@ -0,0 +1,9 @@
+const pathMap = {
+    "/monitors": "Monitors",
+    "/incidents": "Incidents",
+    "/status" : "Status Pages",
+    "/integrations": "Integrations",
+    "/settings" : "Settings"
+}
+
+export default pathMap;
\ No newline at end of file
diff --git a/Client/vite.config.js b/Client/vite.config.js
index 5a33944a9..d697e594d 100644
--- a/Client/vite.config.js
+++ b/Client/vite.config.js
@@ -4,4 +4,7 @@ import react from '@vitejs/plugin-react'
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
-})
+  optimizeDeps: {
+    include: ['@mui/material/Tooltip', '@emotion/styled'],
+  },
+})
\ No newline at end of file