diff --git a/apps/docs/components/FooterHelpCallout.tsx b/apps/docs/components/FooterHelpCallout.tsx
index 364a8135687..bfaf6ec03f8 100644
--- a/apps/docs/components/FooterHelpCallout.tsx
+++ b/apps/docs/components/FooterHelpCallout.tsx
@@ -4,7 +4,7 @@ const FooterHelpCallout = () => {
       <h5 className="text-sm m-0 text-scale-1100">Need some help?</h5>
       <p className="m-0 text-sm text-scale-900">
         Not to worry, we are here to help with our specialist engineers. You can submit a support
-        ticket via our <a href="https://app.supabase.com/support/new">dashboard</a>.
+        ticket through the <a href="https://app.supabase.com/support/new">Dashboard</a>.
       </p>
     </div>
   )
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
index 16da07d161e..e083d23d997 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
@@ -515,7 +515,7 @@ export const resources = {
     { name: 'Examples', url: '/guides/resources/examples', items: [] },
     { name: 'Glossary', url: '/guides/resources/glossary', items: [] },
     {
-      name: 'Migrating to Supabase',
+      name: 'Migrate to Supabase',
       url: '/guides/resources/migrating-to-supabase',
       items: [
         {
@@ -561,7 +561,7 @@ export const resources = {
       ],
     },
     {
-      name: 'Self Hosting',
+      name: 'Self-Hosting',
       items: [
         { name: 'Overview', url: '/guides/resources/self-hosting', items: [] },
         { name: 'Docker', url: '/guides/resources/self-hosting/docker', items: [] },
@@ -571,7 +571,7 @@ export const resources = {
 }
 
 export const selfHosting = {
-  label: 'Self Hosting',
+  label: 'Self-Hosting',
   url: '/guides/self-hosting',
   items: [
     { name: 'Overview', url: '/guides/hosting/overview', items: [] },
@@ -838,7 +838,7 @@ export const references = [
     ],
   },
   {
-    label: 'Self Hosting',
+    label: 'Self-Hosting',
     items: [
       {
         label: 'Auth server',
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx
index 4cc448a1303..61542243d3a 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.tsx
@@ -35,17 +35,14 @@ const SideNav = () => {
       case url.includes(`/docs/guides/auth`) && url:
         setLevel('auth')
         break
-      case url.includes(`/docs/guides/storage`) && url:
-        setLevel('storage')
+      case url.includes(`/docs/guides/functions`) && url:
+        setLevel('functions')
         break
       case url.includes(`/docs/guides/realtime`) && url:
         setLevel('realtime')
         break
-      case url.includes(`/docs/guides/functions`) && url:
-        setLevel('functions')
-        break
-      case url.includes(`/docs/guides/integrations`) && url:
-        setLevel('integrations')
+      case url.includes(`/docs/guides/storage`) && url:
+        setLevel('storage')
         break
       case url.includes(`/docs/guides/platform`) ||
         (url.includes(`/docs/guides/hosting/platform`) && url):
@@ -54,6 +51,9 @@ const SideNav = () => {
       case url.includes(`/docs/guides/resources`) && url:
         setLevel('resources')
         break
+      case url.includes(`/docs/guides/integrations`) && url:
+        setLevel('integrations')
+        break
       case url.includes(`/docs/reference/javascript`) && url:
         setLevel('reference_javascript')
         break
@@ -87,7 +87,7 @@ const SideNav = () => {
         level: 'home',
       },
       {
-        label: 'Getting started',
+        label: 'Getting Started',
         icon: '/img/icons/menu/getting-started',
         href: '/getting-started',
         level: 'gettingstarted',
@@ -113,10 +113,10 @@ const SideNav = () => {
         level: 'auth',
       },
       {
-        label: 'Storage',
-        icon: '/img/icons/menu/storage',
-        href: '/guides/storage',
-        level: 'storage',
+        label: 'Edge Functions',
+        icon: '/img/icons/menu/functions',
+        href: '/guides/functions',
+        level: 'functions',
       },
       {
         label: 'Realtime',
@@ -125,10 +125,10 @@ const SideNav = () => {
         level: 'realtime',
       },
       {
-        label: 'Edge Functions',
-        icon: '/img/icons/menu/functions',
-        href: '/guides/functions',
-        level: 'functions',
+        label: 'Storage',
+        icon: '/img/icons/menu/storage',
+        href: '/guides/storage',
+        level: 'storage',
       },
     ],
     [
@@ -138,25 +138,25 @@ const SideNav = () => {
         href: '/guides/hosting/platform',
         level: 'platform',
       },
-      {
-        label: 'Integrations',
-        icon: '/img/icons/menu/integrations',
-        href: '/guides/integrations',
-        level: 'integrations',
-      },
       {
         label: 'Resources',
         icon: '/img/icons/menu/platform',
         href: '/guides/resources',
         level: 'resources',
       },
+      {
+        label: 'Integrations',
+        icon: '/img/icons/menu/integrations',
+        href: '/guides/integrations',
+        level: 'integrations',
+      },
     ],
     [
       {
         label: 'Client Library Reference',
       },
       {
-        label: 'JavaScript Client',
+        label: 'JavaScript',
         icon: '/img/icons/javascript-icon',
         hasLightIcon: false,
         href: '/reference/javascript/start',
@@ -170,7 +170,7 @@ const SideNav = () => {
       //   level: 'reference_javascript',
       // },
       {
-        label: 'Dart Client Library',
+        label: 'Flutter',
         icon: '/img/icons/dart-icon',
         hasLightIcon: false,
         href: '/reference/dart/start',
@@ -180,21 +180,21 @@ const SideNav = () => {
         label: 'Tools Reference',
       },
       {
-        label: 'Mangement API',
+        label: 'Management API',
         icon: '/img/icons/api-icon',
         hasLightIcon: false,
         href: '/reference/api/start',
         level: 'reference_javascript',
       },
       {
-        label: 'CLI',
+        label: 'Supabase CLI',
         icon: '/img/icons/cli-icon',
         hasLightIcon: false,
         href: '/reference/cli/start',
         level: 'reference_javascript',
       },
       {
-        label: 'Self hosting server',
+        label: 'Self-Hosting Server',
         icon: '/img/icons/menu/platform',
         href: '/reference/javascript/start',
         level: 'reference_javascript',
@@ -277,13 +277,13 @@ const SideNav = () => {
       <NavigationMenuGuideList id={'tutorials'} currentLevel={level} setLevel={setLevel} />
       <NavigationMenuGuideList id={'database'} currentLevel={level} setLevel={setLevel} />
       <NavigationMenuGuideList id={'auth'} currentLevel={level} setLevel={setLevel} />
-      <NavigationMenuGuideList id={'storage'} currentLevel={level} setLevel={setLevel} />
-      <NavigationMenuGuideList id={'realtime'} currentLevel={level} setLevel={setLevel} />
       <NavigationMenuGuideList id={'functions'} currentLevel={level} setLevel={setLevel} />
-      <NavigationMenuGuideList id={'reference'} currentLevel={level} setLevel={setLevel} />
-      <NavigationMenuGuideList id={'integrations'} currentLevel={level} setLevel={setLevel} />
+      <NavigationMenuGuideList id={'realtime'} currentLevel={level} setLevel={setLevel} />
+      <NavigationMenuGuideList id={'storage'} currentLevel={level} setLevel={setLevel} />
       <NavigationMenuGuideList id={'platform'} currentLevel={level} setLevel={setLevel} />
       <NavigationMenuGuideList id={'resources'} currentLevel={level} setLevel={setLevel} />
+      <NavigationMenuGuideList id={'integrations'} currentLevel={level} setLevel={setLevel} />
+      <NavigationMenuGuideList id={'reference'} currentLevel={level} setLevel={setLevel} />
       {/* reference level */}
       <NavigationMenuRefList
         key={'reference-js-menu'}
diff --git a/apps/docs/pages/guides/resources.mdx b/apps/docs/pages/guides/resources.mdx
index 5c5ede69fc5..feb6d3240eb 100644
--- a/apps/docs/pages/guides/resources.mdx
+++ b/apps/docs/pages/guides/resources.mdx
@@ -16,9 +16,7 @@ export const meta = {
 <div>
   <div className="max-w-xl">
 
-### Migrating
-
-Moving to Supabase to Firebase or Heroku is easy. We provide the guides and tools to help you do it fast.
+### Migrate to Supabase
 
   </div>
 
@@ -50,7 +48,7 @@ Moving to Supabase to Firebase or Heroku is easy. We provide the guides and tool
 
     ### Supabase CLI
 
-    Feel more at home on the command line? The Supabase CLI lets you develop your project locally and deploy to the Supabase Platform. The Supabase CLI can also help you manage your Supabase projects. You can handle database migrations, CI/CD workflows, and generate types from your database schema, all from the comfort of your Terminal.
+    Develop your project locally and deploy to the Supabase Platform. The Supabase CLI can also help you manage your Supabase projects, handle database migrations, CI/CD workflows, and generate types from your database schema, all from the comfort of your Terminal.
 
 [Learn more](/docs/guides/resources/supabase-cli)
 
@@ -58,11 +56,11 @@ Moving to Supabase to Firebase or Heroku is easy. We provide the guides and tool
 
   <div>
 
-    ### Self-hosted Supabase
+    ### Self-Hosting Supabase
 
     We're happy to host your next big thing, but we also make it easy to host Supabase on your own. We use Docker to help make setup as painless as possible.
 
-[Learn more](/docs/guides/resources/supabase-cli)
+[Learn more](/docs/guides/resources/self-hosting)
 
   </div>
 
@@ -77,24 +75,32 @@ export const products = [
     title: 'Firebase Auth',
     icon: '/docs/img/icons/menu/auth',
     hasLightIcon: true,
-    href: '/guides/auth',
-    description: 'Move all your users from Firebase Auth to Supabase.',
+    href: '/guides/migrations/firebase-auth',
+    description: 'Move your auth users from a Firebase project to a Supabase project.',
     span: 'col-span-12 md:col-span-4',
   },
   {
     title: 'Firebase Data',
     icon: '/docs/img/icons/menu/database',
     hasLightIcon: true,
-    href: '/guides/database',
-    description: 'Move all your app data from Firebase to Supabase.',
+    href: '/guides/migrations/firestore-data',
+    description: 'Migrate the contents of a Firestore collection to a single PostgreSQL table.',
     span: 'col-span-12 md:col-span-4',
   },
   {
     title: 'Firebase Storage',
     icon: '/docs/img/icons/menu/storage',
     hasLightIcon: true,
-    href: '/guides/storage',
-    description: 'Move all your files from Firebase to Supabase.',
+    href: '/guides/migrations/firebase-storage',
+    description: 'Convert your Firebase Storage files to Supabase Storage.',
+    span: 'col-span-12 md:col-span-4',
+  },
+  {
+    title: 'Heroku',
+    icon: '/docs/img/icons/menu/database',
+    hasLightIcon: true,
+    href: '/guides/migrations/heroku',
+    description: 'Migrate your Heroku Postgres database to Supabase.',
     span: 'col-span-12 md:col-span-4',
   },
 ]
diff --git a/apps/docs/pages/new/index.mdx b/apps/docs/pages/new/index.mdx
index 8129efeaf0e..afc9f54d660 100644
--- a/apps/docs/pages/new/index.mdx
+++ b/apps/docs/pages/new/index.mdx
@@ -91,8 +91,8 @@ export const meta = {
       src="/docs/img/purple-glow-dark.png"
     />
     <div className="z-10 ml-[96px] lg:ml-[128px] flex flex-col items-start justify-center lg:justify-start lg:flex-row lg:items-center lg:gap-3 h-full">
-      <h2 className="text-sm lg:text-base text-scale-1200 m-0">Ready to make a full working app?</h2>
-      <p className="text-sm lg:text-base text-scale-1100 m-0">Follow our step-by-step <Link href="/docs/guides/tutorials"><a className="m-0">tutorials</a></Link></p>
+      <h2 className="text-sm lg:text-base text-scale-1200 m-0">Ready to make a fully working app?</h2>
+      <p className="text-sm lg:text-base text-scale-1100 m-0">Follow the step-by-step <Link href="/guides/tutorials"><a className="m-0">tutorials</a></Link>.</p>
     </div>
   </div>
 </div>
@@ -190,7 +190,7 @@ export const products = [
     icon: '/docs/img/icons/menu/auth',
     hasLightIcon: true,
     href: '/guides/auth',
-    description: 'Add and manage email and password, passwordless, OAuth, and mobile logins to your project through a suite of providers and APIs.',
+    description: 'Add and manage email and password, passwordless, OAuth, and mobile logins to your project through a suite of identity providers and APIs.',
     span: 'col-span-12 md:col-span-6',
   },
   {
@@ -198,7 +198,7 @@ export const products = [
     icon: '/docs/img/icons/menu/storage',
     hasLightIcon: true,
     href: '/guides/storage',
-    description: 'Store, organize, transform, and serve large files—fully integrated with your Postgres database with Row Level Security policies.',
+    description: 'Store, organize, transform, and serve large files—fully integrated with your Postgres database with Row Level Security access policies.',
   },
   {
     title: 'Realtime',
@@ -218,11 +218,11 @@ export const products = [
 
 export const apis = [
   {
-    title: 'Javascript Client Library',
+    title: 'JavaScript Client Library',
     icon: '/docs/img/icons/javascript-icon',
     hasLightIcon: true,
     href: 'reference/javascript',
-    description: 'Official client libraries for Javascript and Typescript.',
+    description: 'Official client libraries for JavaScript and TypeScript.',
   },
   {
     title: 'Flutter Client Library',
@@ -264,7 +264,7 @@ export const apis = [
 export const platform = [
   {
     header: '/docs/img/cards/sample-card-header-3.svg',
-    title: 'Platform guides',
+    title: 'Platform Guides',
     icon: '/docs/img/icons/menu/platform',
     hasLightIcon: true,
     href: 'guides/hosting/platform',
@@ -277,7 +277,7 @@ export const platform = [
     icon: '/docs/img/icons/menu/integrations',
     hasLightIcon: true,
     href: 'guides/integrations',
-    description: Explore a variety of integrations from our official third-party partners,
+    description: 'Explore a variety of integrations from our official third-party partners.',
     span: 'col-span-12 lg:col-span-6',
   },
 ]