diff --git a/apps/studio/components/interfaces/Organization/resource-banner.tsx b/apps/studio/components/interfaces/Organization/resource-banner.tsx
index 9f70705e913..a3fac8e4cbb 100644
--- a/apps/studio/components/interfaces/Organization/resource-banner.tsx
+++ b/apps/studio/components/interfaces/Organization/resource-banner.tsx
@@ -18,16 +18,16 @@ export function OrganizationResourceBanner() {
           type="danger"
           title="Outstanding Invoices"
           message="Please pay invoices to avoid service disruption."
-          link={`/org/${org?.slug}/invoices`}
+          link={`/org/${org?.slug}/settings/invoices`}
           org={org}
         />
       )}
-      {true && (
+      {org?.restriction_status === 'grace_period' && (
         <WarningBanner
           type="warning"
           title="Your organization has exceeded its quota"
           message={`You are given a grace period until ${dayjs(org?.restriction_data?.['grace_period_end']).format('DD MMM, YYYY')}`}
-          link={`/org/${org?.slug}/billing`}
+          link={`/org/${org?.slug}/settings/billing`}
           org={org}
         />
       )}
@@ -36,7 +36,7 @@ export function OrganizationResourceBanner() {
           type="warning"
           title="Grace period is over"
           message="Your project will not be able to serve requests when you used up your quota."
-          link={`/org/${org?.slug}/billing`}
+          link={`/org/${org?.slug}/settings/billing`}
           org={org}
         />
       )}
@@ -45,7 +45,7 @@ export function OrganizationResourceBanner() {
           type="danger"
           title="Services Restricted"
           message="Your project is unable to serve any requests as your organization has used up its quota."
-          link={`/org/${org?.slug}/billing`}
+          link={`/org/${org?.slug}/settings/billing`}
           org={org}
         />
       )}
@@ -78,7 +78,8 @@ const WarningBanner = ({
     <div
       className={cn(
         `relative ${bannerStyles} border-b border-muted py-1 flex items-center gap-2 flex-shrink-0 px-10 justify-center`,
-        isProject && 'last:rounded-b-[7px] mx-2 border-default border-l border-r'
+        isProject && 'last:rounded-b-[7px] mx-2 border-default border-l border-r',
+        'flex-shrink-0'
       )}
     >
       <div className="mx-auto w-full xl:max-w-[700px] items-center flex flex-row gap-3">
diff --git a/apps/studio/components/interfaces/app-default-navigation.tsx b/apps/studio/components/interfaces/app-default-navigation.tsx
index 02e8818e51d..76a46c8068b 100644
--- a/apps/studio/components/interfaces/app-default-navigation.tsx
+++ b/apps/studio/components/interfaces/app-default-navigation.tsx
@@ -110,13 +110,6 @@ export function AppDefaultNavigation() {
 }
 
 function NavLink({ route, active }: { route: any; active?: boolean }) {
-  const router = useRouter()
-  // const hasItems = route.items && route.items.some((section) => section.items.length > 0)
-  const [open, setOpen] = useState(false)
-
-  // console.log('route', route)
-
-  // if (!route.items) {
   return (
     <SidebarMenuItem key={route.key}>
       <SidebarMenuButton
@@ -252,7 +245,7 @@ const OrganizationLinks = () => {
     // },
     {
       label: 'Organization settings',
-      href: `/org/${slug}/settings`,
+      href: `/org/${slug}/settings/general`,
       key: 'settings',
       icon: <Settings size={ICON_SIZE} strokeWidth={ICON_STROKE_WIDTH} />,
     },
@@ -291,21 +284,17 @@ const OrganizationLinks = () => {
 
   return (
     <SidebarMenu className="flex flex-col gap-1 items-start">
-      <SidebarGroup
-      // className={cn(!open && 'pt-0')}
-      >
+      <SidebarGroup>
         {navMenuItems.map((item, i) => (
-          <SidebarMenuItem key={`${item.label}-${i}`}>
-            <NavLink
-              active={i === 0 ? activeRoute === undefined : activeRoute === item.key}
-              route={{
-                label: item.label,
-                link: item.href,
-                key: item.label,
-                icon: item.icon,
-              }}
-            />
-          </SidebarMenuItem>
+          <NavLink
+            active={i === 0 ? activeRoute === undefined : activeRoute === item.key}
+            route={{
+              label: item.label,
+              link: item.href,
+              key: item.label,
+              icon: item.icon,
+            }}
+          />
         ))}
       </SidebarGroup>
     </SidebarMenu>
diff --git a/apps/studio/components/interfaces/sidebar-open-top-banner.tsx b/apps/studio/components/interfaces/sidebar-open-top-banner.tsx
index 7b8941183b5..b355f362bf5 100644
--- a/apps/studio/components/interfaces/sidebar-open-top-banner.tsx
+++ b/apps/studio/components/interfaces/sidebar-open-top-banner.tsx
@@ -116,7 +116,6 @@ export function SidebarOpenTopBanner() {
         </div>
         {!!project?.ref && (
           <motion.div
-            className="border-l flex-0 h-full"
             initial={{ opacity: 0, x: -20 }}
             animate={{
               opacity: !aiAssistantPanel.open ? 1 : 0,
diff --git a/apps/studio/components/layouts/AppLayout/AssistantButton.tsx b/apps/studio/components/layouts/AppLayout/AssistantButton.tsx
index 2854c85248c..a20486ed92f 100644
--- a/apps/studio/components/layouts/AppLayout/AssistantButton.tsx
+++ b/apps/studio/components/layouts/AppLayout/AssistantButton.tsx
@@ -9,12 +9,12 @@ const AssistantButton = () => {
       type="text"
       size="tiny"
       id="assistant-trigger"
-      className="h-full w-full rounded-none"
+      className="w-[24px] h-[24px] flex items-center justify-center p-0"
       onClick={() => {
         setAiAssistantPanel({ open: !aiAssistantPanel.open })
       }}
     >
-      <AiIconAnimation allowHoverEffect size={20} />
+      <AiIconAnimation allowHoverEffect size={16} />
     </Button>
   )
 }
diff --git a/apps/studio/components/layouts/OrganizationLayout.tsx b/apps/studio/components/layouts/OrganizationLayout.tsx
index 612469a3a02..af9b9b6fcb9 100644
--- a/apps/studio/components/layouts/OrganizationLayout.tsx
+++ b/apps/studio/components/layouts/OrganizationLayout.tsx
@@ -8,7 +8,7 @@ import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
 import { ExternalLink } from 'lucide-react'
 import Link from 'next/link'
 import type { PropsWithChildren } from 'react'
-import { Alert_Shadcn_, AlertTitle_Shadcn_, Button, NavMenu, NavMenuItem } from 'ui'
+import { Alert_Shadcn_, AlertTitle_Shadcn_, Button, cn, NavMenu, NavMenuItem } from 'ui'
 import AccountLayout from './AccountLayout/AccountLayout'
 import DefaultLayout from './DefaultLayout'
 import { ScaffoldContainer, ScaffoldDivider, ScaffoldHeader, ScaffoldTitle } from './Scaffold'
@@ -75,30 +75,34 @@ const OrganizationLayout = ({ children }: PropsWithChildren<{}>) => {
   const filteredNavMenuItems = navMenuItems.filter((item) => !item.hidden)
 
   return (
-    <div className="relative py-1.5 w-full h-full">
-      <div className="relative w-full h-full border-l border-t border-b rounded-tl-[7px] rounded-bl-[7px] bg-dash-sidebar flex flex-col">
+    <div className="flex flex-row h-full w-full">
+      <div
+        className={cn(
+          'border-l w-full rounded-tl-[7px] rounded-bl-[7px] border-t border-b my-1.5 bg-dash-sidebar flex flex-col'
+        )}
+      >
         {/* <NoticeBanner /> */}
         <OrganizationResourceBanner />
         {/* <AnimatePresence>
-        <motion.div
-          className="px-10"
-          initial={{ opacity: 0, y: -20 }}
-          animate={{ opacity: 1, y: 0 }}
-          exit={{ opacity: 0, y: -20 }}
-          transition={{
-            duration: 0.2,
-            ease: 'easeOut',
-          }}
-        >
-          <NavMenu className="border-none" aria-label="Organization menu navigation">
-            {filteredNavMenuItems.map((item) => (
-              <NavMenuItem key={item.label} active={currentPath === item.href}>
-                <Link href={item.href}>{item.label}</Link>
-              </NavMenuItem>
-            ))}
-          </NavMenu>
-        </motion.div>
-      </AnimatePresence> */}
+          <motion.div
+            className="px-10"
+            initial={{ opacity: 0, y: -20 }}
+            animate={{ opacity: 1, y: 0 }}
+            exit={{ opacity: 0, y: -20 }}
+            transition={{
+              duration: 0.2,
+              ease: 'easeOut',
+            }}
+          >
+            <NavMenu className="border-none" aria-label="Organization menu navigation">
+              {filteredNavMenuItems.map((item) => (
+                <NavMenuItem key={item.label} active={currentPath === item.href}>
+                  <Link href={item.href}>{item.label}</Link>
+                </NavMenuItem>
+              ))}
+            </NavMenu>
+          </motion.div>
+        </AnimatePresence> */}
 
         {/* <ScaffoldDivider /> */}
         {/* <motion.div
diff --git a/apps/studio/components/layouts/ProjectLayout/organization-settings-layout.tsx b/apps/studio/components/layouts/ProjectLayout/organization-settings-layout.tsx
new file mode 100644
index 00000000000..35f5311fe9a
--- /dev/null
+++ b/apps/studio/components/layouts/ProjectLayout/organization-settings-layout.tsx
@@ -0,0 +1,68 @@
+import { useParams } from 'common'
+import { AnimatePresence, motion } from 'framer-motion'
+import { useCurrentPath } from 'hooks/misc/useCurrentPath'
+import Link from 'next/link'
+import { PropsWithChildren } from 'react'
+import { cn, NavMenu, NavMenuItem } from 'ui'
+
+function OrganizationSettingsLayout({ children }: PropsWithChildren) {
+  const currentPath = useCurrentPath()
+  const { slug } = useParams()
+
+  const navMenuItems = [
+    {
+      label: 'General',
+      href: `/org/${slug}/settings/general`,
+    },
+    {
+      label: 'Billing',
+      href: `/org/${slug}/settings/billing`,
+    },
+    {
+      label: 'Invoices',
+      href: `/org/${slug}/settings/invoices`,
+    },
+    {
+      label: 'Audit Logs',
+      href: `/org/${slug}/settings/audit`,
+    },
+    {
+      label: 'Legal Documents',
+      href: `/org/${slug}/settings/documents`,
+    },
+  ]
+
+  return (
+    <>
+      {/* <AnimatePresence>
+        <motion.div
+          className="px-10"
+          initial={{ opacity: 0, y: -20 }}
+          animate={{ opacity: 1, y: 0 }}
+          exit={{ opacity: 0, y: -20 }}
+          transition={{
+            duration: 0.2,
+            ease: 'easeOut',
+          }}
+        > */}
+      <NavMenu
+        className={cn(
+          '[&_ul]:mx-auto [&_ul]:max-w-[1200px] [&_ul]:px-6 [&_ul]:lg:px-14 [&_ul]:xl:px-24 [&_ul]:2xl:px-32',
+          'pt-6'
+        )}
+        aria-label="Organization menu navigation"
+      >
+        {navMenuItems.map((item) => (
+          <NavMenuItem key={item.label} active={currentPath === item.href}>
+            <Link href={item.href}>{item.label}</Link>
+          </NavMenuItem>
+        ))}
+      </NavMenu>
+      {/* </motion.div>
+      </AnimatePresence> */}
+      <main className="h-full w-full overflow-y-auto">{children}</main>
+    </>
+  )
+}
+
+export default OrganizationSettingsLayout
diff --git a/apps/studio/pages/org/[slug]/audit.tsx b/apps/studio/pages/org/[slug]/settings/audit.tsx
similarity index 80%
rename from apps/studio/pages/org/[slug]/audit.tsx
rename to apps/studio/pages/org/[slug]/settings/audit.tsx
index 3e7501a3d54..4b258c5c5c0 100644
--- a/apps/studio/pages/org/[slug]/audit.tsx
+++ b/apps/studio/pages/org/[slug]/settings/audit.tsx
@@ -2,6 +2,7 @@ import { AuditLogs } from 'components/interfaces/Organization'
 import AppLayout from 'components/layouts/AppLayout/AppLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import OrganizationLayout from 'components/layouts/OrganizationLayout'
+import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/organization-settings-layout'
 import { Loading } from 'components/ui/Loading'
 import { usePermissionsQuery } from 'data/permissions/permissions-query'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
@@ -19,7 +20,9 @@ const OrgAuditLogs: NextPageWithLayout = () => {
 OrgAuditLogs.getLayout = (page) => (
   <AppLayout>
     <DefaultLayout>
-      <OrganizationLayout>{page}</OrganizationLayout>
+      <OrganizationLayout>
+        <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+      </OrganizationLayout>
     </DefaultLayout>
   </AppLayout>
 )
diff --git a/apps/studio/pages/org/[slug]/billing.tsx b/apps/studio/pages/org/[slug]/settings/billing.tsx
similarity index 87%
rename from apps/studio/pages/org/[slug]/billing.tsx
rename to apps/studio/pages/org/[slug]/settings/billing.tsx
index 45cc25d56b8..31b6af69265 100644
--- a/apps/studio/pages/org/[slug]/billing.tsx
+++ b/apps/studio/pages/org/[slug]/settings/billing.tsx
@@ -3,6 +3,7 @@ import { BillingSettings } from 'components/interfaces/Organization'
 import AppLayout from 'components/layouts/AppLayout/AppLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import OrganizationLayout from 'components/layouts/OrganizationLayout'
+import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/organization-settings-layout'
 import { Loading } from 'components/ui/Loading'
 import { usePermissionsQuery } from 'data/permissions/permissions-query'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
@@ -42,7 +43,9 @@ const OrgBillingSettings: NextPageWithLayout = () => {
 OrgBillingSettings.getLayout = (page) => (
   <AppLayout>
     <DefaultLayout>
-      <OrganizationLayout>{page}</OrganizationLayout>
+      <OrganizationLayout>
+        <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+      </OrganizationLayout>
     </DefaultLayout>
   </AppLayout>
 )
diff --git a/apps/studio/pages/org/[slug]/documents.tsx b/apps/studio/pages/org/[slug]/settings/documents.tsx
similarity index 69%
rename from apps/studio/pages/org/[slug]/documents.tsx
rename to apps/studio/pages/org/[slug]/settings/documents.tsx
index 4b95c277216..f1f73cf720c 100644
--- a/apps/studio/pages/org/[slug]/documents.tsx
+++ b/apps/studio/pages/org/[slug]/settings/documents.tsx
@@ -2,6 +2,7 @@ import { Documents } from 'components/interfaces/Organization'
 import AppLayout from 'components/layouts/AppLayout/AppLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import OrganizationLayout from 'components/layouts/OrganizationLayout'
+import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/organization-settings-layout'
 import type { NextPageWithLayout } from 'types'
 
 const OrgDocuments: NextPageWithLayout = () => {
@@ -11,7 +12,9 @@ const OrgDocuments: NextPageWithLayout = () => {
 OrgDocuments.getLayout = (page) => (
   <AppLayout>
     <DefaultLayout>
-      <OrganizationLayout>{page}</OrganizationLayout>
+      <OrganizationLayout>
+        <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+      </OrganizationLayout>
     </DefaultLayout>
   </AppLayout>
 )
diff --git a/apps/studio/pages/org/[slug]/general.tsx b/apps/studio/pages/org/[slug]/settings/general.tsx
similarity index 81%
rename from apps/studio/pages/org/[slug]/general.tsx
rename to apps/studio/pages/org/[slug]/settings/general.tsx
index 33324e8c442..1391b746f41 100644
--- a/apps/studio/pages/org/[slug]/general.tsx
+++ b/apps/studio/pages/org/[slug]/settings/general.tsx
@@ -2,6 +2,7 @@ import { GeneralSettings as GeneralSettingsLegacy } from 'components/interfaces/
 import AppLayout from 'components/layouts/AppLayout/AppLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import OrganizationLayout from 'components/layouts/OrganizationLayout'
+import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/organization-settings-layout'
 import { Loading } from 'components/ui/Loading'
 import { usePermissionsQuery } from 'data/permissions/permissions-query'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
@@ -25,7 +26,9 @@ const OrgGeneralSettings: NextPageWithLayout = () => {
 OrgGeneralSettings.getLayout = (page) => (
   <AppLayout>
     <DefaultLayout>
-      <OrganizationLayout>{page}</OrganizationLayout>
+      <OrganizationLayout>
+        <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+      </OrganizationLayout>
     </DefaultLayout>
   </AppLayout>
 )
diff --git a/apps/studio/pages/org/[slug]/invoices.tsx b/apps/studio/pages/org/[slug]/settings/invoices.tsx
similarity index 81%
rename from apps/studio/pages/org/[slug]/invoices.tsx
rename to apps/studio/pages/org/[slug]/settings/invoices.tsx
index 21103064399..60ebd4d4f19 100644
--- a/apps/studio/pages/org/[slug]/invoices.tsx
+++ b/apps/studio/pages/org/[slug]/settings/invoices.tsx
@@ -2,6 +2,7 @@ import { InvoicesSettings } from 'components/interfaces/Organization'
 import AppLayout from 'components/layouts/AppLayout/AppLayout'
 import DefaultLayout from 'components/layouts/DefaultLayout'
 import OrganizationLayout from 'components/layouts/OrganizationLayout'
+import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/organization-settings-layout'
 import { Loading } from 'components/ui/Loading'
 import { usePermissionsQuery } from 'data/permissions/permissions-query'
 import { useSelectedOrganization } from 'hooks/misc/useSelectedOrganization'
@@ -25,7 +26,9 @@ const OrgInvoices: NextPageWithLayout = () => {
 OrgInvoices.getLayout = (page) => (
   <AppLayout>
     <DefaultLayout>
-      <OrganizationLayout>{page}</OrganizationLayout>
+      <OrganizationLayout>
+        <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+      </OrganizationLayout>
     </DefaultLayout>
   </AppLayout>
 )