diff --git a/package.json b/package.json
index acaa9ad1c06..8c09b0762ca 100644
--- a/package.json
+++ b/package.json
@@ -214,7 +214,7 @@
     "cli.qwik": "pnpm build.cli && node packages/qwik/dist/qwik-cli.cjs",
     "cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts",
     "deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe",
-    "docs.dev": "cd packages/docs && pnpm build.repl-sw && pnpm dev",
+    "docs.dev": "concurrently \"cd packages/docs && pnpm build.repl-sw\" \"cd packages/docs && pnpm dev\"",
     "docs.preview": "cd packages/docs && pnpm preview",
     "docs.sync": "tsx --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt",
     "eslint.update": "tsx --require ./scripts/runBefore.ts scripts/eslint-docs.ts",
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 991781fc063..501fd7b8610 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -76,7 +76,7 @@
     "codesandbox.sync": "tsx codesandbox.sync.ts",
     "contributors": "tsx contributors.ts",
     "deploy": "wrangler pages publish ./dist",
-    "dev": "tsx check-qwik-build.ts && vite --mode ssr --open",
+    "dev": "concurrently \"cross-env tsx check-qwik-build.ts\" \"vite --mode ssr --open\"",
     "dev.debug": "node --inspect-brk ../../node_modules/vite/bin/vite.js --mode ssr --force",
     "prebuild.core": "tsx check-qwik-build.ts",
     "preview": "qwik build preview && vite preview --open",
diff --git a/packages/docs/src/routes/docs/menu.md b/packages/docs/src/routes/docs/menu.md
index 98b58646ff3..0b5a31e39e7 100644
--- a/packages/docs/src/routes/docs/menu.md
+++ b/packages/docs/src/routes/docs/menu.md
@@ -1,6 +1,6 @@
 # Qwik Guide
-
 ## Introduction
+## Qwik Group
 
 - [Overview](</docs/(qwik)/index.mdx>)
 - [Getting Started](</docs/(qwik)/getting-started/index.mdx>)
@@ -19,7 +19,26 @@
 - [Styling](</docs/(qwik)/components/styles/index.mdx>)
 - [API Reference](</api/qwik/>)
 
-## Qwik City
+## Concepts
+
+- [Think Qwik](</docs/(qwik)/concepts/think-qwik/index.mdx>)
+- [Resumable](</docs/(qwik)/concepts/resumable/index.mdx>)
+- [Progressive](</docs/(qwik)/concepts/progressive/index.mdx>)
+- [Reactivity](</docs/(qwik)/concepts/reactivity/index.mdx>)
+
+## Qwik Advanced
+
+- [The $ dollar sign](</docs/(qwik)/advanced/dollar/index.mdx>)
+- [Containers](</docs/(qwik)/advanced/containers/index.mdx>)
+- [QRL](</docs/(qwik)/advanced/qrl/index.mdx>)
+- [Library mode](</docs/(qwik)/advanced/library/index.mdx>)
+- [Qwikloader](</docs/(qwik)/advanced/qwikloader/index.mdx>)
+- [Optimizer](</docs/(qwik)/advanced/optimizer/index.mdx>)
+- [Modules Prefetching](</docs/(qwik)/advanced/modules-prefetching/index.mdx>)
+- [Build Directory](</docs/(qwik)/advanced/custom-build-dir/index.mdx>)
+- [Vite](</docs/(qwik)/advanced/vite/index.mdx>)
+
+## QwikCity
 
 - [Overview](</docs/(qwikcity)/qwikcity/index.mdx>)
 - [Routing](</docs/(qwikcity)/routing/index.mdx>)
@@ -31,11 +50,21 @@
 - [Endpoints](</docs/(qwikcity)/endpoints/index.mdx>)
 - [Middleware](</docs/(qwikcity)/middleware/index.mdx>)
 - [server$](</docs/(qwikcity)/server$/index.mdx>)
-- [Re-exporting loaders](/docs/(qwikcity)/re-exporting-loaders/index.mdx)
+- [Re-exporting loaders](</docs/(qwikcity)/re-exporting-loaders/index.mdx>)
 - [Caching](</docs/(qwikcity)/caching/index.mdx>)
 - [HTML attributes](</docs/(qwikcity)/html-attributes/index.mdx>)
 - [API reference](</docs/(qwikcity)/api/index.mdx>)
 
+## QwikCity Advanced
+
+- [Content Security Policy](</docs/(qwikcity)/advanced/content-security-policy/index.mdx>)
+- [Menus](</docs/(qwikcity)/advanced/menu/index.mdx>)
+- [Request Handling](</docs/(qwikcity)/advanced/request-handling/index.mdx>)
+- [Advanced Routing](</docs/(qwikcity)/advanced/routing/index.mdx>)
+- [Sitemaps](</docs/(qwikcity)/advanced/sitemaps/index.mdx>)
+- [Speculative Module Fetching](</docs/(qwikcity)/advanced/speculative-module-fetching/index.mdx>)
+- [Static Assets](</docs/(qwikcity)/advanced/static-assets/index.mdx>)
+
 ## Cookbook
 
 - [Overview](/docs/cookbook/index.mdx)
@@ -110,35 +139,6 @@
 - [Bundle Optimization](</docs/(qwikcity)/guides/bundle/index.mdx>)
 - [Env variables](</docs/(qwikcity)/guides/env-variables/index.mdx>)
 
-## Concepts
-
-- [Think Qwik](</docs/(qwik)/concepts/think-qwik/index.mdx>)
-- [Resumable](</docs/(qwik)/concepts/resumable/index.mdx>)
-- [Progressive](</docs/(qwik)/concepts/progressive/index.mdx>)
-- [Reactivity](</docs/(qwik)/concepts/reactivity/index.mdx>)
-
-## Advanced
-
-- [The $ dollar sign](</docs/(qwik)/advanced/dollar/index.mdx>)
-- [Containers](</docs/(qwik)/advanced/containers/index.mdx>)
-- [QRL](</docs/(qwik)/advanced/qrl/index.mdx>)
-- [Library mode](</docs/(qwik)/advanced/library/index.mdx>)
-- [Qwikloader](</docs/(qwik)/advanced/qwikloader/index.mdx>)
-- [Optimizer](</docs/(qwik)/advanced/optimizer/index.mdx>)
-- [Modules Prefetching](</docs/(qwik)/advanced/modules-prefetching/index.mdx>)
-- [Build Directory](</docs/(qwik)/advanced/custom-build-dir/index.mdx>)
-- [Vite](</docs/(qwik)/advanced/vite/index.mdx>)
-- [Advanced Routing](</docs/(qwikcity)/advanced/routing/index.mdx>)
-- [Qwik Plugins](</docs/(qwikcity)/advanced/plugins/index.mdx>)
-- [Request Handling](</docs/(qwikcity)/advanced/request-handling/index.mdx>)
-- [Speculative Module Fetching](</docs/(qwikcity)/advanced/speculative-module-fetching/index.mdx>)
-- [Menus](</docs/(qwikcity)/advanced/menu/index.mdx>)
-- [Static Assets](</docs/(qwikcity)/advanced/static-assets/index.mdx>)
-- [Sitemaps](</docs/(qwikcity)/advanced/sitemaps/index.mdx>)
-- [ESLint-Rules](</docs/(qwik)/advanced/eslint/index.mdx>)
-- [Content Security Policy](</docs/(qwikcity)/advanced/content-security-policy/index.mdx>)
-- [Complex Forms](</docs/(qwikcity)/advanced/complex-forms/index.mdx>)
-
 ## Reference
 
 - [API Reference](/api/)
@@ -150,7 +150,7 @@
 - [Insights](/docs/labs/insights/index.mdx)
 - [Typed Routes](/docs/labs/typed-routes/index.mdx)
 - [Devtools](/docs/labs/devtools/index.mdx)
-- [usePreventNavigate](/docs/labs/usePreventNavigate/index.mdx)
+- [usePreventNavigate](</docs/labs/usePreventNavigate/index.mdx>)
 
 ## Community