diff --git a/components/ui/custom/CustomBox.tsx b/components/ui/custom/custom-box.tsx
similarity index 93%
rename from components/ui/custom/CustomBox.tsx
rename to components/ui/custom/custom-box.tsx
index 4ceba6b9be..be4da14410 100644
--- a/components/ui/custom/CustomBox.tsx
+++ b/components/ui/custom/custom-box.tsx
@@ -19,7 +19,7 @@ export const CustomBox = ({
     <Card fullWidth {...props}>
       {(preTitle || subTitle || title) && (
         <>
-          <CardHeader className="flex-col items-start px-3 pb-3 pt-4">
+          <CardHeader className="flex-col items-start px-3 py-2">
             {preTitle && (
               <p className="text-tiny font-bold uppercase">{preTitle}</p>
             )}
diff --git a/components/ui/custom/index.ts b/components/ui/custom/index.ts
index 3b8bd9f162..5cf748708d 100644
--- a/components/ui/custom/index.ts
+++ b/components/ui/custom/index.ts
@@ -1,7 +1,7 @@
+export * from "./custom-box";
 export * from "./custom-button";
 export * from "./custom-dropdown-filter";
 export * from "./CustomAlertModal";
-export * from "./CustomBox";
 export * from "./CustomButtonClientAction";
 export * from "./CustomInput";
 export * from "./CustomLoader";
diff --git a/components/ui/sidebar/SidebarItems.tsx b/components/ui/sidebar/SidebarItems.tsx
index 43f01dfa66..497d29544a 100644
--- a/components/ui/sidebar/SidebarItems.tsx
+++ b/components/ui/sidebar/SidebarItems.tsx
@@ -92,7 +92,7 @@ export const items: SidebarItem[] = [
 export const sectionItems: SidebarItem[] = [
   {
     key: "dashboards",
-    title: "Dashboards",
+    title: "Dashboard",
     items: [
       {
         key: "overview",
@@ -113,48 +113,6 @@ export const sectionItems: SidebarItem[] = [
       //     />
       //   ),
       // },
-      // {
-      //   key: "tasks",
-      //   href: "#",
-      //   icon: "solar:checklist-minimalistic-outline",
-      //   title: "Tasks",
-      //   endContent: (
-      //     <Icon
-      //       className="text-default-400"
-      //       icon="solar:add-circle-line-duotone"
-      //       width={24}
-      //     />
-      //   ),
-      // },
-      {
-        key: "compliance",
-        href: "/compliance",
-        icon: "fluent-mdl2:compliance-audit",
-        title: "Compliance",
-        endContent: (
-          <Chip size="sm" variant="flat">
-            New
-          </Chip>
-        ),
-      },
-      {
-        key: "services",
-        href: "/services",
-        icon: "material-symbols:linked-services-outline",
-        title: "Services",
-      },
-      {
-        key: "categories",
-        href: "/categories",
-        icon: "material-symbols:folder-open-outline",
-        title: "Categories",
-      },
-      {
-        key: "workloads",
-        href: "/workloads",
-        icon: "lucide:tags",
-        title: "Workloads",
-      },
     ],
   },
   {
@@ -184,22 +142,47 @@ export const sectionItems: SidebarItem[] = [
           },
         ],
       },
+      {
+        key: "tasks",
+        href: "#",
+        icon: "solar:checklist-minimalistic-outline",
+        title: "Tasks",
+      },
     ],
   },
   {
-    key: "accounts",
-    title: "Accounts",
+    key: "analytics",
+    title: "Analytics",
+    items: [
+      {
+        key: "compliance",
+        href: "/compliance",
+        icon: "fluent-mdl2:compliance-audit",
+        title: "Compliance",
+        endContent: (
+          <Chip size="sm" variant="flat">
+            New
+          </Chip>
+        ),
+      },
+      {
+        key: "services",
+        href: "/services",
+        icon: "material-symbols:linked-services-outline",
+        title: "Services",
+      },
+    ],
+  },
+
+  {
+    key: "settings",
+    title: "Settings",
     items: [
       {
         key: "providers",
         href: "/providers",
         icon: "fluent:cloud-sync-24-regular",
         title: "Providers",
-        endContent: (
-          <Chip size="sm" variant="flat">
-            3
-          </Chip>
-        ),
       },
       {
         key: "integrations",
@@ -207,12 +190,6 @@ export const sectionItems: SidebarItem[] = [
         icon: "tabler:puzzle",
         title: "Integrations",
       },
-      {
-        key: "settings",
-        href: "/settings",
-        icon: "solar:settings-outline",
-        title: "Settings",
-      },
     ],
   },
 ];
@@ -220,8 +197,8 @@ export const sectionItems: SidebarItem[] = [
 export const sectionItemsWithTeams: SidebarItem[] = [
   ...sectionItems,
   {
-    key: "team",
-    title: "Team",
+    key: "memberships",
+    title: "Membership",
     items: [
       {
         key: "users",
@@ -229,12 +206,12 @@ export const sectionItemsWithTeams: SidebarItem[] = [
         title: "Users",
         icon: "ci:users",
       },
-      {
-        key: "roles",
-        href: "#",
-        title: "Roles",
-        startContent: <TeamAvatar name="Roles page" />,
-      },
+      // {
+      //   key: "memberships",
+      //   href: "#",
+      //   title: "Memberships",
+      //   startContent: <TeamAvatar name="Memberships" />,
+      // },
     ],
   },
 ];
diff --git a/components/ui/sidebar/SidebarWrap.tsx b/components/ui/sidebar/SidebarWrap.tsx
index 72451eb3fe..08204b3392 100644
--- a/components/ui/sidebar/SidebarWrap.tsx
+++ b/components/ui/sidebar/SidebarWrap.tsx
@@ -95,7 +95,7 @@ export const SidebarWrap = () => {
           "items-center": isCompact,
         })}
       >
-        <Tooltip
+        {/* <Tooltip
           content="Feedback & Support"
           isDisabled={!isCompact}
           placement="right"
@@ -133,7 +133,7 @@ export const SidebarWrap = () => {
               "Feedback & Support"
             )}
           </Button>
-        </Tooltip>
+        </Tooltip> */}
 
         <Tooltip
           content="Documentation"
@@ -179,7 +179,7 @@ export const SidebarWrap = () => {
           </Link>
         </Tooltip>
 
-        <Tooltip
+        {/* <Tooltip
           content="Product Updates"
           isDisabled={!isCompact}
           placement="right"
@@ -216,7 +216,7 @@ export const SidebarWrap = () => {
               "Product Updates"
             )}
           </Button>
-        </Tooltip>
+        </Tooltip> */}
 
         <Tooltip content="Log Out" isDisabled={!isCompact} placement="right">
           <Button