diff --git a/Client/src/Components/Sidebar/index.css b/Client/src/Components/Sidebar/index.css
index 4840043c3..e62f67534 100644
--- a/Client/src/Components/Sidebar/index.css
+++ b/Client/src/Components/Sidebar/index.css
@@ -1,40 +1,31 @@
-aside .MuiStack-root {
-  cursor: pointer;
-}
-aside > svg {
-  margin: var(--env-var-spacing-2) var(--env-var-spacing-1);
-}
 aside .selected-path,
+aside .MuiListItemButton-root:hover,
 aside .MuiStack-root:hover {
   background-color: var(--env-var-color-13);
 }
-aside .MuiStack-root svg {
+aside .MuiList-root svg {
   width: 20px;
   height: 20px;
   opacity: 0.8;
 }
 aside span.MuiTypography-root {
   font-size: var(--env-var-font-size-medium);
-  color: var(--env-var-color-5);
   line-height: 1;
 }
-aside .MuiStack-root:nth-last-child(3) {
-  margin-top: auto;
+aside .MuiListSubheader-root {
+  font-size: var(--env-var-font-size-small);
+  font-weight: 500;
+  line-height: 1.5;
+  opacity: 0.6;
+  text-transform: uppercase;
+  margin-bottom: 5px;
 }
-aside .MuiStack-root:last-child,
-aside .MuiStack-root:nth-last-child(3) {
-  position: relative;
-}
-aside .MuiStack-root:last-child:before {
-  content: "";
-  position: absolute;
-  top: -10px;
-  left: 0;
-  width: 100%;
-  border-top: solid 1px var(--env-var-color-6);
+aside span.MuiTypography-root,
+aside .MuiListSubheader-root {
+  color: var(--env-var-color-2);
 }
 aside .MuiStack-root:last-child {
-  margin-top: 15px;
+  margin-top: auto;
 }
 
 .sidebar-menu {
@@ -49,11 +40,6 @@ aside .MuiStack-root:last-child {
 .sidebar-menu .MuiList-root {
   min-width: 100px;
   width: 150px;
-  padding-bottom: 0;
-}
-.sidebar-menu li.MuiButtonBase-root:last-child {
-  border-top: solid 1px var(--env-var-color-6);
-  padding: 12px 16px;
 }
 .sidebar-menu li.MuiButtonBase-root {
   min-height: fit-content;
diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx
index 33ccdafc9..61207c062 100644
--- a/Client/src/Components/Sidebar/index.jsx
+++ b/Client/src/Components/Sidebar/index.jsx
@@ -1,12 +1,22 @@
 import { useState } from "react";
-import { Menu, MenuItem, Stack, Tooltip, Typography } from "@mui/material";
+import {
+  Box,
+  List,
+  ListItemButton,
+  ListItemIcon,
+  ListItemText,
+  ListSubheader,
+  Menu,
+  MenuItem,
+  Stack,
+  Tooltip,
+  Typography,
+} from "@mui/material";
 import { useLocation, useNavigate } from "react-router";
 import { useTheme } from "@emotion/react";
 import { useDispatch, useSelector } from "react-redux";
 import { clearAuthState } from "../../Features/Auth/authSlice";
 import { clearUptimeMonitorState } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
-import { createToast } from "../../Utils/toastUtils";
-import axiosInstance from "../../Utils/axiosConfig";
 import Avatar from "../Avatar";
 import LockSvg from "../../assets/icons/lock.svg?react";
 import UserSvg from "../../assets/icons/user.svg?react";
@@ -32,6 +42,9 @@ const menu = [
   { name: "Maintenance", path: "maintenance", icon: <Maintenance /> },
   { name: "Page speed", path: "pagespeed", icon: <PageSpeed /> },
   { name: "Integrations", path: "integrations", icon: <Integrations /> },
+];
+
+const other = [
   { name: "Support", path: "support", icon: <Support /> },
   { name: "Settings", path: "settings", icon: <Settings /> },
 ];
@@ -108,34 +121,74 @@ function Sidebar() {
   };
 
   return (
-    <Stack component="aside" gap={theme.gap.xs}>
-      <BWULogo alt="BlueWave Uptime Logo" />
-      {menu.map((item) => (
-        <Stack
-          className={
-            location.pathname.includes(item.path) ? "selected-path" : ""
-          }
-          key={item.path}
-          direction="row"
-          alignItems="center"
-          py={theme.gap.small}
-          px={theme.gap.medium}
-          gap={theme.gap.small}
-          borderRadius={`${theme.shape.borderRadius}px`}
-          onClick={() =>
-            item.path === "support"
-              ? window.open(
-                  "https://github.com/bluewave-labs/bluewave-uptime",
-                  "_blank",
-                  "noreferrer"
-                )
-              : navigate(`/${item.path}`)
-          }
-        >
-          {item.icon}
-          <Typography component="span">{item.name}</Typography>
-        </Stack>
-      ))}
+    <Stack component="aside" gap={theme.gap.large}>
+      <Box pt={theme.gap.large} pl={theme.gap.ml} pb={theme.gap.xs}>
+        <BWULogo alt="BlueWave Uptime Logo" />
+      </Box>
+      {/* menu */}
+      <List
+        component="nav"
+        aria-labelledby="nested-menu-subheader"
+        subheader={
+          <ListSubheader component="div" id="nested-menu-subheader">
+            Menu
+          </ListSubheader>
+        }
+        sx={{ width: "100%" }}
+      >
+        {menu.map((item) => (
+          <ListItemButton
+            className={
+              location.pathname.includes(item.path) ? "selected-path" : ""
+            }
+            key={item.path}
+            onClick={() => navigate(`/${item.path}`)}
+            sx={{
+              gap: theme.gap.medium,
+              borderRadius: `${theme.shape.borderRadius}px`,
+            }}
+          >
+            <ListItemIcon sx={{ minWidth: 0 }}>{item.icon}</ListItemIcon>
+            <ListItemText>{item.name}</ListItemText>
+          </ListItemButton>
+        ))}
+      </List>
+      {/* other */}
+      <List
+        component="nav"
+        aria-labelledby="nested-other-subheader"
+        subheader={
+          <ListSubheader component="div" id="nested-other-subheader">
+            Other
+          </ListSubheader>
+        }
+        sx={{ width: "100%" }}
+      >
+        {other.map((item) => (
+          <ListItemButton
+            className={
+              location.pathname.includes(item.path) ? "selected-path" : ""
+            }
+            key={item.path}
+            onClick={() =>
+              item.path === "support"
+                ? window.open(
+                    "https://github.com/bluewave-labs/bluewave-uptime",
+                    "_blank",
+                    "noreferrer"
+                  )
+                : navigate(`/${item.path}`)
+            }
+            sx={{
+              gap: theme.gap.medium,
+              borderRadius: `${theme.shape.borderRadius}px`,
+            }}
+          >
+            <ListItemIcon sx={{ minWidth: 0 }}>{item.icon}</ListItemIcon>
+            <ListItemText>{item.name}</ListItemText>
+          </ListItemButton>
+        ))}
+      </List>
       <Tooltip
         title="Open settings"
         slotProps={{
@@ -191,6 +244,33 @@ function Sidebar() {
           </MenuItem>
         ))}
       </Menu>
+      {/* {menu.map((item) => (
+        <Stack
+          className={
+            location.pathname.includes(item.path) ? "selected-path" : ""
+          }
+          key={item.path}
+          direction="row"
+          alignItems="center"
+          py={theme.gap.small}
+          px={theme.gap.medium}
+          gap={theme.gap.small}
+          borderRadius={`${theme.shape.borderRadius}px`}
+          onClick={() =>
+            item.path === "support"
+              ? window.open(
+                  "https://github.com/bluewave-labs/bluewave-uptime",
+                  "_blank",
+                  "noreferrer"
+                )
+              : navigate(`/${item.path}`)
+          }
+        >
+          {item.icon}
+          <Typography component="span">{item.name}</Typography>
+        </Stack>
+      ))}
+       */}
     </Stack>
   );
 }
diff --git a/Client/src/assets/icons/incidents.svg b/Client/src/assets/icons/incidents.svg
index 054d96b06..ffe04d09f 100644
--- a/Client/src/assets/icons/incidents.svg
+++ b/Client/src/assets/icons/incidents.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 8V12M12 16H12.01M2 8.52274V15.4773C2 15.7218 2 15.8441 2.02763 15.9592C2.05213 16.0613 2.09253 16.1588 2.14736 16.2483C2.2092 16.3492 2.29568 16.4357 2.46863 16.6086L7.39137 21.5314C7.56432 21.7043 7.6508 21.7908 7.75172 21.8526C7.84119 21.9075 7.93873 21.9479 8.04077 21.9724C8.15586 22 8.27815 22 8.52274 22H15.4773C15.7218 22 15.8441 22 15.9592 21.9724C16.0613 21.9479 16.1588 21.9075 16.2483 21.8526C16.3492 21.7908 16.4357 21.7043 16.6086 21.5314L21.5314 16.6086C21.7043 16.4357 21.7908 16.3492 21.8526 16.2483C21.9075 16.1588 21.9479 16.0613 21.9724 15.9592C22 15.8441 22 15.7218 22 15.4773V8.52274C22 8.27815 22 8.15586 21.9724 8.04077C21.9479 7.93873 21.9075 7.84119 21.8526 7.75172C21.7908 7.6508 21.7043 7.56432 21.5314 7.39137L16.6086 2.46863C16.4357 2.29568 16.3492 2.2092 16.2483 2.14736C16.1588 2.09253 16.0613 2.05213 15.9592 2.02763C15.8441 2 15.7218 2 15.4773 2H8.52274C8.27815 2 8.15586 2 8.04077 2.02763C7.93873 2.05213 7.84119 2.09253 7.75172 2.14736C7.6508 2.2092 7.56432 2.29568 7.39137 2.46863L2.46863 7.39137C2.29568 7.56432 2.2092 7.6508 2.14736 7.75172C2.09253 7.84119 2.05213 7.93873 2.02763 8.04077C2 8.15586 2 8.27815 2 8.52274Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 8V12M12 16H12.01M2 8.52274V15.4773C2 15.7218 2 15.8441 2.02763 15.9592C2.05213 16.0613 2.09253 16.1588 2.14736 16.2483C2.2092 16.3492 2.29568 16.4357 2.46863 16.6086L7.39137 21.5314C7.56432 21.7043 7.6508 21.7908 7.75172 21.8526C7.84119 21.9075 7.93873 21.9479 8.04077 21.9724C8.15586 22 8.27815 22 8.52274 22H15.4773C15.7218 22 15.8441 22 15.9592 21.9724C16.0613 21.9479 16.1588 21.9075 16.2483 21.8526C16.3492 21.7908 16.4357 21.7043 16.6086 21.5314L21.5314 16.6086C21.7043 16.4357 21.7908 16.3492 21.8526 16.2483C21.9075 16.1588 21.9479 16.0613 21.9724 15.9592C22 15.8441 22 15.7218 22 15.4773V8.52274C22 8.27815 22 8.15586 21.9724 8.04077C21.9479 7.93873 21.9075 7.84119 21.8526 7.75172C21.7908 7.6508 21.7043 7.56432 21.5314 7.39137L16.6086 2.46863C16.4357 2.29568 16.3492 2.2092 16.2483 2.14736C16.1588 2.09253 16.0613 2.05213 15.9592 2.02763C15.8441 2 15.7218 2 15.4773 2H8.52274C8.27815 2 8.15586 2 8.04077 2.02763C7.93873 2.05213 7.84119 2.09253 7.75172 2.14736C7.6508 2.2092 7.56432 2.29568 7.39137 2.46863L2.46863 7.39137C2.29568 7.56432 2.2092 7.6508 2.14736 7.75172C2.09253 7.84119 2.05213 7.93873 2.02763 8.04077C2 8.15586 2 8.27815 2 8.52274Z" stroke="#667085" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/Client/src/assets/icons/integrations.svg b/Client/src/assets/icons/integrations.svg
index 96edfb485..50e817f00 100644
--- a/Client/src/assets/icons/integrations.svg
+++ b/Client/src/assets/icons/integrations.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.0002 13C10.4297 13.5741 10.9776 14.0491 11.6067 14.3929C12.2359 14.7367 12.9317 14.9411 13.6468 14.9923C14.362 15.0435 15.0798 14.9403 15.7515 14.6897C16.4233 14.4392 17.0333 14.047 17.5402 13.54L20.5402 10.54C21.451 9.59695 21.955 8.33394 21.9436 7.02296C21.9322 5.71198 21.4063 4.45791 20.4793 3.53087C19.5523 2.60383 18.2982 2.07799 16.9872 2.0666C15.6762 2.0552 14.4132 2.55918 13.4702 3.46997L11.7502 5.17997M14.0002 11C13.5707 10.4258 13.0228 9.95078 12.3936 9.60703C11.7645 9.26327 11.0687 9.05885 10.3535 9.00763C9.63841 8.95641 8.92061 9.0596 8.24885 9.31018C7.5771 9.56077 6.96709 9.9529 6.4602 10.46L3.4602 13.46C2.54941 14.403 2.04544 15.666 2.05683 16.977C2.06822 18.288 2.59407 19.542 3.52111 20.4691C4.44815 21.3961 5.70221 21.9219 7.01319 21.9333C8.32418 21.9447 9.58719 21.4408 10.5302 20.53L12.2402 18.82" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.0002 13C10.4297 13.5741 10.9776 14.0491 11.6067 14.3929C12.2359 14.7367 12.9317 14.9411 13.6468 14.9923C14.362 15.0435 15.0798 14.9403 15.7515 14.6897C16.4233 14.4392 17.0333 14.047 17.5402 13.54L20.5402 10.54C21.451 9.59695 21.955 8.33394 21.9436 7.02296C21.9322 5.71198 21.4063 4.45791 20.4793 3.53087C19.5523 2.60383 18.2982 2.07799 16.9872 2.0666C15.6762 2.0552 14.4132 2.55918 13.4702 3.46997L11.7502 5.17997M14.0002 11C13.5707 10.4258 13.0228 9.95078 12.3936 9.60703C11.7645 9.26327 11.0687 9.05885 10.3535 9.00763C9.63841 8.95641 8.92061 9.0596 8.24885 9.31018C7.5771 9.56077 6.96709 9.9529 6.4602 10.46L3.4602 13.46C2.54941 14.403 2.04544 15.666 2.05683 16.977C2.06822 18.288 2.59407 19.542 3.52111 20.4691C4.44815 21.3961 5.70221 21.9219 7.01319 21.9333C8.32418 21.9447 9.58719 21.4408 10.5302 20.53L12.2402 18.82" stroke="#667085" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/Client/src/assets/icons/maintenance.svg b/Client/src/assets/icons/maintenance.svg
index 6d0262f3f..9486f6086 100644
--- a/Client/src/assets/icons/maintenance.svg
+++ b/Client/src/assets/icons/maintenance.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 6V12L16 14M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 6V12L16 14M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="#667085" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>