Improve editor settings navigation, UX, and visual design

- Unsaved changes guard: confirm dialog when navigating away from dirty forms (GeneralSettings, ProjectData, ViewSettings, ServerPortSettings, AutomationSettingsForm) - Sticky breadcrumb header: replaces floating close button with a sticky top bar showing current panel › section context - Scroll-to-sidebar sync: IntersectionObserver in useScrollIntoView feeds active scroll section back into sidebar secondary item highlights - Rich empty states: ClientList now shows friendly messages for empty Ontime/Other client tables - Sidebar styling: distinct background, right border, left-accent active indicator (VS Code style) - Card elevation: raised opacity + box-shadow for visible depth hierarchy - Border radius: 8px cards and 6px sidebar items using existing theme variable https://claude.ai/code/session_017jeJF78B4eXcpXAj7KGmnF
2026-08-09 01:13:55 +00:00 · 2026-05-28 06:51:24 +00:00
123 changed files with 1408 additions and 4473 deletions
@@ -15,10 +15,6 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
      - name: Setup pnpm
        uses: pnpm/action-setup@v6

@@ -58,10 +54,6 @@ jobs:
    steps:
      - uses: actions/checkout@v6

-      - uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-
      - name: Setup pnpm
        uses: pnpm/action-setup@v6

@@ -89,11 +81,11 @@ jobs:
          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
          restore-keys: |
            ${{ runner.os }}-playwright-
-      - run: pnpm playwright install --with-deps
+      - run: npx playwright install --with-deps
        if: steps.playwright-cache.outputs.cache-hit != 'true'

      - name: Install Playwright Browsers
-        run: pnpm playwright install --with-deps
+        run: npx playwright install --with-deps

      - name: Run Playwright tests
        run: pnpm e2e
@@ -54,6 +54,3 @@ ontime-data/

 # temporary write files
 **.tmp
-
-# Claude Code metadata
-.claude/
@@ -1 +1 @@
-v22.22.3
+v22.22.2
@@ -1,6 +1,6 @@
 {
  "name": "@getontime/cli",
-  "version": "4.10.0",
+  "version": "4.8.0",
  "author": "Carlos Valente",
  "description": "Time keeping for live events",
  "repository": "https://github.com/cpvalente/ontime",
@@ -1,10 +1,10 @@
 {
  "name": "ontime-ui",
-  "version": "4.10.0",
+  "version": "4.8.0",
  "private": true,
  "type": "module",
  "dependencies": {
-    "@base-ui/react": "1.6.0",
+    "@base-ui/react": "1.3.0",
    "@codemirror/commands": "^6.0.0",
    "@codemirror/lang-css": "^6.0.0",
    "@codemirror/state": "^6.0.0",
@@ -12,27 +12,27 @@
    "@dnd-kit/core": "^6.3.1",
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
-    "@fontsource/open-sans": "^5.2.7",
+    "@fontsource/open-sans": "^5.2.6",
    "@mantine/hooks": "^8.3.7",
-    "@sentry/react": "^10.59.0",
+    "@sentry/react": "^10.2.0",
    "@table-nav/react": "^0.0.7",
-    "@tanstack/react-query": "^5.101.0",
-    "@tanstack/react-query-devtools": "^5.101.0",
+    "@tanstack/react-query": "^5.85.9",
+    "@tanstack/react-query-devtools": "^5.85.9",
    "@tanstack/react-table": "^8.21.3",
-    "@uiw/codemirror-theme-vscode": "^4.25.10",
+    "@uiw/codemirror-theme-vscode": "^4.25.9",
    "autosize": "^6.0.1",
-    "axios": "^1.18.0",
+    "axios": "^1.12.2",
    "csv-stringify": "^6.6.0",
    "qrcode": "^1.5.4",
-    "react": "^19.2.7",
-    "react-colorful": "^5.7.0",
-    "react-dom": "^19.2.7",
+    "react": "^19.2.3",
+    "react-colorful": "^5.6.1",
+    "react-dom": "^19.2.3",
    "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.80.0",
-    "react-icons": "5.6.0",
-    "react-router": "^8.0.1",
-    "react-virtuoso": "^4.18.7",
-    "zustand": "^5.0.14"
+    "react-hook-form": "^7.72.0",
+    "react-icons": "5.5.0",
+    "react-router": "^7.11.0",
+    "react-virtuoso": "^4.17.0",
+    "zustand": "^5.0.9"
  },
  "scripts": {
    "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -34,17 +34,19 @@ export async function fetchCurrentRundown(options?: RequestOptions): Promise<Run
    throw new Error('Invalid rundown payload');
  }
  return res.data;
-}

-/**
- * HTTP request to fetch all entries in the given rundown
- */
-export async function fetchRundown(rundownId: RundownId, options?: RequestOptions): Promise<Rundown> {
-  const res = await axios.get(`${rundownPath}/${rundownId}`, { signal: options?.signal });
-  if (!isValidRundown(res.data)) {
-    throw new Error('Invalid rundown payload');
+  function isValidRundown(x: any): x is Rundown {
+    return (
+      x &&
+      typeof x === 'object' &&
+      typeof x.id === 'string' &&
+      Array.isArray(x.order) &&
+      Array.isArray(x.flatOrder) &&
+      x.entries &&
+      typeof x.entries === 'object' &&
+      typeof x.revision === 'number'
+    );
  }
-  return res.data;
 }

 /**
@@ -195,16 +197,3 @@ export async function requestDeleteAll(rundownId: RundownId): Promise<AxiosRespo
 }

 // #endregion operations on rundown entries =======================
-
-function isValidRundown(x: any): x is Rundown {
-  return (
-    x &&
-    typeof x === 'object' &&
-    typeof x.id === 'string' &&
-    Array.isArray(x.order) &&
-    Array.isArray(x.flatOrder) &&
-    x.entries &&
-    typeof x.entries === 'object' &&
-    typeof x.revision === 'number'
-  );
-}
@@ -3,8 +3,8 @@ import { ChangeEvent, KeyboardEvent, RefObject, useCallback, useEffect, useMemo,

 interface UseReactiveTextInputReturn {
  value: string;
-  onChange: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
-  onBlur: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
+  onChange: (event: ChangeEvent) => void;
+  onBlur: (event: ChangeEvent) => void;
  onKeyDown: (event: KeyboardEvent<HTMLElement>) => void;
 }

@@ -15,9 +15,7 @@ export default function useReactiveTextInput(
  options?: {
    submitOnEnter?: boolean;
    submitOnCtrlEnter?: boolean;
-    submitOnTab?: boolean;
    onCancelUpdate?: () => void;
-    onTabCancel?: () => void;
    allowSubmitSameValue?: boolean;
    allowKeyboardNavigation?: boolean;
  },
@@ -25,10 +23,6 @@ export default function useReactiveTextInput(
  const [text, setText] = useState<string>(initialText);
  // track whether we are submitting via a submit key (eg enter) and avoid submitting again on blur
  const isKeyboardSubmitting = useRef(false);
-  // track escape to prevent the subsequent blur from submitting
-  const isEscaping = useRef(false);
-  // track tab-out to prevent blur from submitting (used by timer cells)
-  const isTabbing = useRef(false);

  useEffect(() => {
    if (typeof initialText === 'undefined') {
@@ -84,7 +78,6 @@ export default function useReactiveTextInput(
   * @param {string} valueToSubmit
   */
  const handleEscape = useCallback(() => {
-    isEscaping.current = true;
    // No need to update if it hasn't changed
    setText(initialText);
    // force the text to be the initial value
@@ -148,30 +141,16 @@ export default function useReactiveTextInput(
        event.stopPropagation();
      }

-      // for cells that opt out of tab-submit, track tab-out without preventing navigation
-      if (event.key === 'Tab' && options?.submitOnTab === false) {
-        isTabbing.current = true;
-      }
-
      hotKeyHandler(event);
    };
-  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, options?.submitOnTab, text]);
+  }, [handleEscape, handleSubmit, options?.submitOnCtrlEnter, options?.submitOnEnter, text]);

  return {
    value: text,
-    onChange: (event) => handleChange(event.target.value),
-    onBlur: (event) => {
-      if (isTabbing.current) {
-        isTabbing.current = false;
-        (options?.onTabCancel ?? options?.onCancelUpdate)?.();
-        return;
-      }
-      if (isEscaping.current) {
-        isEscaping.current = false;
-        return;
-      }
+    onChange: (event: ChangeEvent) => handleChange((event.target as HTMLInputElement).value),
+    onBlur: (event: ChangeEvent) => {
      if (!isKeyboardSubmitting.current) {
-        handleSubmit(event.target.value);
+        handleSubmit((event.target as HTMLInputElement).value);
      }
    },
    onKeyDown: keyHandler,
@@ -8,7 +8,6 @@ import { useLocation } from 'react-router';
 import { isLocalhost, supportsFullscreen } from '../../../externals';
 import { canUseWakeLock, useKeepAwakeOptions } from '../../../features/keep-awake/useWakeLock';
 import { navigatorConstants } from '../../../viewerConfig';
-import useUrlPresets from '../../hooks-query/useUrlPresets';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
 import { useClientStore } from '../../stores/clientStore';
 import { useViewOptionsStore } from '../../stores/viewOptions';
@@ -106,8 +105,6 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
                {route.label}
              </ClientLink>
            ))}
-
-            <PresetNavigation isSmallScreen={isSmallScreen} onClose={onClose} />
          </div>

          {isLocalhost && (
@@ -120,27 +117,3 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
    </Dialog.Root>
  );
 }
-
-function PresetNavigation({ isSmallScreen, onClose }: { isSmallScreen: boolean; onClose: () => void }) {
-  const location = useLocation();
-  const { data: urlPresets } = useUrlPresets();
-  const navPresets = urlPresets.filter((preset) => preset.enabled && preset.displayInNav);
-
-  if (navPresets.length === 0) return null;
-
-  return (
-    <>
-      <hr className={style.separator} />
-      {navPresets.map((preset) => (
-        <ClientLink
-          key={preset.alias}
-          to={`preset/${preset.alias}`}
-          current={location.pathname === `/preset/${preset.alias}`}
-          postAction={isSmallScreen ? onClose : undefined}
-        >
-          {preset.alias}
-        </ClientLink>
-      ))}
-    </>
-  );
-}
@@ -8,12 +8,9 @@
    padding-top: 10vh;
  }

-  .inline {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 1rem;
-    margin-top: 1em;
+  .empty {
+    width: 100%;
+    opacity: 0.8;
  }

  .text {
@@ -1,33 +1,18 @@
-import { SupportedEntry } from 'ontime-types';
-import { IoAdd } from 'react-icons/io5';
-
-import { useTranslation } from '../../../translation/TranslationProvider';
-import Button from '../buttons/Button';
-import Empty from './Empty';
+import EmptyImage from '../../../assets/images/empty.svg?react';

 import style from './EmptyTableBody.module.scss';

 interface EmptyTableBodyProps {
-  handleAddNew?: (type: SupportedEntry) => void;
+  text: string;
 }

-export default function EmptyTableBody({ handleAddNew }: EmptyTableBodyProps) {
-  const { getLocalizedString } = useTranslation();
-  const text = getLocalizedString('common.no_data');
+export default function EmptyTableBody({ text }: EmptyTableBodyProps) {
  return (
    <tbody className={style.emptyContainer}>
      <tr>
        <td colSpan={99} className={style.emptyCell}>
-          <Empty injectedStyles={{ marginTop: '5vh' }} />
-          <span className={style.text}>{text}</span>
-          {handleAddNew && (
-            <div className={style.inline}>
-              <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='primary' size='large'>
-                <IoAdd />
-                Create Event
-              </Button>
-            </div>
-          )}
+          <EmptyImage className={style.empty} />
+          {text && <span className={style.text}>{text}</span>}
        </td>
      </tr>
    </tbody>
@@ -12,7 +12,6 @@ import {
  renameRundown,
 } from '../api/rundown';

-//TODO: make suspends so we don't have to deal with no value all over
 /**
 * Project rundowns
 */
@@ -4,7 +4,7 @@ import { useEffect, useMemo } from 'react';

 import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { CURRENT_RUNDOWN_QUERY_KEY, getRundownQueryKey } from '../api/constants';
-import { fetchCurrentRundown, fetchRundown } from '../api/rundown';
+import { fetchCurrentRundown } from '../api/rundown';
 import { useSelectedEventId } from '../hooks/useSocket';
 import { ExtendedEntry, getFlatRundownMetadata, getRundownMetadata } from '../utils/rundownMetadata';
 import { useProjectRundowns } from './useProjectRundowns';
@@ -20,11 +20,7 @@ const cachedRundownPlaceholder: Rundown = {
 };

 /**
- * Normalised rundown data for the currently loaded rundown.
- *
- * Bootstraps via the `/current` alias so the first paint is a single round-trip,
- * independent of the project rundown list. Once the loaded id is known, the
- * query key swaps to the id-keyed cache that is shared with `useRundownById`.
+ * Normalised rundown data
 */
 export default function useRundown() {
  const queryClient = useQueryClient();
@@ -38,7 +34,7 @@ export default function useRundown() {
    refetchInterval: queryRefetchIntervalSlow,
  });

-  // Seed the id-keyed cache when fetching via the bootstrap alias
+  // Seed the ID-based cache when fetching via the 'current' alias (bootstrap)
  useEffect(() => {
    if (!data || loadedRundownId) return;
    queryClient.setQueryData(getRundownQueryKey(data.id), data);
@@ -119,21 +115,3 @@ export function useRundownAuxData() {
  }, [data]);
  return { data: filteredData, status };
 }
-
-/**
- * Provides access to a specific rundown by ID.
- * When rundownId is null/undefined the query is disabled and returns the placeholder.
- */
-export function useRundownById(rundownId: string | null | undefined) {
-  const enabled = Boolean(rundownId);
-
-  const { data, status, isError, refetch, isFetching } = useQuery<Rundown>({
-    queryKey: getRundownQueryKey(rundownId ?? ''),
-    queryFn: ({ signal }) => fetchRundown(rundownId!, { signal }),
-    enabled,
-    placeholderData: (previousData, _previousQuery) => previousData,
-    refetchInterval: queryRefetchIntervalSlow,
-  });
-
-  return { data: data ?? cachedRundownPlaceholder, status, isError, refetch, isFetching };
-}
@@ -1,54 +0,0 @@
-import { EntryId, Rundown } from 'ontime-types';
-import { useMemo } from 'react';
-
-import { useSelectedEventId } from '../hooks/useSocket';
-import { getFlatRundownMetadata, type ExtendedEntry } from '../utils/rundownMetadata';
-import { useProjectRundowns } from './useProjectRundowns';
-import { useRundownById } from './useRundown';
-
-export type RundownSource = {
-  rundownId: string | null;
-  rundown: Rundown;
-  flatRundown: ExtendedEntry[];
-  status: string;
-  selectedEventId: EntryId | null;
-};
-
-/**
- * Explicitly scoped rundown data for views that may operate on a non-loaded rundown.
- */
-export function useScopedRundown(rundownId: string | null): RundownSource {
-  const { data: projectRundowns } = useProjectRundowns();
-  return useRundownSource(rundownId, projectRundowns.loaded || null);
-}
-
-/**
- * Loaded-rundown source for views that must follow the active runtime rundown.
- */
-export function useLoadedRundownSource(): RundownSource {
-  const { data: projectRundowns } = useProjectRundowns();
-  const loadedRundownId = projectRundowns.loaded || null;
-  return useRundownSource(loadedRundownId, loadedRundownId);
-}
-
-function useRundownSource(rundownId: string | null, loadedRundownId: string | null): RundownSource {
-  const isLoadedTarget = rundownId !== null && rundownId === loadedRundownId;
-  const runtimeSelectedEventId = useSelectedEventId();
-  const effectiveSelectedEventId = isLoadedTarget ? runtimeSelectedEventId : null;
-  const { data: rundown, status } = useRundownById(rundownId);
-  const flatRundown = useMemo(
-    () => getFlatRundownMetadata(rundown, effectiveSelectedEventId),
-    [effectiveSelectedEventId, rundown],
-  );
-
-  return useMemo(
-    () => ({
-      rundownId,
-      rundown,
-      flatRundown,
-      status,
-      selectedEventId: effectiveSelectedEventId,
-    }),
-    [effectiveSelectedEventId, flatRundown, rundown, rundownId, status],
-  );
-}
@@ -16,7 +16,6 @@ import {
  TimeStrategy,
  isOntimeEvent,
  isOntimeGroup,
-  isOntimeMilestone,
 } from 'ontime-types';
 import {
  MILLIS_PER_SECOND,
@@ -64,16 +63,9 @@ export type EventOptions = Partial<{
 }>;

 /**
- * Gather utilities for actions on entries in the loaded rundown.
+ * Gather utilities for actions on entries
 */
-export const useEntryActions = () => useEntryActionsForRundown(undefined);
-
-/**
- * Gather utilities for actions on entries in an explicitly selected rundown.
- */
-export const useScopedEntryActions = (rundownId: string | null) => useEntryActionsForRundown(rundownId ?? '');
-
-function useEntryActionsForRundown(scopedRundownId: string | undefined) {
+export const useEntryActions = () => {
  const queryClient = useQueryClient();
  const {
    linkPrevious,
@@ -83,16 +75,15 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
    defaultDangerTime,
    defaultTimerType,
    defaultEndAction,
-    inheritGroupColour,
  } = useEditorSettings();

  const resolveCurrentRundownQueryKey = useCallback(() => {
-    if (scopedRundownId !== undefined) {
-      return getRundownQueryKey(scopedRundownId);
-    }
    const loadedRundownId = queryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
-    return loadedRundownId ? getRundownQueryKey(loadedRundownId) : CURRENT_RUNDOWN_QUERY_KEY;
-  }, [queryClient, scopedRundownId]);
+    if (loadedRundownId) {
+      return getRundownQueryKey(loadedRundownId);
+    }
+    return CURRENT_RUNDOWN_QUERY_KEY;
+  }, [queryClient]);

  /**
   * Returns the currently loaded rundown
@@ -241,14 +232,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        }
      }

-      if (inheritGroupColour && (isOntimeEvent(newEntry) || isOntimeMilestone(newEntry)) && !newEntry.colour) {
-        const parentId = resolveInsertParent(rundownData, newEntry);
-        const maybeParent = parentId ? rundownData.entries[parentId] : null;
-        if (maybeParent && isOntimeGroup(maybeParent)) {
-          newEntry.colour = maybeParent.colour;
-        }
-      }
-
      try {
        await addEntryMutation([rundownId, newEntry]);
      } catch (error) {
@@ -264,7 +247,6 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      defaultTimerType,
      defaultEndAction,
      defaultTimeStrategy,
-      inheritGroupColour,
      addEntryMutation,
    ],
  );
@@ -1022,7 +1004,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      updateTimer,
    ],
  );
-}
+};

 /**
 * Utility to optimistically delete entries from client cache
@@ -1,6 +1,10 @@
 import { useEffect, useRef } from 'react';

-export default function useScrollIntoView<T extends HTMLElement>(name: string, location?: string) {
+export default function useScrollIntoView<T extends HTMLElement>(
+  name: string,
+  location?: string,
+  onVisible?: (name: string) => void,
+) {
  const ref = useRef<T>(null);

  useEffect(() => {
@@ -11,5 +15,17 @@ export default function useScrollIntoView<T extends HTMLElement>(name: string, l
    }
  }, [location, name]);

+  useEffect(() => {
+    if (!ref.current || !onVisible) return;
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) onVisible(name);
+      },
+      { threshold: 0.3, rootMargin: '0px 0px -40% 0px' },
+    );
+    observer.observe(ref.current);
+    return () => observer.disconnect();
+  }, [name, onVisible]);
+
  return ref;
 }
@@ -12,10 +12,8 @@ type EditorSettingsStore = {
  defaultDangerTime: string;
  defaultTimerType: TimerType;
  defaultEndAction: EndAction;
-  inheritGroupColour: boolean;
  setDefaultDuration: (defaultDuration: string) => void;
  setLinkPrevious: (linkPrevious: boolean) => void;
-  setInheritGroupColour: (inheritGroupColour: boolean) => void;
  setTimeStrategy: (timeStrategy: TimeStrategy) => void;
  setWarnTime: (warnTime: string) => void;
  setDangerTime: (dangerTime: string) => void;
@@ -31,7 +29,6 @@ export const editorSettingsDefaults = {
  dangerTime: '00:01:00', // 60000 same as backend
  timerType: TimerType.CountDown,
  endAction: EndAction.None,
-  inheritGroupColour: false,
 };

 enum EditorSettingsKeys {
@@ -42,7 +39,6 @@ enum EditorSettingsKeys {
  DefaultDangerTime = 'ontime-default-danger-time',
  DefaultTimerType = 'ontime-default-timer-type',
  DefaultEndAction = 'ontime-default-end-action',
-  InheritGroupColour = 'ontime-inherit-group-colour',
 }

 export const useEditorSettings = create<EditorSettingsStore>((set) => {
@@ -63,10 +59,6 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
      localStorage.getItem(EditorSettingsKeys.DefaultEndAction),
      editorSettingsDefaults.endAction,
    ),
-    inheritGroupColour: booleanFromLocalStorage(
-      EditorSettingsKeys.InheritGroupColour,
-      editorSettingsDefaults.inheritGroupColour,
-    ),

    setDefaultDuration: (defaultDuration) =>
      set(() => {
@@ -105,10 +97,5 @@ export const useEditorSettings = create<EditorSettingsStore>((set) => {
        localStorage.setItem(EditorSettingsKeys.DefaultEndAction, String(defaultEndAction));
        return { defaultEndAction };
      }),
-    setInheritGroupColour: (inheritGroupColour) =>
-      set(() => {
-        localStorage.setItem(EditorSettingsKeys.InheritGroupColour, String(inheritGroupColour));
-        return { inheritGroupColour };
-      }),
  };
 });
@@ -37,16 +37,6 @@ describe('getRouteFromPreset()', () => {
      alias: 'demopage',
      target: OntimeView.Timer,
      search: 'user=guest',
-      displayInNav: false,
-      options: {},
-    },
-  ];
-  const disabledPresets: URLPreset[] = [
-    {
-      enabled: false,
-      alias: 'demopage',
-      target: OntimeView.Timer,
-      search: 'user=guest',
      options: {},
    },
  ];
@@ -57,16 +47,6 @@ describe('getRouteFromPreset()', () => {
    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
  });

-  it('checks if the current location matches an enabled preset target', () => {
-    const location = resolvePath('/timer');
-    expect(getRouteFromPreset(location, presets)).toStrictEqual('timer?user=guest&alias=demopage');
-  });
-
-  it('does not redirect disabled presets', () => {
-    const location = resolvePath('/demopage');
-    expect(getRouteFromPreset(location, disabledPresets)).toBeNull();
-  });
-
  it('returns null when already on a preset path', () => {
    const location = resolvePath('/preset/demopage');
    expect(getRouteFromPreset(location, presets)).toBeNull();
@@ -106,11 +86,6 @@ describe('getRouteFromPreset()', () => {
      const location = resolvePath('/demopage?n=1&token=123');
      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
    });
-
-    it('redirects stale unwrapped params back to the saved preset params while preserving feature params', () => {
-      const location = resolvePath('/timer?user=admin&alias=demopage&n=1&token=123');
-      expect(getRouteFromPreset(location, presets)).toBe('timer?user=guest&alias=demopage&n=1&token=123');
-    });
  });

  describe('cuesheet presets', () => {
@@ -120,7 +95,6 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-4685d6',
        target: OntimeView.Cuesheet,
        search: '',
-        displayInNav: false,
        options: {
          read: 'full',
          write: '-',
@@ -133,7 +107,6 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-basic',
        target: OntimeView.Cuesheet,
        search: '',
-        displayInNav: false,
      },
    ];
    const cuesheetPresetWithNavLock: URLPreset[] = [
@@ -142,7 +115,6 @@ describe('getRouteFromPreset()', () => {
        alias: 'cuesheet-locked',
        target: OntimeView.Cuesheet,
        search: 'n=1',
-        displayInNav: false,
      },
    ];

@@ -224,7 +196,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
    [
@@ -236,7 +207,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
    [
@@ -248,7 +218,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
    [
@@ -260,7 +229,6 @@ describe('generateUrlPresetOptions', () => {
        target: 'timer',
        search: 'param1=value1&param2=value2',
        enabled: true,
-        displayInNav: false,
      },
    ],
  ])('should generate URL preset options for %s', (_description, alias, url, expected) => {
@@ -14,8 +14,8 @@ import {
  APP_SETTINGS,
  CLIENT_LIST,
  CSS_OVERRIDE,
-  CURRENT_RUNDOWN_QUERY_KEY,
  CUSTOM_FIELDS,
+  CURRENT_RUNDOWN_QUERY_KEY,
  PROJECT_DATA,
  REPORT,
  RUNDOWN,
@@ -213,9 +213,6 @@ export const connectSocket = () => {
            case RefetchKey.Settings:
              ontimeQueryClient.invalidateQueries({ queryKey: APP_SETTINGS });
              break;
-            case RefetchKey.ProjectRundowns:
-              ontimeQueryClient.invalidateQueries({ queryKey: PROJECT_RUNDOWNS });
-              break;
            default: {
              target satisfies never;
              break;
@@ -245,9 +242,7 @@ export function maybeInvalidateRundownCache(revision: MaybeNumber, rundownId?: s
  // skip if we dont recognise the ID the revision is lower
  const queryKey = getRundownQueryKey(rundownId);
  const cachedRundown = ontimeQueryClient.getQueryData<{ revision: number }>(queryKey);
-
-  if (revision === cachedRundown?.revision) {
-    // we already have the latest change
+  if (revision !== null && revision === cachedRundown?.revision) {
    return;
  }

@@ -194,7 +194,6 @@ export function generateUrlPresetOptions(alias: string, userUrl: string): URLPre
    target: path,
    search: url.searchParams.toString(),
    enabled: true,
-    displayInNav: false,
  };
 }

@@ -4,7 +4,7 @@
  width: 100%;
  padding: 1rem;
  display: flex;
-  gap: 0.25rem;
+  gap: 0;

  overflow: hidden;
  background-color: $ui-black;
@@ -1,6 +1,7 @@
 import { ErrorBoundary } from '@sentry/react';

 import { useKeyDown } from '../../common/hooks/useKeyDown';
+import { AppSettingsScrollContext, useScrollContextState } from './AppSettingsScrollContext';
 import PanelContent from './panel-content/PanelContent';
 import PanelList from './panel-list/PanelList';
 import AboutPanel from './panel/about-panel/AboutPanel';
@@ -17,13 +18,15 @@ import style from './AppSettings.module.scss';

 export default function AppSettings() {
  const { close, panel, location, setLocation } = useAppSettingsNavigation();
+  const scrollContext = useScrollContextState(panel);
  useKeyDown(close, 'Escape');

  return (
    <div className={style.container}>
      <ErrorBoundary>
+        <AppSettingsScrollContext.Provider value={scrollContext}>
        <PanelList selectedPanel={panel} location={location} />
-        <PanelContent onClose={close}>
+        <PanelContent onClose={close} panel={panel} location={location}>
          {panel === 'settings' && <SettingsPanel location={location} />}
          {panel === 'project' && <ProjectPanel location={location} setLocation={setLocation} />}
          {panel === 'manage' && <ManagePanel location={location} />}
@@ -33,6 +36,7 @@ export default function AppSettings() {
          {panel === 'about' && <AboutPanel />}
          {panel === 'shutdown' && <ShutdownPanel />}
        </PanelContent>
+        </AppSettingsScrollContext.Provider>
      </ErrorBoundary>
    </div>
  );
@@ -0,0 +1,31 @@
+import { createContext, useCallback, useContext, useState } from 'react';
+
+interface ScrollContextValue {
+  activeSection: string | undefined;
+  setActiveSection: (name: string) => void;
+}
+
+export const AppSettingsScrollContext = createContext<ScrollContextValue>({
+  activeSection: undefined,
+  setActiveSection: () => {},
+});
+
+export function useAppSettingsScroll() {
+  return useContext(AppSettingsScrollContext);
+}
+
+export function useScrollContextState(panel: string) {
+  const [activeSection, setActiveSectionRaw] = useState<string | undefined>(undefined);
+  const [trackedPanel, setTrackedPanel] = useState(panel);
+
+  if (panel !== trackedPanel) {
+    setTrackedPanel(panel);
+    setActiveSectionRaw(undefined);
+  }
+
+  const setActiveSection = useCallback((name: string) => {
+    setActiveSectionRaw(name);
+  }, []);
+
+  return { activeSection, setActiveSection };
+}
@@ -0,0 +1,11 @@
+let _isDirty = false;
+
+export const markDirty = () => {
+  _isDirty = true;
+};
+
+export const markClean = () => {
+  _isDirty = false;
+};
+
+export const getIsDirty = () => _isDirty;
@@ -1,8 +1,19 @@
-.corner {
-  position: fixed;
-  top: 6rem;
-  right: 4rem;
-  z-index: $zindex-floating;
+.stickyHeader {
+  position: sticky;
+  top: 0;
+  z-index: $zindex-nav;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5rem 1rem;
+  background-color: $gray-1250;
+  border-bottom: 1px solid $white-10;
+  flex-shrink: 0;
+}
+
+.breadcrumb {
+  font-size: calc(1rem - 1px);
+  color: $gray-400;
 }

 .contentWrapper {
@@ -12,6 +23,7 @@
  flex: 1 1 auto;
  min-width: 0;
  position: relative;
+  overflow: hidden;
 }

 .content {
@@ -2,22 +2,31 @@ import { PropsWithChildren } from 'react';
 import { IoClose } from 'react-icons/io5';

 import Button from '../../../common/components/buttons/Button';
+import { getPanelLabel } from '../useAppSettingsMenu';

 import style from './PanelContent.module.scss';

 interface PanelContentProps {
  onClose: () => void;
+  panel: string;
+  location?: string;
 }

-export default function PanelContent({ onClose, children }: PropsWithChildren<PanelContentProps>) {
+export default function PanelContent({ onClose, panel, location, children }: PropsWithChildren<PanelContentProps>) {
+  const { panelLabel, sectionLabel } = getPanelLabel(panel, location);
+
  return (
    <div className={style.contentWrapper}>
-      <div className={style.content}>{children}</div>
-      <div className={style.corner}>
+      <div className={style.stickyHeader}>
+        <span className={style.breadcrumb}>
+          {panelLabel}
+          {sectionLabel ? <> › {sectionLabel}</> : null}
+        </span>
        <Button size='large' onClick={onClose}>
          Close settings <IoClose />
        </Button>
      </div>
+      <div className={style.content}>{children}</div>
    </div>
  );
 }
@@ -12,6 +12,9 @@ ul {
  display: flex;
  flex-direction: column;
  overflow-y: auto;
+  background-color: $gray-1250;
+  border-right: 1px solid $white-10;
+  padding: 0.5rem 0;
 }

 .primary,
@@ -32,14 +35,16 @@ ul {

 .primary {
  font-size: 1rem;
-  border-radius: 2px;
+  border-radius: 6px;
  display: flex;
  align-items: center;
  gap: 0.5rem;

  &.active {
    color: $blue-400;
-    background-color: $gray-1100;
+    border-left: 3px solid $blue-400;
+    padding-left: calc(1rem - 3px);
+    border-radius: 0 6px 6px 0;
  }

  &.highlight {
@@ -63,5 +68,7 @@ ul {

  &.active {
    color: $blue-400;
+    border-left-color: $blue-400;
+    border-left-width: 2px;
  }
 }
@@ -3,6 +3,8 @@ import { Fragment } from 'react';
 import Tooltip from '../../../common/components/tooltip/Tooltip';
 import { isKeyEnter } from '../../../common/utils/keyEvent';
 import { cx } from '../../../common/utils/styleUtils';
+import { getIsDirty, markClean } from '../appSettingsDirtyState';
+import { useAppSettingsScroll } from '../AppSettingsScrollContext';
 import { SettingsOption, SettingsOptionId, useAppSettingsMenu } from '../useAppSettingsMenu';
 import useAppSettingsNavigation from '../useAppSettingsNavigation';

@@ -42,18 +44,27 @@ interface PanelListItemProps {
  location?: string;
 }

+function navigateWithGuard(navigate: (id: SettingsOptionId) => void, id: SettingsOptionId) {
+  if (getIsDirty()) {
+    if (!window.confirm('You have unsaved changes. Leave without saving?')) return;
+    markClean();
+  }
+  navigate(id);
+}
+
 function PanelListItem({ panel, isSelected, location }: PanelListItemProps) {
  const { setLocation } = useAppSettingsNavigation();
+  const { activeSection } = useAppSettingsScroll();
  const classes = cx([style.primary, isSelected && style.active, panel.highlight && style.highlight]);

  return (
    <Fragment key={panel.id}>
      <li
        key={panel.id}
-        onClick={() => setLocation(panel.id as SettingsOptionId)}
+        onClick={() => navigateWithGuard(setLocation, panel.id as SettingsOptionId)}
        onKeyDown={(event) => {
          if (isKeyEnter(event)) {
-            setLocation(panel.id as SettingsOptionId);
+            navigateWithGuard(setLocation, panel.id as SettingsOptionId);
          }
        }}
        className={classes}
@@ -64,14 +75,15 @@ function PanelListItem({ panel, isSelected, location }: PanelListItemProps) {
      </li>
      {panel.secondary?.map((secondary, index) => {
        const id = secondary.id.split('__')[1];
-        const secondaryClasses = cx([style.secondary, isSelected && location === id ? style.active : null]);
+        const effectiveSection = isSelected ? (activeSection ?? location) : undefined;
+        const secondaryClasses = cx([style.secondary, effectiveSection === id ? style.active : null]);
        return (
          <li
            key={secondary.id + index}
-            onClick={() => setLocation(secondary.id as SettingsOptionId)}
+            onClick={() => navigateWithGuard(setLocation, secondary.id as SettingsOptionId)}
            onKeyDown={(event) => {
              if (isKeyEnter(event)) {
-                setLocation(secondary.id as SettingsOptionId);
+                navigateWithGuard(setLocation, secondary.id as SettingsOptionId);
              }
            }}
            className={secondaryClasses}
@@ -53,9 +53,10 @@ $inner-padding: 1rem;
 .card {
  position: relative;
  padding: 2rem;
-  background-color: $white-3;
+  background-color: $white-5;
  border: 1px solid $gray-1100;
-  border-radius: 3px;
+  border-radius: 8px;
+  box-shadow: $box-shadow-l1;
 }

 .highlight {
@@ -1,5 +1,6 @@
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
+import { useAppSettingsScroll } from '../../AppSettingsScrollContext';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import AutomationSettingsForm from './AutomationSettingsForm';
@@ -8,9 +9,10 @@ import TriggersList from './TriggersList';

 export default function AutomationPanel({ location }: PanelBaseProps) {
  const { data, status } = useAutomationSettings();
-  const settingsRef = useScrollIntoView<HTMLDivElement>('settings', location);
-  const triggersRef = useScrollIntoView<HTMLDivElement>('triggers', location);
-  const automationsRef = useScrollIntoView<HTMLDivElement>('automations', location);
+  const { setActiveSection } = useAppSettingsScroll();
+  const settingsRef = useScrollIntoView<HTMLDivElement>('settings', location, setActiveSection);
+  const triggersRef = useScrollIntoView<HTMLDivElement>('triggers', location, setActiveSection);
+  const automationsRef = useScrollIntoView<HTMLDivElement>('automations', location, setActiveSection);

  const isLoading = status === 'pending';
  const automationState = isLoading ? undefined : data.enabledAutomations;
@@ -12,6 +12,7 @@ import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
 import { isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
+import { useSettingsDirty } from '../../useSettingsDirty';

 const oscApiDocsUrl = 'https://docs.getontime.no/api/protocols/osc/';

@@ -45,6 +46,7 @@ export default function AutomationSettingsForm({
      keepDirtyValues: false,
    },
  });
+  useSettingsDirty(isDirty);

  const onSubmit = async (formData: AutomationSettingsProps) => {
    try {
@@ -1,5 +1,6 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
 import { isOntimeCloud } from '../../../../externals';
+import { useAppSettingsScroll } from '../../AppSettingsScrollContext';
 import GenerateLinkFormExport from '../../../sharing/GenerateLinkFormExport';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -8,9 +9,10 @@ import ReportSettings from './ReportSettings';
 import URLPresets from './URLPresets';

 export default function FeaturePanel({ location }: PanelBaseProps) {
-  const presetsRef = useScrollIntoView<HTMLDivElement>('presets', location);
-  const linkRef = useScrollIntoView<HTMLDivElement>('link', location);
-  const reportRef = useScrollIntoView<HTMLDivElement>('report', location);
+  const { setActiveSection } = useAppSettingsScroll();
+  const presetsRef = useScrollIntoView<HTMLDivElement>('presets', location, setActiveSection);
+  const linkRef = useScrollIntoView<HTMLDivElement>('link', location, setActiveSection);
+  const reportRef = useScrollIntoView<HTMLDivElement>('report', location, setActiveSection);

  return (
    <>
@@ -1,8 +1,7 @@
-import { OntimeView, URLPreset } from 'ontime-types';
+import { URLPreset } from 'ontime-types';
 import { useState } from 'react';
 import { IoAdd, IoOpenOutline, IoPencil, IoTrash } from 'react-icons/io5';

-import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import IconButton from '../../../../common/components/buttons/IconButton';
 import Info from '../../../../common/components/info/Info';
@@ -23,23 +22,13 @@ const urlPresetsDocs = 'https://docs.getontime.no/features/url-presets/';

 export default function URLPresets() {
  const [formState, setFormState] = useState<FormState>({ isOpen: false, preset: undefined });
-  const [actionError, setActionError] = useState<string | null>(null);
  const { data, status } = useUrlPresets();
-  const { updatePreset, deletePreset, isMutating } = useUpdateUrlPreset();
+  const { deletePreset, isMutating } = useUpdateUrlPreset();

  const openNewForm = () => setFormState({ isOpen: true });
  const openEditForm = (preset: URLPreset) => setFormState({ isOpen: true, preset });
  const closeForm = () => setFormState({ isOpen: false, preset: undefined });

-  const persistPreset = async (preset: URLPreset) => {
-    setActionError(null);
-    try {
-      await updatePreset(preset.alias, preset);
-    } catch (error) {
-      setActionError(maybeAxiosError(error));
-    }
-  };
-
  return (
    <Panel.Section>
      <Panel.Card>
@@ -64,12 +53,10 @@ export default function URLPresets() {
        <Panel.Section>
          <Panel.Loader isLoading={status === 'pending'} />
          {formState.isOpen && <URLPresetForm urlPreset={formState.preset} onClose={closeForm} />}
-          {actionError && <Panel.Error>{actionError}</Panel.Error>}
          <Panel.Table>
            <thead>
              <tr>
                <th>Enabled</th>
-                <th>Show in nav</th>
                <th>Target view</th>
                <th>Alias</th>
                <th />
@@ -78,23 +65,10 @@ export default function URLPresets() {
            <tbody>
              {data.length === 0 && <Panel.TableEmpty handleClick={openNewForm} />}
              {data.map((preset, index) => {
-                const isCuesheet = preset.target === OntimeView.Cuesheet;
                return (
                  <tr key={preset.alias}>
                    <td>
-                      <Switch
-                        checked={preset.enabled}
-                        onCheckedChange={(enabled) => persistPreset({ ...preset, enabled })}
-                        disabled={isMutating}
-                        aria-label='Toggle preset enabled'
-                      />
-                    </td>
-                    <td>
-                      <Switch
-                        checked={preset.displayInNav}
-                        onCheckedChange={(checked) => persistPreset({ ...preset, displayInNav: checked })}
-                        disabled={isMutating || isCuesheet}
-                      />
+                      <Switch defaultChecked={preset.enabled} onCheckedChange={() => {}} />
                    </td>
                    <td>
                      <Tag>{preset.target}</Tag>
@@ -1,5 +1,5 @@
 import { OntimeView, OntimeViewPresettable, URLPreset } from 'ontime-types';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef } from 'react';
 import { useForm } from 'react-hook-form';

 import { maybeAxiosError, unwrapError } from '../../../../../common/api/utils';
@@ -12,7 +12,6 @@ import { preventEscape } from '../../../../../common/utils/keyEvent';
 import { isUrlSafe } from '../../../../../common/utils/regex';
 import { enDash } from '../../../../../common/utils/styleUtils';
 import { generateUrlPresetOptions } from '../../../../../common/utils/urlPresets';
-import CuesheetLinkOptions, { CuesheetPermissionValues } from '../../../../sharing/composite/CuesheetLinkOptions';
 import * as Panel from '../../../panel-utils/PanelUtils';

 import style from './URLPresetForm.module.scss';
@@ -33,7 +32,6 @@ const defaultValues: URLPreset = {
  target: OntimeView.Timer,
  search: '',
  enabled: true,
-  displayInNav: false,
 };

 interface URLPresetFormProps {
@@ -63,42 +61,12 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
  });
  const urlRef = useRef<HTMLInputElement>(null);

-  // Cuesheet read/write permissions live outside react-hook-form
-  const initialPermissions = useRef<CuesheetPermissionValues>({
-    read: urlPreset?.options?.read ?? 'full',
-    write: urlPreset?.options?.write ?? 'full',
-  });
-  const [cuesheetPermissions, setCuesheetPermissions] = useState<CuesheetPermissionValues>(initialPermissions.current);
-
-  // update initial permissions on mount
-  useEffect(() => {
-    initialPermissions.current = {
-      read: urlPreset?.options?.read ?? 'full',
-      write: urlPreset?.options?.write ?? 'full',
-    };
-    setCuesheetPermissions(initialPermissions.current);
-    // oxlint-disable-next-line eslint-plugin-react-hooks/exhaustive-deps -- run on mount
-  }, []);
-
-  const isEditingCuesheet = urlPreset && urlPreset.target === OntimeView.Cuesheet;
-  const isCuesheet = watch('target') === OntimeView.Cuesheet;
-  const permissionsDirty =
-    isCuesheet &&
-    (cuesheetPermissions.read !== initialPermissions.current.read ||
-      cuesheetPermissions.write !== initialPermissions.current.write);
-  const noReadAccess = isCuesheet && cuesheetPermissions.read === '-';
-
  const setupSubmit = async (data: URLPreset) => {
    try {
-      // Preserve / apply cuesheet permissions, which are not part of the form fields
-      const payload: URLPreset =
-        data.target === OntimeView.Cuesheet
-          ? { ...data, target: OntimeView.Cuesheet, options: cuesheetPermissions }
-          : data;
      if (urlPreset) {
-        await updatePreset(urlPreset.alias, payload);
+        await updatePreset(urlPreset.alias, data);
      } else {
-        await addPreset(payload);
+        await addPreset(data);
      }
      onClose();
    } catch (error) {
@@ -106,7 +74,6 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
    }
  };

-  // focus on alias when the form opens
  useEffect(() => {
    setFocus('alias');
  }, [setFocus]);
@@ -159,66 +126,44 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
        <div className={style.expand}>
          <Panel.Description>Generate options (paste URL to generate options)</Panel.Description>
          <Panel.InlineElements>
-            <Input placeholder='Paste URL' fluid ref={urlRef} disabled={isEditingCuesheet} />
-            <Button onClick={generateOptions} disabled={isEditingCuesheet}>
-              Generate
-            </Button>
+            <Input placeholder='Paste URL' fluid ref={urlRef} />
+            <Button onClick={generateOptions}>Generate</Button>
          </Panel.InlineElements>
        </div>
      </Panel.InlineElements>
      {errors.alias?.message && <Panel.Error>{errors.alias.message}</Panel.Error>}
-      {!isEditingCuesheet && (
-        <>
-          <div>
-            {enDash} or {enDash}
-          </div>
-          <div>2. Choose a view and its parameters</div>
-          <div>
-            <Panel.Description>Target</Panel.Description>
-            <Select
-              options={targetOptions}
-              {...register('target', { required: 'Target is required' })}
-              value={watch('target')}
-              onValueChange={(value: OntimeViewPresettable | null) => {
-                if (value === null) return;
-                setValue('target', value, { shouldDirty: true });
-              }}
-            />
-          </div>
-          <div>
-            <Panel.Description>Parameters</Panel.Description>
-            <Textarea
-              fluid
-              rows={3}
-              {...register('search', {
-                validate: validateParams,
-              })}
-            />
-            <Panel.Error>{errors.search?.message}</Panel.Error>
-          </div>
-        </>
-      )}
-
-      {isCuesheet && (
-        <div>
-          <Panel.Description>Permissions</Panel.Description>
-          <CuesheetLinkOptions
-            initialRead={initialPermissions.current.read}
-            initialWrite={initialPermissions.current.write}
-            onChange={setCuesheetPermissions}
-          />
-        </div>
-      )}
+      <div>
+        {enDash} or {enDash}
+      </div>
+      <div>2. Choose a view and its parameters</div>
+      <div>
+        <Panel.Description>Target</Panel.Description>
+        <Select
+          options={targetOptions}
+          {...register('target', { required: 'Target is required' })}
+          value={watch('target')}
+          onValueChange={(value: OntimeViewPresettable | null) => {
+            if (value === null) return;
+            setValue('target', value, { shouldDirty: true });
+          }}
+        />
+      </div>
+      <div>
+        <Panel.Description>Parameters</Panel.Description>
+        <Textarea
+          fluid
+          rows={3}
+          {...register('search', {
+            validate: validateParams,
+          })}
+        />
+        <Panel.Error>{errors.search?.message}</Panel.Error>
+      </div>
      <div>
        <Panel.Error>{errors.root?.message}</Panel.Error>
        <Panel.InlineElements align='end'>
          <Button onClick={onClose}>Cancel</Button>
-          <Button
-            variant='primary'
-            type='submit'
-            disabled={!isValid || (!isDirty && !permissionsDirty) || noReadAccess}
-            loading={isSubmitting || isMutating}
-          >
+          <Button variant='primary' type='submit' disabled={!isValid || !isDirty} loading={isSubmitting || isMutating}>
            Save
          </Button>
        </Panel.InlineElements>
@@ -1,4 +1,5 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
+import { useAppSettingsScroll } from '../../AppSettingsScrollContext';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import CustomFieldSettings from './CustomFields';
@@ -7,10 +8,11 @@ import RundownDefaultSettings from './RundownDefaultSettings';
 import SourcesPanel from './sources-panel/SourcesPanel';

 export default function ManagePanel({ location }: PanelBaseProps) {
-  const defaultsRef = useScrollIntoView<HTMLDivElement>('defaults', location);
-  const customRef = useScrollIntoView<HTMLDivElement>('custom', location);
-  const rundownsRef = useScrollIntoView<HTMLDivElement>('rundowns', location);
-  const sheetsRef = useScrollIntoView<HTMLDivElement>('sheets', location);
+  const { setActiveSection } = useAppSettingsScroll();
+  const defaultsRef = useScrollIntoView<HTMLDivElement>('defaults', location, setActiveSection);
+  const customRef = useScrollIntoView<HTMLDivElement>('custom', location, setActiveSection);
+  const rundownsRef = useScrollIntoView<HTMLDivElement>('rundowns', location, setActiveSection);
+  const sheetsRef = useScrollIntoView<HTMLDivElement>('sheets', location, setActiveSection);

  return (
    <>
@@ -9,7 +9,6 @@ import {
  IoPencilOutline,
  IoTrash,
 } from 'react-icons/io5';
-import { TbGhost3 } from 'react-icons/tb';

 import { downloadAsExcel } from '../../../../common/api/excel';
 import { maybeAxiosError } from '../../../../common/api/utils';
@@ -20,7 +19,6 @@ import { DropdownMenu } from '../../../../common/components/dropdown-menu/Dropdo
 import Tag from '../../../../common/components/tag/Tag';
 import { useMutateProjectRundowns, useProjectRundowns } from '../../../../common/hooks-query/useProjectRundowns';
 import { cx } from '../../../../common/utils/styleUtils';
-import { useDirectLinkToBackgroundEdit } from '../../../../views/cuesheet/useCuesheetRundownSelection';
 import * as Panel from '../../panel-utils/PanelUtils';
 import RundownRenameForm from './composite/RundownRenameForm';
 import { ManageRundownForm } from './ManageRundownForm';
@@ -99,8 +97,6 @@ export default function ManageRundowns() {
    await downloadAsExcel(rundownId, title);
  };

-  const navigateToCuesheet = useDirectLinkToBackgroundEdit();
-
  return (
    <>
      <Panel.Section>
@@ -157,7 +153,7 @@ export default function ManageRundowns() {
                      </td>
                      <td>
                        <DropdownMenu
-                          render={<IconButton variant='ghosted-white' data-testId='rundown_menu' />}
+                          render={<IconButton variant='ghosted-white' />}
                          items={[
                            {
                              type: 'item',
@@ -184,12 +180,6 @@ export default function ManageRundowns() {
                              label: 'Duplicate',
                              onClick: () => submitRundownDuplicate(id),
                            },
-                            {
-                              type: 'item',
-                              icon: TbGhost3,
-                              label: 'Edit in cuesheet',
-                              onClick: () => navigateToCuesheet(id),
-                            },
                            { type: 'divider' },
                            {
                              type: 'destructive',
@@ -16,7 +16,6 @@ export default function RundownDefaultSettings() {
    defaultDangerTime,
    defaultTimerType,
    defaultEndAction,
-    inheritGroupColour,
    setDefaultDuration,
    setLinkPrevious,
    setTimeStrategy,
@@ -24,7 +23,6 @@ export default function RundownDefaultSettings() {
    setDangerTime,
    setDefaultTimerType,
    setDefaultEndAction,
-    setInheritGroupColour,
  } = useEditorSettings((state) => state);

  const durationInMs = parseUserTime(defaultDuration);
@@ -46,13 +44,6 @@ export default function RundownDefaultSettings() {
              />
              <Switch size='large' checked={linkPrevious} onCheckedChange={setLinkPrevious} />
            </Panel.ListItem>
-            <Panel.ListItem>
-              <Panel.Field
-                title='Inherit group colour'
-                description='Whether new events and milestones inherit the colour of their parent group'
-              />
-              <Switch size='large' checked={inheritGroupColour} onCheckedChange={setInheritGroupColour} />
-            </Panel.ListItem>
            <Panel.ListItem>
              <Panel.Field
                title='Timer strategy'
@@ -5,14 +5,16 @@ import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
 import { usePing } from '../../../../common/hooks/useSocket';
 import { sendSocket } from '../../../../common/utils/socket';
 import { isDocker } from '../../../../externals';
+import { useAppSettingsScroll } from '../../AppSettingsScrollContext';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import ClientControlPanel from './client-control/ClientControlPanel';
 import LogExport from './NetworkLogExport';

 export default function NetworkLogPanel({ location }: PanelBaseProps) {
-  const clientsRef = useScrollIntoView<HTMLDivElement>('clients', location);
-  const logRef = useScrollIntoView<HTMLDivElement>('log', location);
+  const { setActiveSection } = useAppSettingsScroll();
+  const clientsRef = useScrollIntoView<HTMLDivElement>('clients', location, setActiveSection);
+  const logRef = useScrollIntoView<HTMLDivElement>('log', location, setActiveSection);

  return (
    <>
@@ -68,6 +68,7 @@ export default function ClientList() {
            </tr>
          </thead>
          <tbody>
+            {ontimeClients.length === 0 && <Panel.TableEmpty label='No clients connected' />}
            {ontimeClients.map(([key, client]) => {
              const { identify, name, path } = client;
              const isCurrent = id === key;
@@ -125,6 +126,7 @@ export default function ClientList() {
            </tr>
          </thead>
          <tbody>
+            {otherClients.length === 0 && <Panel.TableEmpty label='No other clients' />}
            {otherClients.map(([key, client]) => {
              const { name, type } = client;

@@ -1,4 +1,5 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
+import { useAppSettingsScroll } from '../../AppSettingsScrollContext';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import QuickStart from '../../quick-start/QuickStart';
@@ -10,7 +11,8 @@ interface ProjectPanelProps extends PanelBaseProps {
 }

 export default function ProjectPanel({ location, setLocation }: ProjectPanelProps) {
-  const manageProjectsRef = useScrollIntoView<HTMLDivElement>('list', location);
+  const { setActiveSection } = useAppSettingsScroll();
+  const manageProjectsRef = useScrollIntoView<HTMLDivElement>('list', location, setActiveSection);

  const handleQuickClose = () => {
    setLocation('project');
@@ -11,6 +11,7 @@ import Select from '../../../../common/components/select/Select';
 import useSettings from '../../../../common/hooks-query/useSettings';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import * as Panel from '../../panel-utils/PanelUtils';
+import { useSettingsDirty } from '../../useSettingsDirty';
 import GeneralPinInput from './composite/GeneralPinInput';

 const TranslationModal = lazy(() => import('./composite/CustomTranslationModal'));
@@ -32,6 +33,7 @@ export default function GeneralSettings() {
      keepDirtyValues: true,
    },
  });
+  useSettingsDirty(isDirty);

  const [isOpen, handler] = useDisclosure();

@@ -1,54 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { generateUrl } from '../../../../common/api/session';
-import CopyTag from '../../../../common/components/copy-tag/CopyTag';
-import useInfo from '../../../../common/hooks-query/useInfo';
-import { isOntimeCloud, serverURL } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-export default function McpSection() {
-  const { data: infoData } = useInfo();
-  const [mcpEndpointUrl, setMcpEndpointUrl] = useState('');
-
-  // generate url
-  useEffect(() => {
-    const baseUrl = (() => {
-      if (isOntimeCloud) return serverURL;
-
-      // for local setups we prefer the localhost IP to avoid remote access
-      if (infoData.networkInterfaces.length > 0) {
-        return `http://${infoData.networkInterfaces[0].address}:${infoData.serverPort}`;
-      }
-      return serverURL;
-    })();
-
-    // we are reusing the endpoint, so locking config and nav have no effect
-    generateUrl({ baseUrl, path: 'mcp', authenticate: true, lockConfig: false, lockNav: false })
-      .then(setMcpEndpointUrl)
-      .catch(() => {
-        setMcpEndpointUrl('');
-      });
-  }, [infoData]);
-
-  const mcpClientConfig = mcpEndpointUrl
-    ? JSON.stringify({ mcpServers: { ontime: { url: mcpEndpointUrl } } }, null, 2)
-    : '';
-
-  return (
-    <Panel.Section>
-      <Panel.Card>
-        <Panel.SubHeader>MCP Server</Panel.SubHeader>
-        <Panel.Paragraph>Connect any MCP-compatible AI agent to Ontime using the endpoint below.</Panel.Paragraph>
-        <Panel.Divider />
-        <Panel.Field title='Endpoint URL' description='Add this URL to your MCP client settings' />
-        {mcpEndpointUrl && <CopyTag copyValue={mcpEndpointUrl}>{mcpEndpointUrl}</CopyTag>}
-        <Panel.Divider />
-        <Panel.Field
-          title='Client configuration snippet'
-          description='Paste this into your AI agent settings under "mcpServers"'
-        />
-        {mcpEndpointUrl && <CopyTag copyValue={mcpClientConfig}>{mcpClientConfig}</CopyTag>}
-      </Panel.Card>
-    </Panel.Section>
-  );
-}
@@ -14,6 +14,7 @@ import { preventEscape } from '../../../../common/utils/keyEvent';
 import { validateLogo } from '../../../../common/utils/uploadUtils';
 import { documentationUrl } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
+import { useSettingsDirty } from '../../useSettingsDirty';

 import style from './SettingsPanel.module.scss';

@@ -38,6 +39,7 @@ export default function ProjectData() {
    },
    mode: 'onChange',
  });
+  useSettingsDirty(isDirty);

  const { fields, append, remove } = useFieldArray({
    control,
@@ -9,6 +9,7 @@ import useServerPort from '../../../../common/hooks-query/useServerPort';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
 import * as Panel from '../../panel-utils/PanelUtils';
+import { useSettingsDirty } from '../../useSettingsDirty';

 interface ServerPortForm {
  serverPort: number;
@@ -27,6 +28,7 @@ export default function ServerPortSettings() {
    mode: 'onChange',
    defaultValues: { serverPort: 4001 },
  });
+  useSettingsDirty(isDirty);

  useEffect(() => {
    reset({ serverPort: data.port });
@@ -1,21 +1,21 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
 import { isDocker } from '../../../../externals';
+import { useAppSettingsScroll } from '../../AppSettingsScrollContext';
 import type { PanelBaseProps } from '../../panel-list/PanelList';
 import * as Panel from '../../panel-utils/PanelUtils';
 import CustomViews from '../manage-panel/CustomViews';
 import GeneralSettings from './GeneralSettings';
-import McpSection from './McpSection';
 import ProjectData from './ProjectData';
 import ServerPortSettings from './ServerPortSettings';
 import ViewSettings from './ViewSettings';

 export default function SettingsPanel({ location }: PanelBaseProps) {
-  const dataRef = useScrollIntoView<HTMLDivElement>('data', location);
-  const generalRef = useScrollIntoView<HTMLDivElement>('general', location);
-  const viewRef = useScrollIntoView<HTMLDivElement>('view', location);
-  const customViewsRef = useScrollIntoView<HTMLDivElement>('custom-views', location);
-  const mcpRef = useScrollIntoView<HTMLDivElement>('mcp', location);
-  const portRef = useScrollIntoView<HTMLDivElement>('port', location);
+  const { setActiveSection } = useAppSettingsScroll();
+  const dataRef = useScrollIntoView<HTMLDivElement>('data', location, setActiveSection);
+  const generalRef = useScrollIntoView<HTMLDivElement>('general', location, setActiveSection);
+  const viewRef = useScrollIntoView<HTMLDivElement>('view', location, setActiveSection);
+  const customViewsRef = useScrollIntoView<HTMLDivElement>('custom-views', location, setActiveSection);
+  const portRef = useScrollIntoView<HTMLDivElement>('port', location, setActiveSection);

  return (
    <>
@@ -32,9 +32,6 @@ export default function SettingsPanel({ location }: PanelBaseProps) {
      <div ref={customViewsRef}>
        <CustomViews />
      </div>
-      <div ref={mcpRef}>
-        <McpSection />
-      </div>
      {!isDocker && (
        <div ref={portRef}>
          <ServerPortSettings />
@@ -13,6 +13,7 @@ import Tag from '../../../../common/components/tag/Tag';
 import useViewSettings from '../../../../common/hooks-query/useViewSettings';
 import { preventEscape } from '../../../../common/utils/keyEvent';
 import * as Panel from '../../panel-utils/PanelUtils';
+import { useSettingsDirty } from '../../useSettingsDirty';
 import CodeEditorModal from './composite/StyleEditorModal';

 const cssOverrideDocsUrl = 'https://docs.getontime.no/features/custom-styling/';
@@ -35,6 +36,7 @@ export default function ViewSettings() {
      keepDirtyValues: true,
    },
  });
+  useSettingsDirty(isDirty);

  // update form if we get new data from server
  useEffect(() => {
@@ -1,3 +0,0 @@
-.footer {
-  width: 100%;
-}
@@ -1,5 +1,5 @@
 import { TranslationObject, langEn } from 'ontime-types';
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { useForm } from 'react-hook-form';

 import { maybeAxiosError } from '../../../../../common/api/utils';
@@ -10,8 +10,6 @@ import Modal from '../../../../../common/components/modal/Modal';
 import { useTranslation } from '../../../../../translation/TranslationProvider';
 import * as Panel from '../../../panel-utils/PanelUtils';

-import style from './CustomTranslationModal.module.scss';
-
 interface CustomTranslationModalProps {
  isOpen: boolean;
  onClose: () => void;
@@ -19,7 +17,14 @@ interface CustomTranslationModalProps {

 export default function CustomTranslationModal({ isOpen, onClose }: CustomTranslationModalProps) {
  const { userTranslation, postUserTranslation } = useTranslation();
-  const customTranslationFormValues = useMemo(() => toFormValues(userTranslation), [userTranslation]);
+
+  const defaultValues = useMemo(() => {
+    const values: Record<string, string> = {};
+    Object.keys(langEn).forEach((key) => {
+      values[toFormKey(key)] = userTranslation[key as keyof TranslationObject] || '';
+    });
+    return values;
+  }, [userTranslation]);

  const {
    handleSubmit,
@@ -28,17 +33,13 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
    formState: { isSubmitting, isDirty, errors, isValid },
    setError,
  } = useForm({
-    defaultValues: customTranslationFormValues,
+    defaultValues,
+    resetOptions: {
+      keepDirtyValues: true,
+    },
    mode: 'onChange',
  });

-  // keep data up to date
-  useEffect(() => {
-    if (isOpen) {
-      reset(customTranslationFormValues);
-    }
-  }, [customTranslationFormValues, isOpen, reset]);
-
  const onSubmit = async (formData: Record<string, string>) => {
    try {
      const translationData: Record<string, string> = {};
@@ -53,10 +54,6 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
    }
  };

-  const resetToEnglish = () => {
-    reset(toFormValues(langEn), { keepDefaultValues: true });
-  };
-
  return (
    <Modal
      title='Edit custom translations'
@@ -87,12 +84,9 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
        </Panel.Section>
      }
      footerElements={
-        <div className={style.footer}>
+        <div>
          {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
          <Panel.InlineElements align='apart'>
-            <Button variant='ghosted' size='large' onClick={resetToEnglish} disabled={isSubmitting}>
-              Reset to English
-            </Button>
            <Panel.InlineElements>
              <Button size='large' onClick={onClose}>
                Cancel
@@ -115,14 +109,6 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
  );
 }

-function toFormValues(translation: Partial<TranslationObject>) {
-  const values: Record<string, string> = {};
-  Object.keys(langEn).forEach((key) => {
-    values[toFormKey(key)] = translation[key as keyof TranslationObject] || '';
-  });
-  return values;
-}
-
 function toFormKey(key: string) {
  return key.replace('.', '_');
 }
@@ -19,8 +19,7 @@ const staticOptions = [
      { id: 'settings__general', label: 'General settings' },
      { id: 'settings__view', label: 'View settings' },
      { id: 'settings__custom-views', label: 'Custom views' },
-      { id: 'settings__mcp', label: 'MCP Server' },
-      ...(isDocker ? [] : [{ id: 'settings__port', label: 'Server port' }]),
+      { id: 'settings__port', label: 'Server port' },
    ],
  },
  {
@@ -87,6 +86,15 @@ const staticOptions = [
  },
 ] as const;

+export function getPanelLabel(panel: string, location?: string): { panelLabel: string; sectionLabel?: string } {
+  const panelOption = staticOptions.find((o) => o.id === panel);
+  if (!panelOption) return { panelLabel: panel };
+  const panelLabel = panelOption.label;
+  if (!location || !('secondary' in panelOption)) return { panelLabel };
+  const match = panelOption.secondary.find((s) => s.id.split('__')[1] === location);
+  return { panelLabel, sectionLabel: match?.label };
+}
+
 // a child of navigation or a child of secondary navigation
 export type SettingsOptionId =
  | (typeof staticOptions)[number]['id']
@@ -97,12 +105,18 @@ export function useAppSettingsMenu() {

  const options: Readonly<SettingsOption[]> = useMemo(
    () =>
-      staticOptions.map((option) =>
+      staticOptions.map((option) => ({
+        ...option,
+        // if we are in docker don't show the port option
+        secondary:
+          'secondary' in option
+            ? isDocker && option.id === 'settings'
+              ? [...option.secondary.filter(({ id }) => id !== 'settings__port')]
+              : [...option.secondary]
+            : undefined,
        // if there is an update then highlight the about setting
-        option.id === 'about' && data.hasUpdates
-          ? Object.assign({}, option, { highlight: 'New version available' })
-          : option,
-      ),
+        highlight: option.id === 'about' && data.hasUpdates ? 'New version available' : undefined,
+      })),
    [data],
  );

@@ -0,0 +1,14 @@
+import { useEffect } from 'react';
+
+import { markClean, markDirty } from './appSettingsDirtyState';
+
+export function useSettingsDirty(isDirty: boolean) {
+  useEffect(() => {
+    if (isDirty) {
+      markDirty();
+    } else {
+      markClean();
+    }
+    return () => markClean();
+  }, [isDirty]);
+}
@@ -6,7 +6,6 @@ import ErrorBoundary from '../../common/components/error-boundary/ErrorBoundary'
 import ViewNavigationMenu from '../../common/components/navigation-menu/ViewNavigationMenu';
 import ProtectRoute from '../../common/components/protect-route/ProtectRoute';
 import { EntryActionsProvider } from '../../common/context/EntryActionsContext';
-import { useLoadedRundownSource } from '../../common/hooks-query/useScopedRundown';
 import { useEntryActions } from '../../common/hooks/useEntryAction';
 import { useIsSmallDevice } from '../../common/hooks/useIsSmallDevice';
 import { handleLinks } from '../../common/utils/linkUtils';
@@ -105,8 +104,6 @@ interface RundownRootProps {
 }

 function RundownRoot({ isSmallDevice, isExtracted, viewMode, setViewMode }: RundownRootProps) {
-  const source = useLoadedRundownSource();
-
  return (
    <div className={style.rundownRoot}>
      {isSmallDevice ? (
@@ -115,7 +112,7 @@ function RundownRoot({ isSmallDevice, isExtracted, viewMode, setViewMode }: Rund
        <RundownHeader isExtracted={isExtracted} viewMode={viewMode} setViewMode={setViewMode} />
      )}
      {viewMode === RundownViewMode.List ? <RundownList /> : <RundownTable />}
-      {viewMode === RundownViewMode.Table && <EntryEditModal rundown={source.rundown} />}
+      {viewMode === RundownViewMode.Table && <EntryEditModal />}
      <RenumberCuesDialog />
    </div>
  );
@@ -1,6 +1,7 @@
-import { OntimeEntry, Rundown, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { OntimeEntry, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
 import { useMemo } from 'react';

+import useRundown from '../../../common/hooks-query/useRundown';
 import EventEditor from './EventEditor';
 import GroupEditor from './GroupEditor';
 import MilestoneEditor from './MilestoneEditor';
@@ -9,18 +10,19 @@ import style from './EntryEditor.module.scss';

 interface CuesheetEntryEditorProps {
  entryId: string;
-  rundown: Rundown;
 }

-export default function CuesheetEntryEditor({ entryId, rundown }: CuesheetEntryEditorProps) {
+export default function CuesheetEntryEditor({ entryId }: CuesheetEntryEditorProps) {
+  const { data } = useRundown();
+
  const entry = useMemo<OntimeEntry | null>(() => {
-    if (rundown.order.length === 0) {
+    if (data.order.length === 0) {
      return null;
    }

-    const event = rundown.entries[entryId];
+    const event = data.entries[entryId];
    return event ?? null;
-  }, [entryId, rundown.entries, rundown.order.length]);
+  }, [entryId, data.order, data.entries]);

  if (isOntimeEvent(entry)) {
    return (
@@ -0,0 +1,39 @@
+import { Toolbar } from '@base-ui/react/toolbar';
+import type { Column } from '@tanstack/react-table';
+
+import type { ExtendedEntry } from '../../../common/utils/rundownMetadata';
+import {
+  ColumnSettings,
+  ViewSettings,
+} from '../../../views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings';
+import { usePersistedRundownOptions } from '../rundown.options';
+
+import style from '../../../views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetTableSettings.module.scss';
+
+interface EditorTableSettingsProps {
+  columns: Column<ExtendedEntry, unknown>[];
+  handleResetResizing: () => void;
+  handleResetReordering: () => void;
+  handleClearToggles: () => void;
+}
+
+export default function EditorTableSettings({
+  columns,
+  handleResetResizing,
+  handleResetReordering,
+  handleClearToggles,
+}: EditorTableSettingsProps) {
+  const options = usePersistedRundownOptions();
+
+  return (
+    <Toolbar.Root className={style.tableSettings}>
+      <ViewSettings optionsStore={options} />
+      <ColumnSettings
+        columns={columns}
+        handleResetResizing={handleResetResizing}
+        handleResetReordering={handleResetReordering}
+        handleClearToggles={handleClearToggles}
+      />
+    </Toolbar.Root>
+  );
+}
@@ -1,10 +1,7 @@
 import { memo, useEffect, useMemo } from 'react';

 import EmptyPage from '../../../common/components/state/EmptyPage';
-import { EntryActionsProvider } from '../../../common/context/EntryActionsContext';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
-import { useLoadedRundownSource } from '../../../common/hooks-query/useScopedRundown';
-import { useEntryActions } from '../../../common/hooks/useEntryAction';
 import CuesheetDnd from '../../../views/cuesheet/cuesheet-dnd/CuesheetDnd';
 import CuesheetTable from '../../../views/cuesheet/cuesheet-table/CuesheetTable';
 import { useCuesheetPermissions } from '../../../views/cuesheet/useTablePermissions';
@@ -16,8 +13,6 @@ function RundownTable() {
  const { data: customFields, status: customFieldStatus } = useCustomFields();
  const setPermissions = useCuesheetPermissions((state) => state.setPermissions);
  const { editorMode } = useEditorFollowMode();
-  const source = useLoadedRundownSource();
-  const actions = useEntryActions();

  // Editor always has full permissions
  useEffect(() => {
@@ -35,14 +30,12 @@ function RundownTable() {
  const isLoading = !customFields || customFieldStatus === 'pending';

  return (
-    <EntryActionsProvider actions={actions}>
-      <CuesheetDnd columns={columns} tableRoot='editor'>
-        {isLoading ? (
-          <EmptyPage text='Loading...' />
-        ) : (
-          <CuesheetTable columns={columns} source={source} cuesheetMode={editorMode} tableRoot='editor' />
-        )}
-      </CuesheetDnd>
-    </EntryActionsProvider>
+    <CuesheetDnd columns={columns} tableRoot='editor'>
+      {isLoading ? (
+        <EmptyPage text='Loading...' />
+      ) : (
+        <CuesheetTable columns={columns} cuesheetMode={editorMode} tableRoot='editor' />
+      )}
+    </CuesheetDnd>
  );
 }
@@ -2,7 +2,7 @@ import { EntryId, MaybeNumber, ProjectRundownsList, Rundown, isOntimeEvent } fro
 import { MouseEvent } from 'react';
 import { create } from 'zustand';

-import { PROJECT_RUNDOWNS, getRundownQueryKey } from '../../common/api/constants';
+import { CURRENT_RUNDOWN_QUERY_KEY, PROJECT_RUNDOWNS, getRundownQueryKey } from '../../common/api/constants';
 import { ontimeQueryClient } from '../../common/queryClient';
 import { isMacOS } from '../../common/utils/deviceUtils';

@@ -137,9 +137,12 @@ export const useEventSelection = create<EventSelectionStore>()((set, get) => ({
 }));

 function getLoadedRundownData() {
-  const rundownId = ontimeQueryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
-  if (!rundownId) return undefined;
-  return ontimeQueryClient.getQueryData<Rundown>(getRundownQueryKey(rundownId));
+  const loadedRundownId = ontimeQueryClient.getQueryData<ProjectRundownsList>(PROJECT_RUNDOWNS)?.loaded;
+  if (loadedRundownId) {
+    return ontimeQueryClient.getQueryData<Rundown>(getRundownQueryKey(loadedRundownId));
+  }
+
+  return ontimeQueryClient.getQueryData<Rundown>(CURRENT_RUNDOWN_QUERY_KEY);
 }

 export function getSelectionMode(event: MouseEvent): SelectionMode {
@@ -1,6 +1,6 @@
 import { OntimeView, URLPreset } from 'ontime-types';
 import { generateId } from 'ontime-utils';
-import { useCallback, useRef, useState } from 'react';
+import { useRef, useState } from 'react';
 import { FieldErrors, useForm } from 'react-hook-form';

 import { generateUrl } from '../../common/api/session';
@@ -18,7 +18,7 @@ import { preventEscape } from '../../common/utils/keyEvent';
 import { isUrlSafe } from '../../common/utils/regex';
 import { isOntimeCloud, serverURL } from '../../externals';
 import * as Panel from '../app-settings/panel-utils/PanelUtils';
-import CuesheetLinkOptions, { CuesheetPermissionValues } from './composite/CuesheetLinkOptions';
+import CuesheetLinkOptions from './composite/CuesheetLinkOptions';

 import style from './GenerateLinkForm.module.scss';

@@ -53,26 +53,12 @@ type GenerateLinkState = 'pending' | 'loading' | 'success' | 'error';

 export default function GenerateLinkForm({ hostOptions, pathOptions, presets, isLockedToView }: GenerateLinkFormProps) {
  const [formState, setFormState] = useState<GenerateLinkState>('pending');
-  const [url, setUrl] = useState('');
-  const [cuesheetPermissions, setCuesheetPermissions] = useState<CuesheetPermissionValues>({
-    read: 'full',
-    write: 'full',
-  });
+  const [url, setUrl] = useState(serverURL);
+  const cuesheetReadRef = useRef<HTMLInputElement>(null);
+  const cuesheetWriteRef = useRef<HTMLInputElement>(null);
  const generatedAlias = useRef<string>(`cuesheet-${generateId()}`);

-  const { addPreset, updatePreset } = useUpdateUrlPreset();
-  // Tracks the alias we already created this session so re-generating updates rather than duplicates it
-  const createdAlias = useRef<string | null>(null);
-
-  /**
-   * Permissions live outside react-hook-form, so we reset a successful state manually
-   * whenever they change - this re-arms the "Create share link" button as the previous
-   * link no longer reflects the selected permissions.
-   */
-  const handlePermissionsChange = useCallback((permissions: CuesheetPermissionValues) => {
-    setCuesheetPermissions(permissions);
-    setFormState((current) => (current === 'success' ? 'pending' : current));
-  }, []);
+  const { addPreset } = useUpdateUrlPreset();

  const {
    handleSubmit,
@@ -104,20 +90,16 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
    if (options.read === '-') {
      throw new Error('Cannot create a share with no read permissions');
    }
-    const payload = {
+    const presets = await addPreset({
      target: OntimeView.Cuesheet,
      enabled: true,
      alias,
      search: '',
-      displayInNav: false,
      options: {
        read: options.read,
        write: options.write,
      },
-    } as const;
-    // Re-generating with the same name updates the existing preset instead of failing on a duplicate alias
-    const presets = createdAlias.current === alias ? await updatePreset(alias, payload) : await addPreset(payload);
-    createdAlias.current = alias;
+    });
    return presets.find((preset) => preset.alias === alias);
  };

@@ -126,8 +108,8 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
      setFormState('loading');
      if (options.path === OntimeView.Cuesheet) {
        const urlPreset = await createPresetFromOptions((options as CuesheetLinkOptions).alias, {
-          read: cuesheetPermissions.read,
-          write: cuesheetPermissions.write,
+          read: cuesheetReadRef.current?.value ?? 'full',
+          write: cuesheetWriteRef.current?.value ?? 'full',
        });

        if (!urlPreset) {
@@ -175,7 +157,6 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
    }
  };

-  const noReadAccess = watch('path') === OntimeView.Cuesheet && cuesheetPermissions.read === '-';
  const canSubmit = isDirty || formState !== 'success';

  return (
@@ -239,7 +220,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
                    })}
                  />
                </Panel.ListItem>
-                <CuesheetLinkOptions onChange={handlePermissionsChange} />
+                <CuesheetLinkOptions readRef={cuesheetReadRef} writeRef={cuesheetWriteRef} />
              </>
            )}

@@ -287,29 +268,18 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
          </Panel.ListGroup>
          <Panel.Error>{errors.root?.message}</Panel.Error>
          <Panel.InlineElements align='end' className={style.end}>
-            <Button
-              type='submit'
-              variant={canSubmit ? 'primary' : 'subtle'}
-              loading={formState === 'loading'}
-              disabled={noReadAccess}
-            >
+            <Button type='submit' variant={canSubmit ? 'primary' : 'subtle'} loading={formState === 'loading'}>
              {canSubmit ? 'Create share link' : 'Link copied to clipboard!'}
            </Button>
          </Panel.InlineElements>
        </div>
        <Panel.Section className={style.column}>
          <Panel.Description>Share this link</Panel.Description>
-          {url ? (
-            <>
-              <QRCode size={172} value={url} />
-              <div className={style.copiableLink} data-testid='copy-link'>
-                {url}
-              </div>
-              <CopyTag copyValue={url}>Copy link</CopyTag>
-            </>
-          ) : (
-            <Panel.Description>Your link will appear here once you create it.</Panel.Description>
-          )}
+          <QRCode size={172} value={url} />
+          <div className={style.copiableLink} data-testid='copy-link'>
+            {url}
+          </div>
+          <CopyTag copyValue={url}>Copy link</CopyTag>
        </Panel.Section>
      </div>
    </form>
@@ -1,4 +1,4 @@
-import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
+import { Fragment, RefObject, useMemo, useState } from 'react';

 import RadioGroup from '../../../common/components/radio-group/RadioGroup';
 import Switch from '../../../common/components/switch/Switch';
@@ -10,141 +10,118 @@ import style from './CuesheetLinkOptions.module.scss';

 type AccessMode = 'full' | 'custom';

-export interface CuesheetPermissionValues {
-  read: string;
-  write: string;
-}
-
 interface CuesheetLinkOptionsProps {
-  /** Existing read permission to seed the form with ('full' | '-' | comma separated keys) */
-  initialRead?: string;
-  /** Existing write permission to seed the form with ('full' | '-' | comma separated keys) */
-  initialWrite?: string;
-  /** Notifies the parent whenever the resolved read/write permissions change */
-  onChange: (permissions: CuesheetPermissionValues) => void;
+  readRef?: RefObject<HTMLInputElement | null>;
+  writeRef?: RefObject<HTMLInputElement | null>;
 }

-/** A null result means "full or unset" - there is no explicit per-column selection to seed */
-function parseKeys(permission: string | undefined): Set<string> | null {
-  if (permission == null || permission === 'full') {
-    return null;
-  }
-  if (permission === '-') {
-    return new Set();
-  }
-  return new Set(permission.split(','));
-}
-
-function modeFromPermission(permission: string | undefined): AccessMode {
-  return permission == null || permission === 'full' ? 'full' : 'custom';
-}
-
-export default function CuesheetLinkOptions({ initialRead, initialWrite, onChange }: CuesheetLinkOptionsProps) {
+export default function CuesheetLinkOptions({ readRef, writeRef }: CuesheetLinkOptionsProps) {
  const { data } = useCustomFields();
  const customFieldColumns = useMemo(() => makeCuesheetCustomColumns(data), [data]);
-  const allColumns = useMemo(() => [...cuesheetDefaultColumns, ...customFieldColumns], [customFieldColumns]);

-  // Parsed seed values - stable for the lifetime of a given preset
-  const initialReadKeys = useMemo(() => parseKeys(initialRead), [initialRead]);
-  const initialWriteKeys = useMemo(() => parseKeys(initialWrite), [initialWrite]);
+  const [readPermissions, setReadPermissions] = useState<AccessMode>('full');
+  const [writePermissions, setWritePermissions] = useState<AccessMode>('full');

-  const [readPermissions, setReadPermissions] = useState<AccessMode>(() => modeFromPermission(initialRead));
-  const [writePermissions, setWritePermissions] = useState<AccessMode>(() => modeFromPermission(initialWrite));
-
-  // Default for a column we have not seen yet: honour the seed in custom mode, otherwise grant access
-  const defaultRead = useCallback(
-    (key: string) => (initialReadKeys ? initialReadKeys.has(key) : true),
-    [initialReadKeys],
-  );
-  const defaultWrite = useCallback(
-    (key: string) => (initialWriteKeys ? initialWriteKeys.has(key) : true),
-    [initialWriteKeys],
-  );
-
-  const [readSwitches, setReadSwitches] = useState<Record<string, boolean>>({});
-  const [writeSwitches, setWriteSwitches] = useState<Record<string, boolean>>({});
-
-  // Custom fields load asynchronously, so reconcile the switch maps whenever the column list grows.
-  // Newly seen columns are seeded from the initial values (or default to on for a fresh link).
-  useEffect(() => {
-    setReadSwitches((prev) => {
-      const next = { ...prev };
-      for (const column of allColumns) {
-        if (!(column.value in next)) next[column.value] = defaultRead(column.value);
-      }
-      return next;
+  const [readSwitches, setReadSwitches] = useState<Record<string, boolean>>(() => {
+    const initialState: Record<string, boolean> = {};
+    [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
+      initialState[column.value] = true;
    });
-    setWriteSwitches((prev) => {
-      const next = { ...prev };
-      for (const column of allColumns) {
-        if (!(column.value in next)) next[column.value] = defaultWrite(column.value);
-      }
-      return next;
-    });
-  }, [allColumns, defaultRead, defaultWrite]);
+    return initialState;
+  });

-  const isReadOn = (key: string) => readSwitches[key] ?? defaultRead(key);
-  const isWriteOn = (key: string) => writeSwitches[key] ?? defaultWrite(key);
+  const [writeSwitches, setWriteSwitches] = useState<Record<string, boolean>>(() => {
+    const initialState: Record<string, boolean> = {};
+    [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
+      initialState[column.value] = true;
+    });
+    return initialState;
+  });

  const handleReadModeChange = (value: AccessMode) => {
    setReadPermissions(value);
+
+    setReadSwitches((prevReadSwitches) => {
+      const updatedReadSwitches = { ...prevReadSwitches };
+      Object.keys(updatedReadSwitches).forEach((key) => {
+        updatedReadSwitches[key] = true;
+      });
+      return updatedReadSwitches;
+    });
  };

  const handleWriteModeChange = (value: AccessMode) => {
-    setWritePermissions(value);
-    // Full write implies full read
    if (value === 'full') {
      setReadPermissions('full');
    }
+    setWritePermissions(value);
+
+    setReadSwitches((prevReadSwitches) => {
+      const updatedReadSwitches = { ...prevReadSwitches };
+      setWriteSwitches((prevWriteSwitches) => {
+        const updatedWriteSwitches = { ...prevWriteSwitches };
+        [...cuesheetDefaultColumns, ...customFieldColumns].forEach((column) => {
+          updatedReadSwitches[column.value] = true;
+          updatedWriteSwitches[column.value] = true;
+        });
+        return updatedWriteSwitches;
+      });
+      return updatedReadSwitches;
+    });
  };

-  const handleReadSwitch = (key: string, value: boolean) => {
-    setReadSwitches((prev) => ({ ...prev, [key]: value }));
-    // A column the recipient cannot read cannot be written either
-    if (!value) {
-      setWriteSwitches((prev) => ({ ...prev, [key]: false }));
+  const handleSwitchChange = (key: string, type: 'read' | 'write', value: boolean) => {
+    if (type === 'read') {
+      setReadSwitches((prevReadSwitches) => {
+        const updatedReadSwitches = { ...prevReadSwitches, [key]: value };
+        return updatedReadSwitches;
+      });
+    } else {
+      setWriteSwitches((prevWriteSwitches) => {
+        const updatedWriteSwitches = { ...prevWriteSwitches, [key]: value };
+        return updatedWriteSwitches;
+      });
    }
  };

-  const handleWriteSwitch = (key: string, value: boolean) => {
-    setWriteSwitches((prev) => ({ ...prev, [key]: value }));
-    // Granting write access requires read access
-    if (value) {
-      setReadSwitches((prev) => ({ ...prev, [key]: true }));
-    }
-  };
-
-  const resolvedRead = useMemo(() => {
+  const getReadPermissions = () => {
    if (readPermissions === 'full' || writePermissions === 'full') {
      return 'full';
    }
-    const keys = allColumns.filter((column) => isReadOn(column.value)).map((column) => column.value);
-    return keys.length ? keys.join(',') : '-';
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [readPermissions, writePermissions, readSwitches, allColumns]);

-  const resolvedWrite = useMemo(() => {
+    return Object.entries(readSwitches)
+      .filter(([_, value]) => value)
+      .map(([key]) => key)
+      .join(',');
+  };
+
+  const getWritePermissions = () => {
    if (writePermissions === 'full') {
      return 'full';
    }
-    const keys = allColumns.filter((column) => isWriteOn(column.value)).map((column) => column.value);
-    return keys.length ? keys.join(',') : '-';
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [writePermissions, writeSwitches, allColumns]);

-  // Notify the parent of the resolved permissions. onChange is expected to be stable.
-  useEffect(() => {
-    onChange({ read: resolvedRead, write: resolvedWrite });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [resolvedRead, resolvedWrite]);
-
-  const noReadAccess = resolvedRead === '-';
+    return Object.entries(writeSwitches)
+      .filter(([_, value]) => value)
+      .map(([key]) => key)
+      .join(',');
+  };

  return (
    <Panel.Indent>
+      <input name='read' hidden readOnly ref={readRef} value={getReadPermissions() || '-'} />
+      <input name='write' hidden readOnly ref={writeRef} value={getWritePermissions() || '-'} />
      <div>
-        <Panel.Field title='Access mode' description='Which parts of the data the link gives access to' />
+        <Panel.Field title='Access mode' description='Which parts of the data will the link give access to' />
        <div>
+          <RadioGroup
+            value={writePermissions}
+            onValueChange={handleWriteModeChange}
+            orientation='horizontal'
+            items={[
+              { value: 'full', label: 'Full write (edit all existing and future columns)' },
+              { value: 'custom', label: 'Custom write' },
+            ]}
+          />
          <RadioGroup
            value={readPermissions}
            onValueChange={handleReadModeChange}
@@ -155,18 +132,8 @@ export default function CuesheetLinkOptions({ initialRead, initialWrite, onChang
              { value: 'custom', label: 'Custom read' },
            ]}
          />
-          <RadioGroup
-            value={writePermissions}
-            onValueChange={handleWriteModeChange}
-            orientation='horizontal'
-            items={[
-              { value: 'full', label: 'Full write (edit all existing and future columns)' },
-              { value: 'custom', label: 'Custom write' },
-            ]}
-          />
        </div>
      </div>
-      {noReadAccess && <Panel.Error>Links must contain at least one readable column.</Panel.Error>}
      <div className={style.twoCols}>
        <div className={style.grid}>
          <Panel.Description>Ontime columns</Panel.Description>
@@ -176,14 +143,14 @@ export default function CuesheetLinkOptions({ initialRead, initialWrite, onChang
            <Fragment key={column.value}>
              <div>{column.label}</div>
              <Switch
-                checked={isReadOn(column.value)}
-                onCheckedChange={(value: boolean) => handleReadSwitch(column.value, value)}
+                checked={Boolean(readSwitches[column.value])}
+                onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'read', value)}
                disabled={readPermissions === 'full' || writePermissions === 'full'}
                data-testid={`read-${column.value}`}
              />
              <Switch
-                checked={isWriteOn(column.value)}
-                onCheckedChange={(value: boolean) => handleWriteSwitch(column.value, value)}
+                checked={Boolean(writeSwitches[column.value])}
+                onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'write', value)}
                disabled={writePermissions === 'full'}
                data-testid={`write-${column.value}`}
              />
@@ -197,16 +164,16 @@ export default function CuesheetLinkOptions({ initialRead, initialWrite, onChang
            <Panel.Description>Write</Panel.Description>
            {customFieldColumns.map((column) => (
              <Fragment key={column.value}>
-                <div>{column.label}</div>
+                {column.label}
                <Switch
-                  checked={isReadOn(column.value)}
-                  onCheckedChange={(value: boolean) => handleReadSwitch(column.value, value)}
+                  checked={Boolean(readSwitches[column.value])}
+                  onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'read', value)}
                  disabled={readPermissions === 'full' || writePermissions === 'full'}
                  data-testid={`read-${column.value}`}
                />
                <Switch
-                  checked={isWriteOn(column.value)}
-                  onCheckedChange={(value: boolean) => handleWriteSwitch(column.value, value)}
+                  checked={Boolean(writeSwitches[column.value])}
+                  onCheckedChange={(value: boolean) => handleSwitchChange(column.value, 'write', value)}
                  disabled={writePermissions === 'full'}
                  data-testid={`write-${column.value}`}
                />
@@ -82,5 +82,5 @@ export const initializeSentry = () => {
    },
  });

-  return Sentry.withSentryReactRouterV7Routing(Routes);
+  return Sentry.withSentryReactRouterV6Routing(Routes);
 };
@@ -28,7 +28,6 @@ export const langDe: TranslationObject = {
  'timeline.done': 'Beendet',
  'timeline.due': 'fällig',
  'timeline.followedby': 'Gefolgt von',
-  'timeline.standby': 'Bereitschaft',
  'project.title': 'Titel',
  'project.description': 'Beschreibung',
  'project.info': 'Projektinfo',
@@ -28,7 +28,6 @@ export const langEs: TranslationObject = {
  'timeline.done': 'Terminado',
  'timeline.due': 'pendiente',
  'timeline.followedby': 'Seguido por',
-  'timeline.standby': 'En espera',
  'project.title': 'Título',
  'project.description': 'Descripción',
  'project.info': 'Información del proyecto',
@@ -28,7 +28,6 @@ export const langFr: TranslationObject = {
  'timeline.done': 'Terminé',
  'timeline.due': 'dû',
  'timeline.followedby': 'Suivi de',
-  'timeline.standby': 'En attente',
  'project.title': 'Titre',
  'project.description': 'Description',
  'project.info': 'Informations du projet',
@@ -28,7 +28,6 @@ export const langIt: TranslationObject = {
  'timeline.done': 'Terminato',
  'timeline.due': 'previsto',
  'timeline.followedby': 'Seguito da',
-  'timeline.standby': 'In attesa',
  'project.title': 'Titolo',
  'project.description': 'Descrizione',
  'project.info': 'Informazioni sul progetto',
@@ -28,7 +28,6 @@ export const langPt: TranslationObject = {
  'timeline.done': 'Concluído',
  'timeline.due': 'Pendente',
  'timeline.followedby': 'Seguido por',
-  'timeline.standby': 'Em espera',
  'project.title': 'Título',
  'project.description': 'Descrição',
  'project.info': 'Informações do projeto',
@@ -14,7 +14,3 @@
    'table';
  color: $ui-white;
 }
-
-.rundownSelect {
-  min-width: min(20rem, calc(100vw - 6rem));
-}
@@ -4,34 +4,28 @@ import { IoApps } from 'react-icons/io5';
 import IconButton from '../../common/components/buttons/IconButton';
 import NavigationMenu from '../../common/components/navigation-menu/NavigationMenu';
 import { EntryActionsProvider } from '../../common/context/EntryActionsContext';
-import { useScopedRundown } from '../../common/hooks-query/useScopedRundown';
-import { useScopedEntryActions } from '../../common/hooks/useEntryAction';
+import { useEntryActions } from '../../common/hooks/useEntryAction';
 import { useWindowTitle } from '../../common/hooks/useWindowTitle';
 import { getIsNavigationLocked } from '../../externals';
 import CuesheetOverview from '../../features/overview/CuesheetOverview';
 import EntryEditModal from './cuesheet-edit-modal/EntryEditModal';
 import CuesheetProgress from './cuesheet-progress/CuesheetProgress';
 import CuesheetTableWrapper from './CuesheetTableWrapper';
-import { FOLLOW_LOADED_RUNDOWN_ID, useCuesheetRundownSelection } from './useCuesheetRundownSelection';

 import styles from './CuesheetPage.module.scss';

 export default function CuesheetPage() {
-  'use memo';
  const [isMenuOpen, menuHandler] = useDisclosure();
-  const { selectedRundownId, loadedRundownId, setSelectedRundownId, projectRundowns } = useCuesheetRundownSelection();
-  const source = useScopedRundown(selectedRundownId === FOLLOW_LOADED_RUNDOWN_ID ? loadedRundownId : selectedRundownId);
-
-  const actions = useScopedEntryActions(source.rundownId);
+  const entryActions = useEntryActions();

  useWindowTitle('Cuesheet');

  const isLocked = getIsNavigationLocked();

  return (
-    <EntryActionsProvider actions={actions}>
+    <EntryActionsProvider actions={entryActions}>
      <NavigationMenu isOpen={isMenuOpen} onClose={menuHandler.close} />
-      <EntryEditModal rundown={source.rundown} />
+      <EntryEditModal />
      <div className={styles.tableWrapper} data-testid='cuesheet'>
        <CuesheetOverview>
          {!isLocked && (
@@ -41,13 +35,7 @@ export default function CuesheetPage() {
          )}
        </CuesheetOverview>
        <CuesheetProgress />
-        <CuesheetTableWrapper
-          source={source}
-          selectedRundownId={selectedRundownId}
-          loadedRundownId={loadedRundownId}
-          setSelectedRundownId={setSelectedRundownId}
-          projectRundowns={projectRundowns}
-        />
+        <CuesheetTableWrapper />
      </div>
    </EntryActionsProvider>
  );
@@ -1,40 +1,18 @@
-import { MaybeString, ProjectRundown } from 'ontime-types';
 import { memo, use, useMemo } from 'react';

-import Select from '../../common/components/select/Select';
 import EmptyPage from '../../common/components/state/EmptyPage';
 import { PresetContext } from '../../common/context/PresetContext';
 import useCustomFields from '../../common/hooks-query/useCustomFields';
-import type { RundownSource } from '../../common/hooks-query/useScopedRundown';
-import { AppMode } from '../../ontimeConfig';
 import CuesheetDnd from './cuesheet-dnd/CuesheetDnd';
 import { makeCuesheetColumns } from './cuesheet-table/cuesheet-table-elements/cuesheetColsFactory';
 import CuesheetTable from './cuesheet-table/CuesheetTable';
 import { useApplyCuesheetPolicy } from './useApplyCuesheetPolicy';
-import { FOLLOW_LOADED_RUNDOWN_ID } from './useCuesheetRundownSelection';
-
-import styles from './CuesheetPage.module.scss';
-
-interface CuesheetTableWrapperProps {
-  source: RundownSource;
-  selectedRundownId: MaybeString;
-  loadedRundownId: string;
-  setSelectedRundownId: (rundownId: string) => void;
-  projectRundowns: ProjectRundown[];
-}

 export default memo(CuesheetTableWrapper);
-function CuesheetTableWrapper({
-  source,
-  selectedRundownId,
-  setSelectedRundownId,
-  loadedRundownId,
-  projectRundowns,
-}: CuesheetTableWrapperProps) {
-  const preset = use(PresetContext);
-  const isCurrentRundown = source.rundownId !== null && source.rundownId === loadedRundownId;
-  const { cuesheetMode, setCuesheetMode } = useApplyCuesheetPolicy(preset, { canRunMode: isCurrentRundown });
+function CuesheetTableWrapper() {
  const { data: customFields, status: customFieldStatus } = useCustomFields();
+  const preset = use(PresetContext);
+  const { cuesheetMode, setCuesheetMode } = useApplyCuesheetPolicy(preset);

  const columns = useMemo(
    () => makeCuesheetColumns(customFields, cuesheetMode, preset),
@@ -50,66 +28,11 @@ function CuesheetTableWrapper({
      ) : (
        <CuesheetTable
          columns={columns}
-          source={source}
          cuesheetMode={cuesheetMode}
          tableRoot='cuesheet'
          setCuesheetMode={setCuesheetMode}
-          isCurrentRundown={isCurrentRundown}
-          insertElement={
-            <>
-              <RundownSelect
-                cuesheetMode={cuesheetMode}
-                selectedRundownId={selectedRundownId}
-                loadedRundownId={loadedRundownId}
-                setSelectedRundownId={setSelectedRundownId}
-                projectRundowns={projectRundowns}
-              />
-            </>
-          }
        />
      )}
    </CuesheetDnd>
  );
 }
-
-interface RundownSelectProps {
-  cuesheetMode: AppMode;
-  selectedRundownId: MaybeString;
-  loadedRundownId: string;
-  setSelectedRundownId: (rundownId: string) => void;
-  projectRundowns: ProjectRundown[];
-}
-
-function RundownSelect({
-  cuesheetMode,
-  projectRundowns,
-  loadedRundownId,
-  selectedRundownId,
-  setSelectedRundownId,
-}: RundownSelectProps) {
-  'use memo';
-  const options = projectRundowns.map(({ id, title }) => ({
-    value: id,
-    label: loadedRundownId === id ? `${title} (loaded)` : title,
-  }));
-  options.unshift({
-    value: FOLLOW_LOADED_RUNDOWN_ID,
-    label: 'Follow loaded', // TODO: Better wording and maybe icon? and translation
-  });
-
-  return (
-    <div className={styles.rundownSelect}>
-      <Select
-        value={selectedRundownId ?? undefined}
-        options={options}
-        onValueChange={(value) => {
-          if (value) {
-            setSelectedRundownId(value);
-          }
-        }}
-        disabled={cuesheetMode === AppMode.Run}
-        fluid
-      />
-    </div>
-  );
-}
@@ -20,7 +20,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-read-only',
      target: OntimeView.Cuesheet,
      search: '',
-      displayInNav: false,
      options: {
        read: 'full',
        write: '-',
@@ -42,7 +41,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-flag',
      target: OntimeView.Cuesheet,
      search: '',
-      displayInNav: false,
      options: {
        read: 'full',
        write: 'flag',
@@ -64,7 +62,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-default',
      target: OntimeView.Cuesheet,
      search: '',
-      displayInNav: false,
    };

    const policy = getCuesheetColumnAccessPolicy(preset, AppMode.Edit);
@@ -79,7 +76,6 @@ describe('getCuesheetPermissionsPolicy()', () => {
      alias: 'cuesheet-granular',
      target: OntimeView.Cuesheet,
      search: '',
-      displayInNav: false,
      options: {
        read: 'cue,title',
        write: 'title',
@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { AppMode } from '../../../ontimeConfig';
-import { getEffectiveCuesheetMode } from '../useApplyCuesheetPolicy';
-
-describe('getEffectiveCuesheetMode()', () => {
-  it('honors the stored mode when the user can change mode on the current rundown', () => {
-    const permissions = { canChangeMode: true };
-
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Edit, { canRunMode: true })).toBe(AppMode.Edit);
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Run, { canRunMode: true })).toBe(AppMode.Run);
-  });
-
-  it('forces Run mode when the preset forbids mode changes', () => {
-    const permissions = { canChangeMode: false };
-
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Edit, { canRunMode: true })).toBe(AppMode.Run);
-  });
-
-  it('forces Edit mode for background rundowns without changing the permission policy', () => {
-    const permissions = { canChangeMode: true };
-
-    expect(getEffectiveCuesheetMode(permissions, AppMode.Run, { canRunMode: false })).toBe(AppMode.Edit);
-  });
-});
@@ -1,21 +0,0 @@
-import {
-  FOLLOW_LOADED_RUNDOWN_ID,
-  getCuesheetRundownStorageKey,
-  resolveSelectedRundownId,
-} from '../useCuesheetRundownSelection';
-
-describe('useCuesheetRundownSelection helpers', () => {
-  it('builds a project-scoped storage key', () => {
-    expect(getCuesheetRundownStorageKey('http://localhost:4001', 'My Project')).toBe(
-      'cuesheet-selected-rundown:http://localhost:4001:My Project',
-    );
-  });
-
-  it('falls back to the follow loaded rundown when the stored selection is missing', () => {
-    expect(resolveSelectedRundownId('missing', new Set(['loaded', 'other']))).toBe(FOLLOW_LOADED_RUNDOWN_ID);
-  });
-
-  it('keeps the stored selection when it still exists in the current project', () => {
-    expect(resolveSelectedRundownId('other', new Set(['loaded', 'other']))).toBe('other');
-  });
-});
@@ -1,16 +1,11 @@
-import { Rundown } from 'ontime-types';
 import { memo } from 'react';

 import Modal from '../../../common/components/modal/Modal';
 import CuesheetEntryEditor from '../../../features/rundown/entry-editor/CuesheetEventEditor';
 import { useEditModal } from './useEditModal';

-interface EntryEditModalProps {
-  rundown: Rundown;
-}
-
 export default memo(EntryEditModal);
-function EntryEditModal({ rundown }: EntryEditModalProps) {
+function EntryEditModal() {
  const entryId = useEditModal((state) => state.selectedEntryId);
  const closeModal = useEditModal((state) => state.clearSelection);

@@ -24,7 +19,7 @@ function EntryEditModal({ rundown }: EntryEditModalProps) {
      onClose={closeModal}
      title='Edit entry'
      showCloseButton
-      bodyElements={<CuesheetEntryEditor entryId={entryId} rundown={rundown} />}
+      bodyElements={<CuesheetEntryEditor entryId={entryId} />}
    />
  );
 }
@@ -1,7 +1,7 @@
 import { useTableNav } from '@table-nav/react';
 import { ColumnDef, Table, getCoreRowModel, useReactTable } from '@tanstack/react-table';
-import { OntimeEntry, SupportedEntry, TimeField, isOntimeDelay, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
-import { ComponentProps, ReactNode, memo, useCallback, useEffect, useMemo, useRef } from 'react';
+import { OntimeEntry, TimeField, isOntimeDelay, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { ComponentProps, memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import {
  ContextProp,
  ItemProps,
@@ -14,20 +14,21 @@ import {
 import EmptyPage from '../../../common/components/state/EmptyPage';
 import EmptyTableBody from '../../../common/components/state/EmptyTableBody';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
-import type { RundownSource } from '../../../common/hooks-query/useScopedRundown';
+import { useFlatRundownWithMetadata } from '../../../common/hooks-query/useRundown';
+import { useSelectedEventId } from '../../../common/hooks/useSocket';
 import type { ExtendedEntry } from '../../../common/utils/rundownMetadata';
+import EditorTableSettings from '../../../features/rundown/rundown-table/EditorTableSettings';
 import { usePersistedRundownOptions } from '../../../features/rundown/rundown.options';
 import { useEventSelection } from '../../../features/rundown/useEventSelection';
 import { AppMode } from '../../../ontimeConfig';
 import { usePersistedCuesheetOptions } from '../cuesheet.options';
-import { useCuesheetPermissions } from '../useTablePermissions';
 import { CuesheetHeader, SortableCuesheetHeader } from './cuesheet-table-elements/CuesheetHeader';
 import DelayRow from './cuesheet-table-elements/DelayRow';
 import EventRow from './cuesheet-table-elements/EventRow';
 import GroupRow from './cuesheet-table-elements/GroupRow';
 import MilestoneRow from './cuesheet-table-elements/MilestoneRow';
 import TableMenu from './cuesheet-table-menu/TableMenu';
-import CuesheetTableHeaderToolbar from './cuesheet-table-settings/CuesheetTableHeaderToolbar';
+import CuesheetTableSettings from './cuesheet-table-settings/CuesheetTableSettings';
 import { useColumnOrder, useColumnSizes, useColumnVisibility } from './useColumnManager';

 import style from './CuesheetTable.module.scss';
@@ -35,41 +36,30 @@ import style from './CuesheetTable.module.scss';
 type CuesheetTableBaseProps = {
  columns: ColumnDef<ExtendedEntry>[];
  cuesheetMode: AppMode;
-  source: RundownSource;
-  insertElement?: ReactNode;
 };

 type EditorCuesheetTableProps = CuesheetTableBaseProps & {
  tableRoot: 'editor';
  setCuesheetMode?: undefined;
-  isCurrentRundown?: undefined;
 };

 type ViewCuesheetTableProps = CuesheetTableBaseProps & {
  tableRoot: 'cuesheet';
  setCuesheetMode: (mode: AppMode) => void;
-  isCurrentRundown?: boolean;
 };

 type CuesheetTableProps = EditorCuesheetTableProps | ViewCuesheetTableProps;

-export default function CuesheetTable({
-  columns,
-  cuesheetMode,
-  source,
-  tableRoot,
-  setCuesheetMode,
-  isCurrentRundown,
-  insertElement,
-}: CuesheetTableProps) {
-  const { flatRundown, status, selectedEventId } = source;
-  const { updateEntry, updateTimer, addEntry } = useEntryActionsContext();
-  const canCreateEntries = useCuesheetPermissions((state) => state.canCreateEntries) && cuesheetMode === AppMode.Edit;
+export default function CuesheetTable({ columns, cuesheetMode, tableRoot, setCuesheetMode }: CuesheetTableProps) {
+  const { data, status } = useFlatRundownWithMetadata();
+  const { updateEntry, updateTimer } = useEntryActionsContext();

  const useOptions = tableRoot === 'editor' ? usePersistedRundownOptions : usePersistedCuesheetOptions;
-  const optionsStore = useOptions();
-  const { showDelayedTimes, hideTableSeconds, hideIndexColumn } = optionsStore;
+  const showDelayedTimes = useOptions((state) => state.showDelayedTimes);
+  const hideTableSeconds = useOptions((state) => state.hideTableSeconds);
+  const hideIndexColumn = useOptions((state) => state.hideIndexColumn);

+  const selectedEventId = useSelectedEventId();
  const cursor = useEventSelection((state) => state.cursor);
  const setScrollHandler = useEventSelection((state) => state.setScrollHandler);

@@ -80,7 +70,7 @@ export default function CuesheetTable({
    () => ({
      handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom = false) => {
        // check if value is the same
-        const event = flatRundown[rowIndex];
+        const event = data[rowIndex];

        if (!event) {
          return;
@@ -111,7 +101,7 @@ export default function CuesheetTable({
        hideIndexColumn,
      },
    }),
-    [cuesheetMode, flatRundown, hideIndexColumn, hideTableSeconds, showDelayedTimes, updateEntry, updateTimer],
+    [cuesheetMode, data, hideIndexColumn, hideTableSeconds, showDelayedTimes, updateEntry, updateTimer],
  );

  const { columnOrder, resetColumnOrder } = useColumnOrder(columns, tableRoot);
@@ -119,7 +109,7 @@ export default function CuesheetTable({
  const { columnVisibility, setColumnVisibility } = useColumnVisibility(tableRoot);

  const table = useReactTable({
-    data: flatRundown,
+    data,
    columns,
    columnResizeMode: 'onChange',
    state: {
@@ -147,13 +137,13 @@ export default function CuesheetTable({
      return;
    }

-    const eventIndex = flatRundown.findIndex((event) => event.id === selectedEventId);
+    const eventIndex = data.findIndex((event) => event.id === selectedEventId);
    if (eventIndex === -1) {
      return;
    }

    virtuosoRef.current.scrollToIndex({ index: eventIndex, behavior: 'auto', align: 'start', offset: -50 });
-  }, [cuesheetMode, flatRundown, selectedEventId]);
+  }, [cuesheetMode, data, selectedEventId]);

  // Provide an imperative scroll handler for explicit jumps (finder/keyboard)
  useEffect(() => {
@@ -162,7 +152,7 @@ export default function CuesheetTable({
        return;
      }

-      const eventIndex = flatRundown.findIndex((event) => event.id === entryId);
+      const eventIndex = data.findIndex((event) => event.id === entryId);
      if (eventIndex === -1) {
        return;
      }
@@ -175,7 +165,7 @@ export default function CuesheetTable({
    return () => {
      setScrollHandler(null);
    };
-  }, [flatRundown, setScrollHandler]);
+  }, [data, setScrollHandler]);

  /**
   * To improve performance on resizing, we memoise the column sizes
@@ -204,9 +194,8 @@ export default function CuesheetTable({
      listeners,
      rows,
      table,
-      handleAddNew: canCreateEntries ? (type: SupportedEntry) => addEntry({ type }) : undefined,
    }),
-    [columnSizeVars, cursor, listeners, rows, table, addEntry, canCreateEntries],
+    [columnSizeVars, cursor, listeners, rows, table],
  );

  const computeItemKey = useCallback((_: number, item: ExtendedEntry) => item.id, []);
@@ -228,7 +217,7 @@ export default function CuesheetTable({
    });
  }, [cuesheetMode, hideIndexColumn, table]);

-  const isLoading = !flatRundown || status === 'pending';
+  const isLoading = !data || status === 'pending';

  if (isLoading) {
    return <EmptyPage text='Loading...' />;
@@ -236,27 +225,26 @@ export default function CuesheetTable({

  return (
    <>
-      <CuesheetTableHeaderToolbar
-        columns={allLeafColumns}
-        optionsStore={optionsStore}
-        handleResetResizing={resetColumnResizing}
-        handleResetReordering={resetColumnOrder}
-        handleClearToggles={setAllVisible}
-        insertElement={insertElement}
-        modeControls={
-          tableRoot === 'cuesheet'
-            ? {
-                cuesheetMode,
-                setCuesheetMode,
-                isCurrentRundown,
-              }
-            : undefined
-        }
-        showShare={tableRoot === 'cuesheet'}
-      />
+      {tableRoot === 'editor' ? (
+        <EditorTableSettings
+          columns={allLeafColumns}
+          handleResetResizing={resetColumnResizing}
+          handleResetReordering={resetColumnOrder}
+          handleClearToggles={setAllVisible}
+        />
+      ) : (
+        <CuesheetTableSettings
+          columns={allLeafColumns}
+          cuesheetMode={cuesheetMode}
+          setCuesheetMode={setCuesheetMode}
+          handleResetResizing={resetColumnResizing}
+          handleResetReordering={resetColumnOrder}
+          handleClearToggles={setAllVisible}
+        />
+      )}
      <TableVirtuoso
        ref={virtuosoRef}
-        data={flatRundown}
+        data={data}
        context={virtuosoContext}
        style={tableRoot === 'editor' ? { paddingLeft: '1rem' } : undefined}
        computeItemKey={computeItemKey}
@@ -276,13 +264,10 @@ interface CuesheetVirtuosoContext {
  listeners: ReturnType<typeof useTableNav>['listeners'];
  rows: ReturnType<Table<ExtendedEntry>['getRowModel']>['rows'];
  table: Table<ExtendedEntry>;
-  handleAddNew?: (type: SupportedEntry) => void;
 }

-const EmptyPlaceholder = memo(function EmptyPlaceholder({
-  context,
-}: TableProps & ContextProp<CuesheetVirtuosoContext>) {
-  return <EmptyTableBody handleAddNew={context.handleAddNew} />;
+const EmptyPlaceholder = memo(function EmptyPlaceholder() {
+  return <EmptyTableBody text='No data in rundown' />;
 });

 const CuesheetTableElement = memo(function CuesheetTableElement({
@@ -49,10 +49,6 @@ function DurationInput({
    setIsEditing(false);
    setTimeout(() => textRef.current?.focusParentElement()); // Immediate timeout to ensure state change takes place first
  };
-  const handleTabOut = useCallback(() => {
-    setIsEditing(false);
-    // Tab moves focus naturally; do not steal it back to parent
-  }, []);

  const handleUpdate = useCallback(
    (newValue: string) => {
@@ -99,10 +95,8 @@ function DurationInput({
      ref={inputRef}
      initialValue={timeString}
      allowSubmitSameValue={!lockedValue} // if the value is not locked, submitting will lock the value
-      submitOnTab={false}
      handleUpdate={handleUpdate}
      handleCancelUpdate={handleFakeBlur}
-      handleTabCancel={handleTabOut}
    />
  ) : (
    <TextLikeInput
@@ -30,16 +30,15 @@ function EditableImage({ initialValue, readOnly, updateValue }: EditableImagePro
    }
  };

-  if (!initialValue && readOnly) {
-    return null;
-  }
-
  if (!initialValue) {
    return (
      <Input
        variant='ghosted'
        className={style.imageInput}
        fluid
+        readOnly={readOnly}
+        // we disable the field to prevent receiving focus
+        disabled={readOnly}
        placeholder='Paste image URL'
        onBlur={(event) => handleUpdate(event.currentTarget.value)}
        onKeyDown={(event) => {
@@ -8,24 +8,13 @@ interface SingleLineCellProps {
  fieldId?: string;
  fieldLabel?: string;
  allowSubmitSameValue?: boolean;
-  submitOnTab?: boolean;
  handleUpdate: (newValue: string) => void;
  handleCancelUpdate?: () => void;
-  handleTabCancel?: () => void;
 }

 const SingleLineCell = forwardRef(
  (
-    {
-      initialValue,
-      fieldId,
-      fieldLabel,
-      allowSubmitSameValue,
-      submitOnTab,
-      handleUpdate,
-      handleCancelUpdate,
-      handleTabCancel,
-    }: SingleLineCellProps,
+    { initialValue, fieldId, fieldLabel, allowSubmitSameValue, handleUpdate, handleCancelUpdate }: SingleLineCellProps,
    inputRef,
  ) => {
    const ref = useRef<HTMLInputElement | null>(null);
@@ -36,9 +25,7 @@ const SingleLineCell = forwardRef(
      allowKeyboardNavigation: true,
      submitOnEnter: true, // single line should submit on enter
      submitOnCtrlEnter: true,
-      submitOnTab,
      onCancelUpdate: handleCancelUpdate,
-      onTabCancel: handleTabCancel,
    });

    // expose a subset of the methods to the parent
@@ -50,10 +50,6 @@ function TimeInputDuration({
    setIsEditing(false);
    setTimeout(() => textRef.current?.focusParentElement()); // Immediate timeout to ensure state change takes place first
  };
-  const handleTabOut = useCallback(() => {
-    setIsEditing(false);
-    // Tab moves focus naturally; do not steal it back to parent
-  }, []);

  const handleUpdate = useCallback(
    (newValue: string) => {
@@ -100,10 +96,8 @@ function TimeInputDuration({
      ref={inputRef}
      initialValue={timeString}
      allowSubmitSameValue={!lockedValue} // if the value is not locked, submitting will lock the value
-      submitOnTab={false}
      handleUpdate={handleUpdate}
      handleCancelUpdate={handleFakeBlur}
-      handleTabCancel={handleTabOut}
    />
  ) : (
    <TextLikeInput
@@ -8,24 +8,6 @@
  gap: 1rem;
  font-size: $inner-section-text-size;
  border-radius: 3px 3px 0 0;
-
-  transition: background-color 0.2s ease-in-out;
-
-  &[data-background-rundown='true'] {
-    background-color: rgba($ontime-color, 0.5);
-
-    .apart::before {
-      content: 'BACKGROUND EDIT';
-      color: $ui-white;
-      animation: blinker 2s ease-in-out infinite;
-    }
-  }
-}
-
-@keyframes blinker {
-  50% {
-    color: transparent;
-  }
 }

 .sectionTitle {
@@ -61,9 +43,6 @@

 .apart {
  margin-left: auto;
-  display: flex;
-  align-items: center;
-  gap: 1rem;
 }

 /** styles should match RundownHeader.module.scss */
@@ -91,17 +70,12 @@
  font-size: calc(1rem - 2px);
  font-weight: 600;

-  &[data-disabled] {
-    cursor: not-allowed;
-    opacity: 0.4;
-  }
-
  &:focus-visible {
    background: transparent;
    outline: 1px solid $blue-500;
  }

-  &:hover:not([data-disabled]):not(:active) {
+  &:hover:not(:disabled):not(:active) {
    background: $gray-1000;
  }

@@ -113,7 +87,7 @@
    background: $blue-700;
    color: $ui-white;

-    &:hover:not([data-disabled]):not(:active) {
+    &:hover:not(:disabled):not(:active) {
      background: $blue-600;
    }
  }
@@ -11,92 +11,78 @@ import Checkbox from '../../../../common/components/checkbox/Checkbox';
 import * as Editor from '../../../../common/components/editor-utils/EditorUtils';
 import PopoverContents from '../../../../common/components/popover/Popover';
 import type { ExtendedEntry } from '../../../../common/utils/rundownMetadata';
+import { cx } from '../../../../common/utils/styleUtils';
 import { AppMode } from '../../../../ontimeConfig';
+import { CuesheetOptions, usePersistedCuesheetOptions } from '../../cuesheet.options';
 import { useCuesheetPermissions } from '../../useTablePermissions';
 import CuesheetShareModal from './CuesheetShareModal';

 import style from './CuesheetTableSettings.module.scss';

-type TableHeaderOptionsStore = {
-  hideTableSeconds: boolean;
-  hideIndexColumn: boolean;
-  showDelayedTimes: boolean;
-  hideDelays: boolean;
-  setOption: <K extends keyof TableHeaderOptionValues>(key: K, value: TableHeaderOptionValues[K]) => void;
-};
-
-type TableHeaderOptionValues = Pick<
-  TableHeaderOptionsStore,
-  'hideTableSeconds' | 'hideIndexColumn' | 'showDelayedTimes' | 'hideDelays'
->;
-
-type TableModeControls = {
+interface CuesheetTableSettingsProps {
+  columns: Column<ExtendedEntry, unknown>[];
  cuesheetMode: AppMode;
  setCuesheetMode: (mode: AppMode) => void;
-  isCurrentRundown?: boolean;
-};
-
-interface CuesheetTableHeaderToolbarProps {
-  columns: Column<ExtendedEntry, unknown>[];
-  optionsStore: TableHeaderOptionsStore;
  handleResetResizing: () => void;
  handleResetReordering: () => void;
  handleClearToggles: () => void;
-  insertElement?: ReactNode;
-  modeControls?: TableModeControls;
-  showShare?: boolean;
 }

-export default function CuesheetTableHeaderToolbar({
+export interface ViewSettingsProps {
+  optionsStore: CuesheetOptions;
+}
+
+export interface ColumnSettingsProps {
+  columns: Column<ExtendedEntry, unknown>[];
+  handleResetResizing: () => void;
+  handleResetReordering: () => void;
+  handleClearToggles: () => void;
+}
+
+export default function CuesheetTableSettings({
  columns,
-  optionsStore,
+  cuesheetMode,
+  setCuesheetMode,
  handleResetResizing,
  handleResetReordering,
  handleClearToggles,
-  insertElement,
-  modeControls,
-  showShare = false,
-}: CuesheetTableHeaderToolbarProps) {
+}: CuesheetTableSettingsProps) {
  const canChangeMode = useCuesheetPermissions((state) => state.canChangeMode);
  const canShare = useCuesheetPermissions((state) => state.canShare);
+  const options = usePersistedCuesheetOptions();

  const toggleCuesheetMode = (mode: AppMode[]) => {
+    // we need to stop user from deselecting a mode
    const newValue = mode.at(0);
-    if (!newValue || !modeControls) return;
-    modeControls.setCuesheetMode(newValue);
+    if (!newValue) return;
+    setCuesheetMode(newValue);
  };

-  const isBackground = !(modeControls?.isCurrentRundown ?? true);
-
  return (
-    <Toolbar.Root className={style.tableSettings} data-background-rundown={isBackground}>
-      <ViewSettings optionsStore={optionsStore} />
+    <Toolbar.Root className={style.tableSettings}>
+      <ViewSettings optionsStore={options} />
      <ColumnSettings
        columns={columns}
        handleResetResizing={handleResetResizing}
        handleResetReordering={handleResetReordering}
        handleClearToggles={handleClearToggles}
      />
-      {modeControls && canChangeMode && (
-        <div className={style.apart}>
-          {insertElement}
-          <ToggleGroup
-            value={[modeControls.cuesheetMode]}
-            onValueChange={toggleCuesheetMode}
-            className={style.group}
-            disabled={!modeControls.isCurrentRundown}
-          >
-            <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.radioButton}>
-              Run
-            </Toolbar.Button>
-            <Toolbar.Button render={<Toggle />} value={AppMode.Edit} className={style.radioButton}>
-              Edit
-            </Toolbar.Button>
-          </ToggleGroup>
-        </div>
+      {canChangeMode && (
+        <ToggleGroup
+          value={[cuesheetMode]}
+          onValueChange={toggleCuesheetMode}
+          className={cx([style.group, style.apart])}
+        >
+          <Toolbar.Button render={<Toggle />} value={AppMode.Run} className={style.radioButton}>
+            Run
+          </Toolbar.Button>
+          <Toolbar.Button render={<Toggle />} value={AppMode.Edit} className={style.radioButton}>
+            Edit
+          </Toolbar.Button>
+        </ToggleGroup>
      )}

-      {showShare && canShare && (
+      {canShare && (
        <>
          <Editor.Separator orientation='vertical' />
          <CuesheetShareModal />
@@ -106,18 +92,9 @@ export default function CuesheetTableHeaderToolbar({
  );
 }

-interface ViewSettingsProps {
-  optionsStore: TableHeaderOptionsStore;
-}
+export function ViewSettings({ optionsStore }: ViewSettingsProps) {
+  const options = optionsStore;

-interface ColumnSettingsProps {
-  columns: Column<ExtendedEntry, unknown>[];
-  handleResetResizing: () => void;
-  handleResetReordering: () => void;
-  handleClearToggles: () => void;
-}
-
-function ViewSettings({ optionsStore }: ViewSettingsProps) {
  return (
    <Popover.Root>
      <Popover.Trigger
@@ -138,15 +115,15 @@ function ViewSettings({ optionsStore }: ViewSettingsProps) {
          <Editor.Label className={style.sectionTitle}>Element visibility</Editor.Label>
          <Editor.Label className={style.option}>
            <Checkbox
-              defaultChecked={optionsStore.hideTableSeconds}
-              onCheckedChange={(checked) => optionsStore.setOption('hideTableSeconds', checked)}
+              defaultChecked={options.hideTableSeconds}
+              onCheckedChange={(checked) => options.setOption('hideTableSeconds', checked)}
            />
            Hide seconds in table
          </Editor.Label>
          <Editor.Label className={style.option}>
            <Checkbox
-              defaultChecked={optionsStore.hideIndexColumn}
-              onCheckedChange={(checked) => optionsStore.setOption('hideIndexColumn', checked)}
+              defaultChecked={options.hideIndexColumn}
+              onCheckedChange={(checked) => options.setOption('hideIndexColumn', checked)}
            />
            Hide index column
          </Editor.Label>
@@ -156,15 +133,15 @@ function ViewSettings({ optionsStore }: ViewSettingsProps) {
          <Editor.Label className={style.sectionTitle}>Table Behaviour</Editor.Label>
          <Editor.Label className={style.option}>
            <Checkbox
-              defaultChecked={optionsStore.showDelayedTimes}
-              onCheckedChange={(checked) => optionsStore.setOption('showDelayedTimes', checked)}
+              defaultChecked={options.showDelayedTimes}
+              onCheckedChange={(checked) => options.setOption('showDelayedTimes', checked)}
            />
            Show delayed times
          </Editor.Label>
          <Editor.Label className={style.option}>
            <Checkbox
-              defaultChecked={optionsStore.hideDelays}
-              onCheckedChange={(checked) => optionsStore.setOption('hideDelays', checked)}
+              defaultChecked={options.hideDelays}
+              onCheckedChange={(checked) => options.setOption('hideDelays', checked)}
            />
            Hide delay entries
          </Editor.Label>
@@ -174,7 +151,7 @@ function ViewSettings({ optionsStore }: ViewSettingsProps) {
  );
 }

-function ColumnSettings({
+export function ColumnSettings({
  columns,
  handleResetResizing,
  handleResetReordering,
@@ -200,7 +177,6 @@ function ColumnSettings({
          {columns.map((column) => {
            const columnHeader = column.columnDef.header;
            const visible = column.getIsVisible();
-
            return (
              <Editor.Label key={`${column.id}-${visible}`} className={style.option}>
                <Checkbox defaultChecked={visible} onCheckedChange={column.toggleVisibility} />
@@ -5,33 +5,12 @@ import { useCallback, useEffect, useMemo } from 'react';
 import { sessionScope } from '../../externals';
 import { AppMode, sessionKeys } from '../../ontimeConfig';
 import { getCuesheetPermissionsPolicy } from './cuesheet.policies';
-import type { CuesheetPermissions } from './useTablePermissions';
 import { useCuesheetPermissions } from './useTablePermissions';

-type CuesheetPolicyOptions = {
-  // Run mode is only meaningful for the loaded rundown — background rundowns force Edit.
-  canRunMode: boolean;
-};
-
-export function getEffectiveCuesheetMode(
-  permissions: Pick<CuesheetPermissions, 'canChangeMode'>,
-  storedMode: AppMode,
-  { canRunMode }: CuesheetPolicyOptions,
-) {
-  if (!permissions.canChangeMode) {
-    return AppMode.Run;
-  }
-
-  return canRunMode ? storedMode : AppMode.Edit;
-}
-
 /**
 * Applies cuesheet permissions to shared state and exposes the effective mode for the UI.
 */
-export function useApplyCuesheetPolicy(
-  preset: URLPreset | undefined,
-  { canRunMode }: CuesheetPolicyOptions,
-): {
+export function useApplyCuesheetPolicy(preset: URLPreset | undefined): {
  cuesheetMode: AppMode;
  setCuesheetMode: (mode: AppMode) => void;
 } {
@@ -47,14 +26,16 @@ export function useApplyCuesheetPolicy(
    defaultValue: preset ? AppMode.Run : AppMode.Edit,
  });

-  const cuesheetMode = getEffectiveCuesheetMode(permissions, storedCuesheetMode, { canRunMode });
-
+  const cuesheetMode = permissions.canChangeMode ? storedCuesheetMode : AppMode.Run;
  const setCuesheetMode = useCallback(
    (mode: AppMode) => {
-      if (!permissions.canChangeMode || !canRunMode) return;
+      if (!permissions.canChangeMode) {
+        return;
+      }
+
      setStoredCuesheetMode(mode);
    },
-    [canRunMode, permissions.canChangeMode, setStoredCuesheetMode],
+    [permissions.canChangeMode, setStoredCuesheetMode],
  );

  // Keep the shared permissions store aligned with the active preset policy.
@@ -1,65 +0,0 @@
-import { useSessionStorage } from '@mantine/hooks';
-import { startTransition, useCallback, useMemo } from 'react';
-import { useNavigate } from 'react-router';
-
-import { useOrderedProjectList } from '../../common/hooks-query/useProjectList';
-import { useProjectRundowns } from '../../common/hooks-query/useProjectRundowns';
-import { serverURL } from '../../externals';
-
-export const FOLLOW_LOADED_RUNDOWN_ID = '__follow-loaded__' as const;
-
-export function getCuesheetRundownStorageKey(server: string, projectFilename: string) {
-  return `cuesheet-selected-rundown:${server}:${projectFilename}`;
-}
-
-export function resolveSelectedRundownId(storedSelectedRundownId: string | null, availableRundownIds: Set<string>) {
-  if (storedSelectedRundownId && availableRundownIds.has(storedSelectedRundownId)) return storedSelectedRundownId;
-  return FOLLOW_LOADED_RUNDOWN_ID;
-}
-
-export function useCuesheetRundownSelection() {
-  'use memo';
-
-  const { data: projectRundowns } = useProjectRundowns();
-  const {
-    data: { lastLoadedProject },
-  } = useOrderedProjectList();
-  const storageKey = useMemo(() => getCuesheetRundownStorageKey(serverURL, lastLoadedProject), [lastLoadedProject]);
-  const [storedSelectedRundownId, setStoredSelectedRundownId] = useSessionStorage<string | null>({
-    key: storageKey,
-    defaultValue: FOLLOW_LOADED_RUNDOWN_ID,
-  });
-
-  const availableRundownIds = new Set(projectRundowns.rundowns.map(({ id }) => id)).add(FOLLOW_LOADED_RUNDOWN_ID);
-  const { loaded: loadedRundownId } = projectRundowns;
-
-  const selectedRundownId = resolveSelectedRundownId(storedSelectedRundownId, availableRundownIds);
-
-  return {
-    loadedRundownId,
-    selectedRundownId,
-    projectRundowns: projectRundowns.rundowns,
-    setSelectedRundownId: (rundownId: string) => {
-      startTransition(() => {
-        setStoredSelectedRundownId(rundownId);
-      });
-    },
-  };
-}
-
-export function useDirectLinkToBackgroundEdit() {
-  const {
-    data: { lastLoadedProject },
-  } = useOrderedProjectList();
-  const navigate = useNavigate();
-  const storageKey = getCuesheetRundownStorageKey(serverURL, lastLoadedProject);
-  const [_, setStoredSelectedRundownId] = useSessionStorage<string | null>({ key: storageKey, defaultValue: null });
-
-  return useCallback(
-    async (rundownId: string) => {
-      await navigate('/cuesheet');
-      startTransition(() => setStoredSelectedRundownId(rundownId));
-    },
-    [setStoredSelectedRundownId, navigate],
-  );
-}
@@ -1,8 +1,6 @@
@use '@/theme/viewerDefs' as *;

 $timeline-height: 1rem;
-$group-band-height: 0.5rem;
-$group-band-gap: 0.25rem;
 $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-override, $viewer-background-color));

 .timelineContainer {
@@ -19,21 +17,7 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over
  position: relative;
  font-weight: 600;
  height: 100%;
-  // reserve the top region (progress bar + gap + group band) with the card background
-  box-shadow: inset 0 calc(#{$timeline-height} + #{$group-band-gap} + #{$group-band-height}) 0 0
-    var(--card-background-color-override, $viewer-card-bg-color);
-}
-
-.groupBand {
-  height: $group-band-height;
-  margin-top: $group-band-gap;
-  width: 100%;
-  background: var(--group-colour, transparent);
-  display: flex;
-  align-items: center;
-  position: relative;
-  z-index: 2;
-  overflow: visible;
+  box-shadow: inset 0 1rem 0 0 var(--card-background-color-override, $viewer-card-bg-color);
 }

 .column {
@@ -108,6 +92,7 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over
  border-top: 2px solid var(--background-color-override, $viewer-background-color);
  box-shadow: 0 0.25rem 0 0 var(--color, $gray-300);

+  text-transform: capitalize;
  white-space: normal;

  &[data-status='done'] {
@@ -134,7 +119,6 @@ $timeline-color: color-mix(in srgb, transparent 60%, var(--background-color-over

  .status {
    width: fit-content;
-    text-transform: uppercase;
  }

  .status.due {
@@ -55,6 +55,10 @@ function Timeline({ firstStart, rundown, selectedEventId, totalDuration }: Timel
    return calculateTimelineLayout(playableEvents, scheduleStart, scheduleEnd, screenWidth, !fixedSize);
  }, [rundown, scheduleStart, scheduleEnd, screenWidth, fixedSize]);

+  if (totalDuration === 0) {
+    return null;
+  }
+
  // Pre-calculate event statuses
  let currentStatus: ProgressStatus = selectedEventId ? 'done' : 'future';
  const statusMap: Record<string, ProgressStatus> = {};
@@ -101,7 +105,6 @@ function Timeline({ firstStart, rundown, selectedEventId, totalDuration }: Timel
              title={displayTitle}
              cue={event.cue}
              width={position.width}
-              groupColour={event.groupColour}
            />
          );
        })}
@@ -26,7 +26,6 @@ interface TimelineEntryProps {
  title: string;
  width: number;
  cue: string;
-  groupColour?: string;
  ref?: RefObject<HTMLDivElement | null>;
 }

@@ -49,7 +48,6 @@ export function TimelineEntry({
  title,
  width,
  cue,
-  groupColour,
  ref,
 }: TimelineEntryProps) {
  const formattedStartTime = formatTime(start, formatOptions);
@@ -69,7 +67,6 @@ export function TimelineEntry({
        {
          '--color': colour,
          '--lighter': lighterColour ?? '',
-          '--group-colour': groupColour ?? 'transparent',
          left: `${left}px`,
          width: `${width}px`,
        } as CSSProperties
@@ -77,7 +74,6 @@ export function TimelineEntry({
      data-testid={cue}
    >
      {status === 'live' ? <ActiveBlock /> : <div data-status={status} className={style.timelineBlock} />}
-      <div className={style.groupBand} />
      <div
        className={cx([style.content, width < 20 && style.hide, !hasLink && style.separeLeft])}
        data-status={status}
@@ -157,8 +153,6 @@ function TimelineEntryStatus({
    statusText = getLocalizedString('timeline.live');
  } else if (statusText === 'pending') {
    statusText = getLocalizedString('timeline.due');
-  } else if (statusText === 'done') {
-    statusText = getLocalizedString('timeline.done');
  }

  const isDue = status === 'future' && timeToStart <= 0;
@@ -38,8 +38,6 @@ export default function TimelinePageLoader() {
 function TimelinePage({ events, customFields, projectData, settings }: TimelineData) {
  const selectedEventId = useSelectedEventId();
  const { mainSource, timeformat } = useTimelineOptions();
-  const { getLocalizedString } = useTranslation();
-
  // holds copy of the rundown with only relevant events
  const { scopedRundown, firstStart, totalDuration } = useScopedRundown(events, selectedEventId);

@@ -52,8 +50,6 @@ function TimelinePage({ events, customFields, projectData, settings }: TimelineD
  const defaultFormat = getDefaultFormat(settings?.timeFormat);
  const progressOptions = useMemo(() => getTimelineOptions(defaultFormat, customFields), [defaultFormat, customFields]);

-  const hasContent = totalDuration > 0;
-
  return (
    <div className='timeline' data-testid='timeline-view'>
      <ViewParamsEditor target={OntimeView.Timeline} viewOptions={progressOptions} />
@@ -65,16 +61,12 @@ function TimelinePage({ events, customFields, projectData, settings }: TimelineD

      <TimelineSections now={now} next={next} followedBy={followedBy} mainSource={mainSource} />

-      {hasContent ? (
-        <Timeline
-          firstStart={firstStart}
-          rundown={scopedRundown}
-          selectedEventId={selectedEventId}
-          totalDuration={totalDuration}
-        />
-      ) : (
-        <EmptyPage text={getLocalizedString('common.no_data')} />
-      )}
+      <Timeline
+        firstStart={firstStart}
+        rundown={scopedRundown}
+        selectedEventId={selectedEventId}
+        totalDuration={totalDuration}
+      />
    </div>
  );
 }
@@ -20,7 +20,7 @@ export default function TimelineSections({ now, next, followedBy, mainSource }:
  const state = useExpectedStartData();

  // gather card data
-  const titleNow = now ? (getPropertyValue(now, mainSource ?? 'title') ?? '-') : getLocalizedString('timeline.standby');
+  const titleNow = getPropertyValue(now, mainSource ?? 'title') ?? '-';
  const dueText = getLocalizedString('timeline.due').toUpperCase();
  const nextText = getPropertyValue(next, mainSource ?? 'title') ?? '-';
  const followedByText = getPropertyValue(followedBy, mainSource ?? 'title') ?? '-';
@@ -96,77 +96,63 @@ export function useScopedRundown(
 ): ScopedRundownData {
  const { hidePast } = useTimelineOptions();

-  const data = useMemo(
-    () => computeScopedRundown(rundown, selectedEventId, hidePast),
-    [hidePast, rundown, selectedEventId],
-  );
+  const data = useMemo(() => {
+    if (rundown.length === 0) {
+      return { scopedRundown: [], firstStart: 0, totalDuration: 0 };
+    }
+
+    const scopedRundown: ExtendedEntry<PlayableEvent>[] = [];
+    let selectedIndex = selectedEventId ? Infinity : -1;
+    let firstStart = null;
+    let totalDuration = 0;
+    let lastEntry: ExtendedEntry<PlayableEvent> | null = null;
+
+    for (let i = 0; i < rundown.length; i++) {
+      const currentEntry = rundown[i];
+      // we only deal with playableEvents
+      if (isOntimeEvent(currentEntry) && isPlayableEvent(currentEntry)) {
+        if (currentEntry.id === selectedEventId) {
+          selectedIndex = i;
+        }
+
+        // maybe filter past
+        if (hidePast && i < selectedIndex) {
+          continue;
+        }
+
+        // add to scopedRundown
+        scopedRundown.push(currentEntry);
+
+        /**
+         * Derive timers
+         * This logic is partially from rundownCache.generate
+         * With the addition of deriving the current day offset
+         */
+        if (firstStart === null) {
+          firstStart = currentEntry.timeStart;
+        }
+
+        const timeFromPrevious: number = getTimeFrom(currentEntry, lastEntry);
+
+        if (timeFromPrevious === 0) {
+          totalDuration += currentEntry.duration;
+        } else if (timeFromPrevious > 0) {
+          totalDuration += timeFromPrevious + currentEntry.duration;
+        } else if (timeFromPrevious < 0) {
+          totalDuration += Math.max(currentEntry.duration + timeFromPrevious, 0);
+        }
+        if (isNewLatest(currentEntry, lastEntry)) {
+          lastEntry = currentEntry;
+        }
+      }
+    }
+
+    return { scopedRundown, firstStart: firstStart ?? 0, totalDuration };
+  }, [hidePast, rundown, selectedEventId]);

  return data;
 }

-/**
- * Pure computation behind useScopedRundown: filters to playable events and derives timers
- */
-export function computeScopedRundown(
-  rundown: ExtendedEntry<OntimeEntry>[],
-  selectedEventId: MaybeString,
-  hidePast: boolean,
-): ScopedRundownData {
-  if (rundown.length === 0) {
-    return { scopedRundown: [], firstStart: 0, totalDuration: 0 };
-  }
-
-  const scopedRundown: ExtendedEntry<PlayableEvent>[] = [];
-  let selectedIndex = selectedEventId ? Infinity : -1;
-  let firstStart: number | null = null;
-  let totalDuration = 0;
-  let lastEntry: ExtendedEntry<PlayableEvent> | null = null;
-
-  for (let i = 0; i < rundown.length; i++) {
-    // we only deal with playableEvents
-    const currentEntry = rundown[i];
-    if (!isOntimeEvent(currentEntry) || !isPlayableEvent(currentEntry)) {
-      continue;
-    }
-
-    if (currentEntry.id === selectedEventId) {
-      selectedIndex = i;
-    }
-
-    // maybe filter past
-    if (hidePast && i < selectedIndex) {
-      continue;
-    }
-
-    // add to scopedRundown
-    scopedRundown.push(currentEntry);
-
-    /**
-     * Derive timers
-     * This logic is partially from rundownCache.generate
-     * With the addition of deriving the current day offset
-     */
-    if (firstStart === null) {
-      firstStart = currentEntry.timeStart;
-    }
-
-    const timeFromPrevious: number = getTimeFrom(currentEntry, lastEntry);
-
-    if (timeFromPrevious === 0) {
-      totalDuration += currentEntry.duration;
-    } else if (timeFromPrevious > 0) {
-      totalDuration += timeFromPrevious + currentEntry.duration;
-    } else if (timeFromPrevious < 0) {
-      totalDuration += Math.max(currentEntry.duration + timeFromPrevious, 0);
-    }
-    if (isNewLatest(currentEntry, lastEntry)) {
-      lastEntry = currentEntry;
-    }
-  }
-
-  return { scopedRundown, firstStart: firstStart ?? 0, totalDuration };
-}
-
 type UpcomingEvents = {
  now: ExtendedEntry<OntimeEvent> | null;
  next: ExtendedEntry<OntimeEvent> | null;
@@ -1,6 +1,6 @@
 {
  "name": "ontime-electron",
-  "version": "4.10.0",
+  "version": "4.8.0",
  "author": "Carlos Valente",
  "description": "Time keeping for live events",
  "repository": "https://github.com/cpvalente/ontime",
@@ -1,6 +1,6 @@
 {
  "name": "@getontime/resolver",
-  "version": "4.10.0",
+  "version": "4.8.0",
  "type": "module",
  "repository": "https://github.com/cpvalente/ontime",
  "types": "./dist/main.d.ts",
@@ -2,22 +2,21 @@
  "name": "ontime-server",
  "type": "module",
  "main": "src/index.ts",
-  "version": "4.10.0",
+  "version": "4.8.0",
  "exports": "./src/index.js",
  "dependencies": {
    "@googleapis/sheets": "^5.0.5",
-    "@modelcontextprotocol/sdk": "^1.15.0",
    "cookie": "1.0.2",
    "cookie-parser": "1.4.7",
-    "cors": "2.8.6",
+    "cors": "2.8.5",
    "dotenv": "^16.0.1",
-    "express": "5.2.1",
-    "express-static-gzip": "3.0.1",
-    "express-validator": "7.3.2",
-    "fast-equals": "^6.0.0",
+    "express": "5.1.0",
+    "express-static-gzip": "3.0.0",
+    "express-validator": "7.2.1",
+    "fast-equals": "^5.0.1",
    "google-auth-library": "^9.4.2",
    "lowdb": "^7.0.1",
-    "multer": "2.2.0",
+    "multer": "2.1.0",
    "ontime-utils": "workspace:*",
    "osc-min": "2.1.2",
    "sanitize-filename": "^1.6.3",
@@ -25,9 +24,9 @@
    "xlsx": "^0.18.5"
  },
  "devDependencies": {
-    "@types/cookie-parser": "1.4.10",
+    "@types/cookie-parser": "1.4.9",
    "@types/cors": "2.8.19",
-    "@types/express": "5.0.6",
+    "@types/express": "5.0.3",
    "@types/multer": "2.1.0",
    "@types/node": "catalog:",
    "@types/ws": "^8.5.10",
@@ -110,13 +110,14 @@ type old_URLPreset = {
 /**
 * migrates a url presets from v3 to v4
 * - pathAndParams split into a target and search
+ *
 */
 export function migrateURLPresets(jsonData: object): URLPreset[] | undefined {
  if (is.objectWithKeys(jsonData, ['urlPresets']) && is.array(jsonData.urlPresets)) {
    const oldURLPresets = structuredClone(jsonData.urlPresets) as old_URLPreset;
    const newURLPreset: URLPreset[] = oldURLPresets.map(({ enabled, alias, pathAndParams }) => {
      const [target, search] = pathAndParams.split('?');
-      return { enabled, alias, target, search, displayInNav: false, options: {} } as URLPreset;
+      return { enabled, alias, target, search, options: {} } as URLPreset;
    });
    return newURLPreset;
  }
@@ -208,7 +208,6 @@ describe('v3 to v4', () => {
        target: OntimeView.Timer,
        search:
          'showLeadingZeros=true&timerType=clock&hideClock=true&hideCards=true&hideProgress=true&hideMessage=true&hideSecondary=true&hideLogo=true',
-        displayInNav: false,
        options: {},
      },
      {
@@ -217,7 +216,6 @@ describe('v3 to v4', () => {
        target: OntimeView.Timer,
        search:
          'showLeadingZeros=true&hideClock=true&hideCards=true&hideProgress=true&hideMessage=true&hideSecondary=true&hideLogo=true',
-        displayInNav: false,
        options: {},
      },
    ];
@@ -1,13 +1,11 @@
 import {
  CustomField,
-  EntryId,
  OntimeDelay,
  OntimeEvent,
  OntimeGroup,
  OntimeMilestone,
  Rundown,
  SupportedEntry,
-  isOntimeGroup,
 } from 'ontime-types';

 import { makeNewRundown } from '../../../models/dataModel.js';
@@ -61,24 +59,13 @@ export function makeOntimeMilestone(patch: Partial<OntimeMilestone>): OntimeMile
 }

 /**
- * Utility to create a rundown object.
- * Derives flatOrder from order/entries when the patch does not provide one,
- * so test fixtures match the shape of a processed rundown.
+ * Utility to create a rundown object
 */
 export function makeRundown(patch: Partial<Rundown>): Rundown {
-  const rundown = { ...makeNewRundown(), ...patch };
-  if (!patch.flatOrder) {
-    const flatOrder: EntryId[] = [];
-    for (const id of rundown.order) {
-      flatOrder.push(id);
-      const entry = rundown.entries[id];
-      if (isOntimeGroup(entry)) {
-        flatOrder.push(...entry.entries);
-      }
-    }
-    rundown.flatOrder = flatOrder;
-  }
-  return rundown;
+  return {
+    ...makeNewRundown(),
+    ...patch,
+  };
 }

 export function makeCustomField(patch: Partial<CustomField>): CustomField {
@@ -63,7 +63,7 @@ describe('createTransaction', () => {
    expect(typeof commit).toBe('function');
  });

-  it('should return the updated data after commit is called and writes are scheduled', async () => {
+  it('should return the updated data after commit is called and writes are scheduled', () => {
    const { rundown, customFields, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: true });
    rundown.title = 'Another Title';
    customFields['newField'] = {
@@ -72,7 +72,8 @@ describe('createTransaction', () => {
      colour: 'blue',
    };

-    const updated = await commit();
+    const updated = commit();
+    vi.runAllTimers();

    expect(updated.rundown.title).toBe('Another Title');
    expect(updated.customFields).toHaveProperty('newField');
@@ -131,23 +132,6 @@ describe('processRundown()', () => {
    expect(initResult.entries['3'].type).toBe(SupportedEntry.Delay);
  });

-  it('produces order, flatOrder and applies delays to following events', () => {
-    const rundown = makeRundown({
-      order: ['1', 'delay', '2'],
-      entries: {
-        '1': makeOntimeEvent({ id: '1', timeStart: 0, timeEnd: 1000, duration: 1000 }),
-        delay: makeOntimeDelay({ id: 'delay', duration: 250 }),
-        '2': makeOntimeEvent({ id: '2', timeStart: 1000, timeEnd: 2000, duration: 1000 }),
-      },
-    });
-
-    const processed = processRundown(rundown, {});
-
-    expect(processed.order).toEqual(['1', 'delay', '2']);
-    expect(processed.flatEntryOrder).toEqual(['1', 'delay', '2']);
-    expect((processed.entries['2'] as OntimeEvent).delay).toBe(250);
-  });
-
  it('calculates delays versions of a given rundown', () => {
    const rundown = makeRundown({
      order: ['1', '2'],
@@ -1638,34 +1622,6 @@ describe('rundownMutation.applyDelay()', () => {
      },
    });
  });
-
-  it('uses the passed rundown own order, not the loaded rundown metadata', () => {
-    // The loaded rundown has completely different events
-    const loadedRundown = makeRundown({
-      order: ['loaded-delay', 'loaded-ev'],
-      entries: {
-        'loaded-delay': makeOntimeDelay({ id: 'loaded-delay', duration: 9999 }),
-        'loaded-ev': makeOntimeEvent({ id: 'loaded-ev', timeStart: 0, timeEnd: 100, duration: 100 }),
-      },
-    });
-    rundownCache.init(loadedRundown, {});
-
-    // Background rundown is independent of the loaded one
-    const bgRundown = makeRundown({
-      order: ['bg-delay', 'bg-ev'],
-      entries: {
-        'bg-delay': makeOntimeDelay({ id: 'bg-delay', duration: 500 }),
-        'bg-ev': makeOntimeEvent({ id: 'bg-ev', timeStart: 0, timeEnd: 200, duration: 200 }),
-      },
-    });
-
-    rundownMutation.applyDelay(bgRundown, bgRundown.entries['bg-delay'] as OntimeDelay);
-
-    // bg-ev must be shifted by its own delay (500), not influenced by the loaded rundown
-    expect((bgRundown.entries['bg-ev'] as OntimeEvent).timeStart).toBe(500);
-    // loaded-ev must be untouched
-    expect((loadedRundown.entries['loaded-ev'] as OntimeEvent).timeStart).toBe(0);
-  });
 });

 describe('rundownMutation.swap()', () => {
@@ -2,11 +2,13 @@ import { EndAction, OntimeEvent, TimeStrategy, TimerType } from 'ontime-types';
 import { MILLIS_PER_HOUR, createEvent } from 'ontime-utils';
 import { assertType } from 'vitest';

+import { demoDb } from '../../../models/demoProject.js';
 import { makeOntimeEvent, makeOntimeGroup, makeRundown } from '../__mocks__/rundown.mocks.js';
 import {
  calculateDayOffset,
  deleteById,
  doesInvalidateMetadata,
+  duplicateRundown,
  getIntegerAndFraction,
  hasChanges,
  makeDeepClone,
@@ -221,6 +223,25 @@ describe('calculateDayOffset()', () => {
  });
 });

+describe('duplicateRundown', () => {
+  it('duplicates a given rundown', () => {
+    const demoRundown = demoDb.rundowns['default'];
+    const title = 'Duplicated Rundown';
+    const duplicatedRundown = duplicateRundown(demoRundown, title);
+
+    expect(duplicatedRundown).toMatchObject({
+      title: title,
+      entries: expect.any(Object),
+      order: expect.any(Array),
+      flatOrder: expect.any(Array),
+    });
+    expect(demoRundown.id).not.toEqual(duplicatedRundown.id);
+    expect(duplicatedRundown.order.length).toEqual(demoRundown.order.length);
+    expect(duplicatedRundown.flatOrder.length).toEqual(demoRundown.flatOrder.length);
+    expect(Object.keys(duplicatedRundown.entries).length).toEqual(Object.keys(demoRundown.entries).length);
+  });
+});
+
 describe('makeDeepClone()', () => {
  it('deep clones a group along with its nested entries', () => {
    const group1 = makeOntimeGroup({ id: 'group1', title: 'Group 1', entries: ['event1', 'event2'] });
@@ -82,85 +82,56 @@ export const getEntryWithId = (entryId: EntryId): OntimeEntry | undefined => cac
 type Transaction = {
  customFields: CustomFields;
  rundown: Rundown;
+  rundownMetadata: Readonly<RundownMetadata>;

-  commit: (shouldProcess?: boolean) => Promise<{
+  commit: (shouldProcess?: boolean) => {
    rundown: Readonly<Rundown>;
-    rundownMetadata: Readonly<RundownMetadata> | null;
+    rundownMetadata: Readonly<RundownMetadata>;
    customFields: Readonly<CustomFields>;
    revision: Readonly<number>;
-  }>;
+  };
 };

 type TransactionOptions = {
  mutableRundown?: boolean;
  mutableCustomFields?: boolean;
-  /**
-   * Target rundown ID. Defaults to the loaded rundown.
-   * When targeting a non-loaded ("background") rundown, the cache and runtime
-   * metadata are bypassed — the rundown is read from disk and persisted directly.
-   */
-  rundownId?: string;
 };

 export function createTransaction(options: TransactionOptions): Transaction {
-  const targetId = options.rundownId ?? cachedRundown.id;
-  const isLoaded = targetId === cachedRundown.id;
-  const sourceRundown: Rundown = isLoaded ? cachedRundown : (getDataProvider().getRundown(targetId) as Rundown);
-  const rundown = options.mutableRundown ? structuredClone(sourceRundown) : sourceRundown;
+  const rundown = options.mutableRundown ? structuredClone(cachedRundown) : cachedRundown;
  const customFields = options.mutableCustomFields ? structuredClone(projectCustomFields) : projectCustomFields;

  /**
-   * Applies a mutated rundown to its persistence target
+   * Applies a mutated rundown to the cache
   * @param shouldProcess - whether the rundown should be processed after the commit
   *                        Some edit mutations, and custom field changes do not require processing
   */
-  async function commit(shouldProcess: boolean = true) {
-    let committedRundown: Readonly<Rundown> = isLoaded ? cachedRundown : rundown;
-    let committedMetadata: RundownMetadata | null = isLoaded ? rundownMetadata : null;
-    let committedRevision: number = sourceRundown.revision;
-
+  function commit(shouldProcess: boolean = true) {
    // if the rundown is mutable we persist the changes
    if (options.mutableRundown) {
-      if (isLoaded) {
-        // update fields which are agnostic of whether the rundown is processed
-        cachedRundown.revision = cachedRundown.revision + 1;
-        cachedRundown.title = rundown.title;
+      // update fields which are agnostic of whether the rundown is processed
+      cachedRundown.revision = cachedRundown.revision + 1;
+      cachedRundown.title = rundown.title;

-        if (!shouldProcess) {
-          // if we dont need to process, we just reassign the commit data to the cache
-          cachedRundown.entries = rundown.entries;
-          cachedRundown.order = rundown.order;
-          cachedRundown.flatOrder = rundown.flatOrder;
-        } else {
-          const processedData = processRundown(rundown, projectCustomFields, { mutate: true });
-          // update the cache values
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
-          const { previousEvent, latestEvent, previousEntry, entries, order, ...metadata } = processedData;
-
-          cachedRundown.entries = entries;
-          cachedRundown.order = order;
-          cachedRundown.flatOrder = metadata.flatEntryOrder;
-          rundownMetadata = metadata;
-        }
-
-        // persist after all mutations are applied
-        await getDataProvider().setRundown(cachedRundown.id, cachedRundown);
-        committedRundown = cachedRundown;
-        committedMetadata = rundownMetadata;
-        committedRevision = cachedRundown.revision;
+      if (!shouldProcess) {
+        // if we dont need to process, we just reassign the commit data to the cache
+        cachedRundown.entries = rundown.entries;
+        cachedRundown.order = rundown.order;
+        cachedRundown.flatOrder = rundown.flatOrder;
      } else {
-        // background rundown: process if requested, persist directly, no runtime metadata
-        rundown.revision = rundown.revision + 1;
-        if (shouldProcess) {
-          const processedData = processRundown(rundown, projectCustomFields, { mutate: true });
-          rundown.entries = processedData.entries;
-          rundown.order = processedData.order;
-          rundown.flatOrder = processedData.flatEntryOrder;
-        }
-        await getDataProvider().setRundown(targetId, rundown);
-        committedRundown = rundown;
-        committedRevision = rundown.revision;
+        const processedData = processRundown(rundown, projectCustomFields);
+        // update the cache values
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
+        const { previousEvent, latestEvent, previousEntry, entries, order, ...metadata } = processedData;
+
+        cachedRundown.entries = entries;
+        cachedRundown.order = order;
+        cachedRundown.flatOrder = metadata.flatEntryOrder;
+        rundownMetadata = metadata;
      }
+
+      // persist after all mutations are applied
+      getDataProvider().setRundown(cachedRundown.id, cachedRundown);
    }

    // if the customFields are mutable we persist the changes
@@ -168,20 +139,21 @@ export function createTransaction(options: TransactionOptions): Transaction {
      projectCustomFields = customFields;

      // persist after reassignment
-      await getDataProvider().setCustomFields(projectCustomFields);
+      getDataProvider().setCustomFields(projectCustomFields);
    }

    return {
-      rundown: committedRundown,
-      rundownMetadata: committedMetadata,
+      rundown: cachedRundown,
+      rundownMetadata,
      customFields: projectCustomFields,
-      revision: committedRevision,
+      revision: cachedRundown.revision,
    };
  }

  return {
    customFields,
    rundown,
+    rundownMetadata,
    commit,
  };
 }
@@ -316,11 +288,11 @@ function reorder(rundown: Rundown, eventFrom: OntimeEntry, eventTo: OntimeEntry,
 * Mutates the given rundown
 */
 function applyDelay(rundown: Rundown, delay: OntimeDelay) {
-  const delayIndex = rundown.flatOrder.indexOf(delay.id);
+  const delayIndex = rundownMetadata.flatEntryOrder.indexOf(delay.id);

  // if the delay is empty, or the last element
  // there is nothing do apply
-  if (delay.duration === 0 || delayIndex === rundown.flatOrder.length - 1) {
+  if (delay.duration === 0 || delayIndex === rundownMetadata.flatEntryOrder.length - 1) {
    return;
  }

@@ -333,8 +305,8 @@ function applyDelay(rundown: Rundown, delay: OntimeDelay) {
  let lastEntry: OntimeEvent | null = null;
  let isFirstEvent = true;

-  for (let i = delayIndex + 1; i < rundown.flatOrder.length; i++) {
-    const currentId = rundown.flatOrder[i];
+  for (let i = delayIndex + 1; i < rundownMetadata.flatEntryOrder.length; i++) {
+    const currentId = rundownMetadata.flatEntryOrder[i];
    const currentEntry = rundown.entries[currentId];

    // we don't do operation on other event types
@@ -616,23 +588,6 @@ export async function updateBackgroundRundown(rundownId: string, rundown: Rundow
  await getDataProvider().setRundown(rundownId, rundown);
 }

-/**
- * Reads a rundown from disk and returns it in the processed shape used by clients.
- * Used for non-loaded rundowns — the loaded rundown is served directly from cache.
- */
-export function getProcessedRundown(rundownId: string): Rundown {
-  const stored = getDataProvider().getRundown(rundownId);
-  const processed = processRundown(stored, getDataProvider().getCustomFields());
-  return {
-    id: stored.id,
-    title: stored.title,
-    entries: processed.entries,
-    order: processed.order,
-    flatOrder: processed.flatEntryOrder,
-    revision: stored.revision,
-  };
-}
-
 /**
 * Adds a new custom field to the object and returns it
 */
@@ -711,7 +666,7 @@ export const customFieldMutation = {
 export function init(initialRundown: Readonly<Rundown>, initialCustomFields: Readonly<CustomFields>) {
  const rundown = structuredClone(initialRundown);
  const customFields = structuredClone(initialCustomFields);
-  const processedData = processRundown(rundown, customFields, { mutate: true });
+  const processedData = processRundown(rundown, customFields);

  // update the cache values
  cachedRundown.id = rundown.id;
@@ -744,57 +699,72 @@ export const rundownCache = {
 };

 /**
- * Computes derived rundown metadata (delays, gaps, group times, ordered lists).
- * By default the input rundown is not mutated — entries are cloned as they are processed.
- * Callers that own a writable rundown can pass `{ mutate: true }` to skip the per-entry clone.
+ * Utility updates cache after a mutation
+ * Handles calculating the rundown metadata
 * @private should not be called outside of `rundown.dao.ts`, exported for testing
 */
 export function processRundown(
  initialRundown: Readonly<Rundown>,
  customFields: Readonly<CustomFields>,
-  options?: { mutate?: boolean },
 ): ProcessedRundownMetadata {
-  const { process, getMetadata } = makeRundownMetadata(customFields, options);
+  const { process, getMetadata } = makeRundownMetadata(customFields);

  for (let i = 0; i < initialRundown.order.length; i++) {
-    const currentEntry = initialRundown.entries[initialRundown.order[i]];
-    if (!currentEntry) continue;
-
-    const processedEntry = process(currentEntry, null);
-    if (!isOntimeGroup(processedEntry)) continue;
-
-    // process nested entries and recompute aggregate group fields
-    let groupStartTime: number | null = null;
-    let groupEndTime: number | null = null;
-    let isFirstLinked = false;
-    const groupEvents: EntryId[] = [];
-    processedEntry.duration = 0;
-
-    for (let j = 0; j < processedEntry.entries.length; j++) {
-      const nestedEntry = initialRundown.entries[processedEntry.entries[j]];
-      if (!nestedEntry) continue;
-
-      groupEvents.push(nestedEntry.id);
-      const processedNestedEntry = process(nestedEntry, processedEntry.id);
-
-      // skip metadata aggregation for non-playable nested entries
-      if (!isOntimeEvent(processedNestedEntry) || !isPlayableEvent(processedNestedEntry)) continue;
-
-      if (groupStartTime === null) {
-        groupStartTime = processedNestedEntry.timeStart;
-        isFirstLinked = Boolean(processedNestedEntry.linkStart);
-      }
-      groupEndTime = processedNestedEntry.timeEnd;
-      if (j > 0) {
-        processedEntry.duration += processedNestedEntry.gap;
-      }
-      processedEntry.duration += processedNestedEntry.duration;
+    // we assign a reference to the current entry, this will be mutated in place
+    const currentEntryId = initialRundown.order[i];
+    const currentEntry = initialRundown.entries[currentEntryId];
+    if (!currentEntry) {
+      continue;
    }
+    const { processedEntry } = process(currentEntry, null);

-    processedEntry.timeStart = groupStartTime;
-    processedEntry.timeEnd = groupEndTime;
-    processedEntry.isFirstLinked = isFirstLinked;
-    processedEntry.entries = groupEvents;
+    // if the event is a group, we process the nested entries
+    // the code here is a copy of the processing of top level events
+    if (isOntimeGroup(processedEntry)) {
+      let groupStartTime = null;
+      let groupEndTime = null;
+      let isFirstLinked = false;
+      const groupEvents: EntryId[] = [];
+      processedEntry.duration = 0;
+
+      // check if the group contains nested entries
+      for (let j = 0; j < processedEntry.entries.length; j++) {
+        const nestedEntryId = processedEntry.entries[j];
+        const nestedEntry = initialRundown.entries[nestedEntryId];
+
+        if (!nestedEntry) {
+          continue;
+        }
+
+        groupEvents.push(nestedEntry.id);
+        const { processedEntry: processedNestedEntry } = process(nestedEntry, processedEntry.id);
+
+        // we dont extract metadata of skipped events,
+        // if this is not a playable event there is nothing else to do
+        if (!isOntimeEvent(processedNestedEntry) || !isPlayableEvent(processedNestedEntry)) {
+          continue;
+        }
+
+        // first start is always the first event
+        if (groupStartTime === null) {
+          groupStartTime = processedNestedEntry.timeStart;
+          isFirstLinked = Boolean(processedNestedEntry.linkStart);
+        }
+
+        // lastEntry is the event with the latest end time
+        groupEndTime = processedNestedEntry.timeEnd;
+        if (j > 0) {
+          processedEntry.duration += processedNestedEntry.gap;
+        }
+        processedEntry.duration = processedEntry.duration + processedNestedEntry.duration;
+      }
+
+      // update group metadata
+      processedEntry.timeStart = groupStartTime;
+      processedEntry.timeEnd = groupEndTime;
+      processedEntry.isFirstLinked = isFirstLinked;
+      processedEntry.entries = groupEvents;
+    }
  }

  return getMetadata();
@@ -205,15 +205,10 @@ export type ProcessedRundownMetadata = RundownMetadata & {

 /**
 * Factory function to create a rundown metadata processor
- *
- * @param customFields project custom fields used to sanitise entries
- * @param options.mutate when true, entries are mutated in place rather than cloned.
- *                      Callers must own (or have already cloned) the input rundown.
- * @returns process() - processes entries in order | getMetadata() returns the accumulated metadata
+ * @returns {process, getMetadata} process() - processes entries in order | getMetadata() -> returns the current metadata
 */
-export function makeRundownMetadata(customFields: CustomFields, options?: { mutate?: boolean }) {
-  const mutate = options?.mutate ?? false;
-  const rundownMeta: ProcessedRundownMetadata = {
+export function makeRundownMetadata(customFields: CustomFields) {
+  let rundownMeta: ProcessedRundownMetadata = {
    totalDelay: 0,
    totalDuration: 0,
    totalDays: 0,
@@ -233,8 +228,13 @@ export function makeRundownMetadata(customFields: CustomFields, options?: { muta
    previousEntry: null,
  };

-  function process<T extends OntimeEntry>(entry: T, childOfGroup: EntryId | null): T {
-    return processEntry(rundownMeta, customFields, mutate ? entry : structuredClone(entry), childOfGroup);
+  function process<T extends OntimeEntry>(
+    entry: T,
+    childOfGroup: EntryId | null,
+  ): { processedData: ProcessedRundownMetadata; processedEntry: T } {
+    const data = processEntry(rundownMeta, customFields, entry, childOfGroup);
+    rundownMeta = data.processedData;
+    return data;
  }

  function getMetadata(): ProcessedRundownMetadata {
@@ -245,19 +245,20 @@ export function makeRundownMetadata(customFields: CustomFields, options?: { muta
 }

 /**
- * Processes a single entry, mutating both `entry` and `rundownMetadata` in place.
- * Returns the same `entry` reference for caller convenience.
+ * Processes a single entry and updates the rundown metadata
 */
 function processEntry<T extends OntimeEntry>(
  rundownMetadata: ProcessedRundownMetadata,
  customFields: CustomFields,
  entry: T,
  childOfGroup: EntryId | null,
-): T {
-  rundownMetadata.flatEntryOrder.push(entry.id);
+): { processedData: ProcessedRundownMetadata; processedEntry: T } {
+  const processedData = { ...rundownMetadata };
+  const currentEntry = structuredClone(entry);
+  processedData.flatEntryOrder.push(currentEntry.id);

-  if (isOntimeEvent(entry)) {
-    rundownMetadata.timedEventOrder.push(entry.id);
+  if (isOntimeEvent(currentEntry)) {
+    processedData.timedEventOrder.push(currentEntry.id);

    /**
     * 1.Checks that link can be established (ie, events exist and are valid)
@@ -265,91 +266,91 @@ function processEntry<T extends OntimeEntry>(
     * The linked event is always the previous playable event
     * If no previous event exists, the link is removed
     */
-    if (entry.linkStart) {
-      if (rundownMetadata.previousEvent) {
-        const timePatch = getLinkedTimes(entry, rundownMetadata.previousEvent);
-        entry.timeStart = timePatch.timeStart;
-        entry.timeEnd = timePatch.timeEnd;
-        entry.duration = timePatch.duration;
+    if (currentEntry.linkStart) {
+      if (processedData.previousEvent) {
+        const timePatch = getLinkedTimes(currentEntry, processedData.previousEvent);
+        currentEntry.timeStart = timePatch.timeStart;
+        currentEntry.timeEnd = timePatch.timeEnd;
+        currentEntry.duration = timePatch.duration;
      } else {
-        entry.linkStart = false;
+        currentEntry.linkStart = false;
      }
    }

-    // 2. handle custom fields - mutates entry
-    sanitiseCustomFields(customFields, entry);
+    // 2. handle custom fields - mutates currentEntry
+    sanitiseCustomFields(customFields, currentEntry);

-    rundownMetadata.totalDays += calculateDayOffset(entry, rundownMetadata.previousEvent);
-    entry.dayOffset = rundownMetadata.totalDays as Day;
-    entry.delay = 0; // this means we dont calculate delays or gaps for skipped events
-    entry.gap = 0; // this means we dont calculate delays or gaps for skipped events
-    entry.parent = childOfGroup;
+    processedData.totalDays += calculateDayOffset(currentEntry, processedData.previousEvent);
+    currentEntry.dayOffset = processedData.totalDays as Day;
+    currentEntry.delay = 0; // this means we dont calculate delays or gaps for skipped events
+    currentEntry.gap = 0; // this means we dont calculate delays or gaps for skipped events
+    currentEntry.parent = childOfGroup;

    // update rundown metadata, it only concerns playable events
-    if (isPlayableEvent(entry)) {
-      rundownMetadata.playableEventOrder.push(entry.id);
+    if (isPlayableEvent(currentEntry)) {
+      processedData.playableEventOrder.push(currentEntry.id);

      // first start is always the first event
-      if (rundownMetadata.firstStart === null) {
-        rundownMetadata.firstStart = entry.timeStart;
+      if (processedData.firstStart === null) {
+        processedData.firstStart = currentEntry.timeStart;
      }

      // check if event is flagged
-      if (entry.flag) {
-        rundownMetadata.flags.push(entry.id);
+      if (currentEntry.flag) {
+        processedData.flags.push(currentEntry.id);
      }

-      entry.gap = getTimeFrom(entry, rundownMetadata.latestEvent);
+      currentEntry.gap = getTimeFrom(currentEntry, processedData.latestEvent);

-      if (entry.gap === 0) {
+      if (currentEntry.gap === 0) {
        // event starts on previous finish, we add its duration
-        rundownMetadata.totalDuration += entry.duration;
-      } else if (entry.gap > 0) {
+        processedData.totalDuration += currentEntry.duration;
+      } else if (currentEntry.gap > 0) {
        // event has a gap, we add the gap and the duration
-        rundownMetadata.totalDuration += entry.gap + entry.duration;
-      } else {
+        processedData.totalDuration += currentEntry.gap + currentEntry.duration;
+      } else if (currentEntry.gap < 0) {
        // there is an overlap, we remove the overlap from the duration
        // ensuring that the sum is not negative (ie: fully overlapped events)
        // NOTE: we add the gap since it is a negative number
-        rundownMetadata.totalDuration += Math.max(entry.duration + entry.gap, 0);
+        processedData.totalDuration += Math.max(currentEntry.duration + currentEntry.gap, 0);
      }

      // remove eventual gaps from the accumulated delay
      // we only affect positive delays (time forwards)
-      if (rundownMetadata.totalDelay > 0 && entry.gap > 0) {
+      if (processedData.totalDelay > 0 && currentEntry.gap > 0) {
        let correctedDelay = 0;
        // we need to separate the delay that is accumulated from one that may exist after the gap
-        if (isOntimeDelay(rundownMetadata.previousEntry)) {
-          correctedDelay = rundownMetadata.previousEntry.duration;
-          rundownMetadata.totalDelay -= correctedDelay;
+        if (isOntimeDelay(processedData.previousEntry)) {
+          correctedDelay = processedData.previousEntry.duration;
+          processedData.totalDelay -= correctedDelay;
        }
-        rundownMetadata.totalDelay = Math.max(rundownMetadata.totalDelay - entry.gap, 0);
-        rundownMetadata.totalDelay += correctedDelay;
+        processedData.totalDelay = Math.max(processedData.totalDelay - currentEntry.gap, 0);
+        processedData.totalDelay += correctedDelay;
      }

      // current event delay is the current accumulated delay
-      entry.delay = rundownMetadata.totalDelay;
+      currentEntry.delay = processedData.totalDelay;

      // assign data for next iteration
-      rundownMetadata.previousEvent = entry;
+      processedData.previousEvent = currentEntry;

      // lastEntry is the event with the latest end time
-      if (isNewLatest(entry, rundownMetadata.latestEvent)) {
-        rundownMetadata.latestEvent = entry;
-        rundownMetadata.lastEnd = entry.timeEnd;
+      if (isNewLatest(currentEntry, processedData.latestEvent)) {
+        processedData.latestEvent = currentEntry;
+        processedData.lastEnd = currentEntry.timeEnd;
      }
    }
-  } else if (isOntimeDelay(entry)) {
+  } else if (isOntimeDelay(currentEntry)) {
    // !!! this must happen after handling the links
-    rundownMetadata.totalDelay += entry.duration;
-    entry.parent = childOfGroup;
+    processedData.totalDelay += currentEntry.duration;
+    currentEntry.parent = childOfGroup;
  }

  if (!childOfGroup) {
-    rundownMetadata.order.push(entry.id);
+    processedData.order.push(currentEntry.id);
  }
-  rundownMetadata.entries[entry.id] = entry;
-  rundownMetadata.previousEntry = entry;
+  processedData.entries[currentEntry.id] = currentEntry;
+  processedData.previousEntry = currentEntry;

-  return entry;
+  return { processedData, processedEntry: currentEntry };
 }
@@ -5,28 +5,26 @@ import { ErrorResponse, OntimeEntry, ProjectRundownsList, RenumberCues, Rundown
 import { getErrorMessage } from 'ontime-utils';

 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
+import { makeNewRundown } from '../../models/dataModel.js';
 import { paramsWithId } from '../validation-utils/validationFunction.js';
-import { getCurrentRundown, getProcessedRundown } from './rundown.dao.js';
+import { getCurrentRundown } from './rundown.dao.js';
 import {
  addEntry,
  applyDelay,
  batchEditEntries,
  cloneEntry,
-  createNewRundown,
  deleteAllEntries,
  deleteEntries,
-  deleteRundown,
-  duplicateExistingRundown,
  editEntry,
  groupEntries,
+  initRundown,
  loadRundown,
-  renameRundown,
  renumberEntries,
  reorderEntry,
  swapEvents,
  ungroupEntries,
 } from './rundown.service.js';
-import { normalisedToRundownArray } from './rundown.utils.js';
+import { duplicateRundown, normalisedToRundownArray } from './rundown.utils.js';
 import {
  clonePostValidator,
  entryBatchPutValidator,
@@ -36,8 +34,8 @@ import {
  entryReorderValidator,
  entrySwapValidator,
  rundownArrayOfIds,
-  rundownPatchValidator,
  rundownPostValidator,
+  validateRundownMutation,
 } from './rundown.validation.js';

 export const router: Router = express.Router();
@@ -47,7 +45,7 @@ export const router: Router = express.Router();
 /**
 * Returns all rundowns in the project
 */
-router.get('/', (_req: Request, res: Response<ProjectRundownsList>) => {
+router.get('/', async (_req: Request, res: Response<ProjectRundownsList>) => {
  const projectRundowns = getDataProvider().getProjectRundowns();
  res.json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
 });
@@ -55,24 +53,11 @@ router.get('/', (_req: Request, res: Response<ProjectRundownsList>) => {
 /**
 * Returns the current rundown
 */
-router.get('/current', (_req: Request, res: Response<Rundown>) => {
+router.get('/current', async (_req: Request, res: Response<Rundown>) => {
  const rundown = getCurrentRundown();
  res.json(rundown);
 });

-/**
- * Returns a given rundown in its normalised client shape
- */
-router.get('/:id', paramsWithId, (req: Request, res: Response<Rundown | ErrorResponse>) => {
-  try {
-    const rundown = getProcessedRundown(req.params.id);
-    res.json(rundown);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(404).send({ message });
-  }
-});
-
 /**
 * Loads a given rundown
 */
@@ -91,7 +76,11 @@ router.post('/:id/load', paramsWithId, async (req: Request, res: Response<Projec
 */
 router.post('/', rundownPostValidator, async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
  try {
-    const projectRundowns = await createNewRundown(req.body.title);
+    const emptyRundown = makeNewRundown();
+    emptyRundown.title = req.body.title;
+    await getDataProvider().setRundown(emptyRundown.id, emptyRundown);
+
+    const projectRundowns = getDataProvider().getProjectRundowns();
    res.status(201).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
  } catch (error) {
    const message = getErrorMessage(error);
@@ -107,7 +96,13 @@ router.post(
  paramsWithId,
  async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
    try {
-      const projectRundowns = await duplicateExistingRundown(req.params.id);
+      const dataProvider = getDataProvider();
+      const rundown = dataProvider.getRundown(req.params.id);
+
+      const duplicatedRundown: Rundown = duplicateRundown(rundown, `Copy of ${rundown.title}`);
+      await dataProvider.setRundown(duplicatedRundown.id, duplicatedRundown);
+
+      const projectRundowns = getDataProvider().getProjectRundowns();
      res.status(201).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
    } catch (error) {
      const message = getErrorMessage(error);
@@ -120,26 +115,54 @@ router.post(
 * Patches the data of an existing rundown
 * Currently only the title can be changed
 */
-router.patch(
-  '/:id',
-  rundownPatchValidator,
-  async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
-    try {
-      const projectRundowns = await renameRundown(req.params.id, req.body.title);
-      res.status(200).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
-    } catch (error) {
-      const message = getErrorMessage(error);
-      res.status(400).send({ message });
+router.patch('/:id', paramsWithId, async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
+  try {
+    const dataProvider = getDataProvider();
+    const rundown = dataProvider.getRundown(req.params.id);
+    if (!rundown) throw new Error(`Rundown with ID ${req.params.id} not found`);
+    if (!req.body.title) throw new Error('No title provided');
+
+    await dataProvider.setRundown(rundown.id, { ...rundown, title: req.body.title });
+
+    /**
+     * If loaded we re-init the rundown
+     * This is likely over-kill but the simplest way to ensure state consistency
+     */
+    if (req.params.id === getCurrentRundown().id) {
+      const rundown = dataProvider.getRundown(req.params.id);
+      const customField = dataProvider.getCustomFields();
+      await initRundown(rundown, customField);
    }
-  },
-);
+
+    const projectRundowns = getDataProvider().getProjectRundowns();
+    res.status(201).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(projectRundowns) });
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});

 /**
 * Deletes a rundown if not loaded
 */
 router.delete('/:id', paramsWithId, async (req: Request, res: Response<ProjectRundownsList | ErrorResponse>) => {
  try {
-    const newProjectRundowns = await deleteRundown(req.params.id);
+    if (req.params.id === getCurrentRundown().id) {
+      res.status(400).send({ message: 'Cannot delete loaded rundown' });
+      return;
+    }
+
+    const dataProvider = getDataProvider();
+    const projectRundowns = dataProvider.getProjectRundowns();
+
+    if (Object.keys(projectRundowns).length <= 1) {
+      // might never hit this as it is likely covered by the case of trying to delete the loaded rundown
+      res.status(400).send({ message: 'Cannot delete the last rundown' });
+      return;
+    }
+
+    await dataProvider.deleteRundown(req.params.id);
+    const newProjectRundowns = getDataProvider().getProjectRundowns();
    res.status(200).json({ loaded: getCurrentRundown().id, rundowns: normalisedToRundownArray(newProjectRundowns) });
  } catch (error) {
    const message = getErrorMessage(error);
@@ -157,9 +180,10 @@ router.delete('/:id', paramsWithId, async (req: Request, res: Response<ProjectRu
 router.post(
  '/:rundownId/entry',
  entryPostValidator,
+  validateRundownMutation,
  async (req: Request, res: Response<OntimeEntry | ErrorResponse>) => {
    try {
-      const newEvent = await addEntry(req.params.rundownId, req.body);
+      const newEvent = await addEntry(req.body);
      res.status(201).send(newEvent);
    } catch (error) {
      const message = getErrorMessage(error);
@@ -171,15 +195,20 @@ router.post(
 /**
 * Edits an entry in a given rundown
 */
-router.put('/:rundownId/entry', entryPutValidator, async (req: Request, res: Response<OntimeEntry | ErrorResponse>) => {
-  try {
-    const event = await editEntry(req.params.rundownId, req.body);
-    res.status(200).send(event);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+router.put(
+  '/:rundownId/entry',
+  entryPutValidator,
+  validateRundownMutation,
+  async (req: Request, res: Response<OntimeEntry | ErrorResponse>) => {
+    try {
+      const event = await editEntry(req.body);
+      res.status(200).send(event);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
+    }
+  },
+);

 /**
 * Edits an entry in a given rundown
@@ -187,9 +216,10 @@ router.put('/:rundownId/entry', entryPutValidator, async (req: Request, res: Res
 router.put(
  '/:rundownId/batch',
  entryBatchPutValidator,
+  validateRundownMutation,
  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
    try {
-      const rundown = await batchEditEntries(req.params.rundownId, req.body.ids, req.body.data);
+      const rundown = await batchEditEntries(req.body.ids, req.body.data);
      res.status(200).send(rundown);
    } catch (error) {
      const message = getErrorMessage(error);
@@ -204,10 +234,11 @@ router.put(
 router.patch(
  '/:rundownId/reorder',
  entryReorderValidator,
+  validateRundownMutation,
  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
    try {
      const { entryId, destinationId, order } = req.body;
-      const rundown = await reorderEntry(req.params.rundownId, entryId, destinationId, order);
+      const rundown = await reorderEntry(entryId, destinationId, order);
      res.status(200).send(rundown);
    } catch (error) {
      const message = getErrorMessage(error);
@@ -222,9 +253,10 @@ router.patch(
 router.patch(
  '/:rundownId/applydelay/:id',
  paramsWithId,
+  validateRundownMutation,
  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
    try {
-      const rundown = await applyDelay(req.params.rundownId, req.params.id);
+      const rundown = await applyDelay(req.params.id);
      res.status(200).send(rundown);
    } catch (error) {
      const message = getErrorMessage(error);
@@ -236,15 +268,20 @@ router.patch(
 /**
 * Swaps data between two Ontime events
 */
-router.patch('/:rundownId/swap', entrySwapValidator, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
-  try {
-    const rundown = await swapEvents(req.params.rundownId, req.body.from, req.body.to);
-    res.status(200).send(rundown);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+router.patch(
+  '/:rundownId/swap',
+  entrySwapValidator,
+  validateRundownMutation,
+  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+    try {
+      const rundown = await swapEvents(req.body.from, req.body.to);
+      res.status(200).send(rundown);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
+    }
+  },
+);

 /**
 * Clones the contents of an entry into a new one
@@ -253,9 +290,10 @@ router.post(
  '/:rundownId/clone/:id',
  paramsWithId,
  clonePostValidator,
+  validateRundownMutation,
  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
    try {
-      const rundown = await cloneEntry(req.params.rundownId, req.params.id, {
+      const rundown = await cloneEntry(req.params.id, {
        before: req.body?.before,
        after: req.body?.after,
      });
@@ -270,28 +308,38 @@ router.post(
 /**
 * Creates a group out of a list of entries
 */
-router.post('/:rundownId/group', rundownArrayOfIds, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
-  try {
-    const rundown = await groupEntries(req.params.rundownId, req.body.ids);
-    res.status(200).send(rundown);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+router.post(
+  '/:rundownId/group',
+  rundownArrayOfIds,
+  validateRundownMutation,
+  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+    try {
+      const rundown = await groupEntries(req.body.ids);
+      res.status(200).send(rundown);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
+    }
+  },
+);

 /**
 * Dissolves a group by moving its children to the main rundown
 */
-router.post('/:rundownId/ungroup/:id', paramsWithId, async (req: Request, res: Response<Rundown | ErrorResponse>) => {
-  try {
-    const rundown = await ungroupEntries(req.params.rundownId, req.params.id);
-    res.status(200).send(rundown);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+router.post(
+  '/:rundownId/ungroup/:id',
+  paramsWithId,
+  validateRundownMutation,
+  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+    try {
+      const rundown = await ungroupEntries(req.params.id);
+      res.status(200).send(rundown);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
+    }
+  },
+);

 /**
 * Deletes a list of entries by their ID
@@ -299,9 +347,10 @@ router.post('/:rundownId/ungroup/:id', paramsWithId, async (req: Request, res: R
 router.delete(
  '/:rundownId/entries',
  rundownArrayOfIds,
+  validateRundownMutation,
  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
    try {
-      const rundown = await deleteEntries(req.params.rundownId, req.body.ids);
+      const rundown = await deleteEntries(req.body.ids);
      res.status(200).send(rundown);
    } catch (error) {
      const message = getErrorMessage(error);
@@ -313,15 +362,19 @@ router.delete(
 /**
 * Deletes all entries in a given rundown
 */
-router.delete('/:rundownId/all', async (req: Request, res: Response<Rundown | ErrorResponse>) => {
-  try {
-    const rundown = await deleteAllEntries(req.params.rundownId);
-    res.status(200).send(rundown);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-});
+router.delete(
+  '/:rundownId/all',
+  validateRundownMutation,
+  async (_req: Request, res: Response<Rundown | ErrorResponse>) => {
+    try {
+      const rundown = await deleteAllEntries();
+      res.status(200).send(rundown);
+    } catch (error) {
+      const message = getErrorMessage(error);
+      res.status(400).send({ message });
+    }
+  },
+);

 /**
 * Reorders two entries in a rundown
@@ -329,10 +382,11 @@ router.delete('/:rundownId/all', async (req: Request, res: Response<Rundown | Er
 router.patch(
  '/:rundownId/renumber',
  entryRenumberValidator,
-  async (req: Request, res: Response<Rundown | ErrorResponse>) => {
+  validateRundownMutation,
+  (req: Request, res: Response<Rundown | ErrorResponse>) => {
    try {
      const { ids, prefix, start, increment } = matchedData<RenumberCues>(req);
-      const rundown = await renumberEntries(req.params.rundownId, ids, prefix, start, increment);
+      const rundown = renumberEntries(ids, prefix, start, increment);
      res.status(200).send(rundown);
    } catch (error) {
      const message = getErrorMessage(error);
@@ -16,12 +16,11 @@ import {
  isOntimeEvent,
  isOntimeGroup,
 } from 'ontime-types';
-import { customFieldLabelToKey, generateId, getInsertAfterId, resolveInsertParent } from 'ontime-utils';
+import { customFieldLabelToKey, getInsertAfterId, resolveInsertParent } from 'ontime-utils';

 import { sendRefetch } from '../../adapters/WebsocketAdapter.js';
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
 import { logger } from '../../classes/Logger.js';
-import { makeNewRundown } from '../../models/dataModel.js';
 import { setLastLoadedRundown } from '../../services/app-state-service/AppStateService.js';
 import { runtimeService } from '../../services/runtime-service/runtime.service.js';
 import { updateRundownData } from '../../stores/runtimeState.js';
@@ -39,8 +38,8 @@ import { generateEvent, getIntegerAndFraction, hasChanges } from './rundown.util
 /**
 * creates a new entry with given data
 */
-export async function addEntry(rundownId: string, eventData: EventPostPayload): Promise<OntimeEntry> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function addEntry(eventData: EventPostPayload): Promise<OntimeEntry> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  // we allow the user to provide an ID, but make sure it is unique
  if (eventData?.id && Object.hasOwn(rundown.entries, eventData.id)) {
@@ -67,7 +66,7 @@ export async function addEntry(rundownId: string, eventData: EventPostPayload):
  // make mutations to rundown
  rundownMutation.add(rundown, newEntry, afterId, parent);

-  const { rundown: responseRundown, rundownMetadata, revision } = await commit();
+  const { rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -78,14 +77,14 @@ export async function addEntry(rundownId: string, eventData: EventPostPayload):
    notifyChanges(rundown.id, rundownMetadata, revision, { timer: [newEntry.id], external: true });
  });

-  return responseRundown.entries[newEntry.id] ?? newEntry;
+  return newEntry;
 }

 /**
 * Applies a patch to an entry in the rundown
 */
-export async function editEntry(rundownId: string, patch: PatchWithId): Promise<OntimeEntry> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
  const currentEntry = rundown.entries[patch.id];

  /**
@@ -111,7 +110,7 @@ export async function editEntry(rundownId: string, patch: PatchWithId): Promise<
  }

  const { entry, didInvalidate } = rundownMutation.edit(rundown, patch);
-  const { rundown: responseRundown, rundownMetadata, revision } = await commit(didInvalidate);
+  const { rundownMetadata, revision } = commit(didInvalidate);

  // schedule the side effects
  setImmediate(() => {
@@ -125,18 +124,14 @@ export async function editEntry(rundownId: string, patch: PatchWithId): Promise<
    });
  });

-  return responseRundown.entries[entry.id] ?? entry;
+  return entry;
 }

 /**
 * Applies a patch to several entries in the rundown
 */
-export async function batchEditEntries(
-  rundownId: string,
-  ids: EntryId[],
-  patch: Partial<OntimeEntry>,
-): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function batchEditEntries(ids: EntryId[], patch: Partial<OntimeEntry>): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  /**
   * We can do some validation globally, but mostly we will validate each entry individually
@@ -181,7 +176,7 @@ export async function batchEditEntries(
      batchDidInvalidate = true;
    }
  }
-  const { rundown: rundownResult, rundownMetadata, revision } = await commit(batchDidInvalidate);
+  const { rundown: rundownResult, rundownMetadata, revision } = commit(batchDidInvalidate);

  // schedule the side effects
  setImmediate(() => {
@@ -201,8 +196,8 @@ export async function batchEditEntries(
 /**
 * Deletes a known entry from the current rundown
 */
-export async function deleteEntries(rundownId: string, entryIds: EntryId[]): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function deleteEntries(entryIds: EntryId[]): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  for (let i = 0; i < entryIds.length; i++) {
    const entry = rundown.entries[entryIds[i]];
@@ -212,7 +207,7 @@ export async function deleteEntries(rundownId: string, entryIds: EntryId[]): Pro
    rundownMutation.remove(rundown, entry);
  }

-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -229,12 +224,12 @@ export async function deleteEntries(rundownId: string, entryIds: EntryId[]): Pro
 /**
 * Deletes all entries from the current rundown
 */
-export async function deleteAllEntries(rundownId: string): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function deleteAllEntries(): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  rundownMutation.removeAll(rundown);

-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -253,13 +248,8 @@ export async function deleteAllEntries(rundownId: string): Promise<Rundown> {
 * Handles moving across root orders (a group order and top level order)
 * @throws if entryId or destinationId not found
 */
-export async function reorderEntry(
-  rundownId: string,
-  entryId: EntryId,
-  destinationId: EntryId,
-  order: 'before' | 'after' | 'insert',
-) {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function reorderEntry(entryId: EntryId, destinationId: EntryId, order: 'before' | 'after' | 'insert') {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  // check that both entries exist
  const eventFrom = rundown.entries[entryId];
@@ -271,7 +261,7 @@ export async function reorderEntry(

  rundownMutation.reorder(rundown, eventFrom, eventTo, order);

-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -288,24 +278,18 @@ export async function reorderEntry(
 /**
 * @throws if an id is missing or not an Ontime event
 */
-export async function renumberEntries(
-  rundownId: string,
-  ids: EntryId[],
-  prefix: string,
-  start: string,
-  increment: string,
-): Promise<Rundown> {
+export function renumberEntries(ids: EntryId[], prefix: string, start: string, increment: string): Rundown {
  const startNumber = getIntegerAndFraction(start);
  const incrementNumber = getIntegerAndFraction(increment);

  // if the prefix doesn't already include a separator or is empty, then insert a separator
  if (prefix !== '' && !prefix.endsWith('-') && !prefix.endsWith(' ')) prefix += ' ';

-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true, mutableCustomFields: false });
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  rundownMutation.renumber(rundown, ids, prefix, startNumber, incrementNumber);

-  const { rundown: rundownResult, rundownMetadata, revision } = await commit(false);
+  const { rundown: rundownResult, rundownMetadata, revision } = commit(false);

  setImmediate(() => {
    updateRuntimeOnChange(rundownMetadata);
@@ -319,8 +303,8 @@ export async function renumberEntries(
 * Applies a delay into the rundown effectively changing the schedule
 * The applied delay is deleted
 */
-export async function applyDelay(rundownId: string, delayId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function applyDelay(delayId: EntryId): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  // check that delay exists
  const delay = rundown.entries[delayId];
@@ -332,7 +316,7 @@ export async function applyDelay(rundownId: string, delayId: EntryId): Promise<R
  rundownMutation.applyDelay(rundown, delay);
  rundownMutation.remove(rundown, delay);

-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -349,8 +333,8 @@ export async function applyDelay(rundownId: string, delayId: EntryId): Promise<R
 /**
 * Swaps the data between two events in the rundown
 */
-export async function swapEvents(rundownId: string, fromId: EntryId, toId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function swapEvents(fromId: EntryId, toId: EntryId): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
  const eventFrom = rundown.entries[fromId];
  const eventTo = rundown.entries[toId];

@@ -365,7 +349,7 @@ export async function swapEvents(rundownId: string, fromId: EntryId, toId: Entry
  }

  rundownMutation.swap(rundown, eventFrom, eventTo);
-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -384,8 +368,8 @@ export async function swapEvents(rundownId: string, fromId: EntryId, toId: Entry
 * Handles cloning children if the entry is a group
 * @throws if the entry to clone does not exist
 */
-export async function cloneEntry(rundownId: string, entryId: EntryId, options: InsertOptions): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function cloneEntry(entryId: EntryId, options: InsertOptions): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
  const originalEntry = rundown.entries[entryId];

  if (!originalEntry) {
@@ -393,7 +377,7 @@ export async function cloneEntry(rundownId: string, entryId: EntryId, options: I
  }

  const newEntry = rundownMutation.clone(rundown, originalEntry, options);
-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -416,11 +400,11 @@ export async function cloneEntry(rundownId: string, entryId: EntryId, options: I
 /**
 * Groups a list of entries into a new group
 */
-export async function groupEntries(rundownId: string, entryIds: EntryId[]): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function groupEntries(entryIds: EntryId[]): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  rundownMutation.group(rundown, entryIds);
-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -437,8 +421,8 @@ export async function groupEntries(rundownId: string, entryIds: EntryId[]): Prom
 /**
 * Deletes a group and moves all its children to the top level
 */
-export async function ungroupEntries(rundownId: string, groupId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction({ rundownId, mutableRundown: true });
+export async function ungroupEntries(groupId: EntryId): Promise<Rundown> {
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });

  const group = rundown.entries[groupId];
  if (!group || !isOntimeGroup(group)) {
@@ -446,7 +430,7 @@ export async function ungroupEntries(rundownId: string, groupId: EntryId): Promi
  }

  rundownMutation.ungroup(rundown, group);
-  const { rundown: rundownResult, rundownMetadata, revision } = await commit();
+  const { rundown: rundownResult, rundownMetadata, revision } = commit();

  // schedule the side effects
  setImmediate(() => {
@@ -481,7 +465,7 @@ export async function createCustomField(customField: CustomField): Promise<Custo
  customFieldMutation.add(customFields, key, customField);

  // Adding a custom field has no immediate implications on the rundown
-  const { customFields: resultCustomFields } = await commit(false);
+  const { customFields: resultCustomFields } = commit(false);

  setImmediate(() => {
    sendRefetch(RefetchKey.CustomFields);
@@ -539,7 +523,7 @@ export async function editCustomField(
  }

  // the custom fields have been removed and there is no processing to be done
-  const { rundownMetadata, revision, customFields: resultCustomFields } = await commit(false);
+  const { rundownMetadata, revision, customFields: resultCustomFields } = commit(false);

  // schedule the side effects
  setImmediate(() => {
@@ -578,7 +562,7 @@ export async function deleteCustomField(key: CustomFieldKey, projectRundowns: Pr
  customFieldMutation.remove(customFields, key);

  // the custom fields have been removed and there is no processing to be done
-  const { rundownMetadata, revision, customFields: resultCustomFields } = await commit(false);
+  const { rundownMetadata, revision, customFields: resultCustomFields } = commit(false);

  // schedule the side effects
  setImmediate(() => {
@@ -595,8 +579,7 @@ export async function deleteCustomField(key: CustomFieldKey, projectRundowns: Pr
 *
 * @private - exported for testing
 */
-export function updateRuntimeOnChange(rundownMetadata: RundownMetadata | null) {
-  if (!rundownMetadata) return;
+export function updateRuntimeOnChange(rundownMetadata: RundownMetadata) {
  // we only declare the amount of playable events
  const numEvents = rundownMetadata.timedEventOrder.length;

@@ -620,15 +603,16 @@ type NotifyChangesOptions = {
 */
 function notifyChanges(
  rundownId: string | undefined,
-  rundownMetadata: RundownMetadata | null,
+  rundownMetadata: RundownMetadata,
  revision: number,
  options: NotifyChangesOptions,
 ) {
  // notify timer service of changed event
-  if (rundownMetadata && options.timer && rundownId && isCurrentRundown(rundownId)) {
+  if (options.timer && rundownId && isCurrentRundown(rundownId)) {
    runtimeService.notifyOfChangedEvents(rundownMetadata);
  }

+  // notify external services of changes
  if (options.reload) {
    sendRefetch(RefetchKey.All);
  } else if (options.external) {
@@ -672,96 +656,8 @@ export async function initRundown(

  setImmediate(() => {
    notifyChanges(rundown.id, rundownMetadata, revision, { timer: true, external: true, reload });
-    sendRefetch(RefetchKey.ProjectRundowns);
    setLastLoadedRundown(rundown.id).catch((error) => {
      logger.error(LogOrigin.Server, `Failed to persist last loaded rundown: ${error}`);
    });
  });
 }
-
-export async function createNewRundown(title: string) {
-  const emptyRundown = makeNewRundown();
-  emptyRundown.title = title;
-  await getDataProvider().setRundown(emptyRundown.id, emptyRundown);
-
-  const projectRundowns = getDataProvider().getProjectRundowns();
-
-  setImmediate(() => {
-    sendRefetch(RefetchKey.ProjectRundowns);
-  });
-
-  return projectRundowns;
-}
-
-/**
- * Renames an existing rundown
- * @throws if the provided id does not exist
- */
-export async function renameRundown(id: string, title: string) {
-  const dataProvider = getDataProvider();
-  const rundown = dataProvider.getRundown(id);
-
-  await dataProvider.setRundown(id, { ...rundown, title });
-
-  /**
-   * If we are modifying the loaded rundown we re-init it
-   * This is likely over-kill but the simplest way to ensure state consistency
-   */
-  if (isCurrentRundown(id)) {
-    const rundown = dataProvider.getRundown(id);
-    const customField = dataProvider.getCustomFields();
-    // init rundown does its own refetch
-    await initRundown(rundown, customField);
-  } else {
-    setImmediate(() => {
-      sendRefetch(RefetchKey.ProjectRundowns);
-    });
-  }
-
-  return dataProvider.getProjectRundowns();
-}
-
-/**
- * Duplicates an existing rundown without making it the loaded one
- * @throws if the provided id does not exist
- */
-export async function duplicateExistingRundown(id: string) {
-  const dataProvider = getDataProvider();
-  const rundown = dataProvider.getRundown(id);
-
-  const duplicatedRundown: Rundown = structuredClone(rundown);
-  duplicatedRundown.id = generateId();
-  duplicatedRundown.title = `Copy of ${rundown.title}`;
-  duplicatedRundown.revision = 0;
-
-  await dataProvider.setRundown(duplicatedRundown.id, duplicatedRundown);
-
-  setImmediate(() => {
-    sendRefetch(RefetchKey.ProjectRundowns);
-  });
-
-  return dataProvider.getProjectRundowns();
-}
-
-/**
- * Deletes a rundown
- * @throws if attempting to delete the loaded rundown or the last rundown in the project
- */
-export async function deleteRundown(id: string) {
-  if (isCurrentRundown(id)) {
-    throw new Error('Cannot delete loaded rundown');
-  }
-
-  const dataProvider = getDataProvider();
-  if (Object.keys(dataProvider.getProjectRundowns()).length <= 1) {
-    throw new Error('Cannot delete the last rundown');
-  }
-
-  const projectRundowns = await dataProvider.deleteRundown(id);
-
-  setImmediate(() => {
-    sendRefetch(RefetchKey.ProjectRundowns);
-  });
-
-  return projectRundowns;
-}
@@ -34,34 +34,43 @@ import {

 import { RundownMetadata } from './rundown.types.js';

+type CompleteEntry<T> =
+  T extends Partial<OntimeEvent>
+    ? OntimeEvent
+    : T extends Partial<OntimeDelay>
+      ? OntimeDelay
+      : T extends Partial<OntimeGroup>
+        ? OntimeGroup
+        : T extends Partial<OntimeMilestone>
+          ? OntimeMilestone
+          : never;
+
 /**
 * Generates a fully formed RundownEntry of the patch type
 */
-export function generateEvent(
-  rundown: Rundown,
-  eventData: Partial<OntimeEvent> | Partial<OntimeDelay> | Partial<OntimeGroup> | Partial<OntimeMilestone>,
-  afterId: EntryId | null,
-  parent?: EntryId,
-): OntimeEntry {
+export function generateEvent<
+  T extends Partial<OntimeEvent> | Partial<OntimeDelay> | Partial<OntimeGroup> | Partial<OntimeMilestone>,
+>(rundown: Rundown, eventData: T, afterId: EntryId | null, parent?: EntryId): CompleteEntry<T> {
  if (isOntimeEvent(eventData)) {
-    const event = createEvent(eventData, getCueCandidate(rundown.entries, rundown.flatOrder, afterId, parent));
-    if (!event) throw new Error('Invalid event type');
-    return event;
+    return createEvent(
+      eventData,
+      getCueCandidate(rundown.entries, rundown.flatOrder, afterId, parent),
+    ) as CompleteEntry<T>;
  }

  const id = eventData.id || getUniqueId(rundown);

  if (isOntimeDelay(eventData)) {
-    return createDelay({ duration: eventData.duration ?? 0, id });
+    return createDelay({ duration: eventData.duration ?? 0, id }) as CompleteEntry<T>;
  }

  // TODO(v4): allow user to provide a larger patch of the group entry
  if (isOntimeGroup(eventData)) {
-    return createGroup({ id, title: eventData.title ?? '' });
+    return createGroup({ id, title: eventData.title ?? '' }) as CompleteEntry<T>;
  }

  if (isOntimeMilestone(eventData)) {
-    return createMilestone({ ...eventData, id });
+    return createMilestone({ ...eventData, id }) as CompleteEntry<T>;
  }

  throw new Error('Invalid event type');
@@ -451,6 +460,20 @@ export function normalisedToRundownArray(rundowns: ProjectRundowns): ProjectRund
  });
 }

+/**
+ * Duplicates an existing rundown ensuring all IDs are unique
+ */
+export function duplicateRundown(rundown: Rundown, newTitle: string): Rundown {
+  const newRundownId = generateId();
+
+  const newRundown = structuredClone(rundown);
+  newRundown.id = newRundownId;
+  newRundown.title = newTitle;
+  newRundown.revision = 0;
+
+  return newRundown;
+}
+
 export type IncrementNumber = {
  integer: number;
  faction: number;
@@ -1,19 +1,39 @@
+import type { NextFunction, Request, Response } from 'express';
 import { body, param } from 'express-validator';

 import { requestValidationFunction } from '../validation-utils/validationFunction.js';
+import { getCurrentRundown } from './rundown.dao.js';

 // #region operations on project rundowns =========================

 export const rundownPostValidator = [body('title').isString().trim().notEmpty(), requestValidationFunction];
-export const rundownPatchValidator = [
-  param('id').isString().trim().notEmpty(),
-  body('title').isString().trim().notEmpty().withMessage('No title provided'),
-  requestValidationFunction,
-];

 // #endregion operations on project rundowns ======================
 // #region operations on rundown entries ==========================

+/**
+ * Middleware prevents mutating a rundown that is not selected
+ * This allows our service to still only handle the current rundown
+ *
+ * This would need to be removed in favour or rundown selection if we would like
+ * to implement the mutation of background rundowns
+ */
+export async function validateRundownMutation(req: Request, res: Response, next: NextFunction) {
+  const { rundownId } = req.params;
+
+  try {
+    if (getCurrentRundown().id !== rundownId) {
+      res.status(404).json({ message: 'Cannot mutate not selected rundown' });
+      return;
+    }
+
+    next();
+  } catch (error) {
+    res.status(404).json({ message: 'Rundown not found' });
+    return;
+  }
+}
+
 export const entryPostValidator = [
  body('type').isString().isIn(['event', 'delay', 'group', 'milestone']),
  body('after').optional().isString(),
@@ -12,9 +12,7 @@ describe('parseUrlPresets()', () => {

  it('parses data, skipping invalid results', () => {
    const errorEmitter = vi.fn();
-    const urlPresets = [
-      { enabled: true, alias: 'alias', target: 'timer', search: 'ss', displayInNav: false },
-    ] as URLPreset[];
+    const urlPresets = [{ enabled: true, alias: 'alias', target: 'timer', search: 'ss' }] as URLPreset[];
    const result = parseUrlPresets({ urlPresets }, errorEmitter);
    expect(result.length).toEqual(1);
    expect(result.at(0)).toMatchObject({
@@ -38,7 +36,6 @@ describe('parseUrlPresets()', () => {
          alias: 'testalias',
          target: 'timer',
          search: 'testpathAndParams',
-          displayInNav: false,
        },
      ],
    } as unknown as DatabaseModel;
@@ -26,7 +26,6 @@ export function parseUrlPresets(data: Partial<DatabaseModel>, emitError?: ErrorE
      alias: preset.alias,
      target: preset.target,
      search: preset.search ?? '',
-      displayInNav: preset.displayInNav ?? false,
      options: preset?.options,
    };
    newPresets.push(newPreset);
--- a/Show More
+++ b/Show More