diff --git a/client/src/components/inputs/SwitchSettings.tsx b/client/src/components/inputs/SwitchSettings.tsx
index 50fb44364..b6bca4cd2 100644
--- a/client/src/components/inputs/SwitchSettings.tsx
+++ b/client/src/components/inputs/SwitchSettings.tsx
@@ -66,11 +66,6 @@ export const SettingsSwitch = () => {
     [perms]
   );
 
-  console.log("ENV VAR: ", ENV_VAR);
-  console.log("DEPLOYMENT_MODE: ", DEPLOYMENT_MODE);
-  console.log("Show billing: ", showBilling);
-  console.log(JSON.stringify(perms, null, 2));
-  console.log("IS_SAAS: ", IS_SAAS);
 
   const hasMaster = perms.includes("master");
 
diff --git a/client/src/components/layouts/RootLayout.tsx b/client/src/components/layouts/RootLayout.tsx
index 1bc832881..7a58292cc 100644
--- a/client/src/components/layouts/RootLayout.tsx
+++ b/client/src/components/layouts/RootLayout.tsx
@@ -11,10 +11,10 @@ const RootLayout = () => {
       <SideBar />
       <Stack
         flex={1}
-        padding={12}
+        padding={6}
         overflow={"hidden"}
         sx={{
-          pl: `${(isSmall ? COLLAPSED_WIDTH : 0) + 24}px`,
+          pl: `${(isSmall ? COLLAPSED_WIDTH : 0) + 12}px`,
           backgroundColor:
             theme.palette.mode === "dark"
               ? "rgba(255, 255, 255, 0.01)"
diff --git a/client/src/components/layouts/sidebar/Logo.tsx b/client/src/components/layouts/sidebar/Logo.tsx
index b0c9648f3..bb87b5020 100644
--- a/client/src/components/layouts/sidebar/Logo.tsx
+++ b/client/src/components/layouts/sidebar/Logo.tsx
@@ -2,28 +2,29 @@ import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import { useTheme } from "@mui/material/styles";
-import { useNavigate } from "react-router";
+import { setSidebarOpen } from "@/features/uiSlice";
+import { useAppDispatch, useAppSelector } from "@/hooks/AppHooks";
 import { useTranslation } from "react-i18next";
 
 export const Logo = ({ sidebarOpen }: { sidebarOpen: boolean }) => {
   const { t } = useTranslation();
   const theme = useTheme();
-  const navigate = useNavigate();
+  const dispatch = useAppDispatch();
+  const isOpen = useAppSelector((state) => state.ui.sidebarOpen);
 
   return (
     <Stack
-      pt={theme.spacing(6)}
-      pb={theme.spacing(12)}
-      pl={theme.spacing(11)}
+      pb={theme.spacing(6)}
       direction="row"
       alignItems="center"
       gap={theme.spacing(4)}
-      onClick={() => navigate("/")}
+      onClick={() => {
+        dispatch(setSidebarOpen(!isOpen));
+      }}
       sx={{ cursor: "pointer" }}
     >
       <Typography
-        pl={theme.spacing("1px")}
-        minWidth={theme.spacing(16)}
+        minWidth={39}
         minHeight={theme.spacing(16)}
         display={"flex"}
         justifyContent={"center"}
diff --git a/client/src/components/layouts/sidebar/index.tsx b/client/src/components/layouts/sidebar/index.tsx
index 5c09e3b44..58e532916 100644
--- a/client/src/components/layouts/sidebar/index.tsx
+++ b/client/src/components/layouts/sidebar/index.tsx
@@ -5,7 +5,8 @@ import { useTranslation } from "react-i18next";
 import { useNavigate, useLocation } from "react-router-dom";
 import { useAppSelector, useAppDispatch } from "@/hooks/AppHooks";
 
-import { CollapseButton } from "@/components/layouts/sidebar/CollapseButton";
+// CollapseButton removed; toggling now handled via Logo click
+import Box from "@mui/material/Box";
 import Stack from "@mui/material/Stack";
 import List from "@mui/material/List";
 import Divider from "@mui/material/Divider";
@@ -54,9 +55,8 @@ export const SideBar = () => {
         backgroundColor: theme.palette.background.paper,
       }}
     >
-      <CollapseButton sidebarOpen={sideBarOpen} />
+      {/* Sidebar collapse handled by Logo click */}
 
-      <Logo sidebarOpen={sideBarOpen} />
       <List
         component="nav"
         disablePadding
@@ -65,6 +65,7 @@ export const SideBar = () => {
           height: "100%",
         }}
       >
+        <Logo sidebarOpen={sideBarOpen} />
         {menu.map((item) => {
           const selected = location.pathname.startsWith(`/${item.path}`);
           return (
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index c62a84e65..4de440df8 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -243,7 +243,7 @@
   "cpuUsage": "CPU usage",
   "createA": "Create a",
   "createMaintenance": "Create maintenance",
-  "createMaintenanceWindow": "Create maintenance window",
+  "createMaintenanceWindow": "Create window",
   "createMaintenanceWindowPage": {
     "generalSettingsTitle": "General settings",
     "generalSettingsDescription": "General maintenance window settings",
diff --git a/client/src/pages/infrastructure/InfraConfig.tsx b/client/src/pages/infrastructure/InfraConfig.tsx
index 7eb873387..0cd3a4e20 100644
--- a/client/src/pages/infrastructure/InfraConfig.tsx
+++ b/client/src/pages/infrastructure/InfraConfig.tsx
@@ -41,7 +41,6 @@ const InfraConfigurePage = () => {
       interval,
     };
 
-    console.log(JSON.stringify(submitData, null, 2));
 
     const result = await patch(`/monitors/${id}`, submitData);
     if (result) {
diff --git a/client/src/pages/infrastructure/InfraMonitorsTable.tsx b/client/src/pages/infrastructure/InfraMonitorsTable.tsx
index 02a5f504f..59e598d96 100644
--- a/client/src/pages/infrastructure/InfraMonitorsTable.tsx
+++ b/client/src/pages/infrastructure/InfraMonitorsTable.tsx
@@ -115,7 +115,7 @@ export const InfraMonitorsTable = ({
       //   id: 5,
       //   label: "Clone",
       //   action: () => {
-      //     console.log("Open clone");
+      
       //   },
       // },
       {
diff --git a/client/src/pages/notification-channels/NotificationChannels.tsx b/client/src/pages/notification-channels/NotificationChannels.tsx
index 0f911e176..c479a4869 100644
--- a/client/src/pages/notification-channels/NotificationChannels.tsx
+++ b/client/src/pages/notification-channels/NotificationChannels.tsx
@@ -129,7 +129,7 @@ const NotificationChannelsPage = () => {
       loading={isValidating}
       error={error}
       items={notificationChannels}
-      actionButtonText="Create a new notification channel"
+      actionButtonText="Create a channel"
       actionLink="/notification-channels/create"
     >
       <InfoBox
diff --git a/client/src/pages/pagespeed/PageSpeedMonitorTable.tsx b/client/src/pages/pagespeed/PageSpeedMonitorTable.tsx
index c50cebdfe..a6e018538 100644
--- a/client/src/pages/pagespeed/PageSpeedMonitorTable.tsx
+++ b/client/src/pages/pagespeed/PageSpeedMonitorTable.tsx
@@ -116,7 +116,7 @@ export const PageSpeedMonitorTable = ({
       //   id: 5,
       //   label: "Clone",
       //   action: () => {
-      //     console.log("Open clone");
+      
       //   },
       // },
       {
diff --git a/client/src/pages/uptime/MonitorTable.tsx b/client/src/pages/uptime/MonitorTable.tsx
index fde4621d7..436b0a822 100644
--- a/client/src/pages/uptime/MonitorTable.tsx
+++ b/client/src/pages/uptime/MonitorTable.tsx
@@ -116,7 +116,7 @@ export const MonitorTable = ({
       //   id: 5,
       //   label: "Clone",
       //   action: () => {
-      //     console.log("Open clone");
+      
       //   },
       // },
       {