diff --git a/apps/client/src/common/components/client-modal/RedirectClientModal.tsx b/apps/client/src/common/components/client-modal/RedirectClientModal.tsx
index 3fd9dc251..553d93e71 100644
--- a/apps/client/src/common/components/client-modal/RedirectClientModal.tsx
+++ b/apps/client/src/common/components/client-modal/RedirectClientModal.tsx
@@ -64,7 +64,7 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
             Either by selecting a URL Preset or entering a custom path.
             <br />
             <br />
-            <AppLink search='settings=feature_settings__urlpresets'>Manage URL Presets</AppLink>
+            <AppLink search='settings=sharing__presets'>Manage URL Presets</AppLink>
           </Info>
           <div>
             <span className={style.label}>Select View or URL Preset</span>
diff --git a/apps/client/src/features/control/playback/playback-timer/PlaybackTimer.tsx b/apps/client/src/features/control/playback/playback-timer/PlaybackTimer.tsx
index 0b49e5bf1..f4d28dfad 100644
--- a/apps/client/src/features/control/playback/playback-timer/PlaybackTimer.tsx
+++ b/apps/client/src/features/control/playback/playback-timer/PlaybackTimer.tsx
@@ -95,7 +95,7 @@ function StoppedStatus() {
   const hasReport = Object.keys(data).length > 0;
 
   if (hasReport) {
-    return <AppLink search='settings=feature_settings__report'>Go to report management</AppLink>;
+    return <AppLink search='settings=sharing__report'>Go to report management</AppLink>;
   }
 
   return null;
diff --git a/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx b/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx
index 8cc8f5c99..930f59c13 100644
--- a/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx
+++ b/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx
@@ -118,7 +118,7 @@ export default function BlockEditor({ block }: BlockEditorProps) {
       <div className={style.column}>
         <Editor.Title>
           Custom Fields
-          {isEditor && <AppLink search='settings=feature_settings__custom'>Manage Custom Fields</AppLink>}
+          {isEditor && <AppLink search='settings=manage__custom'>Manage Custom Fields</AppLink>}
         </Editor.Title>
         <EntryEditorCustomFields fields={customFields} handleSubmit={handleSubmit} entry={block} />
       </div>
diff --git a/apps/client/src/features/rundown/entry-editor/EventEditor.tsx b/apps/client/src/features/rundown/entry-editor/EventEditor.tsx
index 7325a086e..da6900dca 100644
--- a/apps/client/src/features/rundown/entry-editor/EventEditor.tsx
+++ b/apps/client/src/features/rundown/entry-editor/EventEditor.tsx
@@ -67,14 +67,14 @@ export default function EventEditor({ event }: EventEditorProps) {
       <div className={style.column}>
         <Editor.Title>
           Custom Fields
-          {isEditor && <AppLink search='settings=feature_settings__custom'>Manage Custom Fields</AppLink>}
+          {isEditor && <AppLink search='settings=manage__custom'>Manage Custom Fields</AppLink>}
         </Editor.Title>
         <EntryEditorCustomFields fields={customFields} handleSubmit={handleSubmit} entry={event} />
       </div>
       <div className={style.column}>
         <Editor.Title>
           Automations
-          {isEditor && <AppLink search='settings=automation__automations'>Manage Automations</AppLink>}
+          {isEditor && <AppLink search='settings=automation'>Manage Automations</AppLink>}
         </Editor.Title>
         <EventEditorTriggers triggers={event.triggers} eventId={event.id} />
       </div>
diff --git a/apps/client/src/features/rundown/entry-editor/MilestoneEditor.tsx b/apps/client/src/features/rundown/entry-editor/MilestoneEditor.tsx
index 2c9d5a90e..39a2e6c46 100644
--- a/apps/client/src/features/rundown/entry-editor/MilestoneEditor.tsx
+++ b/apps/client/src/features/rundown/entry-editor/MilestoneEditor.tsx
@@ -68,7 +68,7 @@ export default function MilestoneEditor({ milestone }: MilestoneEditorProps) {
       <div className={style.column}>
         <Editor.Title>
           Custom Fields
-          {isEditor && <AppLink search='settings=feature_settings__custom'>Manage Custom Fields</AppLink>}
+          {isEditor && <AppLink search='settings=manage__custom'>Manage Custom Fields</AppLink>}
         </Editor.Title>
         <EntryEditorCustomFields fields={customFields} handleSubmit={handleSubmit} entry={milestone} />
       </div>
diff --git a/apps/electron/src/menu/applicationMenu.js b/apps/electron/src/menu/applicationMenu.js
index 5b4309254..78d3b7bb4 100644
--- a/apps/electron/src/menu/applicationMenu.js
+++ b/apps/electron/src/menu/applicationMenu.js
@@ -111,12 +111,12 @@ function makeFileMenu(serverUrl, redirectWindow, showDialog, download) {
         click: () => redirectWindow('/editor?settings=project__create'),
       },
       {
-        label: 'Edit project info...',
-        click: () => redirectWindow('/editor?settings=project__data'),
+        label: 'Edit project data...',
+        click: () => redirectWindow('/editor?settings=settings__data'),
       },
       {
         label: 'Manage projects',
-        click: () => redirectWindow('/editor?settings=project__manage'),
+        click: () => redirectWindow('/editor?settings=project__list'),
       },
       {
         label: 'Download project',
@@ -148,21 +148,17 @@ function makeViewMenu(clientUrl) {
   return {
     label: 'Views',
     submenu: [
-      makeItemOpenInBrowser('Lower Thirds', `${clientUrl}/lower`),
-      { type: 'separator' },
-      makeItemOpenInBrowser('Timer', `${clientUrl}/timer`),
-      makeItemOpenInBrowser('Minimal Timer', `${clientUrl}/minimal`),
-      makeItemOpenInBrowser('Clock', `${clientUrl}/clock`),
-      makeItemOpenInBrowser('Backstage', `${clientUrl}/backstage`),
-      makeItemOpenInBrowser('Timeline (beta)', `${clientUrl}/timeline`),
-      makeItemOpenInBrowser('Studio Clock', `${clientUrl}/studio`),
-      makeItemOpenInBrowser('Countdown', `${clientUrl}/countdown`),
-      { type: 'separator' },
       makeItemOpenInBrowser('Editor', `${clientUrl}/editor`),
       makeItemOpenInBrowser('Cuesheet', `${clientUrl}/cuesheet`),
       makeItemOpenInBrowser('Operator', `${clientUrl}/op`),
+      { type: 'separator' },
+      makeItemOpenInBrowser('Timer', `${clientUrl}/timer`),
+      makeItemOpenInBrowser('Backstage', `${clientUrl}/backstage`),
+      makeItemOpenInBrowser('Timeline (beta)', `${clientUrl}/timeline`),
+      makeItemOpenInBrowser('Lower Thirds', `${clientUrl}/lower`),
+      makeItemOpenInBrowser('Studio Clock', `${clientUrl}/studio`),
+      makeItemOpenInBrowser('Countdown', `${clientUrl}/countdown`),
       makeItemOpenInBrowser('Project info', `${clientUrl}/info`),
-
       { type: 'separator' },
       { role: 'forceReload' },
       { type: 'separator' },
@@ -190,65 +186,60 @@ function makeSettingsMenu(redirectWindow) {
       {
         label: 'Open Settings',
         accelerator: 'CommandOrControl+,',
-        click: () => redirectWindow('/editor?settings=project'),
-      },
-      {
-        label: 'Project',
-        submenu: [
-          {
-            label: 'Project data',
-            click: () => redirectWindow('/editor?settings=project__data'),
-          },
-          {
-            label: 'Manage projects',
-            click: () => redirectWindow('/editor?settings=project__manage'),
-          },
-        ],
+        click: () => redirectWindow('/editor?settings=settings'),
       },
       {
         label: 'App Settings',
         submenu: [
           {
-            label: 'General settings',
-            click: () => redirectWindow('/editor?settings=general__settings'),
+            label: 'Project data',
+            click: () => redirectWindow('/editor?settings=settings__data'),
           },
           {
-            label: 'Editor settings',
-            click: () => redirectWindow('/editor?settings=general__editor'),
+            label: 'General settings',
+            click: () => redirectWindow('/editor?settings=settings__general'),
           },
           {
             label: 'View settings',
-            click: () => redirectWindow('/editor?settings=general__view'),
+            click: () => redirectWindow('/editor?settings=settings__view'),
           },
         ],
       },
       {
-        label: 'Feature Settings',
+        label: 'Project',
         submenu: [
+          {
+            label: 'Create...',
+            click: () => redirectWindow('/editor?settings=project__create'),
+          },
+          {
+            label: 'Manage projects',
+            click: () => redirectWindow('/editor?settings=project__list'),
+          },
+        ],
+      },
+      {
+        label: 'Project data',
+        submenu: [
+          {
+            label: 'Rundown defaults',
+            click: () => redirectWindow('/editor?settings=manage__defaults'),
+          },
           {
             label: 'Custom fields',
-            click: () => redirectWindow('/editor?settings=feature_settings__custom'),
+            click: () => redirectWindow('/editor?settings=manage__custom'),
           },
           {
-            label: 'URL presets',
-            click: () => redirectWindow('/editor?settings=feature_settings__urlpresets'),
+            label: 'Manage rundowns',
+            click: () => redirectWindow('/editor?settings=manage__rundowns'),
           },
-          {
-            label: 'Report',
-            click: () => redirectWindow('/editor?settings=feature_settings__report'),
-          },
-        ],
-      },
-      {
-        label: 'Data Sources',
-        submenu: [
           {
             label: 'Import spreadsheet',
-            click: () => redirectWindow('/editor?settings=sources__xlsx'),
+            click: () => redirectWindow('/editor?settings=manage__sheets'),
           },
           {
             label: 'Sync with Google Sheet',
-            click: () => redirectWindow('/editor?settings=sources__gsheet'),
+            click: () => redirectWindow('/editor?settings=manage__sheets'),
           },
         ],
       },
@@ -270,12 +261,25 @@ function makeSettingsMenu(redirectWindow) {
         ],
       },
       {
-        label: 'Network',
+        label: 'Sharing and reporting',
         submenu: [
           {
-            label: 'Share link',
-            click: () => redirectWindow('/editor?settings=network__link'),
+            label: 'URL presets',
+            click: () => redirectWindow('/editor?settings=sharing__presets'),
           },
+          {
+            label: 'Share link',
+            click: () => redirectWindow('/editor?settings=sharing__link'),
+          },
+          {
+            label: 'Runtime report',
+            click: () => redirectWindow('/editor?settings=sharing__report'),
+          },
+        ],
+      },
+      {
+        label: 'Network',
+        submenu: [
           {
             label: 'Event log',
             click: () => redirectWindow('/editor?settings=network__log'),