diff --git a/docs/platforms/javascript/common/best-practices/index.mdx b/docs/platforms/javascript/common/best-practices/index.mdx
index 95789708bd6237..d6e04b869c500b 100644
--- a/docs/platforms/javascript/common/best-practices/index.mdx
+++ b/docs/platforms/javascript/common/best-practices/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Special Use Cases
 description: "Learn how to set up Sentry for several specific use cases with these best practice guides."
-sidebar_order: 8000
+sidebar_order: 18
+sidebar_section: configuration
 notSupported:
   - javascript.node
   - javascript.aws-lambda
diff --git a/docs/platforms/javascript/common/apis.mdx b/docs/platforms/javascript/common/configuration/apis.mdx
similarity index 99%
rename from docs/platforms/javascript/common/apis.mdx
rename to docs/platforms/javascript/common/configuration/apis.mdx
index 0c22a8482fc8b7..6ccb63c5058955 100644
--- a/docs/platforms/javascript/common/apis.mdx
+++ b/docs/platforms/javascript/common/configuration/apis.mdx
@@ -1,8 +1,7 @@
 ---
 title: APIs
 description: "Learn more about APIs of the SDK."
-customCanonicalTag: "/platforms/javascript/apis/"
-sidebar_order: 3
+sidebar_order: 1
 ---
 
 This page shows all available top-level APIs of the SDK. You can use these APIs as the primary way to:
diff --git a/docs/platforms/javascript/common/configuration/index.mdx b/docs/platforms/javascript/common/configuration/index.mdx
index a62e57d704dceb..d1695eed74753b 100644
--- a/docs/platforms/javascript/common/configuration/index.mdx
+++ b/docs/platforms/javascript/common/configuration/index.mdx
@@ -1,7 +1,9 @@
 ---
-title: Configuration
+title: Extended Configuration
+sidebar_title: Extended Configuration
 description: "Learn about additional configuration options for the JavaScript SDKs."
-sidebar_order: 2
+sidebar_order: 13
+sidebar_section: configuration
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/common/crons/index.mdx b/docs/platforms/javascript/common/crons/index.mdx
index d8727d026c0fd7..082712d69496da 100644
--- a/docs/platforms/javascript/common/crons/index.mdx
+++ b/docs/platforms/javascript/common/crons/index.mdx
@@ -2,7 +2,8 @@
 title: Set Up Crons
 sidebar_title: Crons
 description: "Sentry Crons allows you to monitor the uptime and performance of any scheduled, recurring job in your application."
-sidebar_order: 5750
+sidebar_order: 9
+sidebar_section: features
 supported:
   - javascript.nextjs
   - javascript.sveltekit
diff --git a/docs/platforms/javascript/common/data-management/index.mdx b/docs/platforms/javascript/common/data-management/index.mdx
index ff505660535760..0cb4455ff72696 100644
--- a/docs/platforms/javascript/common/data-management/index.mdx
+++ b/docs/platforms/javascript/common/data-management/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Data Management
 description: Learn about different ways to scrub data within your SDK before it gets sent to Sentry.
-sidebar_order: 7
+sidebar_order: 16
+sidebar_section: configuration
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/common/enriching-events/index.mdx b/docs/platforms/javascript/common/enriching-events/index.mdx
index 050223cad6110e..69b6849a2980c1 100644
--- a/docs/platforms/javascript/common/enriching-events/index.mdx
+++ b/docs/platforms/javascript/common/enriching-events/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Enriching Events
 description: Add additional data to your events to make them easier to debug.
-sidebar_order: 5
+sidebar_order: 12
+sidebar_section: configuration
 ---
 
 In addition to the data that the Sentry SDK automatically captures, you can add additional data to events to help you debug them.
diff --git a/docs/platforms/javascript/common/feature-flags/index.mdx b/docs/platforms/javascript/common/feature-flags/index.mdx
index d003e03e02df80..9b7795f20c406d 100644
--- a/docs/platforms/javascript/common/feature-flags/index.mdx
+++ b/docs/platforms/javascript/common/feature-flags/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Set Up Feature Flags
 sidebar_title: Feature Flags
-sidebar_order: 7000
+sidebar_order: 15
+sidebar_section: features
 description: With Feature Flags, Sentry tracks feature flag evaluations in your application, keeps an audit log of feature flag changes, and reports any suspicious updates that may have caused an error.
 ---
 
diff --git a/docs/platforms/javascript/common/logs/index.mdx b/docs/platforms/javascript/common/logs/index.mdx
index 50022148b33564..ce5229f21c055e 100644
--- a/docs/platforms/javascript/common/logs/index.mdx
+++ b/docs/platforms/javascript/common/logs/index.mdx
@@ -2,7 +2,9 @@
 title: Set Up Logs
 sidebar_title: Logs
 description: "Structured logs allow you to send, view and query logs sent from your applications within Sentry."
-sidebar_order: 5755
+sidebar_order: 4
+sidebar_section: features
+new: true
 notSupported:
   - javascript.deno
   - javascript.cordova
diff --git a/docs/platforms/javascript/common/metrics/index.mdx b/docs/platforms/javascript/common/metrics/index.mdx
index 5e5583a4b6a0b9..31122897e0650c 100644
--- a/docs/platforms/javascript/common/metrics/index.mdx
+++ b/docs/platforms/javascript/common/metrics/index.mdx
@@ -2,7 +2,9 @@
 title: Set Up Metrics
 sidebar_title: Metrics
 description: "Metrics allow you to send, view and query counters, gauges and measurements from your Sentry-configured apps to track application health and drill down into related traces, logs, and errors."
-sidebar_order: 5755
+sidebar_order: 7
+sidebar_section: features
+beta: true
 ---
 
 With Sentry Metrics, you can send counters, gauges, distributions, and sets from your applications to Sentry. Once in Sentry, these metrics can be viewed alongside relevant errors, and searched using their individual attributes.
diff --git a/docs/platforms/javascript/common/migration/index.mdx b/docs/platforms/javascript/common/migration/index.mdx
index d331144e3f2fc8..ee087710683e49 100644
--- a/docs/platforms/javascript/common/migration/index.mdx
+++ b/docs/platforms/javascript/common/migration/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Migration Guide
 description: "Migrate from an older version of our Sentry JavaScript SDK."
-sidebar_order: 8100
+sidebar_order: 19
+sidebar_section: configuration
 notSupported:
   - javascript.capacitor
   - javascript.cordova
diff --git a/docs/platforms/javascript/common/opentelemetry/index.mdx b/docs/platforms/javascript/common/opentelemetry/index.mdx
index 83e98b38e24c60..88e6968abbb9d4 100644
--- a/docs/platforms/javascript/common/opentelemetry/index.mdx
+++ b/docs/platforms/javascript/common/opentelemetry/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: OpenTelemetry Support
 description: "Learn how to use OpenTelemetry with Sentry."
-sidebar_order: 7000
+sidebar_order: 14
+sidebar_section: configuration
 supported:
   - javascript.nextjs
   - javascript.node
@@ -25,6 +26,7 @@ supported:
   - javascript.tanstackstart-react
 notSupported:
   - javascript
+beta: true
 ---
 
 The Sentry SDK uses [OpenTelemetry](https://opentelemetry.io/) under the hood. This means that any OpenTelemetry instrumentation that emits spans will automatically be picked up by Sentry without any further configuration.
diff --git a/docs/platforms/javascript/common/profiling/index.mdx b/docs/platforms/javascript/common/profiling/index.mdx
index a04da12b821ae1..38e10b04e7699d 100644
--- a/docs/platforms/javascript/common/profiling/index.mdx
+++ b/docs/platforms/javascript/common/profiling/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
+sidebar_section: features
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations. Get started with profiling to understand your application's performance."
 notSupported:
   - javascript.bun
diff --git a/docs/platforms/javascript/common/configuration/sampling.mdx b/docs/platforms/javascript/common/sampling.mdx
similarity index 99%
rename from docs/platforms/javascript/common/configuration/sampling.mdx
rename to docs/platforms/javascript/common/sampling.mdx
index 88bb3498add9e5..725ad22dde21d2 100644
--- a/docs/platforms/javascript/common/configuration/sampling.mdx
+++ b/docs/platforms/javascript/common/sampling.mdx
@@ -1,7 +1,8 @@
 ---
 title: Sampling
 description: "Learn how to configure the volume of error and transaction events sent to Sentry."
-sidebar_order: 50
+sidebar_order: 11
+sidebar_section: configuration
 ---
 
 Adding Sentry to your app gives you a great deal of very valuable information about errors and performance you wouldn't otherwise get. And lots of information is good -- as long as it's the right information, at a reasonable volume.
diff --git a/docs/platforms/javascript/common/security-policy-reporting/index.mdx b/docs/platforms/javascript/common/security-policy-reporting/index.mdx
index 862fcb12452c4a..6e41e3a10dd42b 100644
--- a/docs/platforms/javascript/common/security-policy-reporting/index.mdx
+++ b/docs/platforms/javascript/common/security-policy-reporting/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Set Up Security Policy Reporting
 sidebar_title: Security Policy Reporting
-sidebar_order: 7500
+sidebar_order: 17
+sidebar_section: configuration
 description: "Learn how Sentry can help manage Content-Security-Policy violations and reports here."
 ---
 
diff --git a/docs/platforms/javascript/common/session-replay/index.mdx b/docs/platforms/javascript/common/session-replay/index.mdx
index 2f0a0749385ac2..cf94f16f7b30a5 100644
--- a/docs/platforms/javascript/common/session-replay/index.mdx
+++ b/docs/platforms/javascript/common/session-replay/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Set Up Session Replay
 sidebar_title: Session Replay
-sidebar_order: 5500
+sidebar_order: 5
+sidebar_section: features
 notSupported:
   - javascript.cordova
   - javascript.wasm
diff --git a/docs/platforms/javascript/common/sourcemaps/index.mdx b/docs/platforms/javascript/common/sourcemaps/index.mdx
index 0a67387ae019bb..d940d5931771e1 100644
--- a/docs/platforms/javascript/common/sourcemaps/index.mdx
+++ b/docs/platforms/javascript/common/sourcemaps/index.mdx
@@ -1,6 +1,7 @@
 ---
 title: Source Maps
 sidebar_order: 3
+sidebar_section: features
 description: "Upload your source maps to Sentry to enable readable stack traces in your errors."
 ---
 
diff --git a/docs/platforms/javascript/common/tracing/index.mdx b/docs/platforms/javascript/common/tracing/index.mdx
index 5761afcadeb795..6ec8f6179e4ae5 100644
--- a/docs/platforms/javascript/common/tracing/index.mdx
+++ b/docs/platforms/javascript/common/tracing/index.mdx
@@ -2,7 +2,8 @@
 title: Set Up Tracing
 sidebar_title: Tracing
 description: "Learn how to enable tracing in your app."
-sidebar_order: 4000
+sidebar_order: 6
+sidebar_section: features
 ---
 
 With [tracing](/product/insights/overview/), Sentry automatically tracks your software performance across your application services, measuring metrics like throughput and latency, and displaying the impact of errors across multiple systems.
diff --git a/docs/platforms/javascript/common/troubleshooting/index.mdx b/docs/platforms/javascript/common/troubleshooting/index.mdx
index e47edf6bbb5320..3d0acedd992d4c 100644
--- a/docs/platforms/javascript/common/troubleshooting/index.mdx
+++ b/docs/platforms/javascript/common/troubleshooting/index.mdx
@@ -3,6 +3,7 @@ title: Troubleshooting
 description: >-
   If you need help solving issues with your Sentry JavaScript SDK integration,
   you can read the edge cases documented below.
+sidebar_section: configuration
 keywords:
   - adblocker
   - blocked
@@ -11,7 +12,7 @@ keywords:
   - "404"
 notSupported:
   - javascript.capacitor
-sidebar_order: 9000
+sidebar_order: 20
 og_image: /og-images/platforms-javascript-common-troubleshooting.png
 ---
 
diff --git a/docs/platforms/javascript/common/usage/index.mdx b/docs/platforms/javascript/common/usage/index.mdx
index d402ccad46bb83..dc686940799abe 100644
--- a/docs/platforms/javascript/common/usage/index.mdx
+++ b/docs/platforms/javascript/common/usage/index.mdx
@@ -1,7 +1,8 @@
 ---
-title: Capturing Errors and Events
+title: Capturing Errors
 description: "Learn how to use the SDK to manually capture errors and other events."
-sidebar_order: 4
+sidebar_order: 2
+sidebar_section: features
 ---
 
 Sentry's SDK hooks into your runtime environment and automatically reports errors, uncaught exceptions, and unhandled rejections as well as other types of errors depending on the platform.
diff --git a/docs/platforms/javascript/common/user-feedback/index.mdx b/docs/platforms/javascript/common/user-feedback/index.mdx
index 033750ca59a148..719a05e2ae9fe6 100644
--- a/docs/platforms/javascript/common/user-feedback/index.mdx
+++ b/docs/platforms/javascript/common/user-feedback/index.mdx
@@ -2,7 +2,8 @@
 title: Set Up User Feedback
 sidebar_title: User Feedback
 description: Learn how to enable User Feedback in your app.
-sidebar_order: 6000
+sidebar_order: 10
+sidebar_section: features
 og_image: /og-images/platforms-javascript-common-user-feedback.png
 ---
 
diff --git a/docs/platforms/javascript/guides/astro/profiling/index.mdx b/docs/platforms/javascript/guides/astro/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/astro/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/astro/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/guides/gatsby/profiling/index.mdx b/docs/platforms/javascript/guides/gatsby/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/gatsby/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/gatsby/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/guides/nextjs/index.mdx b/docs/platforms/javascript/guides/nextjs/index.mdx
index 3306adfe15844f..08878b10dbb603 100644
--- a/docs/platforms/javascript/guides/nextjs/index.mdx
+++ b/docs/platforms/javascript/guides/nextjs/index.mdx
@@ -13,33 +13,17 @@ categories:
 
 <PlatformContent includePath="getting-started-prerequisites" />
 
-## Features
+<StepComponent>
 
-In addition to capturing errors, you can monitor interactions between multiple services or applications by [enabling tracing](/concepts/key-terms/tracing/). You can also get to the root of an error or performance issue faster, by watching a video-like reproduction of a user session with [session replay](/product/explore/session-replay/web/getting-started/).
-
-Select which Sentry features you'd like to install in addition to Error Monitoring to get the corresponding installation and configuration instructions below.
-
-<OnboardingOptionButtons
-  options={[
-    "error-monitoring",
-    "performance",
-    "session-replay",
-    "user-feedback",
-    "logs",
-  ]}
-/>
+## Install
 
-## Step 1: Install
+<SplitLayout>
+<SplitSection>
+<SplitSectionText>
 
-To install Sentry using the installation wizard, run the following command within your project:
+To install Sentry using the installation wizard, run the command on the right within your project directory.
 
-```bash
-npx @sentry/wizard@latest -i nextjs
-```
-
-The wizard then guides you through the setup process, asking you to enable additional (optional) Sentry features for your application beyond error monitoring.
-
-<PlatformContent includePath="getting-started-features-expandable" />
+The wizard guides you through the setup process, asking you to enable additional (optional) Sentry features for your application beyond error monitoring.
 
 This guide assumes that you enable all features and allow the wizard to create an example page and route. You can add or remove features at any time, but setting them up now will save you the effort of configuring them manually later.
 
@@ -54,12 +38,50 @@ This guide assumes that you enable all features and allow the wizard to create a
 
 </Expandable>
 
-## Step 2: Configure
+</SplitSectionText>
+<SplitSectionCode>
+
+```bash
+npx @sentry/wizard@latest -i nextjs
+```
+
+</SplitSectionCode>
+</SplitSection>
+</SplitLayout>
+
+## Configure
 
 If you prefer to configure Sentry manually, here are the configuration files the wizard would create:
 
+In addition to capturing errors, you can monitor interactions between multiple services or applications by [enabling tracing](/concepts/key-terms/tracing/). You can also get to the root of an error or performance issue faster, by watching a video-like reproduction of a user session with [session replay](/product/explore/session-replay/web/getting-started/).
+
+Select which Sentry features you'd like to install in addition to Error Monitoring to get the corresponding installation and configuration instructions below.
+
+<OnboardingOptionButtons
+  options={[
+    "error-monitoring",
+    "performance",
+    "session-replay",
+    "user-feedback",
+    "logs",
+  ]}
+/>
+
+<PlatformContent includePath="getting-started-features-expandable" />
+
+<SplitLayout>
+<SplitSection>
+<SplitSectionText>
+
 ### Client-Side Configuration
 
+The wizard creates a client configuration file that initializes the Sentry SDK in your browser.
+
+The configuration includes your DSN (Data Source Name), which connects your app to your Sentry project, and enables the features you selected during installation.
+
+</SplitSectionText>
+<SplitSectionCode>
+
 ```javascript {tabTitle:Client} {filename:instrumentation-client.(js|ts)}
 import * as Sentry from "@sentry/nextjs";
 
@@ -111,8 +133,21 @@ export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;
 // ___PRODUCT_OPTION_END___ performance
 ```
 
+</SplitSectionCode>
+</SplitSection>
+
+<SplitSection>
+<SplitSectionText>
+
 ### Server-Side Configuration
 
+The wizard also creates a server configuration file for Node.js and Edge runtimes.
+
+For more advanced configuration options or to set up Sentry manually, check out our [manual setup guide](/platforms/javascript/guides/nextjs/manual-setup/).
+
+</SplitSectionText>
+<SplitSectionCode>
+
 ```javascript {tabTitle:Server} {filename:sentry.server.config.(js|ts)}
 import * as Sentry from "@sentry/nextjs";
 
@@ -139,9 +174,11 @@ Sentry.init({
 });
 ```
 
-For detailed manual setup instructions, see our [manual setup guide](/platforms/javascript/guides/nextjs/manual-setup/).
+</SplitSectionCode>
+</SplitSection>
+</SplitLayout>
 
-## Step 3: Verify Your Setup
+## Verify Your Setup
 
 <Include name="nextjs-turbopack-warning-expandable.mdx" />
 
@@ -188,3 +225,5 @@ Our next recommended steps for you are:
 - [Get support](https://sentry.zendesk.com/hc/en-us/)
 
 </Expandable>
+
+</StepComponent>
diff --git a/docs/platforms/javascript/guides/nextjs/profiling/index.mdx b/docs/platforms/javascript/guides/nextjs/profiling/index.mdx
index 358ff175b7055b..0de973726e9742 100644
--- a/docs/platforms/javascript/guides/nextjs/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/nextjs/profiling/index.mdx
@@ -1,7 +1,8 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
+sidebar_section: features
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
 ---
 
diff --git a/docs/platforms/javascript/guides/nuxt/profiling/index.mdx b/docs/platforms/javascript/guides/nuxt/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/nuxt/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/nuxt/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/guides/react-router/profiling/index.mdx b/docs/platforms/javascript/guides/react-router/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/react-router/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/react-router/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/guides/remix/profiling/index.mdx b/docs/platforms/javascript/guides/remix/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/remix/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/remix/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/guides/solidstart/profiling/index.mdx b/docs/platforms/javascript/guides/solidstart/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/solidstart/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/solidstart/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/guides/sveltekit/profiling/index.mdx b/docs/platforms/javascript/guides/sveltekit/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/sveltekit/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/sveltekit/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/docs/platforms/javascript/guides/sveltekit/sourcemaps/index.mdx b/docs/platforms/javascript/guides/sveltekit/sourcemaps/index.mdx
index cac8ae2f55ccc2..c6a6328cb9ca9d 100644
--- a/docs/platforms/javascript/guides/sveltekit/sourcemaps/index.mdx
+++ b/docs/platforms/javascript/guides/sveltekit/sourcemaps/index.mdx
@@ -2,6 +2,7 @@
 title: Source Maps
 sidebar_order: 3
 description: "Upload your source maps to Sentry to enable readable stack traces in your errors, along with numerous other benefits. Learn more here."
+sidebar_section: features
 ---
 
 <PlatformContent includePath="sourcemaps/primer" />
diff --git a/docs/platforms/javascript/guides/tanstackstart-react/profiling/index.mdx b/docs/platforms/javascript/guides/tanstackstart-react/profiling/index.mdx
index 358ff175b7055b..e2d49d44b71414 100644
--- a/docs/platforms/javascript/guides/tanstackstart-react/profiling/index.mdx
+++ b/docs/platforms/javascript/guides/tanstackstart-react/profiling/index.mdx
@@ -1,8 +1,9 @@
 ---
 title: Set Up Profiling
 sidebar_title: Profiling
-sidebar_order: 5000
+sidebar_order: 8
 description: "Collect & view performance insights for JavaScript programs with Sentry's Profiling integrations."
+sidebar_section: features
 ---
 
 <PageGrid />
diff --git a/redirects.js b/redirects.js
index 1b551ce15b7467..0887a23ded05b1 100644
--- a/redirects.js
+++ b/redirects.js
@@ -529,23 +529,23 @@ const userDocsRedirects = [
   },
   {
     source: '/platforms/javascript/configuration/draining/',
-    destination: '/platforms/javascript/apis/#flush',
+    destination: '/platforms/javascript/configuration/apis/#flush',
   },
   {
     source: '/platforms/javascript/guides/:guide/configuration/draining/',
-    destination: '/platforms/javascript/guides/:guide/apis/#flush',
+    destination: '/platforms/javascript/guides/:guide/configuration/apis/#flush',
   },
   {
     source: '/platforms/javascript/enriching-events/identify-user/',
-    destination: '/platforms/javascript/apis/#setUser',
+    destination: '/platforms/javascript/configuration/apis/#setUser',
   },
   {
     source: '/platforms/javascript/guides/:guide/enriching-events/identify-user/',
-    destination: '/platforms/javascript/guides/:guide/apis/#setUser',
+    destination: '/platforms/javascript/guides/:guide/configuration/apis/#setUser',
   },
   {
     source: '/platforms/javascript/enriching-events/context/',
-    destination: '/platforms/javascript/apis/',
+    destination: '/platforms/javascript/configuration/apis/',
   },
   {
     source: '/platforms/javascript/guides/:guide/enriching-events/context/',
@@ -1118,6 +1118,22 @@ const userDocsRedirects = [
     source: '/platforms/javascript/guides/:guide/profiling/browser-profiling/',
     destination: '/platforms/javascript/guides/:guide/profiling/',
   },
+  {
+    source: '/platforms/javascript/apis/',
+    destination: '/platforms/javascript/configuration/apis/',
+  },
+  {
+    source: '/platforms/javascript/guides/:guide/apis/',
+    destination: '/platforms/javascript/guides/:guide/configuration/apis/',
+  },
+  {
+    source: '/platforms/javascript/configuration/sampling/',
+    destination: '/platforms/javascript/sampling/',
+  },
+  {
+    source: '/platforms/javascript/guides/:guide/configuration/sampling/',
+    destination: '/platforms/javascript/guides/:guide/sampling/',
+  },
   {
     source: '/platforms/javascript/guides/:guide/profiling/node-profiling/',
     destination: '/platforms/javascript/guides/:guide/profiling/',
diff --git a/src/components/docPage/index.tsx b/src/components/docPage/index.tsx
index 51e1c7fb995dab..58366bef8bf6b7 100644
--- a/src/components/docPage/index.tsx
+++ b/src/components/docPage/index.tsx
@@ -67,10 +67,10 @@ export function DocPage({
         {sidebar ?? (
           <Sidebar path={unversionedPath.split('/')} versions={frontMatter.versions} />
         )}
-        <main className="main-content flex w-full mt-[var(--header-height)] flex-1 mx-auto">
+        <main className="main-content flex mt-[var(--header-height)] flex-1">
           <div
             className={[
-              'mx-auto pt-6 px-6 prose dark:prose-invert max-w-full text-[var(--gray-12)] prose-a:no-underline hover:prose-a:underline',
+              'pt-6 px-6 prose dark:prose-invert max-w-full text-[var(--gray-12)] prose-a:no-underline hover:prose-a:underline',
               'prose-code:font-normal prose-code:font-mono marker:text-[var(--accent)] prose-li:my-1',
               'prose-headings:mt-0 prose-headings:font-medium prose-headings:relative prose-headings:text-[var(--gray-12)]',
               'prose-blockquote:font-normal prose-blockquote:border-l-[3px] prose-em:font-normal prose-blockquote:text-[var(--gray-12)]',
@@ -128,11 +128,15 @@ export function DocPage({
           </aside>
         )}
       </section>
-      <style>{`:root { --doc-content-w: 1200px; } #doc-content { max-width: var(--doc-content-w); box-sizing: border-box; }`}</style>
+      <style>{`:root { --doc-content-w: 1100px; }`}</style>
       <style>{`
+        #doc-content {
+          max-width: none;
+          box-sizing: border-box;
+        }
         @media (min-width: 2057px) {
           :root {
-            --doc-content-w: 1200px;
+            --doc-content-w: 1100px;
             --toc-w: 250px;
             --gap: 24px;
           }
@@ -141,6 +145,8 @@ export function DocPage({
             max-width: var(--doc-content-w);
             padding-left: 2rem;
             padding-right: 2rem;
+            margin-left: auto;
+            margin-right: auto;
           }
           /* Cancel default push so content can center */
           [data-layout-anchor="left"] + .main-content {
diff --git a/src/components/sidebar/dynamicNav.tsx b/src/components/sidebar/dynamicNav.tsx
index e1e7f7e86c3fdc..5f3c6509879935 100644
--- a/src/components/sidebar/dynamicNav.tsx
+++ b/src/components/sidebar/dynamicNav.tsx
@@ -7,6 +7,14 @@ import {getUnversionedPath, VERSION_INDICATOR} from 'sentry-docs/versioning';
 import {CollapsibleSidebarLink} from './collapsibleSidebarLink';
 import {SidebarLink, SidebarSeparator} from './sidebarLink';
 
+// Section configuration for sidebar organization
+const SECTION_LABELS: Record<string, string> = {
+  features: 'Features',
+  configuration: 'Configuration',
+};
+
+const SECTION_ORDER = ['features', 'configuration'] as const;
+
 type Node = {
   [key: string]: any;
   context: {
@@ -16,6 +24,7 @@ type Node = {
     section_end_divider?: boolean;
     sidebar_hidden?: boolean;
     sidebar_order?: number;
+    sidebar_section?: 'features' | 'configuration';
     sidebar_title?: string;
     title?: string;
   };
@@ -80,31 +89,121 @@ export const renderChildren = (
 
   const result: React.ReactNode[] = [];
 
-  sortedChildren.forEach(({node, children: nodeChildren}) => {
-    // will not be null because of the filter above
-    if (!node) {
-      return;
-    }
+  // Only group by sections at the top level (depth === 0)
+  if (depth === 0) {
+    // Group children by section
+    const sectioned: Record<string, EntityTree[]> = {};
+    const unsectioned: EntityTree[] = [];
 
-    result.push(
-      <CollapsibleSidebarLink
-        to={node.path}
-        key={node.path}
-        title={node.context.sidebar_title || node.context.title!}
-        collapsed={depth >= showDepth}
-        path={path}
-        beta={node.context.beta}
-        isNew={node.context.new}
-      >
-        {renderChildren(nodeChildren, exclude, path, showDepth, depth + 1)}
-      </CollapsibleSidebarLink>
-    );
-
-    // Add separator after this item if section_end_divider is true
-    if (node.context.section_end_divider && depth === 0) {
-      result.push(<SidebarSeparator key={`separator-${node.path}`} />);
-    }
-  });
+    sortedChildren.forEach(item => {
+      const section = item.node?.context.sidebar_section;
+      if (section && SECTION_ORDER.includes(section)) {
+        if (!sectioned[section]) {
+          sectioned[section] = [];
+        }
+        sectioned[section].push(item);
+      } else {
+        // Items without a section appear at the top
+        unsectioned.push(item);
+      }
+    });
+
+    // First, render unsectioned items (fallback behavior)
+    unsectioned.forEach(({node, children: nodeChildren}) => {
+      if (!node) {
+        return;
+      }
+
+      result.push(
+        <CollapsibleSidebarLink
+          to={node.path}
+          key={node.path}
+          title={node.context.sidebar_title || node.context.title!}
+          collapsed={depth >= showDepth}
+          path={path}
+          beta={node.context.beta}
+          isNew={node.context.new}
+        >
+          {renderChildren(nodeChildren, exclude, path, showDepth, depth + 1)}
+        </CollapsibleSidebarLink>
+      );
+
+      // Keep backwards compatibility with section_end_divider
+      if (node.context.section_end_divider) {
+        result.push(<SidebarSeparator key={`separator-${node.path}`} />);
+      }
+    });
+
+    // Then render sections in order
+    SECTION_ORDER.forEach((sectionKey, sectionIndex) => {
+      const sectionItems = sectioned[sectionKey];
+      if (!sectionItems || sectionItems.length === 0) {
+        return;
+      }
+
+      // Add separator before section (add even before first section if there are unsectioned items)
+      if (sectionIndex > 0 || unsectioned.length > 0) {
+        result.push(<SidebarSeparator key={`sep-${sectionKey}`} />);
+      }
+
+      // Add section header
+      result.push(
+        <li
+          key={`header-${sectionKey}`}
+          className="sidebar-section-header text-xs font-semibold text-gray-11 uppercase tracking-wider px-2 py-2 mt-2"
+        >
+          {SECTION_LABELS[sectionKey]}
+        </li>
+      );
+
+      // Render items in this section
+      sectionItems.forEach(({node, children: nodeChildren}) => {
+        if (!node) {
+          return;
+        }
+
+        result.push(
+          <CollapsibleSidebarLink
+            to={node.path}
+            key={node.path}
+            title={node.context.sidebar_title || node.context.title!}
+            collapsed={depth >= showDepth}
+            path={path}
+            beta={node.context.beta}
+            isNew={node.context.new}
+          >
+            {renderChildren(nodeChildren, exclude, path, showDepth, depth + 1)}
+          </CollapsibleSidebarLink>
+        );
+
+        // Keep backwards compatibility with section_end_divider
+        if (node.context.section_end_divider) {
+          result.push(<SidebarSeparator key={`separator-${node.path}`} />);
+        }
+      });
+    });
+  } else {
+    // For nested items (depth > 0), render normally without sections
+    sortedChildren.forEach(({node, children: nodeChildren}) => {
+      if (!node) {
+        return;
+      }
+
+      result.push(
+        <CollapsibleSidebarLink
+          to={node.path}
+          key={node.path}
+          title={node.context.sidebar_title || node.context.title!}
+          collapsed={depth >= showDepth}
+          path={path}
+          beta={node.context.beta}
+          isNew={node.context.new}
+        >
+          {renderChildren(nodeChildren, exclude, path, showDepth, depth + 1)}
+        </CollapsibleSidebarLink>
+      );
+    });
+  }
 
   return result;
 };
diff --git a/src/components/sidebar/platformSidebar.tsx b/src/components/sidebar/platformSidebar.tsx
index 18fea14bf2789a..2867f4ef6ef07d 100644
--- a/src/components/sidebar/platformSidebar.tsx
+++ b/src/components/sidebar/platformSidebar.tsx
@@ -25,6 +25,7 @@ export function PlatformSidebar({
         beta: n.frontmatter.beta,
         new: n.frontmatter.new,
         section_end_divider: n.frontmatter.section_end_divider,
+        sidebar_section: n.frontmatter.sidebar_section,
       },
       path: '/' + n.path + '/',
     };
diff --git a/src/components/sidebar/style.module.scss b/src/components/sidebar/style.module.scss
index 38ecb43258964d..df9366a45dde1d 100644
--- a/src/components/sidebar/style.module.scss
+++ b/src/components/sidebar/style.module.scss
@@ -167,43 +167,62 @@
 .beta-badge {
   display: inline-flex;
   align-items: center;
-  padding: 0.0625rem 0.375rem;
+  padding: 0.25rem 0.375rem;
   font-size: 0.625rem;
-  font-weight: 500;
-  letter-spacing: 0.02em;
-  color: #fafaf9; /* off-white */
+  font-weight: 600;
+  line-height: 1;
+  letter-spacing: 0.08em;
+  color: #d97706; /* amber-600 for light mode */
   background-color: transparent;
-  border: 1px solid #f59e0b; /* amber-500 warning color */
+  border: 2px solid #f59e0b; /* amber-500 warning color */
   border-radius: 0.25rem;
   white-space: nowrap;
   flex-shrink: 0;
 }
 
 :global(.dark) .beta-badge {
-  color: #fafaf9; /* off-white */
+  color: #fafaf9; /* off-white for dark mode */
   border-color: #fbbf24; /* amber-400 for dark mode */
 }
 
 .new-badge {
   display: inline-flex;
   align-items: center;
-  padding: 0.0625rem 0.375rem;
+  padding: 0.25rem 0.375rem;
   font-size: 0.625rem;
-  font-weight: 500;
-  letter-spacing: 0.02em;
-  color: #fafaf9; /* off-white */
+  font-weight: 600;
+  line-height: 1;
+  letter-spacing: 0.08em;
+  color: #059669; /* emerald-600 for light mode */
   background-color: transparent;
-  border: 1px solid #10b981; /* emerald-500 success green */
+  border: 2px solid #10b981; /* emerald-500 success green */
   border-radius: 0.25rem;
   white-space: nowrap;
   flex-shrink: 0;
 }
 
 :global(.dark) .new-badge {
-  color: #fafaf9; /* off-white */
+  color: #fafaf9; /* off-white for dark mode */
   border-color: #34d399; /* emerald-400 for dark mode */
 }
 
 .sidebar-separator {
   border-top: 2px solid var(--gray-6);
 }
+
+.sidebar {
+  :global(.sidebar-section-header) {
+    font-size: 0.75rem;
+    font-weight: 600;
+    color: #6e47ae;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    padding: 0.5rem 0 0.375rem;
+    margin-top: 0.5rem;
+    list-style: none;
+    
+    &:first-child {
+      margin-top: 0;
+    }
+  }
+}
diff --git a/src/components/splitLayout/style.module.scss b/src/components/splitLayout/style.module.scss
index fd2cbcb6dd009e..2c42ea2f0b7aa4 100644
--- a/src/components/splitLayout/style.module.scss
+++ b/src/components/splitLayout/style.module.scss
@@ -67,14 +67,19 @@
 
 .splitCode {
   position: sticky;
-  top: calc(var(--header-height, 80px) + 1rem);
+  top: calc(var(--header-height, 80px) + 3.25rem);
   min-width: 0; // Allow flex item to shrink below content size
-  overflow: hidden; // Prevent content from expanding the column
+  max-height: calc(100vh - var(--header-height, 80px) - 6.5rem);
+  overflow-y: auto; // Allow vertical scrolling for long code
+  overflow-x: auto; // Allow horizontal scrolling as fallback if wrapping fails
+  padding-bottom: 1rem; // Ensure bottom content isn't cut off
   
   @media (max-width: 1024px) {
     position: relative;
     top: auto;
+    max-height: none;
     overflow: visible;
+    padding-bottom: 0;
   }
 
   // Ensure code blocks fill the space
@@ -85,28 +90,5 @@
   > *:last-child {
     margin-bottom: 0;
   }
-
-  // Override global code block styles to enable wrapping
-  // Use !important to ensure these override the global styles
-  :global(pre),
-  :global(pre[class*='language-']) {
-    white-space: pre-wrap !important;
-    word-wrap: break-word !important;
-    overflow-wrap: break-word !important;
-    overflow-x: visible !important;
-  }
-
-  :global(code),
-  :global(code[class*='language-']) {
-    white-space: pre-wrap !important;
-    word-wrap: break-word !important;
-    overflow-wrap: break-word !important;
-  }
-
-  :global(.code-line) {
-    white-space: pre-wrap !important;
-    word-wrap: break-word !important;
-    overflow-wrap: break-word !important;
-  }
 }
 
diff --git a/src/types/frontmatter.ts b/src/types/frontmatter.ts
index c7a71bbb5041d4..a336bcefefe48a 100644
--- a/src/types/frontmatter.ts
+++ b/src/types/frontmatter.ts
@@ -83,12 +83,10 @@ export interface FrontMatter {
 
   /**
    * Set this to true to show a separator/divider below this item in the sidebar
+   * @deprecated Use sidebar_section instead
    */
   section_end_divider?: boolean;
 
-  /**
-   * The next page in the sidebar navigation.
-   */
   /**
    * Set this to true to hide from the sidebar
    */
@@ -99,6 +97,13 @@ export interface FrontMatter {
    */
   sidebar_order?: number;
 
+  /**
+   * Which sidebar section this page belongs to (for platform docs).
+   * Options: 'features' | 'configuration'
+   * Defaults to 'features' if not specified.
+   */
+  sidebar_section?: 'features' | 'configuration';
+
   /**
    * optional sidebar title
    */