diff --git a/cypress/e2e/a11y.cy.ts b/cypress/e2e/a11y.cy.ts
index 3ee87daf2a107..87b87d1e6bb0e 100644
--- a/cypress/e2e/a11y.cy.ts
+++ b/cypress/e2e/a11y.cy.ts
@@ -16,9 +16,7 @@ describe('a11y', () => {
         'experiments',
         'events',
         'datamanagement',
-        'persons',
-        'cohorts',
-        'annotations',
+        'personsmanagement',
         'apps',
         'toolbarlaunch',
         'projectsettings',
diff --git a/cypress/e2e/annotations.cy.ts b/cypress/e2e/annotations.cy.ts
index 5300b376a6559..90db053326770 100644
--- a/cypress/e2e/annotations.cy.ts
+++ b/cypress/e2e/annotations.cy.ts
@@ -1,10 +1,10 @@
 describe('Annotations', () => {
     beforeEach(() => {
-        cy.clickNavMenu('annotations')
+        cy.clickNavMenu('datamanagement')
+        cy.get('[data-attr=data-management-annotations-tab]').click()
     })
 
     it('Annotations loaded', () => {
-        cy.get('h1').should('contain', 'Annotations')
         cy.get('h2').should('contain', 'Create your first annotation')
         cy.get('[data-attr="product-introduction-docs-link"]').should('contain', 'Learn more about Annotations')
     })
diff --git a/cypress/e2e/cohorts.cy.ts b/cypress/e2e/cohorts.cy.ts
index 267b579e79021..1c7e3be39865d 100644
--- a/cypress/e2e/cohorts.cy.ts
+++ b/cypress/e2e/cohorts.cy.ts
@@ -1,17 +1,22 @@
 describe('Cohorts', () => {
+    const goToCohorts = (): void => {
+        cy.clickNavMenu('personsmanagement')
+        cy.get('[data-attr=persons-management-cohorts-tab]').click()
+    }
+
     beforeEach(() => {
-        cy.clickNavMenu('cohorts')
+        goToCohorts()
     })
 
     it('Cohorts new and list', () => {
         // load an empty page
-        cy.get('h1').should('contain', 'Cohorts')
-        cy.title().should('equal', 'Cohorts • PostHog')
+        cy.get('h1').should('contain', 'People')
+        cy.title().should('equal', 'Cohorts • People • PostHog')
         cy.get('h2').should('contain', 'Create your first cohort')
         cy.get('[data-attr="product-introduction-docs-link"]').should('contain', 'Learn more about Cohorts')
 
         // go to create a new cohort
-        cy.get('[data-attr="create-cohort"]').click()
+        cy.get('[data-attr="new-cohort"]').click()
 
         // select "add filter" and "property"
         cy.get('[data-attr="cohort-selector-field-value"]').click()
@@ -34,7 +39,7 @@ describe('Cohorts', () => {
         cy.get('[data-attr=success-toast]').contains('Cohort saved').should('exist')
 
         // back to cohorts
-        cy.clickNavMenu('cohorts')
+        goToCohorts()
         cy.get('tbody').contains('Test Cohort')
         cy.get('h2').should('not.have.text', 'Create your first cohort')
 
@@ -69,7 +74,7 @@ describe('Cohorts', () => {
         // delete cohort
         cy.get('[data-attr="more-button"]').click()
         cy.get('.Popover__content').contains('Delete cohort').click()
-        cy.clickNavMenu('cohorts')
+        goToCohorts()
         cy.get('tbody').should('not.have.text', 'Test Cohort (dynamic copy) (static copy)')
     })
 })
diff --git a/cypress/e2e/insights-unsaved-confirmation.cy.ts b/cypress/e2e/insights-unsaved-confirmation.cy.ts
index 6257fc264e20f..9d64c3d93df41 100644
--- a/cypress/e2e/insights-unsaved-confirmation.cy.ts
+++ b/cypress/e2e/insights-unsaved-confirmation.cy.ts
@@ -38,11 +38,9 @@ describe('Insights', () => {
             const insightName = randomString('to save and then navigate away from')
             insight.create(insightName)
 
-            cy.get('[data-attr="menu-item-annotations"]').click()
+            cy.get('[data-attr="menu-item-dashboards"]').click()
 
-            // the annotations API call is made before the annotations page loads, so we can't wait for it
-            cy.get('[data-attr="annotations-content"]').should('exist')
-            cy.url().should('include', '/annotations')
+            cy.url().should('include', '/dashboard')
         })
 
         it('Can keep editing changed new insight after navigating away with confirm() rejection (case 1)', () => {
diff --git a/cypress/e2e/person.cy.ts b/cypress/e2e/person.cy.ts
index a4af1f83e9f40..5a5b1d2856e32 100644
--- a/cypress/e2e/person.cy.ts
+++ b/cypress/e2e/person.cy.ts
@@ -1,8 +1,8 @@
 describe('Person Visualization Check', () => {
     beforeEach(() => {
-        cy.clickNavMenu('persons')
+        cy.clickNavMenu('personsmanagement')
         cy.location('pathname').should('eq', '/persons')
-        cy.get('.ant-spin-spinning').should('not.exist') // Wait until initial table load to be able to use the search
+        cy.wait(1000)
         cy.get('[data-attr=persons-search]').type('deb').should('have.value', 'deb')
         cy.contains('deborah.fernandez@gmail.com').should('not.exist')
         cy.contains('deborah.fernandez@gmail.com').click()
diff --git a/cypress/e2e/persons.cy.ts b/cypress/e2e/persons.cy.ts
index 79765fcf8c875..1492c6077465a 100644
--- a/cypress/e2e/persons.cy.ts
+++ b/cypress/e2e/persons.cy.ts
@@ -1,10 +1,10 @@
 describe('Persons', () => {
     beforeEach(() => {
-        cy.clickNavMenu('persons')
+        cy.clickNavMenu('personsmanagement')
     })
 
     it('All tabs work', () => {
-        cy.get('h1').should('contain', 'Persons')
+        cy.get('h1').should('contain', 'People')
         cy.get('[data-attr=persons-search]').type('marisol').type('{enter}').should('have.value', 'marisol')
         cy.wait(200)
         cy.get('[data-row-key]').its('length').should('be.gte', 0)
diff --git a/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png b/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png
index 29f658fac2fb8..b49b6fc4bd341 100644
Binary files a/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png and b/frontend/__snapshots__/layout-navigation--app-page-with-side-bar-shown.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png b/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png
index 80acd540123ce..11b06e1c7556d 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png and b/frontend/__snapshots__/posthog-3000-navigation--dark-mode.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--light-mode.png b/frontend/__snapshots__/posthog-3000-navigation--light-mode.png
index dfa4e5819c3c2..678543a30f547 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--light-mode.png and b/frontend/__snapshots__/posthog-3000-navigation--light-mode.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png
index 4164e2d6ec68f..b6f723c5ac043 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-3000.png differ
diff --git a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png
index b2697e16b93fa..91d15be692849 100644
Binary files a/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png and b/frontend/__snapshots__/posthog-3000-navigation--navigation-base.png differ
diff --git a/frontend/__snapshots__/scenes-app-annotations--annotations.png b/frontend/__snapshots__/scenes-app-annotations--annotations.png
index b04aef3ec2f31..1d0a33cc15c08 100644
Binary files a/frontend/__snapshots__/scenes-app-annotations--annotations.png and b/frontend/__snapshots__/scenes-app-annotations--annotations.png differ
diff --git a/frontend/__snapshots__/scenes-app-apps--installed.png b/frontend/__snapshots__/scenes-app-apps--installed.png
index 34ae3b5167bb3..ca7fff9f98e95 100644
Binary files a/frontend/__snapshots__/scenes-app-apps--installed.png and b/frontend/__snapshots__/scenes-app-apps--installed.png differ
diff --git a/frontend/__snapshots__/scenes-app-batchexports--create-export.png b/frontend/__snapshots__/scenes-app-batchexports--create-export.png
index aaa0d622855be..5812443d7cc01 100644
Binary files a/frontend/__snapshots__/scenes-app-batchexports--create-export.png and b/frontend/__snapshots__/scenes-app-batchexports--create-export.png differ
diff --git a/frontend/__snapshots__/scenes-app-batchexports--exports.png b/frontend/__snapshots__/scenes-app-batchexports--exports.png
index 105535afdb5cc..673b04e0d721e 100644
Binary files a/frontend/__snapshots__/scenes-app-batchexports--exports.png and b/frontend/__snapshots__/scenes-app-batchexports--exports.png differ
diff --git a/frontend/__snapshots__/scenes-app-batchexports--view-export.png b/frontend/__snapshots__/scenes-app-batchexports--view-export.png
index d46d231d06a04..f6551bc248623 100644
Binary files a/frontend/__snapshots__/scenes-app-batchexports--view-export.png and b/frontend/__snapshots__/scenes-app-batchexports--view-export.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--list.png b/frontend/__snapshots__/scenes-app-dashboards--list.png
index f7ed888ae6bf3..527d891a4f182 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--list.png and b/frontend/__snapshots__/scenes-app-dashboards--list.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png
index 4e53d35d1dffa..c4d3fc8fb4f30 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png and b/frontend/__snapshots__/scenes-app-dashboards--new-select-variables.png differ
diff --git a/frontend/__snapshots__/scenes-app-dashboards--new.png b/frontend/__snapshots__/scenes-app-dashboards--new.png
index 66b685f868517..58ca8d61687d2 100644
Binary files a/frontend/__snapshots__/scenes-app-dashboards--new.png and b/frontend/__snapshots__/scenes-app-dashboards--new.png differ
diff --git a/frontend/__snapshots__/scenes-app-data-management--database.png b/frontend/__snapshots__/scenes-app-data-management--database.png
index ff22ffdb8d467..deb2115180341 100644
Binary files a/frontend/__snapshots__/scenes-app-data-management--database.png and b/frontend/__snapshots__/scenes-app-data-management--database.png differ
diff --git a/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png b/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png
index 52b29a9abf121..03287eac29f23 100644
Binary files a/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png and b/frontend/__snapshots__/scenes-app-data-management--ingestion-warnings.png differ
diff --git a/frontend/__snapshots__/scenes-app-events--event-explorer.png b/frontend/__snapshots__/scenes-app-events--event-explorer.png
index a41b3e31d7ca8..4ed82b3bdbbdd 100644
Binary files a/frontend/__snapshots__/scenes-app-events--event-explorer.png and b/frontend/__snapshots__/scenes-app-events--event-explorer.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png
index 3332b4e9b583f..422655b2bf360 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png and b/frontend/__snapshots__/scenes-app-experiments--experiment-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png b/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png
index 36ad5c81084e2..fd9d704276d4c 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png and b/frontend/__snapshots__/scenes-app-experiments--experiments-list-pay-gate.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--experiments-list.png b/frontend/__snapshots__/scenes-app-experiments--experiments-list.png
index 35578f8df9b47..9261742d1d8e2 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--experiments-list.png and b/frontend/__snapshots__/scenes-app-experiments--experiments-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png b/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png
index dbfa94be817be..e4572b8da8409 100644
Binary files a/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png and b/frontend/__snapshots__/scenes-app-experiments--view-experiment-pay-gate.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png
index 3848b31fa78a8..143d99730cbf9 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png and b/frontend/__snapshots__/scenes-app-feature-flags--feature-flag-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png b/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png
index 6231ed9ab28e7..eaaba388c9c59 100644
Binary files a/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png and b/frontend/__snapshots__/scenes-app-feature-flags--feature-flags-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--features-list.png b/frontend/__snapshots__/scenes-app-features--features-list.png
index b18cd979d9480..0cfa6720e1859 100644
Binary files a/frontend/__snapshots__/scenes-app-features--features-list.png and b/frontend/__snapshots__/scenes-app-features--features-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--new-feature-flag.png b/frontend/__snapshots__/scenes-app-features--new-feature-flag.png
index 1e8c4ac19a5b5..9ad9250549df8 100644
Binary files a/frontend/__snapshots__/scenes-app-features--new-feature-flag.png and b/frontend/__snapshots__/scenes-app-features--new-feature-flag.png differ
diff --git a/frontend/__snapshots__/scenes-app-features--not-found-early-access.png b/frontend/__snapshots__/scenes-app-features--not-found-early-access.png
index 9cb4f72d11d6e..b25a28b0fd025 100644
Binary files a/frontend/__snapshots__/scenes-app-features--not-found-early-access.png and b/frontend/__snapshots__/scenes-app-features--not-found-early-access.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png
index 60774c6d19344..5d9b07803bd26 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png
index e7ae0a9602d9c..53cb826a62a1c 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png and b/frontend/__snapshots__/scenes-app-insights--funnel-historical-trends.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png
index ad0d74d3d35ac..7d3fa0e935dfc 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png and b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png
index d3c5a1c7e9457..3e3b254a5e43a 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png and b/frontend/__snapshots__/scenes-app-insights--funnel-time-to-convert.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png b/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png
index e73a067a7514f..be116ff8b3ba0 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png and b/frontend/__snapshots__/scenes-app-insights--lifecycle--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--lifecycle.png b/frontend/__snapshots__/scenes-app-insights--lifecycle.png
index 738d5ec8994c5..8fda2317ec4d0 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--lifecycle.png and b/frontend/__snapshots__/scenes-app-insights--lifecycle.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png b/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png
index 8c33b18f5d894..bcf04c038e70b 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png and b/frontend/__snapshots__/scenes-app-insights--stickiness--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--stickiness.png b/frontend/__snapshots__/scenes-app-insights--stickiness.png
index 8a6be5ba22fdc..de3afbf8cc7af 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--stickiness.png and b/frontend/__snapshots__/scenes-app-insights--stickiness.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png
index b118e92405c22..17a8821fb39ed 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-number--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-number.png b/frontend/__snapshots__/scenes-app-insights--trends-number.png
index 932161c2835e5..48d95207dd24d 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-number.png and b/frontend/__snapshots__/scenes-app-insights--trends-number.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png
index 0cd8bfe68f2d7..2ba75da1d8204 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png
index 45b723002a54e..063e78dd5feaf 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png
index fb9e049372866..a3a2a9a805370 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-breakdown.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png b/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png
index e0ad1fcf31097..fb0e1de7e7310 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-edit--webkit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png b/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png
index b7e8cedbda6c6..4ca89e34bfd22 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png and b/frontend/__snapshots__/scenes-app-insights--trends-table-edit.png differ
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-table.png b/frontend/__snapshots__/scenes-app-insights--trends-table.png
index 53b2b12ca2cf5..e36f384700aee 100644
Binary files a/frontend/__snapshots__/scenes-app-insights--trends-table.png and b/frontend/__snapshots__/scenes-app-insights--trends-table.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png b/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png
index 295d07af47a71..d196998a7e56f 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png and b/frontend/__snapshots__/scenes-app-notebooks--bullet-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png b/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png
index 4ffe557aaf74a..2086ed0aa90aa 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png and b/frontend/__snapshots__/scenes-app-notebooks--empty-notebook.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--headings.png b/frontend/__snapshots__/scenes-app-notebooks--headings.png
index 0554493976818..3186fed28fd49 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--headings.png and b/frontend/__snapshots__/scenes-app-notebooks--headings.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png
index dc8cdf401a6f4..0df1f64e9ec3c 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png and b/frontend/__snapshots__/scenes-app-notebooks--notebook-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png b/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png
index a2a7a11db4cc9..c9f29c566c2c6 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png and b/frontend/__snapshots__/scenes-app-notebooks--notebooks-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png b/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png
index b9da335cd61d7..cbe5aefd199ed 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png and b/frontend/__snapshots__/scenes-app-notebooks--numbered-list.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png b/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png
index 234a80e2649d7..4e0b8532abe35 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png and b/frontend/__snapshots__/scenes-app-notebooks--recordings-playlist.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--text-formats.png b/frontend/__snapshots__/scenes-app-notebooks--text-formats.png
index 8c133958b39cc..aa872f0a5cfe9 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--text-formats.png and b/frontend/__snapshots__/scenes-app-notebooks--text-formats.png differ
diff --git a/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png b/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png
index a803eed954067..f0ea3f9550997 100644
Binary files a/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png and b/frontend/__snapshots__/scenes-app-notebooks--text-only-notebook.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png
index 57b43ed4238ff..a13107e8bbaa8 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-filtering-page.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png
index 854c2468d8cfc..c51a24f39fa18 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-landing-page.png differ
diff --git a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png
index 4cf705d0bb98b..dd103d2f11446 100644
Binary files a/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png and b/frontend/__snapshots__/scenes-app-pipeline--pipeline-transformations-page.png differ
diff --git a/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png b/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png
index 142d66d3f95df..c4c27f4db817a 100644
Binary files a/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png and b/frontend/__snapshots__/scenes-app-recordings--recordings-play-lists.png differ
diff --git a/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png b/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png
index 76d3085776638..86a13a05a8926 100644
Binary files a/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png and b/frontend/__snapshots__/scenes-app-saved-insights--empty-state.png differ
diff --git a/frontend/__snapshots__/scenes-app-saved-insights--list-view.png b/frontend/__snapshots__/scenes-app-saved-insights--list-view.png
index 45cbb37f481dd..68b73d4906ad2 100644
Binary files a/frontend/__snapshots__/scenes-app-saved-insights--list-view.png and b/frontend/__snapshots__/scenes-app-saved-insights--list-view.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png b/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png
index 73966cfe59303..a86eba79b8ac0 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png and b/frontend/__snapshots__/scenes-app-surveys--new-survey-appearance-section.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png b/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png
index a19faf8440760..711d125b3d17e 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png and b/frontend/__snapshots__/scenes-app-surveys--survey-not-found.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--survey-view.png b/frontend/__snapshots__/scenes-app-surveys--survey-view.png
index 1fedb0eef095e..115efcf6e29af 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--survey-view.png and b/frontend/__snapshots__/scenes-app-surveys--survey-view.png differ
diff --git a/frontend/__snapshots__/scenes-app-surveys--surveys-list.png b/frontend/__snapshots__/scenes-app-surveys--surveys-list.png
index 2561db683b5f7..012692ee2758d 100644
Binary files a/frontend/__snapshots__/scenes-app-surveys--surveys-list.png and b/frontend/__snapshots__/scenes-app-surveys--surveys-list.png differ
diff --git a/frontend/src/layout/navigation-3000/components/NavbarButton.tsx b/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
index c6dc5479055b8..72e07508a9ebf 100644
--- a/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
+++ b/frontend/src/layout/navigation-3000/components/NavbarButton.tsx
@@ -4,6 +4,7 @@ import { Tooltip } from 'lib/lemon-ui/Tooltip'
 import clsx from 'clsx'
 import { useValues } from 'kea'
 import { sceneLogic } from 'scenes/sceneLogic'
+import { SidebarChangeNoticeContent, useSidebarChangeNotices } from '~/layout/navigation/SideBar/SidebarChangeNotice'
 import { navigation3000Logic } from '../navigationLogic'
 import { LemonTag } from '@posthog/lemon-ui'
 import { useFeatureFlag } from 'lib/hooks/useFeatureFlag'
@@ -63,29 +64,46 @@ export const NavbarButton: FunctionComponent<NavbarButtonProps> = React.forwardR
         }
     }
 
+    const buttonContent = (
+        <LemonButton
+            ref={ref}
+            data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
+            onMouseEnter={() => setHasBeenClicked(false)}
+            onClick={() => {
+                setHasBeenClicked(true)
+                onClick?.()
+            }}
+            className={clsx('NavbarButton', isUsingNewNav && here && 'NavbarButton--here')}
+            fullWidth
+            {...buttonProps}
+        >
+            {content}
+        </LemonButton>
+    )
+
+    const [notices, onAcknowledged] = useSidebarChangeNotices({ identifier })
+
     return (
         <li className="w-full">
-            <Tooltip
-                title={isNavCollapsedActually ? (here ? `${title} (you are here)` : title) : null}
-                placement="right"
-                delayMs={0}
-                visible={!persistentTooltip && hasBeenClicked ? false : undefined} // Force-hide tooltip after button click
-            >
-                <LemonButton
-                    ref={ref}
-                    data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
-                    onMouseEnter={() => setHasBeenClicked(false)}
-                    onClick={() => {
-                        setHasBeenClicked(true)
-                        onClick?.()
-                    }}
-                    className={clsx('NavbarButton', isUsingNewNav && here && 'NavbarButton--here')}
-                    fullWidth
-                    {...buttonProps}
+            {notices.length ? (
+                <Tooltip
+                    title={<SidebarChangeNoticeContent notices={notices} onAcknowledged={onAcknowledged} />}
+                    placement={notices[0].placement ?? 'right'}
+                    delayMs={0}
+                    visible={true}
+                >
+                    {buttonContent}
+                </Tooltip>
+            ) : (
+                <Tooltip
+                    title={isNavCollapsedActually ? (here ? `${title} (you are here)` : title) : null}
+                    placement="right"
+                    delayMs={0}
+                    visible={!persistentTooltip && hasBeenClicked ? false : undefined} // Force-hide tooltip after button click
                 >
-                    {content}
-                </LemonButton>
-            </Tooltip>
+                    {buttonContent}
+                </Tooltip>
+            )}
         </li>
     )
 })
diff --git a/frontend/src/layout/navigation-3000/navigationLogic.tsx b/frontend/src/layout/navigation-3000/navigationLogic.tsx
index 48f14cf59fd20..8d07a1843eaaa 100644
--- a/frontend/src/layout/navigation-3000/navigationLogic.tsx
+++ b/frontend/src/layout/navigation-3000/navigationLogic.tsx
@@ -19,9 +19,7 @@ import {
     IconHome,
     IconLive,
     IconPeople,
-    IconPerson,
     IconPieChart,
-    IconQuestion,
     IconRewindPlay,
     IconTestTube,
     IconToggle,
@@ -32,8 +30,6 @@ import {
     IconChat,
 } from '@posthog/icons'
 import { urls } from 'scenes/urls'
-import { annotationsSidebarLogic } from './sidebars/annotations'
-import { cohortsSidebarLogic } from './sidebars/cohorts'
 import { dashboardsSidebarLogic } from './sidebars/dashboards'
 import { dataManagementSidebarLogic } from './sidebars/dataManagement'
 import { experimentsSidebarLogic } from './sidebars/experiments'
@@ -322,33 +318,12 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                             to: isUsingSidebar ? undefined : urls.eventDefinitions(),
                         },
                         {
-                            identifier: Scene.Persons,
-                            label: 'People and groups',
-                            icon: <IconPerson />,
+                            identifier: Scene.PersonsManagement,
+                            label: 'People',
+                            icon: <IconPeople />,
                             logic: isUsingSidebar ? personsAndGroupsSidebarLogic : undefined,
                             to: isUsingSidebar ? undefined : urls.persons(),
                         },
-                        {
-                            identifier: Scene.Cohorts,
-                            label: 'Cohorts',
-                            icon: <IconPeople />,
-                            logic: isUsingSidebar ? cohortsSidebarLogic : undefined,
-                            to: isUsingSidebar ? undefined : urls.cohorts(),
-                        },
-                        {
-                            identifier: Scene.Annotations,
-                            label: 'Annotations',
-                            icon: <IconQuestion />,
-                            logic: isUsingSidebar ? annotationsSidebarLogic : undefined,
-                            to: isUsingSidebar ? undefined : urls.annotations(),
-                        },
-                        {
-                            identifier: Scene.ToolbarLaunch,
-                            label: 'Toolbar',
-                            icon: <IconToolbar />,
-                            logic: isUsingSidebar ? toolbarSidebarLogic : undefined,
-                            to: isUsingSidebar ? undefined : urls.toolbarLaunch(),
-                        },
                     ],
                     [
                         {
@@ -415,6 +390,13 @@ export const navigation3000Logic = kea<navigation3000LogicType>([
                             icon: <IconApps />,
                             to: urls.projectApps(),
                         },
+                        {
+                            identifier: Scene.ToolbarLaunch,
+                            label: 'Toolbar',
+                            icon: <IconToolbar />,
+                            logic: isUsingSidebar ? toolbarSidebarLogic : undefined,
+                            to: isUsingSidebar ? undefined : urls.toolbarLaunch(),
+                        },
                     ],
                 ]
             },
diff --git a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts
index 04e0abc6fd424..dd49842bc5fa7 100644
--- a/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts
+++ b/frontend/src/layout/navigation/Breadcrumbs/breadcrumbsLogic.test.ts
@@ -7,7 +7,7 @@ import { sceneLogic } from 'scenes/sceneLogic'
 import { Scene } from 'scenes/sceneTypes'
 
 const blankScene = (): any => ({ scene: { component: () => null, logic: null } })
-const scenes: any = { [Scene.Annotations]: blankScene, [Scene.Dashboards]: blankScene }
+const scenes: any = { [Scene.SavedInsights]: blankScene, [Scene.Dashboards]: blankScene }
 
 describe('breadcrumbsLogic', () => {
     let logic: ReturnType<typeof breadcrumbsLogic.build>
@@ -24,9 +24,9 @@ describe('breadcrumbsLogic', () => {
         logic.mount()
 
         // test with .delay because subscriptions happen async
-        router.actions.push(urls.annotations())
-        await expectLogic(logic).delay(1).toMatchValues({ documentTitle: 'Annotations • PostHog' })
-        expect(global.document.title).toEqual('Annotations • PostHog')
+        router.actions.push(urls.savedInsights())
+        await expectLogic(logic).delay(1).toMatchValues({ documentTitle: 'Insights • PostHog' })
+        expect(global.document.title).toEqual('Insights • PostHog')
 
         router.actions.push(urls.dashboards())
         await expectLogic(logic).delay(1).toMatchValues({ documentTitle: 'Dashboards • PostHog' })
diff --git a/frontend/src/layout/navigation/SideBar/PageButton.tsx b/frontend/src/layout/navigation/SideBar/PageButton.tsx
index f76b535ddc74e..1e8fafeca07de 100644
--- a/frontend/src/layout/navigation/SideBar/PageButton.tsx
+++ b/frontend/src/layout/navigation/SideBar/PageButton.tsx
@@ -6,6 +6,7 @@ import { Scene } from 'scenes/sceneTypes'
 import { LemonButton, LemonButtonProps, LemonButtonWithSideAction, SideAction } from 'lib/lemon-ui/LemonButton'
 import { sceneConfigurations } from 'scenes/scenes'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
+import { SidebarChangeNoticeTooltip } from '~/layout/navigation/SideBar/SidebarChangeNotice'
 
 export interface PageButtonProps extends Pick<LemonButtonProps, 'icon' | 'onClick' | 'to'> {
     /** Used for highlighting the active scene. `identifier` of type number means dashboard ID instead of scene. */
@@ -32,48 +33,51 @@ export function PageButton({ title, sideAction, identifier, highlight, ...button
 
     return (
         <li>
-            {sideAction ? (
-                <LemonButtonWithSideAction
-                    fullWidth
-                    status={buttonStatus}
-                    active={isActive}
-                    onClick={hideSideBarMobile}
-                    sideAction={{
-                        ...sideAction,
-                        'data-attr': sideAction.identifier
-                            ? `menu-item-${sideAction.identifier.toLowerCase()}`
-                            : undefined,
-                    }}
-                    data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
-                    {...buttonProps}
-                >
-                    <span className="text-default">{title}</span>
-                </LemonButtonWithSideAction>
-            ) : (
-                <LemonButton
-                    fullWidth
-                    status={buttonStatus}
-                    active={isActive}
-                    data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
-                    onClick={hideSideBarMobile}
-                    {...buttonProps}
-                >
-                    <span className="text-default grow">{title}</span>
-                    {highlight === 'alpha' ? (
-                        <LemonTag type="completion" className="ml-1 float-right uppercase">
-                            Alpha
-                        </LemonTag>
-                    ) : highlight === 'beta' ? (
-                        <LemonTag type="warning" className="ml-1 float-right uppercase">
-                            Beta
-                        </LemonTag>
-                    ) : highlight === 'new' ? (
-                        <LemonTag type="success" className="ml-1 float-right uppercase">
-                            New
-                        </LemonTag>
-                    ) : null}
-                </LemonButton>
-            )}
+            <SidebarChangeNoticeTooltip identifier={identifier}>
+                {sideAction ? (
+                    <LemonButtonWithSideAction
+                        fullWidth
+                        status={buttonStatus}
+                        active={isActive}
+                        onClick={hideSideBarMobile}
+                        sideAction={{
+                            ...sideAction,
+                            'data-attr': sideAction.identifier
+                                ? `menu-item-${sideAction.identifier.toLowerCase()}`
+                                : undefined,
+                        }}
+                        data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
+                        {...buttonProps}
+                    >
+                        <span className="text-default">{title}</span>
+                    </LemonButtonWithSideAction>
+                ) : (
+                    <LemonButton
+                        fullWidth
+                        status={buttonStatus}
+                        active={isActive}
+                        data-attr={`menu-item-${identifier.toString().toLowerCase()}`}
+                        onClick={hideSideBarMobile}
+                        sideIcon={null}
+                        {...buttonProps}
+                    >
+                        <span className="text-default grow">{title}</span>
+                        {highlight === 'alpha' ? (
+                            <LemonTag type="completion" className="ml-1 float-right uppercase">
+                                Alpha
+                            </LemonTag>
+                        ) : highlight === 'beta' ? (
+                            <LemonTag type="warning" className="ml-1 float-right uppercase">
+                                Beta
+                            </LemonTag>
+                        ) : highlight === 'new' ? (
+                            <LemonTag type="success" className="ml-1 float-right uppercase">
+                                New
+                            </LemonTag>
+                        ) : null}
+                    </LemonButton>
+                )}
+            </SidebarChangeNoticeTooltip>
         </li>
     )
 }
diff --git a/frontend/src/layout/navigation/SideBar/SideBar.tsx b/frontend/src/layout/navigation/SideBar/SideBar.tsx
index dce2dbf9936ac..d5b53b5e31991 100644
--- a/frontend/src/layout/navigation/SideBar/SideBar.tsx
+++ b/frontend/src/layout/navigation/SideBar/SideBar.tsx
@@ -7,7 +7,6 @@ import {
     IconApps,
     IconBarChart,
     IconCohort,
-    IconComment,
     IconDatabase,
     IconExperiment,
     IconFlag,
@@ -15,7 +14,6 @@ import {
     IconLive,
     IconMessages,
     IconOpenInApp,
-    IconPerson,
     IconPinOutline,
     IconPipeline,
     IconPlus,
@@ -39,7 +37,6 @@ import { AvailableFeature } from '~/types'
 import './SideBar.scss'
 import { navigationLogic } from '../navigationLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
-import { groupsModel } from '~/models/groupsModel'
 import { userLogic } from 'scenes/userLogic'
 import { preflightLogic } from 'scenes/PreflightCheck/preflightLogic'
 import { SideBarApps } from '~/layout/navigation/SideBar/SideBarApps'
@@ -60,7 +57,6 @@ function Pages(): JSX.Element {
     const { hideSideBarMobile, toggleProjectSwitcher, hideProjectSwitcher } = useActions(navigationLogic)
     const { isProjectSwitcherShown } = useValues(navigationLogic)
     const { pinnedDashboards } = useValues(dashboardsModel)
-    const { showGroupsOptions } = useValues(groupsModel)
     const { hasAvailableFeature } = useValues(userLogic)
     const { preflight } = useValues(preflightLogic)
     const { currentTeam } = useValues(teamLogic)
@@ -222,10 +218,10 @@ function Pages(): JSX.Element {
                         to={urls.eventDefinitions()}
                     />
                     <PageButton
-                        icon={<IconPerson />}
-                        identifier={Scene.Persons}
+                        icon={<IconCohort />}
+                        identifier={Scene.PersonsManagement}
                         to={urls.persons()}
-                        title={`Persons${showGroupsOptions ? ' & Groups' : ''}`}
+                        title="People"
                     />
                     <FlaggedFeature flag={FEATURE_FLAGS.PIPELINE_UI}>
                         <PageButton icon={<IconPipeline />} identifier={Scene.Pipeline} to={urls.pipeline()} />
@@ -239,8 +235,6 @@ function Pages(): JSX.Element {
                             highlight="beta"
                         />
                     </FlaggedFeature>
-                    <PageButton icon={<IconCohort />} identifier={Scene.Cohorts} to={urls.cohorts()} />
-                    <PageButton icon={<IconComment />} identifier={Scene.Annotations} to={urls.annotations()} />
                     {canViewPlugins(currentOrganization) || Object.keys(frontendApps).length > 0 ? (
                         <>
                             <div className="SideBar__heading">Apps</div>
diff --git a/frontend/src/layout/navigation/SideBar/SidebarChangeNotice.tsx b/frontend/src/layout/navigation/SideBar/SidebarChangeNotice.tsx
new file mode 100644
index 0000000000000..5c09034b53815
--- /dev/null
+++ b/frontend/src/layout/navigation/SideBar/SidebarChangeNotice.tsx
@@ -0,0 +1,130 @@
+import { IconCheck } from '@posthog/icons'
+import { LemonButton, LemonDivider, Tooltip, TooltipProps } from '@posthog/lemon-ui'
+import { useValues } from 'kea'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import posthog from 'posthog-js'
+import React, { Fragment, useState } from 'react'
+import { Scene } from 'scenes/sceneTypes'
+
+export type SidebarChangeNoticeProps = {
+    identifier: string | number
+}
+
+export type SidebarChangeNoticeTooltipProps = SidebarChangeNoticeProps & {
+    children: TooltipProps['children']
+}
+
+/**
+ * Used in combination with a feature flag like:
+ *
+ * sidebar-notice-annotations-2023-10-30
+ * matching:
+ *   properties:
+ *     sidebar_notice/annotations-2023-10-30: doesn't equal true
+ *     joined_at: before 2023-10-30
+ *
+ */
+
+const NOTICES: {
+    identifier: Scene
+    description: React.ReactNode
+    placement: TooltipProps['placement']
+    flagSuffix: string
+}[] = [
+    {
+        identifier: Scene.DataManagement,
+        description: (
+            <>
+                <b>Annotations</b> have moved here!
+                <br />
+                You can now find them in <b>Data Management</b>
+            </>
+        ),
+        placement: 'rightBottom',
+        flagSuffix: 'annotations-2023-10-30',
+    },
+    {
+        identifier: Scene.PersonsManagement,
+        description: (
+            <>
+                <b>Cohorts</b> have moved here!
+                <br />
+                You can now find them in <b>People</b>
+            </>
+        ),
+        placement: 'rightTop',
+        flagSuffix: 'cohorts-2023-10-30',
+    },
+]
+
+export function SidebarChangeNoticeContent({
+    notices,
+    onAcknowledged,
+}: {
+    notices: typeof NOTICES
+    onAcknowledged: () => void
+}): JSX.Element | null {
+    return (
+        <div className="flex items-center gap-1">
+            <div className="flex-1">
+                {notices.map((notice, i) => (
+                    <Fragment key={i}>
+                        {notice.description}
+                        {i < notices.length - 1 && <LemonDivider />}
+                    </Fragment>
+                ))}
+            </div>
+
+            <LemonButton size="small" onClick={onAcknowledged} icon={<IconCheck />} />
+        </div>
+    )
+}
+
+export function useSidebarChangeNotices({ identifier }: SidebarChangeNoticeProps): [typeof NOTICES, () => void] {
+    const { featureFlags } = useValues(featureFlagLogic)
+    const [noticeAcknowledged, setNoticeAcknowledged] = useState(false)
+
+    const notices = NOTICES.filter((notice) => notice.identifier === identifier).filter(
+        (notice) => featureFlags[`sidebar-notice-${notice.flagSuffix}`]
+    )
+
+    const onAcknowledged = (): void => {
+        notices.forEach((change) => {
+            posthog.capture('sidebar notice acknowledged', {
+                change: change.flagSuffix,
+                $set: {
+                    [`sidebar_notice/${change.flagSuffix}`]: true,
+                },
+            })
+            setNoticeAcknowledged(true)
+        })
+    }
+
+    return [!noticeAcknowledged ? notices : [], onAcknowledged]
+}
+
+export function SidebarChangeNoticeTooltip({ identifier, children }: SidebarChangeNoticeTooltipProps): JSX.Element {
+    const [notices, onAcknowledged] = useSidebarChangeNotices({ identifier })
+
+    if (!notices.length) {
+        return <>{children}</>
+    }
+
+    return (
+        <Tooltip
+            visible
+            placement={notices[0].placement}
+            delayMs={0}
+            title={<SidebarChangeNoticeContent notices={notices} onAcknowledged={onAcknowledged} />}
+        >
+            {React.cloneElement(children as React.ReactElement, {
+                onClick: () => {
+                    onAcknowledged()
+                    if (React.isValidElement(children)) {
+                        children.props.onClick?.()
+                    }
+                },
+            })}
+        </Tooltip>
+    )
+}
diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
index 096cd7198b5d8..1f49b28943c5b 100644
--- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
+++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton.scss
@@ -256,6 +256,19 @@
         }
     }
 
+    .ant-tooltip & {
+        // Buttons have an overriden style in tooltips, as they are always dark
+        &:hover {
+            background: rgba(255, 255, 255, 0.15) !important;
+        }
+        &:active {
+            background: rgba(255, 255, 255, 0.2) !important;
+        }
+        .LemonButton__icon {
+            color: #fff !important;
+        }
+    }
+
     .posthog-3000 & {
         font-size: 0.8125rem;
         border: none !important; // 3000 buttons never have borders
diff --git a/frontend/src/lib/lemon-ui/Link/Link.tsx b/frontend/src/lib/lemon-ui/Link/Link.tsx
index c1571716d37f0..0e3bad276c1a4 100644
--- a/frontend/src/lib/lemon-ui/Link/Link.tsx
+++ b/frontend/src/lib/lemon-ui/Link/Link.tsx
@@ -134,10 +134,7 @@ export const Link: React.FC<LinkProps & React.RefAttributes<HTMLElement>> = Reac
                 {targetBlankIcon && target === '_blank' ? <IconOpenInNew /> : null}
             </a>
         ) : (
-            <Tooltip
-                isDefaultTooltip
-                title={disabledReason ? <span className="italic">{disabledReason}</span> : undefined}
-            >
+            <Tooltip title={disabledReason ? <span className="italic">{disabledReason}</span> : undefined}>
                 <span>
                     <button
                         ref={ref as any}
diff --git a/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx b/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
index f7a56a141f08b..0232b319bf732 100644
--- a/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
+++ b/frontend/src/lib/lemon-ui/Tooltip/Tooltip.tsx
@@ -6,8 +6,6 @@ import { useDebounce } from 'use-debounce'
 const DEFAULT_DELAY_MS = 500
 
 export type TooltipProps = AntdTooltipProps & {
-    /** Whether Ant Design's default Tooltip behavior should be used instead of PostHog's. */
-    isDefaultTooltip?: boolean
     delayMs?: number
 }
 
@@ -17,17 +15,11 @@ export type TooltipProps = AntdTooltipProps & {
  * See https://github.com/ant-design/ant-design/blob/master/components/tooltip/index.tsx#L82-L130.
  */
 // CAUTION: Any changes here will affect tooltips across the entire app.
-export function Tooltip({
-    children,
-    visible,
-    isDefaultTooltip = false,
-    delayMs = DEFAULT_DELAY_MS,
-    ...props
-}: TooltipProps): JSX.Element {
-    const [localVisible, setVisible] = useState(!!visible)
+export function Tooltip({ children, visible, delayMs = DEFAULT_DELAY_MS, ...props }: TooltipProps): JSX.Element {
+    const [localVisible, setVisible] = useState(false)
     const [debouncedLocalVisible] = useDebounce(visible ?? localVisible, delayMs)
 
-    if (!isDefaultTooltip && !('mouseEnterDelay' in props)) {
+    if (!('mouseEnterDelay' in props)) {
         // If not preserving default behavior and mouseEnterDelay is not already provided, we use a custom default here
         props.mouseEnterDelay = delayMs
     }
@@ -36,16 +28,22 @@ export function Tooltip({
     // See https://github.com/ant-design/ant-design/blob/master/components/tooltip/index.tsx#L226
     const child = React.isValidElement(children) ? children : <span>{children}</span>
 
+    const derivedVisible = typeof visible === 'undefined' ? localVisible && debouncedLocalVisible : visible
+
     return props.title ? (
-        <AntdTooltip {...props} visible={isDefaultTooltip ? visible : localVisible && debouncedLocalVisible}>
+        <AntdTooltip {...props} visible={derivedVisible}>
             {React.cloneElement(child, {
                 onMouseEnter: () => {
                     child.props.onMouseEnter?.()
-                    setVisible(true)
+                    if (typeof visible === 'undefined') {
+                        setVisible(true)
+                    }
                 },
                 onMouseLeave: () => {
                     child.props.onMouseLeave?.()
-                    setVisible(false)
+                    if (typeof visible === 'undefined') {
+                        setVisible(false)
+                    }
                 },
             })}
         </AntdTooltip>
diff --git a/frontend/src/models/groupsModel.ts b/frontend/src/models/groupsModel.ts
index 9f7cd247a88de..1c5506f5c6c87 100644
--- a/frontend/src/models/groupsModel.ts
+++ b/frontend/src/models/groupsModel.ts
@@ -1,4 +1,4 @@
-import { kea, path, connect, selectors, events } from 'kea'
+import { kea, path, connect, selectors, afterMount } from 'kea'
 import api from 'lib/api'
 import { GroupType, GroupTypeIndex } from '~/types'
 import { teamLogic } from 'scenes/teamLogic'
@@ -105,7 +105,7 @@ export const groupsModel = kea<groupsModelType>([
             }
         },
     })),
-    events(({ actions }) => ({
-        afterMount: actions.loadAllGroupTypes,
-    })),
+    afterMount(({ actions }) => {
+        actions.loadAllGroupTypes()
+    }),
 ])
diff --git a/frontend/src/models/index.ts b/frontend/src/models/index.ts
index 31a15fb580275..0bfc8cb98d496 100644
--- a/frontend/src/models/index.ts
+++ b/frontend/src/models/index.ts
@@ -5,9 +5,10 @@ import { cohortsModel } from './cohortsModel'
 import { dashboardsModel } from './dashboardsModel'
 import { propertyDefinitionsModel } from './propertyDefinitionsModel'
 import type { modelsType } from './indexType'
+import { groupsModel } from './groupsModel'
 
 /** "Models" are logics that are persistently mounted (start with app) */
 export const models = kea<modelsType>([
     path(['models', 'index']),
-    connect([actionsModel, annotationsModel, cohortsModel, dashboardsModel, propertyDefinitionsModel]),
+    connect([actionsModel, annotationsModel, cohortsModel, dashboardsModel, propertyDefinitionsModel, groupsModel]),
 ])
diff --git a/frontend/src/scenes/annotations/AnnotationModal.tsx b/frontend/src/scenes/annotations/AnnotationModal.tsx
index 25007ed7096e6..cee3d836fccef 100644
--- a/frontend/src/scenes/annotations/AnnotationModal.tsx
+++ b/frontend/src/scenes/annotations/AnnotationModal.tsx
@@ -9,6 +9,15 @@ import { IconWarning } from 'lib/lemon-ui/icons'
 import { shortTimeZone } from 'lib/utils'
 import { urls } from 'scenes/urls'
 
+export function NewAnnotationButton(): JSX.Element {
+    const { openModalToCreateAnnotation } = useActions(annotationModalLogic)
+    return (
+        <LemonButton type="primary" data-attr="create-annotation" onClick={() => openModalToCreateAnnotation()}>
+            New annotation
+        </LemonButton>
+    )
+}
+
 export function AnnotationModal({
     overlayRef,
     contentRef,
diff --git a/frontend/src/scenes/annotations/Annotations.tsx b/frontend/src/scenes/annotations/Annotations.tsx
index 89fe8259d792e..b71b8969d0899 100644
--- a/frontend/src/scenes/annotations/Annotations.tsx
+++ b/frontend/src/scenes/annotations/Annotations.tsx
@@ -5,9 +5,7 @@ import {
     annotationModalLogic,
     ANNOTATION_DAYJS_FORMAT,
 } from './annotationModalLogic'
-import { PageHeader } from 'lib/components/PageHeader'
 import { AnnotationScope, InsightShortId, AnnotationType, ProductKey } from '~/types'
-import { SceneExport } from 'scenes/sceneTypes'
 import { LemonTable, LemonTableColumns, LemonTableColumn } from 'lib/lemon-ui/LemonTable'
 import { createdAtColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
 import { LemonButton } from 'lib/lemon-ui/LemonButton'
@@ -24,11 +22,6 @@ import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'
 import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductIntroduction'
 import { MicrophoneHog } from 'lib/components/hedgehogs'
 
-export const scene: SceneExport = {
-    component: Annotations,
-    logic: annotationModalLogic,
-}
-
 export function Annotations(): JSX.Element {
     const { currentTeam } = useValues(teamLogic)
     const { currentOrganization } = useValues(organizationLogic)
@@ -135,26 +128,10 @@ export function Annotations(): JSX.Element {
 
     return (
         <>
-            <PageHeader
-                title="Annotations"
-                caption={
-                    !shouldShowEmptyState && !shouldShowProductIntroduction ? (
-                        <>
-                            Annotations allow you to mark when certain changes happened so you can easily see how they
-                            impacted your metrics.
-                        </>
-                    ) : null
-                }
-                buttons={
-                    <LemonButton
-                        type="primary"
-                        data-attr="create-annotation"
-                        onClick={() => openModalToCreateAnnotation()}
-                    >
-                        New annotation
-                    </LemonButton>
-                }
-            />
+            <p>
+                Annotations allow you to mark when certain changes happened so you can easily see how they impacted your
+                metrics.
+            </p>
             <div data-attr={'annotations-content'}>
                 {(shouldShowEmptyState || shouldShowProductIntroduction) && (
                     <div className="mt-4">
diff --git a/frontend/src/scenes/annotations/annotationModalLogic.ts b/frontend/src/scenes/annotations/annotationModalLogic.ts
index e8603925f52a8..d1dd40c68061e 100644
--- a/frontend/src/scenes/annotations/annotationModalLogic.ts
+++ b/frontend/src/scenes/annotations/annotationModalLogic.ts
@@ -9,10 +9,8 @@ import { teamLogic } from 'scenes/teamLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { userLogic } from 'scenes/userLogic'
 import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { actionToUrl, urlToAction } from 'kea-router'
-import { sceneLogic } from 'scenes/sceneLogic'
-import { urls } from '@posthog/apps-common'
-import { Scene } from 'scenes/sceneTypes'
+import { urlToAction } from 'kea-router'
+import { urls } from 'scenes/urls'
 
 export const ANNOTATION_DAYJS_FORMAT = 'MMMM DD, YYYY h:mm A'
 
@@ -176,7 +174,7 @@ export const annotationModalLogic = kea<annotationModalLogicType>([
         },
     })),
     urlToAction(({ values, actions, cache }) => ({
-        '/annotations/:id': ({ id }) => {
+        [urls.annotation(':id')]: ({ id }) => {
             cache.annotationToShowId = parseInt(id as string)
             const annotation = values.annotations.find((a) => a.id === cache.annotationToShowId)
             if (!annotation) {
@@ -185,7 +183,4 @@ export const annotationModalLogic = kea<annotationModalLogicType>([
             actions.openModalToEditAnnotation(annotation)
         },
     })),
-    actionToUrl(() => ({
-        closeModal: () => (sceneLogic.values.scene === Scene.Annotations ? urls.annotations() : undefined),
-    })),
 ])
diff --git a/frontend/src/scenes/appScenes.ts b/frontend/src/scenes/appScenes.ts
index 09b66331d26f2..46b3493bcde1e 100644
--- a/frontend/src/scenes/appScenes.ts
+++ b/frontend/src/scenes/appScenes.ts
@@ -9,27 +9,20 @@ export const appScenes: Record<Scene, () => any> = {
     [Scene.Dashboard]: () => import('./dashboard/Dashboard'),
     [Scene.Insight]: () => import('./insights/InsightScene'),
     [Scene.WebAnalytics]: () => import('./web-analytics/WebAnalyticsScene'),
-    [Scene.Cohorts]: () => import('./cohorts/Cohorts'),
     [Scene.Cohort]: () => import('./cohorts/Cohort'),
-    [Scene.DataManagement]: () => import('./data-management/events/EventDefinitionsTable'),
+    [Scene.DataManagement]: () => import('./data-management/DataManagementScene'),
     [Scene.Events]: () => import('./events/Events'),
     [Scene.BatchExports]: () => import('./batch_exports/BatchExportsListScene'),
     [Scene.BatchExportEdit]: () => import('./batch_exports/BatchExportEditScene'),
     [Scene.BatchExport]: () => import('./batch_exports/BatchExportScene'),
-    [Scene.Actions]: () => import('./actions/ActionsTable'),
-    [Scene.EventDefinitions]: () => import('./data-management/events/EventDefinitionsTable'),
     [Scene.EventDefinition]: () => import('./data-management/definition/DefinitionView'),
-    [Scene.PropertyDefinitions]: () => import('./data-management/properties/PropertyDefinitionsTable'),
     [Scene.PropertyDefinition]: () => import('./data-management/definition/DefinitionView'),
-    [Scene.DataManagementHistory]: () => import('./data-management/history/History'),
-    [Scene.Database]: () => import('./data-management/database/DatabaseScene'),
     [Scene.Replay]: () => import('./session-recordings/SessionRecordings'),
     [Scene.ReplaySingle]: () => import('./session-recordings/detail/SessionRecordingDetail'),
     [Scene.ReplayPlaylist]: () => import('./session-recordings/playlist/SessionRecordingsPlaylistScene'),
+    [Scene.PersonsManagement]: () => import('./persons-management/PersonsManagementScene'),
     [Scene.Person]: () => import('./persons/PersonScene'),
-    [Scene.Persons]: () => import('./persons/PersonsScene'),
     [Scene.Pipeline]: () => import('./pipeline/Pipeline'),
-    [Scene.Groups]: () => import('./groups/Groups'),
     [Scene.Group]: () => import('./groups/Group'),
     [Scene.Action]: () => import('./actions/Action'),
     [Scene.Experiments]: () => import('./experiments/Experiments'),
@@ -59,7 +52,6 @@ export const appScenes: Record<Scene, () => any> = {
     [Scene.AsyncMigrations]: () => import('./instance/AsyncMigrations/AsyncMigrations'),
     [Scene.DeadLetterQueue]: () => import('./instance/DeadLetterQueue/DeadLetterQueue'),
     [Scene.MySettings]: () => import('./me/Settings'),
-    [Scene.Annotations]: () => import('./annotations/Annotations'),
     [Scene.PreflightCheck]: () => import('./PreflightCheck/PreflightCheck'),
     [Scene.Signup]: () => import('./authentication/signup/SignupContainer'),
     [Scene.InviteSignup]: () => import('./authentication/InviteSignup'),
@@ -75,7 +67,6 @@ export const appScenes: Record<Scene, () => any> = {
     [Scene.PasswordResetComplete]: () => import('./authentication/PasswordResetComplete'),
     [Scene.Unsubscribe]: () => import('./Unsubscribe/Unsubscribe'),
     [Scene.IntegrationsRedirect]: () => import('./IntegrationsRedirect/IntegrationsRedirect'),
-    [Scene.IngestionWarnings]: () => import('./data-management/ingestion-warnings/IngestionWarningsView'),
     [Scene.DebugQuery]: () => import('./debug/DebugScene'),
     [Scene.VerifyEmail]: () => import('./authentication/signup/verify-email/VerifyEmail'),
     [Scene.Feedback]: () => import('./feedback/Feedback'),
diff --git a/frontend/src/scenes/cohorts/Cohorts.tsx b/frontend/src/scenes/cohorts/Cohorts.tsx
index 3915962270746..10f7f14d66b0d 100644
--- a/frontend/src/scenes/cohorts/Cohorts.tsx
+++ b/frontend/src/scenes/cohorts/Cohorts.tsx
@@ -1,13 +1,11 @@
 import { useState } from 'react'
 import { cohortsModel } from '../../models/cohortsModel'
 import { useValues, useActions } from 'kea'
-import { PageHeader } from 'lib/components/PageHeader'
 import { AvailableFeature, CohortType, ProductKey } from '~/types'
 import './Cohorts.scss'
 import Fuse from 'fuse.js'
 import { createdAtColumn, createdByColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
 import { Link } from 'lib/lemon-ui/Link'
-import { SceneExport } from 'scenes/sceneTypes'
 import { dayjs } from 'lib/dayjs'
 import { Spinner } from 'lib/lemon-ui/Spinner/Spinner'
 import { urls } from 'scenes/urls'
@@ -160,10 +158,6 @@ export function Cohorts(): JSX.Element {
 
     return (
         <div>
-            <PageHeader
-                title="Cohorts"
-                caption="Create lists of users who have something in common to use in analytics or feature flags."
-            />
             {(shouldShowProductIntroduction || shouldShowEmptyState) && (
                 <ProductIntroduction
                     productName="Cohorts"
@@ -185,13 +179,6 @@ export function Cohorts(): JSX.Element {
                             onChange={setSearchTerm}
                             value={searchTerm}
                         />
-                        <LemonButton
-                            type="primary"
-                            data-attr="create-cohort"
-                            onClick={() => router.actions.push(urls.cohort('new'))}
-                        >
-                            New Cohort
-                        </LemonButton>
                     </div>
                     <LemonTable
                         columns={columns}
@@ -207,8 +194,3 @@ export function Cohorts(): JSX.Element {
         </div>
     )
 }
-
-export const scene: SceneExport = {
-    component: Cohorts,
-    logic: cohortsModel,
-}
diff --git a/frontend/src/scenes/data-management/DataManagementPageTabs.tsx b/frontend/src/scenes/data-management/DataManagementPageTabs.tsx
deleted file mode 100644
index f78c851a7f43b..0000000000000
--- a/frontend/src/scenes/data-management/DataManagementPageTabs.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { actionToUrl, urlToAction } from 'kea-router'
-import { kea, useActions, useValues, path, connect, actions, reducers, selectors } from 'kea'
-import { urls } from 'scenes/urls'
-import type { eventsTabsLogicType } from './DataManagementPageTabsType'
-import { Tooltip } from 'lib/lemon-ui/Tooltip'
-import { IconInfo } from 'lib/lemon-ui/icons'
-import { TitleWithIcon } from 'lib/components/TitleWithIcon'
-import { FEATURE_FLAGS } from 'lib/constants'
-import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
-import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
-import { LemonTabs } from 'lib/lemon-ui/LemonTabs'
-
-export enum DataManagementTab {
-    Actions = 'actions',
-    EventDefinitions = 'events',
-    PropertyDefinitions = 'properties',
-    History = 'history',
-    IngestionWarnings = 'warnings',
-    Database = 'database',
-}
-
-const tabUrls = {
-    [DataManagementTab.PropertyDefinitions]: urls.propertyDefinitions(),
-    [DataManagementTab.EventDefinitions]: urls.eventDefinitions(),
-    [DataManagementTab.Actions]: urls.actions(),
-    [DataManagementTab.History]: urls.dataManagementHistory(),
-    [DataManagementTab.IngestionWarnings]: urls.ingestionWarnings(),
-    [DataManagementTab.Database]: urls.database(),
-}
-
-const eventsTabsLogic = kea<eventsTabsLogicType>([
-    path(['scenes', 'events', 'eventsTabsLogic']),
-    connect({
-        values: [featureFlagLogic, ['featureFlags']],
-    }),
-    actions({
-        setTab: (tab: DataManagementTab) => ({ tab }),
-    }),
-    reducers({
-        tab: [
-            DataManagementTab.EventDefinitions as DataManagementTab,
-            {
-                setTab: (_, { tab }) => tab,
-            },
-        ],
-    }),
-    selectors({
-        showWarningsTab: [
-            (s) => [s.featureFlags],
-            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.INGESTION_WARNINGS_ENABLED],
-        ],
-    }),
-    actionToUrl(() => ({
-        setTab: ({ tab }) => tabUrls[tab as DataManagementTab] || urls.events(),
-    })),
-    urlToAction(({ actions, values }) => {
-        return Object.fromEntries(
-            Object.entries(tabUrls).map(([key, url]) => [
-                url,
-                () => {
-                    if (values.tab !== key) {
-                        actions.setTab(key as DataManagementTab)
-                    }
-                },
-            ])
-        )
-    }),
-])
-
-export function DataManagementPageTabs({ tab }: { tab: DataManagementTab }): JSX.Element {
-    const { showWarningsTab } = useValues(eventsTabsLogic)
-    const { setTab } = useActions(eventsTabsLogic)
-
-    return (
-        <>
-            <LemonTabs
-                activeKey={tab}
-                onChange={(t) => setTab(t)}
-                tabs={[
-                    {
-                        key: DataManagementTab.EventDefinitions,
-                        label: <span data-attr="data-management-events-tab">Events</span>,
-                    },
-                    {
-                        key: DataManagementTab.Actions,
-                        label: (
-                            <TitleWithIcon
-                                icon={
-                                    <Tooltip title="Actions consist of one or more events that you have decided to put into a deliberately-labeled bucket. They're used in insights and dashboards.">
-                                        <IconInfo />
-                                    </Tooltip>
-                                }
-                                data-attr="data-management-actions-tab"
-                            >
-                                Actions
-                            </TitleWithIcon>
-                        ),
-                    },
-                    {
-                        key: DataManagementTab.PropertyDefinitions,
-                        label: (
-                            <TitleWithIcon
-                                icon={
-                                    <Tooltip title="Properties are additional data sent along with an event capture. Use properties to understand additional information about events and the actors that generate them.">
-                                        <IconInfo />
-                                    </Tooltip>
-                                }
-                                data-attr="data-management-event-properties-tab"
-                            >
-                                Properties
-                            </TitleWithIcon>
-                        ),
-                    },
-                    {
-                        key: DataManagementTab.History,
-                        label: <span data-attr="data-management-history-tab">History</span>,
-                    },
-
-                    showWarningsTab && {
-                        key: DataManagementTab.IngestionWarnings,
-                        label: <span data-attr="data-management-warnings-tab">Ingestion Warnings</span>,
-                    },
-
-                    {
-                        key: DataManagementTab.Database,
-                        label: (
-                            <span data-attr="data-management-database-tab">
-                                Database
-                                <LemonTag type="warning" className="uppercase ml-2">
-                                    Beta
-                                </LemonTag>
-                            </span>
-                        ),
-                    },
-                ]}
-            />
-        </>
-    )
-}
diff --git a/frontend/src/scenes/data-management/DataManagementScene.stories.tsx b/frontend/src/scenes/data-management/DataManagementScene.stories.tsx
index e1c6f67232a9e..9f2492a913ce4 100644
--- a/frontend/src/scenes/data-management/DataManagementScene.stories.tsx
+++ b/frontend/src/scenes/data-management/DataManagementScene.stories.tsx
@@ -1,4 +1,4 @@
-import { mswDecorator } from '~/mocks/browser'
+import { mswDecorator, setFeatureFlags } from '~/mocks/browser'
 import { Meta } from '@storybook/react'
 import { useAvailableFeatures } from '~/mocks/features'
 import { AvailableFeature } from '~/types'
@@ -9,6 +9,7 @@ import { App } from 'scenes/App'
 import { DatabaseSchemaQueryResponse } from '~/queries/schema'
 import { ingestionWarningsResponse } from './ingestion-warnings/__mocks__/ingestion-warnings-response'
 import { dayjs } from 'lib/dayjs'
+import { FEATURE_FLAGS } from 'lib/constants'
 
 const MOCK_DATABASE: DatabaseSchemaQueryResponse = {
     events: [
@@ -116,6 +117,7 @@ export function Database(): JSX.Element {
 }
 
 export function IngestionWarnings(): JSX.Element {
+    setFeatureFlags([FEATURE_FLAGS.INGESTION_WARNINGS_ENABLED])
     useEffect(() => {
         router.actions.push(urls.ingestionWarnings())
     }, [])
diff --git a/frontend/src/scenes/data-management/DataManagementScene.tsx b/frontend/src/scenes/data-management/DataManagementScene.tsx
new file mode 100644
index 0000000000000..0513de6e11e5e
--- /dev/null
+++ b/frontend/src/scenes/data-management/DataManagementScene.tsx
@@ -0,0 +1,207 @@
+import { actions, connect, kea, path, reducers, selectors, useActions, useValues } from 'kea'
+import { actionToUrl, urlToAction } from 'kea-router'
+import { urls } from 'scenes/urls'
+import { Tooltip } from 'lib/lemon-ui/Tooltip'
+import { IconInfo } from 'lib/lemon-ui/icons'
+import { TitleWithIcon } from 'lib/components/TitleWithIcon'
+import { FEATURE_FLAGS } from 'lib/constants'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
+import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
+import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
+import React from 'react'
+import { SceneExport } from 'scenes/sceneTypes'
+import { PageHeader } from 'lib/components/PageHeader'
+import { NewActionButton } from 'scenes/actions/NewActionButton'
+import { Annotations } from 'scenes/annotations'
+
+import type { dataManagementSceneLogicType } from './DataManagementSceneType'
+import { NewAnnotationButton } from 'scenes/annotations/AnnotationModal'
+import { EventDefinitionsTable } from './events/EventDefinitionsTable'
+import { ActionsTable } from './actions/ActionsTable'
+import { PropertyDefinitionsTable } from './properties/PropertyDefinitionsTable'
+import { ActivityLog } from 'lib/components/ActivityLog/ActivityLog'
+import { ActivityScope } from 'lib/components/ActivityLog/humanizeActivity'
+import { IngestionWarningsView } from './ingestion-warnings/IngestionWarningsView'
+import { DatabaseTableList } from './database/DatabaseTableList'
+import { Breadcrumb } from '~/types'
+import { capitalizeFirstLetter } from 'lib/utils'
+
+export enum DataManagementTab {
+    Actions = 'actions',
+    EventDefinitions = 'events',
+    PropertyDefinitions = 'properties',
+    Annotations = 'annotations',
+    History = 'history',
+    IngestionWarnings = 'warnings',
+    Database = 'database',
+}
+
+const tabs: Record<
+    DataManagementTab,
+    { url: string; label: LemonTab<any>['label']; content: JSX.Element; buttons?: React.ReactNode }
+> = {
+    [DataManagementTab.EventDefinitions]: {
+        url: urls.eventDefinitions(),
+        label: 'Events',
+        content: <EventDefinitionsTable />,
+    },
+    [DataManagementTab.Actions]: {
+        url: urls.actions(),
+        label: (
+            <TitleWithIcon
+                icon={
+                    <Tooltip title="Actions consist of one or more events that you have decided to put into a deliberately-labeled bucket. They're used in insights and dashboards.">
+                        <IconInfo />
+                    </Tooltip>
+                }
+            >
+                Actions
+            </TitleWithIcon>
+        ),
+        buttons: <NewActionButton />,
+        content: <ActionsTable />,
+    },
+    [DataManagementTab.PropertyDefinitions]: {
+        url: urls.propertyDefinitions(),
+        label: (
+            <TitleWithIcon
+                icon={
+                    <Tooltip title="Properties are additional data sent along with an event capture. Use properties to understand additional information about events and the actors that generate them.">
+                        <IconInfo />
+                    </Tooltip>
+                }
+            >
+                Properties
+            </TitleWithIcon>
+        ),
+        content: <PropertyDefinitionsTable />,
+    },
+    [DataManagementTab.Annotations]: {
+        url: urls.annotations(),
+        content: <Annotations />,
+        label: 'Annotations',
+        buttons: <NewAnnotationButton />,
+    },
+    [DataManagementTab.History]: {
+        url: urls.dataManagementHistory(),
+        label: 'History',
+        content: (
+            <ActivityLog
+                scope={ActivityScope.DATA_MANAGEMENT}
+                caption={
+                    'Only actions taken in the UI are captured in History. Automatic creation of definitions by ingestion is not shown here.'
+                }
+            />
+        ),
+    },
+    [DataManagementTab.IngestionWarnings]: {
+        url: urls.ingestionWarnings(),
+        label: 'Ingestion Warnings',
+        content: <IngestionWarningsView />,
+    },
+    [DataManagementTab.Database]: {
+        url: urls.database(),
+        label: (
+            <>
+                Database
+                <LemonTag type="warning" className="uppercase ml-2">
+                    Beta
+                </LemonTag>
+            </>
+        ),
+        content: <DatabaseTableList />,
+    },
+}
+
+const dataManagementSceneLogic = kea<dataManagementSceneLogicType>([
+    path(['scenes', 'events', 'dataManagementSceneLogic']),
+    connect({
+        values: [featureFlagLogic, ['featureFlags']],
+    }),
+    actions({
+        setTab: (tab: DataManagementTab) => ({ tab }),
+    }),
+    reducers({
+        tab: [
+            DataManagementTab.EventDefinitions as DataManagementTab,
+            {
+                setTab: (_, { tab }) => tab,
+            },
+        ],
+    }),
+    selectors({
+        breadcrumbs: [
+            (s) => [s.tab],
+            (tab): Breadcrumb[] => {
+                return [
+                    {
+                        name: `Data Management`,
+                        path: tabs.events.url,
+                    },
+                    {
+                        name: capitalizeFirstLetter(tab),
+                        path: tabs[tab].url,
+                    },
+                ]
+            },
+        ],
+        showWarningsTab: [
+            (s) => [s.featureFlags],
+            (featureFlags): boolean => !!featureFlags[FEATURE_FLAGS.INGESTION_WARNINGS_ENABLED],
+        ],
+        enabledTabs: [
+            (s) => [s.showWarningsTab],
+            (showWarningsTab): DataManagementTab[] => {
+                const allTabs = Object.keys(tabs)
+
+                return allTabs.filter((x) => {
+                    return x === DataManagementTab.IngestionWarnings ? showWarningsTab : true
+                }) as DataManagementTab[]
+            },
+        ],
+    }),
+    actionToUrl(() => ({
+        setTab: ({ tab }) => tabs[tab as DataManagementTab]?.url || tabs.events.url,
+    })),
+    urlToAction(({ actions, values }) => {
+        return Object.fromEntries(
+            Object.entries(tabs).map(([key, tab]) => [
+                tab.url,
+                () => {
+                    if (values.tab !== key) {
+                        actions.setTab(key as DataManagementTab)
+                    }
+                },
+            ])
+        )
+    }),
+])
+
+export function DataManagementScene(): JSX.Element {
+    const { enabledTabs, tab } = useValues(dataManagementSceneLogic)
+    const { setTab } = useActions(dataManagementSceneLogic)
+
+    const lemonTabs: LemonTab<DataManagementTab>[] = enabledTabs.map((key) => ({
+        key: key as DataManagementTab,
+        label: <span data-attr={`data-management-${key}-tab`}>{tabs[key].label}</span>,
+        content: tabs[key].content,
+    }))
+
+    return (
+        <>
+            <PageHeader
+                title="Data Management"
+                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
+                tabbedPage
+                buttons={<>{tabs[tab].buttons}</>}
+            />
+
+            <LemonTabs activeKey={tab} onChange={(t) => setTab(t)} tabs={lemonTabs} />
+        </>
+    )
+}
+
+export const scene: SceneExport = {
+    component: DataManagementScene,
+    logic: dataManagementSceneLogic,
+}
diff --git a/frontend/src/scenes/actions/ActionsTable.tsx b/frontend/src/scenes/data-management/actions/ActionsTable.tsx
similarity index 94%
rename from frontend/src/scenes/actions/ActionsTable.tsx
rename to frontend/src/scenes/data-management/actions/ActionsTable.tsx
index 38259efc8719a..aa9bf6aad9876 100644
--- a/frontend/src/scenes/actions/ActionsTable.tsx
+++ b/frontend/src/scenes/data-management/actions/ActionsTable.tsx
@@ -3,13 +3,12 @@ import { Radio } from 'antd'
 import { deleteWithUndo, stripHTTP } from 'lib/utils'
 import { useActions, useValues } from 'kea'
 import { actionsModel } from '~/models/actionsModel'
-import { NewActionButton } from './NewActionButton'
+import { NewActionButton } from '../../actions/NewActionButton'
 import { ActionType, AvailableFeature, ChartDisplayType, InsightType, ProductKey } from '~/types'
 import { userLogic } from 'scenes/userLogic'
-import { teamLogic } from '../teamLogic'
-import { SceneExport } from 'scenes/sceneTypes'
+import { teamLogic } from '../../teamLogic'
 import api from 'lib/api'
-import { urls } from '../urls'
+import { urls } from '../../urls'
 import { createdAtColumn, createdByColumn } from 'lib/lemon-ui/LemonTable/columnUtils'
 import { LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable/types'
 import { LemonTable } from 'lib/lemon-ui/LemonTable'
@@ -18,19 +17,12 @@ import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { combineUrl } from 'kea-router'
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { PageHeader } from 'lib/components/PageHeader'
 import { LemonInput } from '@posthog/lemon-ui'
 import { actionsLogic } from 'scenes/actions/actionsLogic'
 import { IconCheckmark, IconPlayCircle } from 'lib/lemon-ui/icons'
 import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductIntroduction'
 import { LemonMarkdown } from 'lib/lemon-ui/LemonMarkdown'
 
-export const scene: SceneExport = {
-    component: ActionsTable,
-    logic: actionsLogic,
-}
-
 export function ActionsTable(): JSX.Element {
     const { currentTeam } = useValues(teamLogic)
     const { actionsLoading } = useValues(actionsModel({ params: 'include_count=1' }))
@@ -230,13 +222,6 @@ export function ActionsTable(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-                buttons={<NewActionButton />}
-            />
-            <DataManagementPageTabs tab={DataManagementTab.Actions} />
             {(shouldShowEmptyState || shouldShowProductIntroduction) && (
                 <ProductIntroduction
                     productName="Actions"
diff --git a/frontend/src/scenes/data-management/database/DatabaseScene.tsx b/frontend/src/scenes/data-management/database/DatabaseScene.tsx
deleted file mode 100644
index adcca97e4bc95..0000000000000
--- a/frontend/src/scenes/data-management/database/DatabaseScene.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { PageHeader } from 'lib/components/PageHeader'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { SceneExport } from 'scenes/sceneTypes'
-import { databaseSceneLogic } from './databaseSceneLogic'
-import { useActions, useValues } from 'kea'
-import { LemonInput, Link } from '@posthog/lemon-ui'
-import { DatabaseTablesContainer } from 'scenes/data-management/database/DatabaseTables'
-
-export function DatabaseScene(): JSX.Element {
-    const { searchTerm } = useValues(databaseSceneLogic)
-    const { setSearchTerm } = useActions(databaseSceneLogic)
-
-    return (
-        <div data-attr="database-scene">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.Database} />
-            <div className="flex items-center justify-between gap-2 mb-4">
-                <LemonInput type="search" placeholder="Search for tables" onChange={setSearchTerm} value={searchTerm} />
-            </div>
-            <div className="flex items-center justify-between gap-2 mb-4">
-                <div>
-                    These are the database tables you can query under SQL insights with{' '}
-                    <Link to="https://posthog.com/manual/hogql" target="_blank">
-                        HogQL
-                    </Link>
-                    .
-                </div>
-            </div>
-            <DatabaseTablesContainer />
-        </div>
-    )
-}
-
-export const scene: SceneExport = {
-    component: DatabaseScene,
-    logic: databaseSceneLogic,
-}
diff --git a/frontend/src/scenes/data-management/database/DatabaseTable.tsx b/frontend/src/scenes/data-management/database/DatabaseTable.tsx
index 07a8d44f499cb..1f330f8ad7f2d 100644
--- a/frontend/src/scenes/data-management/database/DatabaseTable.tsx
+++ b/frontend/src/scenes/data-management/database/DatabaseTable.tsx
@@ -2,12 +2,12 @@ import { LemonTable } from 'lib/lemon-ui/LemonTable'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { Link } from 'lib/lemon-ui/Link'
 import { ViewLinkDeleteButton } from 'scenes/data-warehouse/ViewLinkModal'
-import { DatabaseSceneRow } from 'scenes/data-warehouse/types'
+import { DatabaseTableListRow } from 'scenes/data-warehouse/types'
 import { urls } from 'scenes/urls'
 
 interface DatabaseTableProps {
     table: string
-    tables: DatabaseSceneRow[]
+    tables: DatabaseTableListRow[]
 }
 
 export function DatabaseTable({ table, tables }: DatabaseTableProps): JSX.Element {
diff --git a/frontend/src/scenes/data-management/database/DatabaseTableList.tsx b/frontend/src/scenes/data-management/database/DatabaseTableList.tsx
new file mode 100644
index 0000000000000..e9d41917e7031
--- /dev/null
+++ b/frontend/src/scenes/data-management/database/DatabaseTableList.tsx
@@ -0,0 +1,27 @@
+import { databaseTableListLogic } from './databaseTableListLogic'
+import { useActions, useValues } from 'kea'
+import { LemonInput, Link } from '@posthog/lemon-ui'
+import { DatabaseTablesContainer } from 'scenes/data-management/database/DatabaseTables'
+
+export function DatabaseTableList(): JSX.Element {
+    const { searchTerm } = useValues(databaseTableListLogic)
+    const { setSearchTerm } = useActions(databaseTableListLogic)
+
+    return (
+        <div data-attr="database-list">
+            <div className="flex items-center justify-between gap-2 mb-4">
+                <LemonInput type="search" placeholder="Search for tables" onChange={setSearchTerm} value={searchTerm} />
+            </div>
+            <div className="flex items-center justify-between gap-2 mb-4">
+                <div>
+                    These are the database tables you can query under SQL insights with{' '}
+                    <Link to="https://posthog.com/manual/hogql" target="_blank">
+                        HogQL
+                    </Link>
+                    .
+                </div>
+            </div>
+            <DatabaseTablesContainer />
+        </div>
+    )
+}
diff --git a/frontend/src/scenes/data-management/database/DatabaseTables.tsx b/frontend/src/scenes/data-management/database/DatabaseTables.tsx
index 29f626f92286e..2bad7c2909802 100644
--- a/frontend/src/scenes/data-management/database/DatabaseTables.tsx
+++ b/frontend/src/scenes/data-management/database/DatabaseTables.tsx
@@ -1,6 +1,6 @@
 import { LemonTable, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { useActions, useValues } from 'kea'
-import { databaseSceneLogic, DatabaseSceneRow } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic, DatabaseTableListRow } from 'scenes/data-management/database/databaseTableListLogic'
 import { LemonTag } from 'lib/lemon-ui/LemonTag/LemonTag'
 import { LemonButton, Link } from '@posthog/lemon-ui'
 import { urls } from 'scenes/urls'
@@ -12,7 +12,7 @@ import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { FEATURE_FLAGS } from 'lib/constants'
 
 export function DatabaseTablesContainer(): JSX.Element {
-    const { filteredTables, databaseLoading } = useValues(databaseSceneLogic)
+    const { filteredTables, databaseLoading } = useValues(databaseTableListLogic)
     const { toggleFieldModal, selectTableName } = useActions(viewLinkLogic)
     const { featureFlags } = useValues(featureFlagLogic)
 
@@ -21,7 +21,7 @@ export function DatabaseTablesContainer(): JSX.Element {
             <DatabaseTables
                 tables={filteredTables}
                 loading={databaseLoading}
-                renderRow={(row: DatabaseSceneRow) => {
+                renderRow={(row: DatabaseTableListRow) => {
                     return (
                         <div className="px-4 py-3">
                             <div className="mt-2">
@@ -59,7 +59,7 @@ interface DatabaseTablesProps<T extends Record<string, any>> {
     extraColumns?: LemonTableColumns<T>
 }
 
-export function DatabaseTables<T extends DatabaseSceneRow>({
+export function DatabaseTables<T extends DatabaseTableListRow>({
     tables,
     loading,
     renderRow,
diff --git a/frontend/src/scenes/data-management/database/databaseSceneLogic.ts b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
similarity index 79%
rename from frontend/src/scenes/data-management/database/databaseSceneLogic.ts
rename to frontend/src/scenes/data-management/database/databaseTableListLogic.ts
index a3e53d53091fd..dcacee040b848 100644
--- a/frontend/src/scenes/data-management/database/databaseSceneLogic.ts
+++ b/frontend/src/scenes/data-management/database/databaseTableListLogic.ts
@@ -2,16 +2,17 @@ import { actions, afterMount, kea, path, reducers, selectors } from 'kea'
 import { loaders } from 'kea-loaders'
 import { query } from '~/queries/query'
 
-import type { databaseSceneLogicType } from './databaseSceneLogicType'
 import { DatabaseSchemaQuery, DatabaseSchemaQueryResponseField, NodeKind } from '~/queries/schema'
 
-export interface DatabaseSceneRow {
+import type { databaseTableListLogicType } from './databaseTableListLogicType'
+
+export interface DatabaseTableListRow {
     name: string
     columns: DatabaseSchemaQueryResponseField[]
 }
 
-export const databaseSceneLogic = kea<databaseSceneLogicType>([
-    path(['scenes', 'data-management', 'database', 'databaseSceneLogic']),
+export const databaseTableListLogic = kea<databaseTableListLogicType>([
+    path(['scenes', 'data-management', 'database', 'databaseTableListLogic']),
     actions({
         setSearchTerm: (searchTerm: string) => ({ searchTerm }),
     }),
@@ -28,7 +29,7 @@ export const databaseSceneLogic = kea<databaseSceneLogicType>([
     selectors({
         filteredTables: [
             (s) => [s.database, s.searchTerm],
-            (database, searchTerm): DatabaseSceneRow[] => {
+            (database, searchTerm): DatabaseTableListRow[] => {
                 if (!database) {
                     return []
                 }
@@ -39,7 +40,7 @@ export const databaseSceneLogic = kea<databaseSceneLogicType>([
                             ({
                                 name: key,
                                 columns: value,
-                            } as DatabaseSceneRow)
+                            } as DatabaseTableListRow)
                     )
                     .filter(({ name }) => name.toLowerCase().includes(searchTerm.toLowerCase()))
                     .sort((a, b) => a.name.localeCompare(b.name))
@@ -47,7 +48,7 @@ export const databaseSceneLogic = kea<databaseSceneLogicType>([
         ],
         tableOptions: [
             (s) => [s.filteredTables],
-            (filteredTables: DatabaseSceneRow[]) =>
+            (filteredTables: DatabaseTableListRow[]) =>
                 filteredTables.map((row) => ({
                     value: row.name,
                     label: row.name,
diff --git a/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx b/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx
index fdc3adf810e0f..7571d91bf5731 100644
--- a/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx
+++ b/frontend/src/scenes/data-management/events/EventDefinitionsTable.tsx
@@ -6,13 +6,10 @@ import {
     EVENT_DEFINITIONS_PER_PAGE,
     eventDefinitionsTableLogic,
 } from 'scenes/data-management/events/eventDefinitionsTableLogic'
-import { SceneExport } from 'scenes/sceneTypes'
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
 import { organizationLogic } from 'scenes/organizationLogic'
 import { EventDefinitionHeader } from 'scenes/data-management/events/DefinitionHeader'
 import { EventDefinitionProperties } from 'scenes/data-management/events/EventDefinitionProperties'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { PageHeader } from 'lib/components/PageHeader'
 import { LemonButton, LemonInput, LemonSelect, LemonSelectOptions, Link } from '@posthog/lemon-ui'
 import { More } from 'lib/lemon-ui/LemonButton/More'
 import { urls } from 'scenes/urls'
@@ -35,12 +32,6 @@ const eventTypeOptions: LemonSelectOptions<EventDefinitionType> = [
     },
 ]
 
-export const scene: SceneExport = {
-    component: EventDefinitionsTable,
-    logic: eventDefinitionsTableLogic,
-    paramsToProps: () => ({ syncWithUrl: true }),
-}
-
 export function EventDefinitionsTable(): JSX.Element {
     const { eventDefinitions, eventDefinitionsLoading, filters } = useValues(eventDefinitionsTableLogic)
     const { loadEventDefinitions, setFilters } = useActions(eventDefinitionsTableLogic)
@@ -124,14 +115,6 @@ export function EventDefinitionsTable(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-
-            <DataManagementPageTabs tab={DataManagementTab.EventDefinitions} />
-
             <LemonBanner className="mb-4" type="info">
                 Looking for{' '}
                 {filters.event_type === 'event_custom'
diff --git a/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts b/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
index 005f24f872247..58ce1a766852c 100644
--- a/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
+++ b/frontend/src/scenes/data-management/events/eventDefinitionsTableLogic.ts
@@ -1,5 +1,5 @@
 import { actions, kea, key, listeners, path, props, reducers, selectors } from 'kea'
-import { AnyPropertyFilter, Breadcrumb, EventDefinitionType, EventDefinition, PropertyDefinition } from '~/types'
+import { AnyPropertyFilter, EventDefinitionType, EventDefinition, PropertyDefinition } from '~/types'
 import type { eventDefinitionsTableLogicType } from './eventDefinitionsTableLogicType'
 import api, { PaginatedResponse } from 'lib/api'
 import { keyMappingKeys } from 'lib/taxonomy'
@@ -7,7 +7,6 @@ import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import { convertPropertyGroupToProperties, objectsEqual } from 'lib/utils'
 import { eventUsageLogic } from 'lib/utils/eventUsageLogic'
 import { loaders } from 'kea-loaders'
-import { urls } from 'scenes/urls'
 
 export interface EventDefinitionsPaginatedResponse extends PaginatedResponse<EventDefinition> {
     current?: string
@@ -280,21 +279,6 @@ export const eventDefinitionsTableLogic = kea<eventDefinitionsTableLogicType>([
     selectors(({ cache }) => ({
         // Expose for testing
         apiCache: [() => [], () => cache.apiCache],
-        breadcrumbs: [
-            () => [],
-            (): Breadcrumb[] => {
-                return [
-                    {
-                        name: `Data Management`,
-                        path: urls.eventDefinitions(),
-                    },
-                    {
-                        name: 'Events',
-                        path: urls.eventDefinitions(),
-                    },
-                ]
-            },
-        ],
     })),
     listeners(({ actions, values, cache }) => ({
         setFilters: async () => {
diff --git a/frontend/src/scenes/data-management/history/History.tsx b/frontend/src/scenes/data-management/history/History.tsx
deleted file mode 100644
index 1bc446992f594..0000000000000
--- a/frontend/src/scenes/data-management/history/History.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { PageHeader } from 'lib/components/PageHeader'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { ActivityLog } from 'lib/components/ActivityLog/ActivityLog'
-import { ActivityScope } from 'lib/components/ActivityLog/humanizeActivity'
-import { SceneExport } from 'scenes/sceneTypes'
-
-export function History(): JSX.Element {
-    return (
-        <div data-attr="database-scene">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.History} />
-            <ActivityLog
-                scope={ActivityScope.DATA_MANAGEMENT}
-                caption={
-                    'Only actions taken in the UI are captured in History. Automatic creation of definitions by ingestion is not shown here.'
-                }
-            />
-        </div>
-    )
-}
-
-export const scene: SceneExport = {
-    component: History,
-}
diff --git a/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx b/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
index ba5690063c8aa..1150d65f52f36 100644
--- a/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
+++ b/frontend/src/scenes/data-management/ingestion-warnings/IngestionWarningsView.tsx
@@ -1,8 +1,5 @@
 import { useValues } from 'kea'
-import { SceneExport } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
-import { PageHeader } from 'lib/components/PageHeader'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
 import { IngestionWarning, ingestionWarningsLogic, IngestionWarningSummary } from './ingestionWarningsLogic'
 import { LemonTable } from 'lib/lemon-ui/LemonTable'
 import { TZLabel } from 'lib/components/TZLabel'
@@ -12,11 +9,6 @@ import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductI
 import { ProductKey } from '~/types'
 import { ReadingHog } from 'lib/components/hedgehogs'
 
-export const scene: SceneExport = {
-    component: IngestionWarningsView,
-    logic: ingestionWarningsLogic,
-}
-
 const WARNING_TYPE_TO_DESCRIPTION = {
     cannot_merge_already_identified: 'Refused to merge an already identified user',
     cannot_merge_with_illegal_distinct_id: 'Refused to merge with an illegal distinct id',
@@ -147,12 +139,6 @@ export function IngestionWarningsView(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.IngestionWarnings} />
             {data.length > 0 || dataLoading ? (
                 <>
                     <div className="mb-4">Data ingestion related warnings from past 30 days.</div>
diff --git a/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts b/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
index ecc8faeba9f9e..c3509561e1a42 100644
--- a/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
+++ b/frontend/src/scenes/data-management/ingestion-warnings/ingestionWarningsLogic.ts
@@ -1,4 +1,4 @@
-import { kea, connect, path, selectors, events } from 'kea'
+import { kea, connect, path, selectors, afterMount } from 'kea'
 import { loaders } from 'kea-loaders'
 import { Breadcrumb } from '~/types'
 import { urls } from 'scenes/urls'
@@ -82,10 +82,7 @@ export const ingestionWarningsLogic = kea<ingestionWarningsLogicType>([
             },
         ],
     }),
-
-    events(({ actions }) => ({
-        afterMount: () => {
-            actions.loadData()
-        },
-    })),
+    afterMount(({ actions }) => {
+        actions.loadData()
+    }),
 ])
diff --git a/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx b/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx
index 3af8c729b8642..19a9d8429a0db 100644
--- a/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx
+++ b/frontend/src/scenes/data-management/properties/PropertyDefinitionsTable.tsx
@@ -2,7 +2,6 @@ import './PropertyDefinitionsTable.scss'
 import { useActions, useValues } from 'kea'
 import { LemonTable, LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
 import { PropertyDefinition } from '~/types'
-import { SceneExport } from 'scenes/sceneTypes'
 import { ObjectTags } from 'lib/components/ObjectTags/ObjectTags'
 import { organizationLogic } from 'scenes/organizationLogic'
 import { PropertyDefinitionHeader } from 'scenes/data-management/events/DefinitionHeader'
@@ -10,18 +9,10 @@ import {
     EVENT_PROPERTY_DEFINITIONS_PER_PAGE,
     propertyDefinitionsTableLogic,
 } from 'scenes/data-management/properties/propertyDefinitionsTableLogic'
-import { DataManagementPageTabs, DataManagementTab } from 'scenes/data-management/DataManagementPageTabs'
-import { PageHeader } from 'lib/components/PageHeader'
 import { LemonInput, LemonSelect, LemonTag, Link } from '@posthog/lemon-ui'
 import { LemonBanner } from 'lib/lemon-ui/LemonBanner'
 import { urls } from 'scenes/urls'
 
-export const scene: SceneExport = {
-    component: PropertyDefinitionsTable,
-    logic: propertyDefinitionsTableLogic,
-    paramsToProps: () => ({ syncWithUrl: true }),
-}
-
 export function PropertyDefinitionsTable(): JSX.Element {
     const { propertyDefinitions, propertyDefinitionsLoading, filters, propertyTypeOptions } =
         useValues(propertyDefinitionsTableLogic)
@@ -73,12 +64,6 @@ export function PropertyDefinitionsTable(): JSX.Element {
 
     return (
         <div data-attr="manage-events-table">
-            <PageHeader
-                title="Data Management"
-                caption="Use data management to organize events that come into PostHog. Reduce noise, clarify usage, and help collaborators get the most value from your data."
-                tabbedPage
-            />
-            <DataManagementPageTabs tab={DataManagementTab.PropertyDefinitions} />
             <LemonBanner className="mb-4" type="info">
                 Looking for {filters.type === 'person' ? 'person ' : ''}property usage statistics?{' '}
                 <Link
diff --git a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
index 933c08d6442fc..f83419217e84b 100644
--- a/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
+++ b/frontend/src/scenes/data-management/properties/propertyDefinitionsTableLogic.ts
@@ -1,5 +1,5 @@
 import { actions, connect, kea, key, listeners, path, props, reducers, selectors } from 'kea'
-import { Breadcrumb, PropertyDefinition } from '~/types'
+import { PropertyDefinition } from '~/types'
 import api from 'lib/api'
 import { actionToUrl, combineUrl, router, urlToAction } from 'kea-router'
 import {
@@ -82,21 +82,6 @@ export const propertyDefinitionsTableLogic = kea<propertyDefinitionsTableLogicTy
         ],
     }),
     selectors({
-        breadcrumbs: [
-            () => [],
-            (): Breadcrumb[] => {
-                return [
-                    {
-                        name: `Data Management`,
-                        path: urls.eventDefinitions(),
-                    },
-                    {
-                        name: 'Properties',
-                        path: urls.propertyDefinitions(),
-                    },
-                ]
-            },
-        ],
         propertyTypeOptions: [
             (s) => [s.groupTypes, s.aggregationLabel],
             (groupTypes, aggregationLabel) => {
diff --git a/frontend/src/scenes/data-warehouse/new_table/dataWarehouseTableLogic.tsx b/frontend/src/scenes/data-warehouse/new_table/dataWarehouseTableLogic.tsx
index dfb07fcab6df3..910336cef0de6 100644
--- a/frontend/src/scenes/data-warehouse/new_table/dataWarehouseTableLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/new_table/dataWarehouseTableLogic.tsx
@@ -7,7 +7,7 @@ import api from 'lib/api'
 import { urls } from 'scenes/urls'
 import { AnyPropertyFilter, Breadcrumb, DataWarehouseTable } from '~/types'
 import { DataTableNode } from '~/queries/schema'
-import { databaseSceneLogic } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
 import type { dataWarehouseTableLogicType } from './dataWarehouseTableLogicType'
 import { dataWarehouseSceneLogic } from '../external/dataWarehouseSceneLogic'
 
@@ -32,7 +32,7 @@ export const dataWarehouseTableLogic = kea<dataWarehouseTableLogicType>([
     props({} as TableLogicProps),
     connect(() => ({
         actions: [
-            databaseSceneLogic,
+            databaseTableListLogic,
             ['loadDatabase'],
             dataWarehouseSceneLogic,
             ['loadDataWarehouse', 'toggleSourceModal'],
diff --git a/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx b/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx
index b6ae6d9a975af..6e91637178af1 100644
--- a/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx
+++ b/frontend/src/scenes/data-warehouse/posthog/DataWarehousePosthogScene.tsx
@@ -1,7 +1,7 @@
 import { LemonButton, LemonTag, Link } from '@posthog/lemon-ui'
 import { PageHeader } from 'lib/components/PageHeader'
 import { SceneExport } from 'scenes/sceneTypes'
-import { databaseSceneLogic } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
 import { DataWarehousePageTabs, DataWarehouseTab } from '../DataWarehousePageTabs'
 import { DatabaseTablesContainer } from 'scenes/data-management/database/DatabaseTables'
 import { ViewLinkModal } from '../ViewLinkModal'
@@ -12,7 +12,7 @@ import { FEATURE_FLAGS } from 'lib/constants'
 
 export const scene: SceneExport = {
     component: DataWarehousePosthogScene,
-    logic: databaseSceneLogic,
+    logic: databaseTableListLogic,
 }
 
 export function DataWarehousePosthogScene(): JSX.Element {
diff --git a/frontend/src/scenes/data-warehouse/types.ts b/frontend/src/scenes/data-warehouse/types.ts
index 01db9119dd9ee..6da8ea535c24a 100644
--- a/frontend/src/scenes/data-warehouse/types.ts
+++ b/frontend/src/scenes/data-warehouse/types.ts
@@ -1,11 +1,11 @@
 import { DatabaseSchemaQueryResponseField, HogQLQuery } from '~/queries/schema'
 
-export interface DatabaseSceneRow {
+export interface DatabaseTableListRow {
     name: string
     columns: DatabaseSchemaQueryResponseField[]
 }
 
-export interface DataWarehouseSceneRow extends DatabaseSceneRow {
+export interface DataWarehouseSceneRow extends DatabaseTableListRow {
     id: string
     url_pattern?: string
     format?: string
diff --git a/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx b/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
index 634c44b2013d0..9e867642eed89 100644
--- a/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
+++ b/frontend/src/scenes/data-warehouse/viewLinkLogic.tsx
@@ -4,7 +4,7 @@ import { DataWarehouseSceneRow } from './types'
 import { DataWarehouseViewLink } from '~/types'
 import { forms } from 'kea-forms'
 import api from 'lib/api'
-import { databaseSceneLogic } from 'scenes/data-management/database/databaseSceneLogic'
+import { databaseTableListLogic } from 'scenes/data-management/database/databaseTableListLogic'
 import { loaders } from 'kea-loaders'
 import { lemonToast } from 'lib/lemon-ui/lemonToast'
 import type { viewLinkLogicType } from './viewLinkLogicType'
@@ -26,8 +26,8 @@ export interface KeySelectOption {
 export const viewLinkLogic = kea<viewLinkLogicType>([
     path(['scenes', 'data-warehouse', 'viewLinkLogic']),
     connect({
-        values: [dataWarehouseSavedQueriesLogic, ['savedQueries'], databaseSceneLogic, ['tableOptions']],
-        actions: [databaseSceneLogic, ['loadDatabase']],
+        values: [dataWarehouseSavedQueriesLogic, ['savedQueries'], databaseTableListLogic, ['tableOptions']],
+        actions: [databaseTableListLogic, ['loadDatabase']],
     }),
     actions({
         selectView: (selectedView) => ({ selectedView }),
diff --git a/frontend/src/scenes/groups/Groups.tsx b/frontend/src/scenes/groups/Groups.tsx
index f6fc1d48a090c..ec50e9950543c 100644
--- a/frontend/src/scenes/groups/Groups.tsx
+++ b/frontend/src/scenes/groups/Groups.tsx
@@ -2,13 +2,11 @@ import { useActions, useValues } from 'kea'
 import { Group, PropertyDefinitionType } from '~/types'
 import { groupsListLogic } from './groupsListLogic'
 import { PropertiesTable } from 'lib/components/PropertiesTable'
-import { PersonPageHeader } from 'scenes/persons/PersonPageHeader'
 import { LemonTableColumns } from 'lib/lemon-ui/LemonTable/types'
 import { TZLabel } from 'lib/components/TZLabel'
 import { LemonTable } from 'lib/lemon-ui/LemonTable'
 import { Link } from 'lib/lemon-ui/Link'
 import { urls } from 'scenes/urls'
-import { SceneExport } from 'scenes/sceneTypes'
 import { GroupsIntroduction } from 'scenes/groups/GroupsIntroduction'
 import { groupsAccessLogic, GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
 import { groupDisplayId } from 'scenes/persons/GroupActorDisplay'
@@ -18,22 +16,14 @@ import { LemonInput } from 'lib/lemon-ui/LemonInput/LemonInput'
 import { LemonDivider } from 'lib/lemon-ui/LemonDivider'
 import { capitalizeFirstLetter } from 'lib/utils'
 
-export const scene: SceneExport = {
-    component: Groups,
-    logic: groupsListLogic,
-    paramsToProps: ({ params: { groupTypeIndex } }) => ({
-        groupTypeIndex: parseInt(groupTypeIndex),
-    }),
-}
-
-export function Groups({ groupTypeIndex }: { groupTypeIndex?: string } = {}): JSX.Element {
+export function Groups({ groupTypeIndex }: { groupTypeIndex: number }): JSX.Element {
     const {
         groupTypeName: { singular, plural },
         groups,
         groupsLoading,
         search,
-    } = useValues(groupsListLogic)
-    const { loadGroups, setSearch } = useActions(groupsListLogic)
+    } = useValues(groupsListLogic({ groupTypeIndex }))
+    const { loadGroups, setSearch } = useActions(groupsListLogic({ groupTypeIndex }))
     const { groupsAccessStatus } = useValues(groupsAccessLogic)
 
     if (groupTypeIndex === undefined) {
@@ -47,7 +37,6 @@ export function Groups({ groupTypeIndex }: { groupTypeIndex?: string } = {}): JS
     ) {
         return (
             <>
-                <PersonPageHeader activeGroupTypeIndex={parseInt(groupTypeIndex)} />
                 <GroupsIntroduction access={groupsAccessStatus} />
             </>
         )
@@ -76,7 +65,6 @@ export function Groups({ groupTypeIndex }: { groupTypeIndex?: string } = {}): JS
 
     return (
         <>
-            <PersonPageHeader activeGroupTypeIndex={parseInt(groupTypeIndex)} />
             <LemonInput
                 type="search"
                 placeholder={`Search for ${plural}`}
diff --git a/frontend/src/scenes/groups/GroupsTabs.tsx b/frontend/src/scenes/groups/GroupsTabs.tsx
deleted file mode 100644
index 89900d8054480..0000000000000
--- a/frontend/src/scenes/groups/GroupsTabs.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useValues } from 'kea'
-import { groupsAccessLogic, GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
-import { capitalizeFirstLetter } from 'lib/utils'
-import { groupsModel } from '~/models/groupsModel'
-import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
-import { urls } from 'scenes/urls'
-
-export function GroupsTabs({ activeGroupTypeIndex }: { activeGroupTypeIndex: number }): JSX.Element {
-    const { groupTypes, aggregationLabel } = useValues(groupsModel)
-    const { groupsAccessStatus } = useValues(groupsAccessLogic)
-
-    const showGroupsIntroductionPage = [
-        GroupsAccessStatus.HasAccess,
-        GroupsAccessStatus.HasGroupTypes,
-        GroupsAccessStatus.NoAccess,
-    ].includes(groupsAccessStatus)
-
-    return (
-        <LemonTabs
-            activeKey={activeGroupTypeIndex}
-            tabs={[
-                {
-                    key: -1,
-                    label: 'Persons',
-                    link: urls.persons(),
-                },
-                ...(showGroupsIntroductionPage
-                    ? [
-                          {
-                              key: 0,
-                              label: 'Groups',
-                              link: urls.groups(0),
-                          },
-                      ]
-                    : Array.from(groupTypes.values()).map(
-                          (groupType) =>
-                              ({
-                                  label: capitalizeFirstLetter(aggregationLabel(groupType.group_type_index).plural),
-                                  key: groupType.group_type_index,
-                                  link: urls.groups(groupType.group_type_index),
-                              } as LemonTab<number>)
-                      )),
-            ]}
-        />
-    )
-}
diff --git a/frontend/src/scenes/groups/groupsListLogic.ts b/frontend/src/scenes/groups/groupsListLogic.ts
index 07a7d0c4b77b9..639aecd2ee007 100644
--- a/frontend/src/scenes/groups/groupsListLogic.ts
+++ b/frontend/src/scenes/groups/groupsListLogic.ts
@@ -1,13 +1,11 @@
 import { loaders } from 'kea-loaders'
-import { kea, props, key, path, connect, actions, reducers, selectors, listeners, events } from 'kea'
+import { kea, props, key, path, connect, actions, reducers, selectors, listeners, afterMount } from 'kea'
 import api from 'lib/api'
 import { groupsAccessLogic } from 'lib/introductions/groupsAccessLogic'
 import { teamLogic } from 'scenes/teamLogic'
-import { urls } from 'scenes/urls'
 import { Noun, groupsModel } from '~/models/groupsModel'
-import { Breadcrumb, Group } from '~/types'
+import { Group } from '~/types'
 import type { groupsListLogicType } from './groupsListLogicType'
-import { capitalizeFirstLetter } from 'lib/utils'
 
 export interface GroupsPaginatedResponse {
     next: string | null
@@ -69,15 +67,6 @@ export const groupsListLogic = kea<groupsListLogicType>([
             (groupTypeIndex, aggregationLabel): Noun =>
                 groupTypeIndex === -1 ? { singular: 'person', plural: 'persons' } : aggregationLabel(groupTypeIndex),
         ],
-        breadcrumbs: [
-            (s, p) => [s.groupTypeName, p.groupTypeIndex],
-            (groupTypeName, groupTypeIndex): Breadcrumb[] => [
-                {
-                    name: capitalizeFirstLetter(groupTypeName.plural),
-                    path: urls.groups(groupTypeIndex),
-                },
-            ],
-        ],
     }),
     listeners(({ actions }) => ({
         setSearch: async ({ debounce }, breakpoint) => {
@@ -87,9 +76,7 @@ export const groupsListLogic = kea<groupsListLogicType>([
             actions.loadGroups()
         },
     })),
-    events(({ actions }) => ({
-        afterMount: () => {
-            actions.loadGroups()
-        },
-    })),
+    afterMount(({ actions }) => {
+        actions.loadGroups()
+    }),
 ])
diff --git a/frontend/src/scenes/persons-management/PersonsManagementScene.tsx b/frontend/src/scenes/persons-management/PersonsManagementScene.tsx
new file mode 100644
index 0000000000000..156f54d1d6342
--- /dev/null
+++ b/frontend/src/scenes/persons-management/PersonsManagementScene.tsx
@@ -0,0 +1,38 @@
+import { useActions, useValues } from 'kea'
+import { LemonTab, LemonTabs } from 'lib/lemon-ui/LemonTabs'
+
+import { groupsModel } from '~/models/groupsModel'
+import { PageHeader } from 'lib/components/PageHeader'
+import { personsManagementSceneLogic } from './personsManagementSceneLogic'
+import { SceneExport } from 'scenes/sceneTypes'
+
+export function PersonsManagementScene(): JSX.Element {
+    const { tabs, activeTab, tabKey } = useValues(personsManagementSceneLogic)
+    const { setTabKey } = useActions(personsManagementSceneLogic)
+    const { showGroupsOptions } = useValues(groupsModel)
+
+    const lemonTabs: LemonTab<string>[] = tabs.map((tab) => ({
+        key: tab.key,
+        label: <span data-attr={`persons-management-${tab.key}-tab`}>{tab.label}</span>,
+        content: tab.content,
+    }))
+
+    return (
+        <>
+            <PageHeader
+                title="People"
+                caption={`A catalog of your product's end users, lists of users who have something in common to use in analytics or feature flags${
+                    showGroupsOptions ? ' and groups' : ''
+                }.`}
+                buttons={activeTab?.buttons}
+            />
+
+            <LemonTabs activeKey={tabKey} onChange={(t) => setTabKey(t)} tabs={lemonTabs} />
+        </>
+    )
+}
+
+export const scene: SceneExport = {
+    component: PersonsManagementScene,
+    logic: personsManagementSceneLogic,
+}
diff --git a/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx b/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx
new file mode 100644
index 0000000000000..0e1202affc14c
--- /dev/null
+++ b/frontend/src/scenes/persons-management/personsManagementSceneLogic.tsx
@@ -0,0 +1,152 @@
+import { actions, connect, kea, path, reducers, selectors } from 'kea'
+import { actionToUrl, router, urlToAction } from 'kea-router'
+import { urls } from 'scenes/urls'
+import { LemonTab } from 'lib/lemon-ui/LemonTabs'
+import { Breadcrumb } from '~/types'
+import { capitalizeFirstLetter } from 'lib/utils'
+import { GroupsAccessStatus } from 'lib/introductions/groupsAccessLogic'
+
+import { groupsModel } from '~/models/groupsModel'
+import { Persons } from './tabs/Persons'
+import { Cohorts } from 'scenes/cohorts/Cohorts'
+import { LemonButton } from '@posthog/lemon-ui'
+
+import type { personsManagementSceneLogicType } from './personsManagementSceneLogicType'
+import { Groups } from 'scenes/groups/Groups'
+
+export type PersonsManagementTab = {
+    key: string
+    url: string
+    label: string
+    content: any
+    buttons?: any
+}
+
+export type PersonsManagementTabs = Record<
+    string,
+    { url: string; label: LemonTab<any>['label']; content: any; buttons?: any }
+>
+
+export const personsManagementSceneLogic = kea<personsManagementSceneLogicType>([
+    path(['scenes', 'persons-management', 'personsManagementSceneLogic']),
+    connect({
+        values: [groupsModel, ['aggregationLabel', 'groupTypes', 'groupsAccessStatus', 'aggregationLabel']],
+    }),
+    actions({
+        setTabKey: (tabKey: string) => ({ tabKey }),
+    }),
+    reducers({
+        tabKey: [
+            'persons' as string,
+            {
+                setTabKey: (_, { tabKey }) => tabKey,
+            },
+        ],
+    }),
+    selectors({
+        tabs: [
+            (s) => [s.groupTabs],
+            (groupTabs): PersonsManagementTab[] => {
+                return [
+                    {
+                        key: 'persons',
+                        url: urls.persons(),
+                        label: 'Persons',
+                        content: <Persons />,
+                    },
+                    {
+                        key: 'cohorts',
+                        url: urls.cohorts(),
+                        label: 'Cohorts',
+                        content: <Cohorts />,
+                        buttons: (
+                            <LemonButton
+                                type="primary"
+                                data-attr="new-cohort"
+                                onClick={() => router.actions.push(urls.cohort('new'))}
+                            >
+                                New Cohort
+                            </LemonButton>
+                        ),
+                    },
+                    ...groupTabs,
+                ]
+            },
+        ],
+
+        activeTab: [
+            (s) => [s.tabs, s.tabKey],
+            (tabs, tabKey): PersonsManagementTab | null => {
+                return tabs.find((x) => x.key === tabKey) ?? null
+            },
+        ],
+
+        groupTabs: [
+            (s) => [s.groupTypes, s.groupsAccessStatus, s.aggregationLabel],
+            (groupTypes, groupsAccessStatus, aggregationLabel): PersonsManagementTab[] => {
+                const showGroupsIntroductionPage = [
+                    GroupsAccessStatus.HasAccess,
+                    GroupsAccessStatus.HasGroupTypes,
+                    GroupsAccessStatus.NoAccess,
+                ].includes(groupsAccessStatus)
+
+                const groupTabs: PersonsManagementTab[] = [
+                    ...(showGroupsIntroductionPage
+                        ? [
+                              {
+                                  key: 'groups-intro',
+                                  label: 'Groups',
+                                  url: urls.groups(0),
+                                  content: <Groups groupTypeIndex={0} />,
+                              },
+                          ]
+                        : Array.from(groupTypes.values()).map((groupType) => ({
+                              key: `groups-${groupType.group_type_index}`,
+                              label: capitalizeFirstLetter(aggregationLabel(groupType.group_type_index).plural),
+                              url: urls.groups(groupType.group_type_index),
+                              content: <Groups groupTypeIndex={groupType.group_type_index} />,
+                          }))),
+                ]
+
+                return groupTabs
+            },
+        ],
+        breadcrumbs: [
+            (s) => [s.tabs, s.activeTab],
+            (tabs, activeTab): Breadcrumb[] => {
+                return [
+                    {
+                        name: `People`,
+                        path: tabs[0].url,
+                    },
+                    activeTab
+                        ? {
+                              name: activeTab.label,
+                              path: activeTab.url,
+                          }
+                        : {
+                              name: 'Loading...',
+                          },
+                ]
+            },
+        ],
+    }),
+    actionToUrl(({ values }) => ({
+        setTabKey: ({ tabKey }) => {
+            return values.tabs.find((x) => x.key === tabKey)?.url || values.tabs[0].url
+        },
+    })),
+    urlToAction(({ actions }) => {
+        return {
+            [urls.persons()]: () => {
+                actions.setTabKey('persons')
+            },
+            [urls.cohorts()]: () => {
+                actions.setTabKey('cohorts')
+            },
+            [urls.groups(':key')]: ({ key }) => {
+                actions.setTabKey(`groups-${key}`)
+            },
+        }
+    }),
+])
diff --git a/frontend/src/scenes/persons-management/tabs/Persons.tsx b/frontend/src/scenes/persons-management/tabs/Persons.tsx
new file mode 100644
index 0000000000000..15fb70d8f518f
--- /dev/null
+++ b/frontend/src/scenes/persons-management/tabs/Persons.tsx
@@ -0,0 +1,14 @@
+import { useActions, useValues } from 'kea'
+import { personsSceneLogic } from 'scenes/persons-management/tabs/personsSceneLogic'
+import { Query } from '~/queries/Query/Query'
+
+export function Persons(): JSX.Element {
+    const { query } = useValues(personsSceneLogic)
+    const { setQuery } = useActions(personsSceneLogic)
+
+    return (
+        <>
+            <Query query={query} setQuery={setQuery} />
+        </>
+    )
+}
diff --git a/frontend/src/scenes/persons/personsSceneLogic.ts b/frontend/src/scenes/persons-management/tabs/personsSceneLogic.ts
similarity index 100%
rename from frontend/src/scenes/persons/personsSceneLogic.ts
rename to frontend/src/scenes/persons-management/tabs/personsSceneLogic.ts
diff --git a/frontend/src/scenes/persons/PersonPageHeader.tsx b/frontend/src/scenes/persons/PersonPageHeader.tsx
deleted file mode 100644
index 9e41014f08946..0000000000000
--- a/frontend/src/scenes/persons/PersonPageHeader.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useValues } from 'kea'
-import { PageHeader } from 'lib/components/PageHeader'
-import { GroupsTabs } from 'scenes/groups/GroupsTabs'
-import { groupsModel } from '~/models/groupsModel'
-
-export function PersonPageHeader({ activeGroupTypeIndex }: { activeGroupTypeIndex: number }): JSX.Element {
-    const { showGroupsOptions } = useValues(groupsModel)
-
-    return (
-        <>
-            <PageHeader
-                title={`Persons${showGroupsOptions ? ' & Groups' : ''}`}
-                caption={`A catalog of your product's end users${showGroupsOptions ? ' and groups' : ''}.`}
-            />
-            {showGroupsOptions && <GroupsTabs activeGroupTypeIndex={activeGroupTypeIndex} />}
-        </>
-    )
-}
diff --git a/frontend/src/scenes/persons/Persons.scss b/frontend/src/scenes/persons/PersonScene.scss
similarity index 100%
rename from frontend/src/scenes/persons/Persons.scss
rename to frontend/src/scenes/persons/PersonScene.scss
diff --git a/frontend/src/scenes/persons/PersonScene.tsx b/frontend/src/scenes/persons/PersonScene.tsx
index bce2a2b72d130..52349b767458d 100644
--- a/frontend/src/scenes/persons/PersonScene.tsx
+++ b/frontend/src/scenes/persons/PersonScene.tsx
@@ -3,7 +3,7 @@ import { DownOutlined } from '@ant-design/icons'
 import { useActions, useValues } from 'kea'
 import { personsLogic } from './personsLogic'
 import { PersonDisplay } from './PersonDisplay'
-import './Persons.scss'
+import './PersonScene.scss'
 import { CopyToClipboardInline } from 'lib/components/CopyToClipboard'
 import { MergeSplitPerson } from './MergeSplitPerson'
 import { PersonCohorts } from './PersonCohorts'
diff --git a/frontend/src/scenes/persons/Persons.tsx b/frontend/src/scenes/persons/Persons.tsx
deleted file mode 100644
index 2393c765e76bc..0000000000000
--- a/frontend/src/scenes/persons/Persons.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { useValues, useActions, BindLogic } from 'kea'
-import { PersonsTable } from './PersonsTable'
-import { Col, Popconfirm } from 'antd'
-import { personsLogic } from './personsLogic'
-import { CohortType, PersonType, ProductKey } from '~/types'
-import { PersonsSearch } from './PersonsSearch'
-import { PropertyFilters } from 'lib/components/PropertyFilters/PropertyFilters'
-import { TaxonomicFilterGroupType } from 'lib/components/TaxonomicFilter/types'
-import { LemonButton } from 'lib/lemon-ui/LemonButton'
-import { IconExport } from 'lib/lemon-ui/icons'
-import { triggerExport } from 'lib/components/ExportButton/exporter'
-import { LemonTableColumn } from 'lib/lemon-ui/LemonTable'
-import { ProductIntroduction } from 'lib/components/ProductIntroduction/ProductIntroduction'
-import { router } from 'kea-router'
-import { urls } from 'scenes/urls'
-import { Link } from '@posthog/lemon-ui'
-
-interface PersonsProps {
-    cohort?: CohortType['id']
-}
-
-export function Persons({ cohort }: PersonsProps = {}): JSX.Element {
-    return (
-        <BindLogic logic={personsLogic} props={{ cohort: cohort, syncWithUrl: !cohort, fixedProperties: undefined }}>
-            <PersonsScene />
-        </BindLogic>
-    )
-}
-
-interface PersonsSceneProps {
-    extraSceneActions?: JSX.Element[]
-    compact?: boolean
-    showFilters?: boolean
-    showExportAction?: boolean
-    extraColumns?: LemonTableColumn<PersonType, keyof PersonType | undefined>[]
-    showSearch?: boolean
-    emptyState?: JSX.Element
-}
-
-export function PersonsScene({
-    extraSceneActions,
-    compact,
-    extraColumns,
-    emptyState,
-    showFilters = true,
-    showExportAction = true,
-    showSearch = true,
-}: PersonsSceneProps): JSX.Element {
-    const { loadPersons, setListFilters } = useActions(personsLogic)
-    const { persons, listFilters, personsLoading, exporterProps, apiDocsURL } = useValues(personsLogic)
-    const shouldShowEmptyState = !personsLoading && persons.results.length === 0 && !listFilters.search
-
-    return (
-        <>
-            {shouldShowEmptyState ? (
-                <ProductIntroduction
-                    productName="Persons"
-                    thingName="person"
-                    productKey={ProductKey.PERSONS}
-                    description="PostHog tracks user behaviour, whether or not the user is logged in or anonymous. Once you've sent some data, the associated persons will show up here."
-                    docsURL="https://posthog.com/docs/getting-started/install"
-                    actionElementOverride={
-                        <LemonButton type="primary" onClick={() => router.actions.push(urls.ingestion() + '/platform')}>
-                            Start sending data
-                        </LemonButton>
-                    }
-                    isEmpty={true}
-                />
-            ) : (
-                <div className="persons-list">
-                    <div className="space-y-2">
-                        <div className="flex justify-between items-center gap-2">
-                            {showSearch && (
-                                <Col>
-                                    <PersonsSearch />
-                                </Col>
-                            )}
-                            <Col className="flex flex-row gap-2">
-                                {showExportAction && (
-                                    <Popconfirm
-                                        placement="topRight"
-                                        title={
-                                            <>
-                                                Exporting by CSV is limited to 10,000 users.
-                                                <br />
-                                                To export more, please use <Link to={apiDocsURL}>the API</Link>. Do you
-                                                want to export by CSV?
-                                            </>
-                                        }
-                                        onConfirm={() => triggerExport(exporterProps[0])}
-                                    >
-                                        <LemonButton
-                                            type="secondary"
-                                            icon={<IconExport style={{ color: 'var(--primary)' }} />}
-                                        >
-                                            {listFilters.properties && listFilters.properties.length > 0 ? (
-                                                <div className="block">
-                                                    Export (<strong>{listFilters.properties.length}</strong> filter)
-                                                </div>
-                                            ) : (
-                                                'Export'
-                                            )}
-                                        </LemonButton>
-                                    </Popconfirm>
-                                )}
-                                {extraSceneActions ? extraSceneActions : null}
-                            </Col>
-                        </div>
-                        {showFilters && (
-                            <PropertyFilters
-                                pageKey="persons-list-page"
-                                propertyFilters={listFilters.properties}
-                                onChange={(properties) => {
-                                    setListFilters({ properties })
-                                    loadPersons()
-                                }}
-                                endpoint="person"
-                                taxonomicGroupTypes={[TaxonomicFilterGroupType.PersonProperties]}
-                                showConditionBadge
-                            />
-                        )}
-                        <PersonsTable
-                            people={persons.results}
-                            loading={personsLoading}
-                            hasPrevious={!!persons.previous}
-                            hasNext={!!persons.next}
-                            loadPrevious={() => loadPersons(persons.previous)}
-                            loadNext={() => loadPersons(persons.next)}
-                            compact={compact}
-                            extraColumns={extraColumns}
-                            emptyState={emptyState}
-                        />
-                    </div>
-                </div>
-            )}
-        </>
-    )
-}
diff --git a/frontend/src/scenes/persons/PersonsScene.tsx b/frontend/src/scenes/persons/PersonsScene.tsx
deleted file mode 100644
index 4e5faea47610a..0000000000000
--- a/frontend/src/scenes/persons/PersonsScene.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { SceneExport } from 'scenes/sceneTypes'
-import { useActions, useValues } from 'kea'
-import { Query } from '~/queries/Query/Query'
-import { PersonPageHeader } from 'scenes/persons/PersonPageHeader'
-import { personsSceneLogic } from 'scenes/persons/personsSceneLogic'
-
-export const scene: SceneExport = {
-    component: PersonsScene,
-}
-
-export function PersonsScene(): JSX.Element {
-    const { query } = useValues(personsSceneLogic)
-    const { setQuery } = useActions(personsSceneLogic)
-
-    return (
-        <>
-            <PersonPageHeader activeGroupTypeIndex={-1} />
-            <Query query={query} setQuery={setQuery} />
-        </>
-    )
-}
diff --git a/frontend/src/scenes/persons/PersonsTable.tsx b/frontend/src/scenes/persons/PersonsTable.tsx
index 40e150e4683a4..c3d8a2f456fe6 100644
--- a/frontend/src/scenes/persons/PersonsTable.tsx
+++ b/frontend/src/scenes/persons/PersonsTable.tsx
@@ -1,7 +1,6 @@
 import { TZLabel } from 'lib/components/TZLabel'
 import { PropertiesTable } from 'lib/components/PropertiesTable'
 import { PersonType, PropertyDefinitionType } from '~/types'
-import './Persons.scss'
 import { CopyToClipboardInline } from 'lib/components/CopyToClipboard'
 import { PersonDisplay } from './PersonDisplay'
 import { LemonTable, LemonTableColumn, LemonTableColumns } from 'lib/lemon-ui/LemonTable'
diff --git a/frontend/src/scenes/sceneLogic.test.tsx b/frontend/src/scenes/sceneLogic.test.tsx
index edf4c4b4d6f3b..57e23434dc538 100644
--- a/frontend/src/scenes/sceneLogic.test.tsx
+++ b/frontend/src/scenes/sceneLogic.test.tsx
@@ -15,7 +15,7 @@ export const logic = kea<logicType>([path(['scenes', 'sceneLogic', 'test'])])
 const sceneImport = (): any => ({ scene: { component: Component, logic: logic } })
 
 const testScenes: Record<string, () => any> = {
-    [Scene.Annotations]: sceneImport,
+    [Scene.DataManagement]: sceneImport,
     [Scene.MySettings]: sceneImport,
 }
 
@@ -26,7 +26,7 @@ describe('sceneLogic', () => {
         initKeaTests()
         await expectLogic(teamLogic).toDispatchActions(['loadCurrentTeamSuccess'])
         featureFlagLogic.mount()
-        router.actions.push(urls.annotations())
+        router.actions.push(urls.eventDefinitions())
         logic = sceneLogic({ scenes: testScenes })
         logic.mount()
     })
@@ -43,7 +43,7 @@ describe('sceneLogic', () => {
 
     it('changing URL runs openScene, loadScene and setScene', async () => {
         await expectLogic(logic).toDispatchActions(['openScene', 'loadScene', 'setScene']).toMatchValues({
-            scene: Scene.Annotations,
+            scene: Scene.DataManagement,
         })
         router.actions.push(urls.mySettings())
         await expectLogic(logic).toDispatchActions(['openScene', 'loadScene', 'setScene']).toMatchValues({
@@ -53,7 +53,7 @@ describe('sceneLogic', () => {
 
     it('persists the loaded scenes', async () => {
         const expectedAnnotation = partial({
-            name: Scene.Annotations,
+            name: Scene.DataManagement,
             component: expect.any(Function),
             logic: expect.any(Function),
             sceneParams: { hashParams: {}, params: {}, searchParams: {} },
@@ -71,7 +71,7 @@ describe('sceneLogic', () => {
             .delay(1)
             .toMatchValues({
                 loadedScenes: partial({
-                    [Scene.Annotations]: expectedAnnotation,
+                    [Scene.DataManagement]: expectedAnnotation,
                 }),
             })
         router.actions.push(urls.mySettings())
@@ -79,7 +79,7 @@ describe('sceneLogic', () => {
             .delay(1)
             .toMatchValues({
                 loadedScenes: partial({
-                    [Scene.Annotations]: expectedAnnotation,
+                    [Scene.DataManagement]: expectedAnnotation,
                     [Scene.MySettings]: expectedMySettings,
                 }),
             })
diff --git a/frontend/src/scenes/sceneLogic.ts b/frontend/src/scenes/sceneLogic.ts
index 039e4d9cf8cfd..b90f49d9e2f5c 100644
--- a/frontend/src/scenes/sceneLogic.ts
+++ b/frontend/src/scenes/sceneLogic.ts
@@ -19,17 +19,12 @@ import { FEATURE_FLAGS } from 'lib/constants'
 /** Mapping of some scenes that aren't directly accessible from the sidebar to ones that are - for the sidebar. */
 const sceneNavAlias: Partial<Record<Scene, Scene>> = {
     [Scene.Action]: Scene.DataManagement,
-    [Scene.Actions]: Scene.DataManagement,
-    [Scene.EventDefinitions]: Scene.DataManagement,
-    [Scene.PropertyDefinitions]: Scene.DataManagement,
     [Scene.EventDefinition]: Scene.DataManagement,
     [Scene.PropertyDefinition]: Scene.DataManagement,
-    [Scene.IngestionWarnings]: Scene.DataManagement,
-    [Scene.Person]: Scene.Persons,
-    [Scene.Cohort]: Scene.Cohorts,
-    [Scene.Groups]: Scene.Persons,
+    [Scene.Person]: Scene.PersonsManagement,
+    [Scene.Cohort]: Scene.PersonsManagement,
     [Scene.Experiment]: Scene.Experiments,
-    [Scene.Group]: Scene.Persons,
+    [Scene.Group]: Scene.PersonsManagement,
     [Scene.Dashboard]: Scene.Dashboards,
     [Scene.FeatureFlag]: Scene.FeatureFlags,
     [Scene.EarlyAccessFeature]: Scene.EarlyAccessFeatures,
diff --git a/frontend/src/scenes/sceneTypes.ts b/frontend/src/scenes/sceneTypes.ts
index 523717aad0ffa..7ccdb9ed2f0f6 100644
--- a/frontend/src/scenes/sceneTypes.ts
+++ b/frontend/src/scenes/sceneTypes.ts
@@ -9,29 +9,21 @@ export enum Scene {
     ErrorProjectUnavailable = 'ProjectUnavailable',
     Dashboards = 'Dashboards',
     Dashboard = 'Dashboard',
-    Database = 'Database',
     Insight = 'Insight',
     WebAnalytics = 'WebAnalytics',
-    Cohorts = 'Cohorts',
     Cohort = 'Cohort',
     Events = 'Events',
     DataManagement = 'DataManagement',
-    EventDefinitions = 'EventDefinitionsTable',
     EventDefinition = 'EventDefinition',
-    PropertyDefinitions = 'PropertyDefinitionsTable',
     PropertyDefinition = 'PropertyDefinition',
-    DataManagementHistory = 'DataManagementHistory',
-    IngestionWarnings = 'IngestionWarnings',
     Replay = 'Replay',
     ReplaySingle = 'ReplaySingle',
     ReplayPlaylist = 'ReplayPlaylist',
+    PersonsManagement = 'PersonsManagement',
     Person = 'Person',
-    Persons = 'Persons',
     Pipeline = 'Pipeline',
-    Groups = 'Groups',
     Group = 'Group',
     Action = 'Action',
-    Actions = 'ActionsTable',
     Experiments = 'Experiments',
     Experiment = 'Experiment',
     BatchExports = 'BatchExports',
@@ -59,7 +51,6 @@ export enum Scene {
     AsyncMigrations = 'AsyncMigrations',
     DeadLetterQueue = 'DeadLetterQueue',
     MySettings = 'MySettings',
-    Annotations = 'Annotations',
     Billing = 'Billing',
     Apps = 'Apps',
     FrontendAppScene = 'FrontendAppScene',
diff --git a/frontend/src/scenes/scenes.ts b/frontend/src/scenes/scenes.ts
index e56a65e708e36..42167571d315a 100644
--- a/frontend/src/scenes/scenes.ts
+++ b/frontend/src/scenes/scenes.ts
@@ -48,10 +48,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         name: 'Web Analytics',
         layout: 'app-container',
     },
-    [Scene.Cohorts]: {
-        projectBased: true,
-        name: 'Cohorts',
-    },
     [Scene.Cohort]: {
         projectBased: true,
         name: 'Cohort',
@@ -76,38 +72,14 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Data Management',
     },
-    [Scene.Actions]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
-    [Scene.EventDefinitions]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
     [Scene.EventDefinition]: {
         projectBased: true,
         name: 'Data Management',
     },
-    [Scene.PropertyDefinitions]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
     [Scene.PropertyDefinition]: {
         projectBased: true,
         name: 'Data Management',
     },
-    [Scene.DataManagementHistory]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
-    [Scene.IngestionWarnings]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
-    [Scene.Database]: {
-        projectBased: true,
-        name: 'Data Management',
-    },
     [Scene.Replay]: {
         projectBased: true,
         name: 'Session Replay',
@@ -124,7 +96,7 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Person',
     },
-    [Scene.Persons]: {
+    [Scene.PersonsManagement]: {
         projectBased: true,
         name: 'Persons & Groups',
     },
@@ -132,10 +104,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
         projectBased: true,
         name: 'Action',
     },
-    [Scene.Groups]: {
-        projectBased: true,
-        name: 'Persons & Groups',
-    },
     [Scene.Group]: {
         projectBased: true,
         name: 'Persons & Groups',
@@ -201,10 +169,6 @@ export const sceneConfigurations: Partial<Record<Scene, SceneConfig>> = {
     [Scene.EarlyAccessFeature]: {
         projectBased: true,
     },
-    [Scene.Annotations]: {
-        projectBased: true,
-        name: 'Annotations',
-    },
     [Scene.Apps]: {
         projectBased: true,
         name: 'Apps',
@@ -357,12 +321,12 @@ export const redirects: Record<
     '/dashboards': urls.dashboards(),
     '/plugins': urls.projectApps(),
     '/project/plugins': urls.projectApps(),
-    '/actions': urls.actions(), // TODO: change to urls.eventDefinitions() when "simplify-actions" FF is released
+    '/actions': urls.actions(),
     '/organization/members': urls.organizationSettings(),
     '/i/:shortId': ({ shortId }) => urls.insightView(shortId),
     '/action/:id': ({ id }) => urls.action(id),
     '/action': urls.createAction(),
-    '/events/actions': urls.actions(), // TODO: change to urls.eventDefinitions() when "simplify-actions" FF is released
+    '/events/actions': urls.actions(),
     '/events/stats': urls.eventDefinitions(),
     '/events/stats/:id': ({ id }) => urls.eventDefinition(id),
     '/events/:id/*': ({ id, _ }) => {
@@ -385,6 +349,8 @@ export const redirects: Record<
     },
     '/events/properties': urls.propertyDefinitions(),
     '/events/properties/:id': ({ id }) => urls.propertyDefinition(id),
+    '/annotations': () => urls.annotations(),
+    '/annotations/:id': ({ id }) => urls.annotation(id),
     '/recordings/:id': ({ id }) => urls.replaySingle(id),
     '/recordings/playlists/:id': ({ id }) => urls.replayPlaylist(id),
     '/recordings': (_params, _searchParams, hashParams) => {
@@ -408,7 +374,7 @@ export const routes: Record<string, Scene> = {
     [urls.createAction()]: Scene.Action,
     [urls.copyAction(null)]: Scene.Action,
     [urls.action(':id')]: Scene.Action,
-    [urls.ingestionWarnings()]: Scene.IngestionWarnings,
+    [urls.ingestionWarnings()]: Scene.DataManagement,
     [urls.insightNew()]: Scene.Insight,
     [urls.insightEdit(':shortId' as InsightShortId)]: Scene.Insight,
     [urls.insightView(':shortId' as InsightShortId)]: Scene.Insight,
@@ -417,17 +383,17 @@ export const routes: Record<string, Scene> = {
     [urls.insightSharing(':shortId' as InsightShortId)]: Scene.Insight,
     [urls.savedInsights()]: Scene.SavedInsights,
     [urls.webAnalytics()]: Scene.WebAnalytics,
-    [urls.actions()]: Scene.Actions, // TODO: remove when "simplify-actions" FF is released
-    [urls.eventDefinitions()]: Scene.EventDefinitions,
+    [urls.actions()]: Scene.DataManagement,
+    [urls.eventDefinitions()]: Scene.DataManagement,
     [urls.eventDefinition(':id')]: Scene.EventDefinition,
     [urls.batchExports()]: Scene.BatchExports,
     [urls.batchExportNew()]: Scene.BatchExportEdit,
     [urls.batchExport(':id')]: Scene.BatchExport,
     [urls.batchExportEdit(':id')]: Scene.BatchExportEdit,
-    [urls.propertyDefinitions()]: Scene.PropertyDefinitions,
+    [urls.propertyDefinitions()]: Scene.DataManagement,
     [urls.propertyDefinition(':id')]: Scene.PropertyDefinition,
-    [urls.dataManagementHistory()]: Scene.DataManagementHistory,
-    [urls.database()]: Scene.Database,
+    [urls.dataManagementHistory()]: Scene.DataManagement,
+    [urls.database()]: Scene.DataManagement,
     [urls.events()]: Scene.Events,
     [urls.replay()]: Scene.Replay,
     // One entry for every available tab
@@ -439,18 +405,18 @@ export const routes: Record<string, Scene> = {
     [urls.replayPlaylist(':id')]: Scene.ReplayPlaylist,
     [urls.personByDistinctId('*', false)]: Scene.Person,
     [urls.personByUUID('*', false)]: Scene.Person,
-    [urls.persons()]: Scene.Persons,
+    [urls.persons()]: Scene.PersonsManagement,
     [urls.pipeline()]: Scene.Pipeline,
     // One entry for every available tab
     ...Object.values(PipelineTabs).reduce((acc, tab) => {
         acc[urls.pipeline(tab)] = Scene.Pipeline
         return acc
     }, {} as Record<string, Scene>),
-    [urls.groups(':groupTypeIndex')]: Scene.Groups,
+    [urls.groups(':groupTypeIndex')]: Scene.PersonsManagement,
     [urls.group(':groupTypeIndex', ':groupKey', false)]: Scene.Group,
     [urls.group(':groupTypeIndex', ':groupKey', false, ':groupTab')]: Scene.Group,
     [urls.cohort(':id')]: Scene.Cohort,
-    [urls.cohorts()]: Scene.Cohorts,
+    [urls.cohorts()]: Scene.PersonsManagement,
     [urls.experiments()]: Scene.Experiments,
     [urls.experiment(':id')]: Scene.Experiment,
     [urls.earlyAccessFeatures()]: Scene.EarlyAccessFeatures,
@@ -466,8 +432,8 @@ export const routes: Record<string, Scene> = {
     [urls.dataWarehouseSettings()]: Scene.DataWarehouseSettings,
     [urls.featureFlags()]: Scene.FeatureFlags,
     [urls.featureFlag(':id')]: Scene.FeatureFlag,
-    [urls.annotations()]: Scene.Annotations,
-    [urls.annotation(':id')]: Scene.Annotations,
+    [urls.annotations()]: Scene.DataManagement,
+    [urls.annotation(':id')]: Scene.DataManagement,
     [urls.projectHomepage()]: Scene.ProjectHomepage,
     [urls.projectSettings()]: Scene.ProjectSettings,
     [urls.projectApps()]: Scene.Apps,
diff --git a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
index 9df94720ef541..49bb97485ad82 100644
--- a/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
+++ b/frontend/src/scenes/session-recordings/player/inspector/components/ItemPerformanceEvent.tsx
@@ -169,7 +169,7 @@ export function ItemPerformanceEvent({
                                 {performanceSummaryCards.map(({ label, description, key, scoreBenchmarks }, index) => (
                                     <Fragment key={key}>
                                         {index !== 0 && <LemonDivider vertical dashed />}
-                                        <Tooltip isDefaultTooltip title={description}>
+                                        <Tooltip title={description}>
                                             <div className="flex-1 p-2 text-center">
                                                 <div className="text-sm">{label}</div>
                                                 <div className="text-lg font-semibold">
diff --git a/frontend/src/scenes/teamLogic.tsx b/frontend/src/scenes/teamLogic.tsx
index be21abb60f6da..26fadbed4ed66 100644
--- a/frontend/src/scenes/teamLogic.tsx
+++ b/frontend/src/scenes/teamLogic.tsx
@@ -1,4 +1,4 @@
-import { actions, connect, events, kea, listeners, path, reducers, selectors } from 'kea'
+import { actions, afterMount, connect, kea, listeners, path, reducers, selectors } from 'kea'
 import api from 'lib/api'
 import type { teamLogicType } from './teamLogicType'
 import { CorrelationConfigType, PropertyOperator, TeamPublicType, TeamType } from '~/types'
@@ -222,28 +222,26 @@ export const teamLogic = kea<teamLogicType>([
             lemonToast.success('Project has been deleted')
         },
     })),
-    events(({ actions }) => ({
-        afterMount: () => {
-            const appContext = getAppContext()
-            const currentTeam = appContext?.current_team
-            const switchedTeam = appContext?.switched_team
-            if (switchedTeam) {
-                lemonToast.info(<>You've switched to&nbsp;project {currentTeam?.name}</>, {
-                    button: {
-                        label: 'Switch back',
-                        action: () => userLogic.actions.updateCurrentTeam(switchedTeam),
-                    },
-                    icon: <IconSwapHoriz />,
-                })
-            }
+    afterMount(({ actions }) => {
+        const appContext = getAppContext()
+        const currentTeam = appContext?.current_team
+        const switchedTeam = appContext?.switched_team
+        if (switchedTeam) {
+            lemonToast.info(<>You've switched to&nbsp;project {currentTeam?.name}</>, {
+                button: {
+                    label: 'Switch back',
+                    action: () => userLogic.actions.updateCurrentTeam(switchedTeam),
+                },
+                icon: <IconSwapHoriz />,
+            })
+        }
 
-            if (currentTeam) {
-                // If app context is available (it should be practically always) we can immediately know currentTeam
-                actions.loadCurrentTeamSuccess(currentTeam)
-            } else {
-                // If app context is not available, a traditional request is needed
-                actions.loadCurrentTeam()
-            }
-        },
-    })),
+        if (currentTeam) {
+            // If app context is available (it should be practically always) we can immediately know currentTeam
+            actions.loadCurrentTeamSuccess(currentTeam)
+        } else {
+            // If app context is not available, a traditional request is needed
+            actions.loadCurrentTeam()
+        }
+    }),
 ])
diff --git a/frontend/src/scenes/urls.ts b/frontend/src/scenes/urls.ts
index 1d087c0100c3c..4f0097d2bf180 100644
--- a/frontend/src/scenes/urls.ts
+++ b/frontend/src/scenes/urls.ts
@@ -117,8 +117,8 @@ export const urls = {
     dataWarehouseExternal: (): string => '/data-warehouse/external',
     dataWarehouseSavedQueries: (): string => '/data-warehouse/views',
     dataWarehouseSettings: (): string => '/data-warehouse/settings',
-    annotations: (): string => '/annotations',
-    annotation: (id: AnnotationType['id'] | ':id'): string => `/annotations/${id}`,
+    annotations: (): string => '/data-management/annotations',
+    annotation: (id: AnnotationType['id'] | ':id'): string => `/data-management/annotations/${id}`,
     projectApps: (tab?: PluginTab): string => `/project/apps${tab ? `?tab=${tab}` : ''}`,
     projectApp: (id: string | number): string => `/project/apps/${id}`,
     projectAppSearch: (name: string): string => `/project/apps?name=${name}`,
diff --git a/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png b/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png
index 42cc00ad95c9a..e411cd1451433 100644
Binary files a/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png and b/playwright/e2e-vrt/layout/Navigation.spec.ts-snapshots/Navigation-App-Page-With-Side-Bar-Shown-Mobile-1-chromium-linux.png differ