Fix rundown-switch data loss and clone key divergence found in review

Two real bugs in the clone work, both confirmed with repros before fixing and re-confirmed by reverting each fix afterwards. 1. Data loss on every rundown switch (blocker). cachedRundown was a module-level const mutated in place by init(). Once setRundown stored by reference, db.data.rundowns[loadedId] aliased that object, so loading a second rundown rewrote the first one's stored record in place. Repro: after init(A) then init(B), store['rundown-a'] had id 'rundown-b', title 'B' and order ['b1'] - A's data was gone, and both keys pointed at one object. The earlier audit missed this because it only asked whether callers mutate an object after handing it over, within one rundown's lifetime. It never considered that cachedRundown is a singleton reused across different rundowns, which is where the aliasing actually bites. Fixed at the root: cachedRundown is now reassigned rather than repurposed, so a stored record keeps pointing at the data it was stored for. Mutating in place from commit, while it still represents the same rundown, is unchanged and is what keeps the stored record current. Every getCurrentRundown() call site was checked - all are locals used within a single operation, none held across a switch. 2. cloneEntryData was not key-equal to structuredClone. For an entry without a custom/triggers/entries key, the spread-then- override form added those as own keys ('custom' as {}, 'triggers' as undefined). fast-equals deepEqual counts own keys, so a clone never compared equal to its source, which is the comparison runtime.service.ts uses to decide whether to re-broadcast - reinstating the per-tick re-broadcast and restore-save this PR had already fixed once. Dropping `?? []` earlier corrected the value but not the key. Containers are now only replaced when the entry carries them. The regression test was vacuous: toBeUndefined() passes for both an absent key and an own key holding undefined. It now asserts key equality against structuredClone plus deepEqual, and was verified to fail against the previous implementation. Typecheck, lint, format and the full suite (706 tests) pass.
Remove the second full-rundown clone from DataProvider.setRundown
2026-08-25 08:59:13 +00:00 · 2026-08-25 05:32:52 +00:00 · 2026-08-25 05:08:02 +00:00 · 2026-08-24 18:56:57 +00:00 · 2026-08-24 18:51:39 +00:00 · 2026-08-23 19:59:56 +00:00
204 changed files with 6560 additions and 4542 deletions
@@ -1,6 +1,6 @@
 {
  "name": "@getontime/cli",
-  "version": "4.11.0",
+  "version": "4.12.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.11.0",
+  "version": "4.12.0",
  "private": true,
  "type": "module",
  "dependencies": {
-    "@base-ui/react": "1.6.0",
+    "@base-ui/react": "1.7.0",
    "@codemirror/commands": "^6.0.0",
    "@codemirror/lang-css": "^6.0.0",
    "@codemirror/state": "^6.0.0",
@@ -13,12 +13,12 @@
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@fontsource/open-sans": "^5.2.7",
-    "@mantine/hooks": "^8.3.7",
+    "@mantine/hooks": "^9.5.1",
    "@sentry/react": "^10.59.0",
    "@table-nav/react": "^0.0.7",
    "@tanstack/react-query": "^5.101.0",
    "@tanstack/react-query-devtools": "^5.101.0",
-    "@tanstack/react-table": "^8.21.3",
+    "@tanstack/react-table": "^9.1.2",
    "@uiw/codemirror-theme-vscode": "^4.25.10",
    "autosize": "^6.0.1",
    "axios": "^1.18.0",
@@ -29,7 +29,7 @@
    "react-dom": "^19.2.7",
    "react-fast-compare": "^3.2.2",
    "react-hook-form": "^7.80.0",
-    "react-icons": "5.6.0",
+    "react-icons": "5.7.0",
    "react-router": "^8.0.1",
    "react-virtuoso": "^4.18.7",
    "zustand": "^5.0.14"
@@ -60,7 +60,8 @@
    ]
  },
  "devDependencies": {
-    "@sentry/vite-plugin": "5.1.1",
+    "@sentry/vite-plugin": "5.4.0",
+    "@types/node": "catalog:",
    "@types/qrcode": "^1.5.6",
    "@types/react": "^19.1.12",
    "@types/react-dom": "^19.1.9",
@@ -72,8 +73,8 @@
    "ontime-utils": "workspace:*",
    "sass": "^1.57.1",
    "typescript": "catalog:",
-    "vite": "8.0.1",
-    "vite-plugin-compression2": "2.5.1",
+    "vite": "8.2.1",
+    "vite-plugin-compression2": "2.5.3",
    "vite-plugin-svgr": "4.5.0",
    "vitest": "catalog:"
  }
@@ -176,6 +176,13 @@ export async function postCloneEntry(
  return axios.post(`${rundownPath}/${rundownId}/clone/${entryId}`, options);
 }

+/**
+ * HTTP request events duration to fit inside the group target
+ */
+export async function requestFitGroupTarget(rundownId: RundownId, eventId: EntryId): Promise<AxiosResponse<Rundown>> {
+  return axios.post(`${rundownPath}/${rundownId}/${eventId}/fit-group-duration`);
+}
+
 /**
 * HTTP request for grouping a list of entries into a group
 */
@@ -1,24 +1,82 @@
+.section {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+  padding: 0.75rem;
+  background-color: $gray-1300;
+  border: 1px solid $gray-1100;
+  border-radius: $component-border-radius-md;
+}
+
+.sectionHeader {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+}
+
+.separator {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  color: $gray-500;
+  font-size: $inner-section-text-size;
+  font-weight: 600;
+  letter-spacing: 0.08em;
+  text-transform: uppercase;
+
+  &::before,
+  &::after {
+    content: '';
+    flex: 1;
+    border-top: 1px solid $gray-1100;
+  }
+}
+
 .textEntry {
-  grid-area: input;
  display: flex;
  align-items: center;
  gap: 0.5rem;
+  flex: 1;
+  min-width: 0;
  color: $label-gray;
 }

 .inlineEntry {
  display: grid;
-  grid-template-areas:
-    'label label'
-    'input btn';
-  grid-template-columns: 1fr auto;
-  column-gap: 0.5rem;
+  grid-template-columns: minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 0.75rem;
 }

 .redirect {
-  grid-area: btn;
+  margin-left: auto;
 }

 .label {
-  color: $label-gray;
+  color: $gray-200;
+  font-size: $text-body-size;
+  font-weight: 600;
+}
+
+.description {
+  color: $gray-500;
+  font-size: $inner-section-text-size;
+}
+
+.origin {
+  flex: 0 0 auto;
+  color: $gray-500;
+  font-size: $inner-section-text-size;
+  white-space: nowrap;
+}
+
+@media (max-width: $min-tablet) {
+  .inlineEntry {
+    grid-template-columns: 1fr;
+    align-items: stretch;
+  }
+
+  .redirect {
+    align-self: flex-end;
+  }
 }
@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import { IoArrowForward } from 'react-icons/io5';

+import { baseURI } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';
 import useUrlPresets from '../../hooks-query/useUrlPresets';
 import { setClientRemote } from '../../hooks/useSocket';
@@ -8,7 +9,7 @@ import Button from '../buttons/Button';
 import Dialog from '../dialog/Dialog';
 import Info from '../info/Info';
 import Input from '../input/input/Input';
-import AppLink from '../link/app-link/AppLink';
+import ExternalLink from '../link/external-link/ExternalLink';
 import Select from '../select/Select';

 import style from './RedirectClientModal.module.scss';
@@ -44,6 +45,7 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
  };

  const enabledPresets = data.filter((preset) => preset.enabled);
+  const settingsUrl = `${window.location.origin}${baseURI}/?settings=sharing__presets`;

  const viewOptions = [
    ...navigatorConstants.map((view) => ({
@@ -66,34 +68,46 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
      bodyElements={
        <>
          <Info>
-            Remotely redirect the client to a different URL. <br />
-            Either by entering a custom path or selecting a URL Preset.
-            <br />
-            <br />
-            <AppLink search='settings=sharing__presets'>Manage URL Presets</AppLink>
+            <Info.Body>
+              Remotely redirect the client to a different URL. Choose a custom path or select a URL Preset.
+            </Info.Body>
+            <Info.Footer>
+              <ExternalLink href={settingsUrl}>Manage URL Presets</ExternalLink>
+            </Info.Footer>
          </Info>
-          <div className={style.inlineEntry}>
-            <span className={style.label}>Enter custom path</span>
-            <label className={style.textEntry}>
-              {origin}
-              <Input placeholder='eg. /timer' fluid value={path} onChange={(event) => setPath(event.target.value)} />
-            </label>
-            <Button
-              variant='primary'
-              aria-label='Redirect'
-              disabled={path === currentPath || path === ''}
-              className={style.redirect}
-              onClick={() => handleRedirect(path)}
-            >
-              Redirect
-              <IoArrowForward />
-            </Button>
-          </div>
-          <div>
-            <span className={style.label}>Select View or URL Preset</span>
+          <section className={style.section}>
+            <div className={style.sectionHeader}>
+              <span className={style.label}>Enter custom path</span>
+              <span className={style.description}>Type the path the client should open.</span>
+            </div>
            <div className={style.inlineEntry}>
              <label className={style.textEntry}>
-                {origin}
+                <span className={style.origin}>{origin}</span>
+                <Input placeholder='eg. /timer' fluid value={path} onChange={(event) => setPath(event.target.value)} />
+              </label>
+              <Button
+                variant='primary'
+                aria-label='Redirect to custom path'
+                disabled={path === currentPath || path === ''}
+                className={style.redirect}
+                onClick={() => handleRedirect(path)}
+              >
+                Redirect
+                <IoArrowForward />
+              </Button>
+            </div>
+          </section>
+          <div className={style.separator} role='separator'>
+            <span>Or</span>
+          </div>
+          <section className={style.section}>
+            <div className={style.sectionHeader}>
+              <span className={style.label}>Select view or URL Preset</span>
+              <span className={style.description}>Choose from the available destinations.</span>
+            </div>
+            <div className={style.inlineEntry}>
+              <label className={style.textEntry}>
+                <span className={style.origin}>{origin}</span>
                <Select
                  fluid
                  options={viewOptions}
@@ -115,7 +129,7 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
                Redirect <IoArrowForward />
              </Button>
            </div>
-          </div>
+          </section>
        </>
      }
    />
@@ -0,0 +1,13 @@
+@use '../../../theme/ontimeStyles' as *;
+
+.form {
+  padding: 0.25rem 0.5rem 0.5rem;
+}
+
+.label {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  color: $label-gray;
+  font-size: $inner-section-text-size;
+}
@@ -5,6 +5,8 @@ import { setClientRemote } from '../../hooks/useSocket';
 import Dialog from '../dialog/Dialog';
 import Input from '../input/input/Input';

+import style from './RenameClientModal.module.scss';
+
 interface RenameClientModalProps {
  id: string;
  name?: string;
@@ -31,9 +33,22 @@ export function RenameClientModal({ id, name: currentName = '', isOpen, onClose
      isOpen={isOpen}
      title={`Rename Client: ${currentName}`}
      showCloseButton
+      showBackdrop
      onClose={onClose}
      bodyElements={
-        <Input height='large' placeholder='New name' value={name} onChange={(event) => setName(event.target.value)} />
+        <div className={style.form}>
+          <label className={style.label}>
+            Client name
+            <Input
+              height='large'
+              fluid
+              autoComplete='off'
+              placeholder='New name'
+              value={name}
+              onChange={(event) => setName(event.target.value)}
+            />
+          </label>
+        </div>
      }
      footerElements={
        <>
@@ -1,12 +1,16 @@
 .dialog {
  position: fixed;
-  top: 10%;
+  top: 10vh;
  left: 50%;

  transform: translateX(-50%);

+  box-sizing: border-box;
+  width: min(600px, 90vw);
+  max-height: calc(90vh - 1rem);
+  display: flex;
+  flex-direction: column;
  padding-inline: 1rem;
-  min-width: min(600px, 90vw);

  background-color: $gray-1250;
  color: $ui-white;
@@ -43,7 +47,8 @@
  flex-direction: column;
  gap: 0.5rem;

-  max-height: min(80vh, 600px);
+  flex: 1;
+  min-height: 0;
  overflow-y: auto;
 }

@@ -53,4 +58,5 @@
  align-items: center;
  justify-content: end;
  gap: 1rem;
+  flex-wrap: wrap;
 }
@@ -0,0 +1,6 @@
+.eyebrow {
+  font-size: $aux-text-size;
+  font-weight: 400;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+}
@@ -0,0 +1,13 @@
+import { PropsWithChildren } from 'react';
+
+import { cx } from '../../utils/styleUtils';
+
+import style from './Eyebrow.module.scss';
+
+interface EyebrowProps {
+  className?: string;
+}
+
+export default function Eyebrow({ children, className }: PropsWithChildren<EyebrowProps>) {
+  return <span className={cx([style.eyebrow, className])}>{children}</span>;
+}
@@ -21,4 +21,15 @@
    outline: none;
    box-shadow: 0 1px 0 0 currentColor;
  }
+
+  &:hover .icon,
+  &:focus-visible .icon {
+    transform: translateX(0.25rem);
+  }
+}
+
+.icon {
+  flex: 0 0 1.5em;
+  font-size: 1em;
+  transition: transform $transition-time-action;
 }
@@ -1,5 +1,5 @@
 import { MouseEvent, ReactNode } from 'react';
-import { IoOpenOutline } from 'react-icons/io5';
+import { HiArrowLongRight } from 'react-icons/hi2';

 import { openLink } from '../../../utils/linkUtils';
 import { cx } from '../../../utils/styleUtils';
@@ -10,9 +10,10 @@ interface ExternalLinkProps {
  href: string;
  children: ReactNode;
  inline?: boolean;
+  className?: string;
 }

-export default function ExternalLink({ href, inline, children }: ExternalLinkProps) {
+export default function ExternalLink({ href, inline, className, children }: ExternalLinkProps) {
  const handleClick = (event: MouseEvent) => {
    event.preventDefault();
    openLink(href);
@@ -23,10 +24,11 @@ export default function ExternalLink({ href, inline, children }: ExternalLinkPro
      href='#!'
      target='_blank'
      rel='noreferrer'
-      className={cx([style.link, inline && style.inline])}
+      className={cx([style.link, inline && style.inline, className])}
      onClick={handleClick}
    >
-      {children} <IoOpenOutline style={{ fontSize: '1em' }} />
+      {children}
+      <HiArrowLongRight className={style.icon} />
    </a>
  );
 }
@@ -4,10 +4,13 @@
  left: 50%;
  transform: translateX(-50%);

-  padding-inline: 1rem;
-  min-width: min(880px, 90vw);
+  box-sizing: border-box;
+  width: min(880px, 90vw);
  min-height: min(200px, 10vh);
-  max-width: min(1200px, 90vw);
+  max-height: calc(90vh - 1rem);
+
+  display: flex;
+  flex-direction: column;

  background-color: $gray-1250;
  color: $ui-white;
@@ -17,14 +20,21 @@
  outline: none;
 }

+.compact {
+  min-width: 0;
+  width: min(680px, 90vw);
+}
+
+.small {
+  min-width: 0;
+  width: min(480px, 90vw);
+}
+
 .wide {
  top: 4vh;
-  min-width: min(1280px, 96vw);
-  max-width: min(1600px, 96vw);
-  height: 88vh;
-  max-height: 88vh;
-  display: flex;
-  flex-direction: column;
+  width: min(1800px, 98vw);
+  height: min(88vh, calc(96vh - 1rem));
+  min-height: 0;
 }

 .backdrop {
@@ -41,15 +51,19 @@

 .title {
  padding-block: 1rem;
+  padding-inline: 1rem;

  display: flex;
  align-items: center;
  justify-content: space-between;
+  gap: 1rem;
 }

 .titleText {
+  min-width: 0;
  font-size: 1rem;
  font-weight: 600;
+  overflow-wrap: anywhere;
 }

 .body {
@@ -57,21 +71,23 @@
  flex-direction: column;
  gap: 0.5rem;

-  max-height: 60vh;
+  flex: 1;
+  min-height: 0;
+  padding: 0.5rem 1rem;
  overflow-y: auto;
+  scroll-padding-block: 0.5rem;
 }

 .wide .body {
-  flex: 1;
-  min-height: 0;
-  max-height: none;
  overflow: hidden;
 }

 .footer {
  padding-block: 1rem;
+  padding-inline: 1rem;
  display: flex;
  align-items: center;
  justify-content: end;
  gap: 1rem;
+  flex-wrap: wrap;
 }
@@ -12,7 +12,7 @@ interface ModalProps {
  title?: string;
  showCloseButton?: boolean;
  showBackdrop?: boolean;
-  size?: 'default' | 'wide';
+  size?: 'small' | 'compact' | 'default' | 'wide';
  bodyElements: ReactNode;
  footerElements?: ReactNode;
  onClose: () => void;
@@ -38,7 +38,7 @@ export default function Modal({
    >
      <BaseDialog.Portal>
        {showBackdrop && <BaseDialog.Backdrop className={style.backdrop} />}
-        <BaseDialog.Popup aria-label={title} className={cx([style.modal, size === 'wide' && style.wide])}>
+        <BaseDialog.Popup aria-label={title} className={cx([style.modal, style[size]])}>
          <div className={style.title}>
            {title ? <BaseDialog.Title className={style.titleText}>{title}</BaseDialog.Title> : <div />}
            {showCloseButton && (
@@ -9,6 +9,7 @@ import './MultiPartProgressBar.scss';
 interface MultiPartProgressBar {
  now: MaybeNumber;
  complete: MaybeNumber;
+  eventId?: string | null;
  normalColor: string;
  warning?: MaybeNumber;
  warningColor: string;
@@ -24,6 +25,7 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
  const {
    now,
    complete,
+    eventId,
    normalColor,
    warning,
    warningColor,
@@ -35,7 +37,7 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
    className = '',
  } = props;

-  const percentRemaining = 100 - useAnimatedProgress(now, complete);
+  const percentRemaining = 100 - useAnimatedProgress(now, complete, eventId);
  const dangerWidth = danger ? 100 - getProgress(danger, complete) : 0;
  const warningWidth = warning ? 100 - dangerWidth - getProgress(warning, complete) : 0;
  const isOvertime = now !== null && now < 0;
@@ -1,7 +1,3 @@
-.separator {
-  border-color: $border-color-ondark;
-}
-
 .backdrop {
  position: fixed;
  inset: 0;
@@ -23,14 +19,15 @@

  width: 22rem;
  height: 100vh;
+  height: 100dvh;

  display: flex;
  flex-direction: column;
-  padding-block: 1rem;

  background-color: $gray-1250;
  color: $ui-white;
  border-right: 1px solid $gray-1100;
+  box-shadow: $box-shadow-right;

  &[data-open] {
    transform: translateX(0%);
@@ -50,22 +47,51 @@
 }

 .header {
+  flex: 0 0 auto;
  display: flex;
  align-items: center;
  justify-content: space-between;
-  height: 3.5rem;
-  padding-inline: 1.5rem;
+  gap: 1rem;
+  min-height: 4rem;
+  padding: 0.75rem 1rem 0.75rem 1.25rem;
+  border-bottom: 1px solid $white-10;
+}

+.headerText {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+}
+
+.title {
  font-weight: 600;
  font-size: 1.25rem;
+  line-height: 1.2;
+}
+
+.clientName {
+  font-size: $aux-text-size;
+  color: $gray-600;
+  @include ellipsis-text;
 }

 .body {
  flex: 1;
+  min-height: 0;
  overflow-y: auto;
+  padding-block: 0.5rem 1rem;
 }

-.note {
-  margin-left: auto;
-  color: $white-20;
+.group {
+  display: flex;
+  flex-direction: column;
+
+  &:not(:first-child) {
+    margin-top: 0.75rem;
+  }
+}
+
+.groupLabel {
+  padding: 0.5rem 1.25rem 0.25rem;
+  color: $gray-700;
 }
@@ -1,7 +1,7 @@
 import { Dialog } from '@base-ui/react/dialog';
-import { useDisclosure, useFullscreen } from '@mantine/hooks';
-import { memo } from 'react';
-import { IoClose, IoContract, IoExpand, IoLockClosedOutline, IoSwapVertical } from 'react-icons/io5';
+import { useDisclosure, useFullscreenDocument } from '@mantine/hooks';
+import { memo, PropsWithChildren } from 'react';
+import { IoClose, IoExpand, IoLockClosedOutline, IoPencilOutline, IoSwapVertical } from 'react-icons/io5';
 import { LuCoffee } from 'react-icons/lu';
 import { useLocation } from 'react-router';

@@ -14,9 +14,11 @@ import { useClientStore } from '../../stores/clientStore';
 import { useViewOptionsStore } from '../../stores/viewOptions';
 import IconButton from '../buttons/IconButton';
 import { RenameClientModal } from '../client-modal/RenameClientModal';
+import Eyebrow from '../eyebrow/Eyebrow';
 import ClientLink from './client-link/ClientLink';
 import EditorNavigation from './editor-navigation/EditorNavigation';
 import NavigationMenuItem from './navigation-menu-item/NavigationMenuItem';
+import NavigationMenuToggle from './navigation-menu-item/NavigationMenuToggle';
 import OtherAddresses from './other-addresses/OtherAddresses';

 import style from './NavigationMenu.module.scss';
@@ -33,7 +35,7 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
  const isSmallScreen = useIsSmallScreen();

  const [isRenameOpen, handlers] = useDisclosure(false);
-  const { fullscreen, toggle } = useFullscreen();
+  const { fullscreen, toggle } = useFullscreenDocument();
  const { mirror, toggleMirror } = useViewOptionsStore();
  const { keepAwake, toggleKeepAwake } = useKeepAwakeOptions();
  const location = useLocation();
@@ -52,75 +54,93 @@ function NavigationMenu({ isOpen, onClose }: NavigationMenuProps) {
        <RenameClientModal id={id} name={name} isOpen={isRenameOpen} onClose={handlers.close} />
        <Dialog.Popup className={style.drawer}>
          <div className={style.header}>
-            <Dialog.Title>Ontime</Dialog.Title>
-            <IconButton variant='subtle-white' size='large' onClick={onClose}>
+            <div className={style.headerText}>
+              <Dialog.Title className={style.title}>Ontime</Dialog.Title>
+              {name && <span className={style.clientName}>{name}</span>}
+            </div>
+            <IconButton variant='subtle-white' size='large' aria-label='Close menu' onClick={onClose}>
              <IoClose />
            </IconButton>
          </div>
          <div className={style.body}>
-            {supportsFullscreen && (
-              <NavigationMenuItem active={fullscreen} onClick={toggle}>
-                Toggle Fullscreen
-                {fullscreen ? <IoContract /> : <IoExpand />}
+            <MenuGroup label='This screen'>
+              {supportsFullscreen && (
+                <NavigationMenuToggle checked={fullscreen} icon={<IoExpand />} label='Fullscreen' onToggle={toggle} />
+              )}
+              <NavigationMenuToggle
+                checked={mirror}
+                icon={<IoSwapVertical />}
+                label='Flip Screen'
+                onToggle={() => toggleMirror()}
+              />
+              {canUseWakeLock && (
+                <NavigationMenuToggle
+                  checked={keepAwake}
+                  icon={<LuCoffee />}
+                  label='Keep Awake'
+                  onToggle={toggleKeepAwake}
+                />
+              )}
+              <NavigationMenuItem onClick={handlers.open}>
+                <IoPencilOutline />
+                Rename Client
              </NavigationMenuItem>
-            )}
-            <NavigationMenuItem active={mirror} onClick={() => toggleMirror()}>
-              Flip Screen
-              <IoSwapVertical />
-              {mirror && <span className={style.note}>Active</span>}
-            </NavigationMenuItem>
-            {canUseWakeLock && (
-              <NavigationMenuItem active={keepAwake} onClick={toggleKeepAwake}>
-                Keep Awake
-                <LuCoffee />
-                {keepAwake && <span className={style.note}>Active</span>}
-              </NavigationMenuItem>
-            )}
-            <NavigationMenuItem onClick={handlers.open}>Rename Client</NavigationMenuItem>
+            </MenuGroup>

-            <hr className={style.separator} />
-
-            <EditorNavigation />
-            <ClientLink
-              to='cuesheet'
-              current={location.pathname === '/cuesheet'}
-              postAction={isSmallScreen ? onClose : undefined}
-            >
-              <IoLockClosedOutline />
-              Cuesheet
-            </ClientLink>
-            <ClientLink to='op' current={location.pathname === '/op'} postAction={isSmallScreen ? onClose : undefined}>
-              <IoLockClosedOutline />
-              Operator
-            </ClientLink>
-
-            <hr className={style.separator} />
-
-            {navigatorConstants.map((route) => (
+            <MenuGroup label='Ontime app'>
+              <EditorNavigation />
              <ClientLink
-                key={route.url}
-                to={route.url}
-                current={location.pathname === `/${route.url}`}
+                to='cuesheet'
+                current={location.pathname === '/cuesheet'}
                postAction={isSmallScreen ? onClose : undefined}
              >
-                {route.label}
+                <IoLockClosedOutline />
+                Cuesheet
              </ClientLink>
-            ))}
+              <ClientLink
+                to='op'
+                current={location.pathname === '/op'}
+                postAction={isSmallScreen ? onClose : undefined}
+              >
+                <IoLockClosedOutline />
+                Operator
+              </ClientLink>
+            </MenuGroup>
+
+            <MenuGroup label='Views'>
+              {navigatorConstants.map((route) => (
+                <ClientLink
+                  key={route.url}
+                  to={route.url}
+                  current={location.pathname === `/${route.url}`}
+                  postAction={isSmallScreen ? onClose : undefined}
+                >
+                  {route.label}
+                </ClientLink>
+              ))}
+            </MenuGroup>

            <PresetNavigation isSmallScreen={isSmallScreen} onClose={onClose} />
          </div>

-          {isLocalhost && (
-            <div>
-              <OtherAddresses currentLocation={location.pathname} />
-            </div>
-          )}
+          {isLocalhost && <OtherAddresses currentLocation={location.pathname} />}
        </Dialog.Popup>
      </Dialog.Portal>
    </Dialog.Root>
  );
 }

+function MenuGroup({ label, children }: PropsWithChildren<{ label: string }>) {
+  return (
+    <div className={style.group}>
+      <div className={style.groupLabel}>
+        <Eyebrow>{label}</Eyebrow>
+      </div>
+      {children}
+    </div>
+  );
+}
+
 function PresetNavigation({ isSmallScreen, onClose }: { isSmallScreen: boolean; onClose: () => void }) {
  const location = useLocation();
  const { data: urlPresets } = useUrlPresets();
@@ -129,8 +149,7 @@ function PresetNavigation({ isSmallScreen, onClose }: { isSmallScreen: boolean;
  if (navPresets.length === 0) return null;

  return (
-    <>
-      <hr className={style.separator} />
+    <MenuGroup label='Presets'>
      {navPresets.map((preset) => (
        <ClientLink
          key={preset.alias}
@@ -141,6 +160,6 @@ function PresetNavigation({ isSmallScreen, onClose }: { isSmallScreen: boolean;
          {preset.alias}
        </ClientLink>
      ))}
-    </>
+    </MenuGroup>
  );
 }
@@ -1,8 +1,8 @@
-import { useDisclosure, useHotkeys } from '@mantine/hooks';
-import { memo } from 'react';
+import { useHotkeys } from '@mantine/hooks';
+import { memo, useCallback, useState } from 'react';
 import { useSearchParams } from 'react-router';

-import { hasCustomParams, useSavedViewParams } from '../../stores/savedViewParams';
+import { hasCustomParams } from '../../stores/savedViewParams';
 import { useViewParamsEditorStore } from '../view-params-editor/viewParamsEditor.store';
 import FloatingNavigation from './floating-navigation/FloatingNavigation';
 import NavigationMenu from './NavigationMenu';
@@ -15,22 +15,37 @@ interface ViewNavigationMenuProps {
  suppressSettings?: boolean;
 }

+function isInteractiveKeyboardAction(target: EventTarget | null): boolean {
+  if (!(target instanceof HTMLElement)) {
+    return false;
+  }
+
+  return (
+    target.closest(
+      'button, a, input, textarea, select, [role="button"], [role="checkbox"], [role="switch"], [contenteditable]:not([contenteditable="false"])',
+    ) !== null
+  );
+}
+
 export default memo(ViewNavigationMenu);
 function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNavigationMenuProps) {
-  const [isMenuOpen, menuHandler] = useDisclosure();
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
  const { open: showEditFormDrawer } = useViewParamsEditorStore();
  const [searchParams] = useSearchParams();
-  const savedParams = useSavedViewParams((store) => store.params);
-  const hasSavedChanges = hasCustomParams(searchParams) || Object.keys(savedParams).length > 0;
+  const hasSavedChanges = hasCustomParams(searchParams);
+
+  const toggleMenu = useCallback(() => setIsMenuOpen((prev) => !prev), []);
+  const closeMenu = useCallback(() => setIsMenuOpen(false), []);

  useHotkeys([
    [
      'Space',
-      () => {
-        if (isNavigationLocked) return;
-        menuHandler.toggle();
+      (event) => {
+        if (isNavigationLocked || isInteractiveKeyboardAction(event.target)) return;
+        event.preventDefault();
+        toggleMenu();
      },
-      { preventDefault: true },
+      { preventDefault: false },
    ],
    [
      'mod + ,',
@@ -49,11 +64,11 @@ function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNaviga
  return (
    <>
      <FloatingNavigation
-        toggleMenu={isNavigationLocked ? undefined : menuHandler.toggle}
+        toggleMenu={isNavigationLocked ? undefined : toggleMenu}
        toggleSettings={suppressSettings ? undefined : showEditFormDrawer}
        hasSavedChanges={hasSavedChanges}
      />
-      {!isNavigationLocked && <NavigationMenu isOpen={isMenuOpen} onClose={menuHandler.close} />}
+      {!isNavigationLocked && <NavigationMenu isOpen={isMenuOpen} onClose={closeMenu} />}
    </>
  );
 }
@@ -2,35 +2,68 @@
  display: flex;
  align-items: center;

-  padding: 0.75rem 1.5rem;
-  gap: 0.5rem;
+  padding: 0.625rem 1.25rem;
+  gap: 0.625rem;
  width: 100%;

-  border-left: 4px solid transparent;
-  color: $action-text-color;
+  border-left: 3px solid transparent;
+  color: $gray-200;
+  font-size: $text-body-size;
  white-space: nowrap;
+  text-align: left;

  cursor: pointer;

-  transition-property: color;
+  transition-property: color, background-color;
  transition-duration: $transition-time-action;

+  // keep icons on a fixed box so labels align regardless of the glyph
+  > svg {
+    flex-shrink: 0;
+    width: 1.125rem;
+    height: 1.125rem;
+    color: $gray-500;
+    transition: color $transition-time-action;
+  }
+
  &:hover {
-    color: $ontime-color;
-    background-color: $gray-1350;
+    background-color: $white-3;
+    color: $ui-white;
+
+    > svg {
+      color: $gray-300;
+    }
  }

  &:active {
-    background-color: $border-color-ondark;
+    background-color: $white-7;
  }

-  &:focus {
+  &:focus-visible {
    outline: 2px solid $blue-500;
-    background-color: $gray-1350;
+    outline-offset: -2px;
+    background-color: $white-3;
+  }
+
+  // toggle rows are labels, the focusable control sits inside them
+  &:focus-within {
+    background-color: $white-3;
  }

  &.current {
-    background-color: $gray-1300;
-    border-left: 4px solid $action-text-color;
+    background-color: $bg-active;
+    border-left-color: $blue-400;
+    color: $ui-white;
+    font-weight: 600;
+
+    > svg {
+      color: $blue-300;
+    }
  }
 }
+
+.label {
+  flex: 1;
+  min-width: 0;
+  @include ellipsis-text;
+}
@@ -1,6 +1,6 @@
 import { PropsWithChildren } from 'react';

-import { isKeyEnter } from '../../../utils/keyEvent';
+import { isKeyEnter, isKeySpace } from '../../../utils/keyEvent';
 import { cx } from '../../../utils/styleUtils';

 import style from './NavigationMenuItem.module.scss';
@@ -11,6 +11,7 @@ interface NavigationMenuItemProps {
  onClick: () => void;
 }

+/** A row in the navigation menu, and the single place which decides how a row reacts to input */
 export default function NavigationMenuItem({
  active,
  className,
@@ -24,7 +25,9 @@ export default function NavigationMenuItem({
      role='button'
      onClick={onClick}
      onKeyDown={(event) => {
-        if (isKeyEnter(event)) {
+        if (isKeyEnter(event) || isKeySpace(event)) {
+          event.preventDefault();
+          event.stopPropagation();
          onClick();
        }
      }}
@@ -0,0 +1,23 @@
+import { ReactNode } from 'react';
+
+import Switch from '../../switch/Switch';
+
+import style from './NavigationMenuItem.module.scss';
+
+interface NavigationMenuToggleProps {
+  checked: boolean;
+  icon: ReactNode;
+  label: string;
+  onToggle: () => void;
+}
+
+/** A menu row which reflects, and toggles, an on/off state */
+export default function NavigationMenuToggle({ checked, icon, label, onToggle }: NavigationMenuToggleProps) {
+  return (
+    <label className={style.link}>
+      {icon}
+      <span className={style.label}>{label}</span>
+      <Switch checked={checked} onCheckedChange={onToggle} />
+    </label>
+  );
+}
@@ -1,22 +1,52 @@
+.footer {
+  flex: 0 0 auto;
+  padding: 0.75rem 0;
+  border-top: 1px solid $white-10;
+}
+
 .header {
-  font-size: calc(1rem - 2px);
-  margin-left: 1rem;
+  padding: 0 1.25rem 0.25rem;
  color: $gray-700;
 }

 .interfaces {
-  padding: 0.5rem 0.5rem;
+  padding: 0.25rem 1.25rem 0;
  display: flex;
  flex-wrap: wrap;
-  gap: 0.5rem;
+  gap: 0.25rem;
+}
+
+.interface {
+  min-width: 0;
+  max-width: 100%;
+
+  > div {
+    max-width: 100%;
+
+    > button:first-child {
+      min-width: 0;
+      max-width: calc(100% - 1.5rem);
+      justify-content: flex-start;
+      padding-inline: 0.5rem;
+    }
+  }
 }

 .interfaceCopy {
  display: flex;
  align-items: center;
+  min-width: 0;
+  width: 100%;
+}
+
+.address {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }

 .goIcon {
+  flex: 0 0 auto;
  @include rotate-fourty-five;
  margin-left: 0.25rem;
  margin-bottom: 0.25rem;
@@ -3,6 +3,8 @@ import { IoArrowUp } from 'react-icons/io5';
 import useInfo from '../../../hooks-query/useInfo';
 import { linkToOtherHost, openLink } from '../../../utils/linkUtils';
 import CopyTag from '../../copy-tag/CopyTag';
+import Eyebrow from '../../eyebrow/Eyebrow';
+import { getExternalInterfaces } from './otherAddresses.utils';

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

@@ -12,32 +14,33 @@ interface OtherAddressesProps {

 export default function OtherAddresses({ currentLocation }: OtherAddressesProps) {
  const { data } = useInfo();
+  const externalInterfaces = getExternalInterfaces(data.networkInterfaces);

-  // there is no point showing this if we only have one interface
-  if (data.networkInterfaces.length < 2) {
+  if (externalInterfaces.length === 0) {
    return null;
  }

  return (
-    <>
-      <div className={style.header}>Accessible on external networks</div>
+    <div className={style.footer}>
+      <div className={style.header}>
+        <Eyebrow>Also available at</Eyebrow>
+      </div>
      <div className={style.interfaces}>
-        {data?.networkInterfaces?.map((nif) => {
-          if (nif.name === 'localhost') {
-            return null;
-          }
-
+        {externalInterfaces.map((nif) => {
          const address = linkToOtherHost(nif.address, currentLocation);

          return (
-            <CopyTag key={nif.name} copyValue={address} onClick={() => openLink(address)} size='small'>
-              <span className={style.interfaceCopy}>
-                {nif.address} <IoArrowUp className={style.goIcon} />
-              </span>
-            </CopyTag>
+            <div key={nif.name} className={style.interface}>
+              <CopyTag copyValue={address} onClick={() => openLink(address)} size='small'>
+                <span className={style.interfaceCopy}>
+                  <span className={style.address}>{nif.address}</span>
+                  <IoArrowUp className={style.goIcon} />
+                </span>
+              </CopyTag>
+            </div>
          );
        })}
      </div>
-    </>
+    </div>
  );
 }
@@ -0,0 +1,31 @@
+import { describe, expect, test } from 'vitest';
+
+import { getExternalInterfaces } from '../otherAddresses.utils';
+
+describe('getExternalInterfaces', () => {
+  test('returns no alternatives when localhost is the only interface', () => {
+    expect(getExternalInterfaces([{ name: 'localhost', address: '127.0.0.1' }])).toEqual([]);
+  });
+
+  test('does not treat an interface name as deployment information', () => {
+    expect(
+      getExternalInterfaces([
+        { name: 'localhost', address: '127.0.0.1' },
+        { name: 'cloud', address: '192.168.1.42' },
+      ]),
+    ).toEqual([{ name: 'cloud', address: '192.168.1.42' }]);
+  });
+
+  test('returns non-local interfaces when local and external interfaces are available', () => {
+    expect(
+      getExternalInterfaces([
+        { name: 'localhost', address: '127.0.0.1' },
+        { name: 'Wi-Fi', address: '192.168.1.42' },
+        { name: 'Ethernet', address: '10.0.0.42' },
+      ]),
+    ).toEqual([
+      { name: 'Wi-Fi', address: '192.168.1.42' },
+      { name: 'Ethernet', address: '10.0.0.42' },
+    ]);
+  });
+});
@@ -0,0 +1,6 @@
+import { type NetworkInterface } from 'ontime-types';
+
+/** Returns network addresses other than the localhost address injected by the info endpoint. */
+export function getExternalInterfaces(interfaces: NetworkInterface[]) {
+  return interfaces.filter((networkInterface) => networkInterface.name !== 'localhost');
+}
@@ -7,12 +7,12 @@ import './ProgressBar.scss';
 interface ProgressBarProps {
  current: MaybeNumber;
  duration: MaybeNumber;
+  eventId?: string | null;
  className?: string;
 }

-export default function ProgressBar(props: ProgressBarProps) {
-  const { current, duration, className } = props;
-  const progress = useAnimatedProgress(current, duration);
+export default function ProgressBar({ current, duration, eventId, className }: ProgressBarProps) {
+  const progress = useAnimatedProgress(current, duration, eventId);

  return (
    <div className={`progress-bar__bg ${className}`}>
@@ -1,20 +1,43 @@
+@use '@/theme/viewerDefs' as *;
+
 .emptyContainer {
  width: 100%;
  text-align: center;
-  color: $white-10;
+  color: var(--secondary-color-override, $viewer-secondary-color);

  .empty {
    display: block;
-    width: min(100%, 24rem);
-    margin-inline: auto;
-    opacity: 0.8;
+    width: min(100%, 14rem);
+    margin: 0 auto -1.5rem;
+    opacity: 0.6;
  }

  .text {
    display: block;
    margin-inline: auto;
-    font-weight: 600;
-    font-size: 2em;
-    max-width: min(100%, 600px);
+    font-weight: 400;
+    font-size: clamp(1rem, 1.55vw, 1.5rem);
+    line-height: 1.35;
+    max-width: min(100%, 40rem);
+  }
+
+  &.error {
+    color: $error-red;
+
+    .empty {
+      opacity: 0.35;
+      filter: grayscale(1);
+    }
+
+    .text {
+      margin-top: 0.5rem;
+    }
+  }
+
+  .errorIcon {
+    display: block;
+    width: 1.5rem;
+    height: 1.5rem;
+    margin: -0.125rem auto 0;
  }
 }
@@ -1,4 +1,5 @@
 import { CSSProperties } from 'react';
+import { IoWarningOutline } from 'react-icons/io5';

 import EmptyImage from '../../../assets/images/empty.svg?react';
 import { cx } from '../../utils/styleUtils';
@@ -9,12 +10,18 @@ interface EmptyProps {
  text?: string;
  injectedStyles?: CSSProperties;
  className?: string;
+  variant?: 'error';
 }

-export default function Empty({ text, className, injectedStyles }: EmptyProps) {
+export default function Empty({ text, className, injectedStyles, variant }: EmptyProps) {
  return (
-    <div className={cx([style.emptyContainer, className])} style={injectedStyles}>
+    <div
+      className={cx([style.emptyContainer, variant === 'error' && style.error, className])}
+      style={injectedStyles}
+      role={variant === 'error' ? 'alert' : undefined}
+    >
      <EmptyImage className={style.empty} />
+      {variant === 'error' && <IoWarningOutline className={style.errorIcon} aria-hidden />}
      {text && <span className={style.text}>{text}</span>}
    </div>
  );
@@ -0,0 +1,11 @@
+.fill {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+  flex: 1;
+
+  display: grid;
+  place-items: start center;
+  padding: clamp(4rem, 20dvh, 12rem) 1.5rem 1rem;
+}
@@ -0,0 +1,19 @@
+import { cx } from '../../utils/styleUtils';
+import Empty from './Empty';
+
+import style from './EmptyFill.module.scss';
+
+interface EmptyFillProps {
+  text?: string;
+  /** placed on the fill wrapper — e.g. to assign a grid-area in a grid parent */
+  className?: string;
+}
+
+/** Container-filling empty/loading state for panels and grid/flex cells. */
+export default function EmptyFill({ text, className }: EmptyFillProps) {
+  return (
+    <div className={cx([style.fill, className])}>
+      <Empty text={text} />
+    </div>
+  );
+}
@@ -6,7 +6,7 @@
  box-sizing: border-box; /* reset */
  overflow: hidden;
  width: 100%; /* restrict the page width to viewport */
-  height: 100vh;
+  height: 100dvh;

  font-family: var(--font-family-override, $viewer-font-family);
  background: var(--background-color-override, $viewer-background-color);
@@ -16,5 +16,6 @@
  display: flex;
  flex-direction: column;
  align-items: center;
-  padding-top: 5rem;
+  justify-content: center;
+  padding-block: 5rem;
 }
@@ -7,12 +7,13 @@ import style from './EmptyPage.module.scss';
 interface EmptyPageProps {
  text?: string;
  injectedStyles?: CSSProperties;
+  variant?: 'error';
 }

-export default function EmptyPage({ text, injectedStyles }: EmptyPageProps) {
+export default function EmptyPage({ text, injectedStyles, variant }: EmptyPageProps) {
  return (
    <div className={style.page}>
-      <Empty text={text} injectedStyles={injectedStyles} />
+      <Empty text={text} injectedStyles={injectedStyles} variant={variant} />
    </div>
  );
 }
@@ -15,9 +15,4 @@
    gap: 1rem;
    margin-top: 1em;
  }
-
-  .text {
-    font-weight: 600;
-    font-size: 2em;
-  }
 }
@@ -18,8 +18,7 @@ export default function EmptyTableBody({ handleAddNew }: EmptyTableBodyProps) {
    <tbody className={style.emptyContainer}>
      <tr>
        <td colSpan={99} className={style.emptyCell}>
-          <Empty injectedStyles={{ marginTop: '5vh' }} />
-          <span className={style.text}>{text}</span>
+          <Empty text={text} injectedStyles={{ marginTop: '5vh' }} />
          {handleAddNew && (
            <div className={style.inline}>
              <Button onClick={() => handleAddNew(SupportedEntry.Event)} variant='primary' size='large'>
@@ -11,6 +11,11 @@
  color: $ui-white;
 }

+.active {
+  border: 1px solid $green-700;
+  color: $green-400;
+}
+
 .warning {
  background-color: $orange-1300;
  color: $orange-300;
@@ -6,7 +6,7 @@ import style from './Tag.module.scss';

 interface TagProps {
  className?: string;
-  variant?: 'default' | 'warning';
+  variant?: 'default' | 'active' | 'warning';
 }

 export default function Tag({ className, variant = 'default', children }: PropsWithChildren<TagProps>) {
@@ -2,6 +2,12 @@
  display: flex;
  align-items: center;
  gap: 0.5rem;
+
+  > span {
+    font-variant-numeric: tabular-nums;
+    text-align: right;
+    text-transform: uppercase;
+  }
 }

 // attempt to match with ontimeTextInputs
@@ -1,37 +1,77 @@
-.inline {
-  display: inline-flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 1rem;
+.multiOptionList {
+  overflow-y: auto;
+  max-height: 12rem;
+  background: $gray-1200;
+  border: 1px solid $gray-1100;
+  border-radius: $component-border-radius-md;
 }

-// styles from subtle button
 .toggleSelect {
+  box-sizing: border-box;
  display: flex;
  align-items: center;
-  gap: 0.25rem;
-  padding-inline: 0.5rem;
-  height: 2.5rem;
-  background: $gray-1050;
-  color: $ui-white;
+  gap: 0.75rem;
+  min-height: 2.5rem;
+  padding: 0.5rem 0.75rem;
+  background: transparent;
+  border: 0;
+  color: $gray-300;
  line-height: 1em;
-  border-radius: $component-border-radius-md;
+  cursor: pointer;
+  transition:
+    background-color $transition-time-action,
+    border-color $transition-time-action,
+    color $transition-time-action;

-  &:hover:not(:disabled):not(:active) {
+  &:hover {
    background: $gray-1000;
-    color: $blue-500;
+    color: $ui-white;
  }

-  &:active:not(:disabled) {
+  &:active {
    background: $gray-1100;
-    border-color: $gray-1250;
+  }
+
+  &:focus-within {
+    outline: 2px solid $blue-500;
+    outline-offset: -2px;
+  }
+
+  &.selected {
+    background: $bg-active;
+    box-shadow: inset 3px 0 $blue-400;
+    color: $ui-white;
+  }
+
+  &:not(:last-child) {
+    border-bottom: 1px solid $white-7;
+  }
+
+  > [role='checkbox'] {
+    flex: 0 0 auto;
+    width: 1.125rem;
+    height: 1.125rem;
+    border: 1px solid $gray-400;
+
+    &[data-unchecked] {
+      background: $gray-1100;
+    }
+
+    &[data-checked] {
+      border-color: $blue-400;
+    }
+
+    &:focus-visible {
+      outline: 0;
+    }
  }

  &::after {
    content: '';
-    margin-left: 0.25rem;
-    width: 0.75em;
-    height: 0.75em;
+    flex: 0 0 auto;
+    margin-left: auto;
+    width: 0.625rem;
+    height: 0.625rem;
    background: var(--user-bg, $gray-900);
    border-radius: 50%;
  }
@@ -2,6 +2,7 @@ import { ComponentProps, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router';

 import { isStringBoolean } from '../../../views/common/viewUtils';
+import { cx } from '../../utils/styleUtils';
 import Checkbox from '../checkbox/Checkbox';
 import Input from '../input/input/Input';
 import Select, { SelectOption } from '../select/Select';
@@ -107,18 +108,20 @@ function MultiOption({ paramField, options }: EditFormMultiOptionProps) {
  return (
    <>
      <input name={id} hidden readOnly value={paramState.join(',')} />
-      <div className={style.inline}>
+      <div className={style.multiOptionList}>
        {values.map((option) => {
+          const selected = paramState.includes(option.value);
+
          return (
            <label
              key={option.value}
-              className={style.toggleSelect}
+              className={cx([style.toggleSelect, selected && style.selected])}
              style={{
                '--user-bg': option.colour,
              }}
            >
              <Checkbox
-                checked={paramState.includes(option.value)}
+                checked={selected}
                onCheckedChange={(checked) => toggleValue(option.value, checked as boolean)}
              />
              {option.label}
@@ -1,13 +1,3 @@
-.drawerFooter {
-  display: flex;
-  justify-content: end;
-  gap: $section-spacing;
-
-  button {
-    padding: 0 2em;
-  }
-}
-
 .backdrop {
  position: fixed;
  inset: 0;
@@ -34,11 +24,11 @@

  display: flex;
  flex-direction: column;
-  padding-block: 1rem 1.5rem;

-  background-color: $gray-1250;
+  background-color: $ui-black;
  color: $ui-white;
  border-left: 1px solid $gray-1100;
+  box-shadow: $box-shadow-l1;

  &[data-open] {
    transform: translateX(0%);
@@ -58,36 +48,54 @@
 }

 .header {
-  padding-inline: 1rem;
+  flex: 0 0 auto;
  display: flex;
  align-items: center;
  justify-content: space-between;
-  height: 3.5rem;
+  gap: 1rem;
+  min-height: 4rem;
+  padding: 0.75rem 1rem;
+}

+.headerText {
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+}
+
+.title {
  font-weight: 600;
  font-size: 1.25rem;
+  line-height: 1.2;
+}
+
+.target {
+  font-size: $aux-text-size;
+  color: $gray-600;
 }

 .body {
  flex: 1;
-  padding-inline: 1rem;
-  padding-bottom: 10vh;
+  padding: 1rem;
  overflow-y: auto;
 }

 .footer {
+  flex: 0 0 auto;
  display: flex;
-  padding-inline: 1rem;
+  padding: 0.75rem 1rem;
  gap: 1rem;
  align-items: center;
  justify-content: flex-end;
+
+  background-color: $ui-black;
+  border-top: 1px solid $white-10;
 }

 .sectionList {
  display: flex;
  flex-direction: column;
-  gap: 2rem;
-  padding-right: 0.5rem;
+  gap: 0.75rem;
 }

 .info {
@@ -4,6 +4,7 @@ import { FormEvent, memo } from 'react';
 import { IoClose } from 'react-icons/io5';
 import { useSearchParams } from 'react-router';

+import { viewLabels } from '../../../viewerConfig';
 import useViewSettings from '../../hooks-query/useViewSettings';
 import { useIsSmallScreen } from '../../hooks/useIsSmallScreen';
 import { useSavedViewParams } from '../../stores/savedViewParams';
@@ -71,8 +72,17 @@ function ViewParamsEditor({ target, viewOptions }: EditFormDrawerProps) {
        <Dialog.Backdrop className={style.backdrop} />
        <Dialog.Popup className={style.drawer}>
          <div className={style.header}>
-            <Dialog.Title>Customise</Dialog.Title>
-            <IconButton variant='subtle-white' size='large' data-testid='close-view-params' onClick={handleClose}>
+            <div className={style.headerText}>
+              <Dialog.Title className={style.title}>Customise</Dialog.Title>
+              <span className={style.target}>{viewLabels[target]}</span>
+            </div>
+            <IconButton
+              variant='subtle-white'
+              size='large'
+              aria-label='Close'
+              data-testid='close-view-params'
+              onClick={handleClose}
+            >
              <IoClose />
            </IconButton>
          </div>
@@ -1,10 +1,21 @@
 .presetSection {
  background-color: $gray-1350;
+  border: 1px solid $white-10;
+  border-radius: $component-border-radius-md;
+  margin-bottom: 0.75rem;
+}
+
+.header {
+  padding: 0.5rem 1rem;
+  min-height: 2.25rem;
  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-  padding: 1rem 0.5rem;
-  margin-bottom: 1rem;
+  align-items: center;
+
+  color: $gray-300;
+}
+
+.presetList {
+  border-top: 1px solid $white-7;
  max-height: 10rem;
  overflow-y: auto;
  scrollbar-gutter: stable;
@@ -14,12 +25,39 @@
  display: flex;
  align-items: center;
  gap: 0.5rem;
+  min-height: 2.5rem;
+  padding: 0.375rem 1rem;
+  font-size: $inner-section-text-size;
+
+  &:not(:last-child) {
+    border-bottom: 1px solid $white-7;
+  }

  &.active {
-    color: $blue-500;
+    background-color: $bg-active;
+    box-shadow: inset 3px 0 $blue-400;
+    color: $ui-white;
+    font-weight: 600;
  }
 }

+.presetName {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .presetActions {
  margin-left: auto;
 }
+
+.current {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.25rem;
+  margin-left: auto;
+  color: $blue-400;
+  font-size: $aux-text-size;
+  font-weight: 600;
+}
@@ -4,6 +4,7 @@ import { useSearchParams } from 'react-router';
 import { useViewUrlPresets } from '../../hooks-query/useUrlPresets';
 import { cx } from '../../utils/styleUtils';
 import Button from '../buttons/Button';
+import Eyebrow from '../eyebrow/Eyebrow';

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

@@ -26,22 +27,31 @@ export function ViewParamsPresets({ target }: { target: OntimeView }) {

  return (
    <div className={style.presetSection}>
-      {viewPresets.map((preset) => {
-        const active = searchParams.get('alias') === preset.alias;
-        return (
-          <div key={preset.alias} className={cx([style.preset, active && style.active])}>
-            <div>{preset.alias}</div>
-            <Button
-              variant={active ? 'ghosted' : 'subtle-white'}
-              onClick={() => handleRecall(preset)}
-              disabled={active}
-              className={style.presetActions}
-            >
-              {active ? 'Applied' : 'Apply'}
-            </Button>
-          </div>
-        );
-      })}
+      <div className={style.header}>
+        <Eyebrow>Saved presets</Eyebrow>
+      </div>
+      <div className={style.presetList}>
+        {viewPresets.map((preset) => {
+          const active = searchParams.get('alias') === preset.alias;
+          return (
+            <div key={preset.alias} className={cx([style.preset, active && style.active])}>
+              <span className={style.presetName}>{preset.alias}</span>
+              {active ? (
+                <span className={style.current}>Current</span>
+              ) : (
+                <Button
+                  variant='ghosted'
+                  size='small'
+                  onClick={() => handleRecall(preset)}
+                  className={style.presetActions}
+                >
+                  Apply
+                </Button>
+              )}
+            </div>
+          );
+        })}
+      </div>
    </div>
  );
 }
@@ -1,48 +1,118 @@
 .section {
+  overflow: hidden;
+
  color: $ui-white;
  font-size: 1rem;
+  background-color: $white-3;
+  border: 1px solid $gray-1100;
+  border-radius: $component-border-radius-md;
 }

 .sectionHeader {
  display: flex;
  justify-content: space-between;
  align-items: center;
-  height: 2rem;
+  gap: 0.5rem;
+  width: 100%;
+  min-height: 2.75rem;
+  padding: 0.5rem 1rem;
+
+  background: transparent;
+  border: 0;
+  font: inherit;
+  text-align: left;
+
+  color: $gray-300;

  &.collapsible {
    cursor: pointer;
+    transition-property: color, background-color;
+    transition-duration: $transition-time-action;
+
+    &:hover {
+      background-color: $white-3;
+      color: $ui-white;
+    }
+
+    &:focus-visible {
+      outline: 2px solid $blue-500;
+      outline-offset: -2px;
+    }
  }
 }

+.sectionTitle {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+/** marks a section which holds values coming from the URL */
+.customised {
+  width: 0.4rem;
+  height: 0.4rem;
+  border-radius: 50%;
+  background-color: $active-indicator;
+  flex-shrink: 0;
+}
+
+.chevron {
+  flex-shrink: 0;
+  rotate: 180deg;
+  transition: rotate 300ms cubic-bezier(0.45, 1.005, 0, 1.005);
+
+  &.closed {
+    rotate: 0deg;
+  }
+}
+
+.options {
+  padding-inline: 1rem;
+  border-top: 1px solid $white-7;
+}
+
 .label {
-  margin-top: $section-spacing;
+  display: grid;
+  grid-template-columns: minmax(0, 1fr);
+  row-gap: 0.25rem;
+  padding: 0.75rem 0;
  font-size: $inner-section-text-size;
-  color: $label-gray;
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
+
+  &:not(:last-child) {
+    border-bottom: 1px solid $white-7;
+  }
+}
+
+/**
+ * Compact controls sit beside their label instead of below it.
+ * Placement is done with grid areas so that the markup stays flat.
+ */
+.inline {
+  grid-template-columns: minmax(0, 1fr) auto;
+  align-items: center;
+  column-gap: 1rem;
+
+  > .title {
+    grid-area: 1 / 1;
+  }
+
+  > .description {
+    grid-area: 2 / 1;
+  }
+
+  > *:last-child {
+    grid-area: 1 / 2 / span 2;
+  }
 }

 .title {
-  font-size: $inner-section-text-size;
-  display: block;
-  width: 100%;
+  color: $ui-white;
 }

 .description {
-  font-size: $inner-section-text-size;
-  display: block;
-  color: $modal-note-color;
-}
-
-.closed {
-  transition: rotate 300ms cubic-bezier(0.45, 1.005, 0, 1.005);
-  rotate: 0deg;
-}
-
-.open {
-  transition: rotate 300ms cubic-bezier(0.45, 1.005, 0, 1.005);
-  rotate: 180deg;
+  color: $gray-400;
+  font-size: $aux-text-size;
+  line-height: 1.4;
 }

 .hidden {
@@ -1,7 +1,9 @@
 import { useLocalStorage } from '@mantine/hooks';
 import { IoChevronDown } from 'react-icons/io5';
+import { useSearchParams } from 'react-router';

 import { cx } from '../../utils/styleUtils';
+import Eyebrow from '../eyebrow/Eyebrow';
 import { OptionTitle } from './constants';
 import ParamInput from './ParamInput';
 import { type ParamField } from './viewParams.types';
@@ -14,50 +16,74 @@ interface ViewParamsSectionProps {
  options: ParamField[];
 }

+/** Fields which are compact enough to share a row with their label */
+function isInlineField(option: ParamField): boolean {
+  return option.type === 'boolean' || option.type === 'colour';
+}
+
 export default function ViewParamsSection({ title, collapsible, options }: ViewParamsSectionProps) {
  const [collapsed, setCollapsed] = useLocalStorage({ key: `params-${title}`, defaultValue: false });
+  const [searchParams] = useSearchParams();

-  const handleCollapse = () => {
-    if (collapsible) {
-      setCollapsed((prev) => !prev);
-    }
-  };
+  // hidden options are inputs without a UI, there is nothing to frame them with
+  if (title === OptionTitle.Hidden) {
+    return <HiddenContents options={options} />;
+  }
+
+  const isCollapsed = Boolean(collapsible && collapsed);

  return (
    <section className={style.section}>
-      {title === OptionTitle.Hidden ? (
-        <HiddenContents options={options} />
-      ) : (
-        <>
-          <div className={cx([style.sectionHeader, collapsible && style.collapsible])} onClick={handleCollapse}>
-            {title}
-            {collapsible && <IoChevronDown className={cx([collapsed ? style.closed : style.open])} />}
-          </div>
-          <SectionContents options={options} collapsed={collapsed} />
-        </>
-      )}
-    </section>
-  );
-}
-
-interface SectionContentsProps {
-  options: ParamField[];
-  collapsed: boolean;
-}
-
-function SectionContents({ options, collapsed }: SectionContentsProps) {
-  return (
-    <>
-      {options.map((option) => {
-        return (
-          <label key={option.title} className={cx([style.label, collapsed && style.hidden])}>
+      <SectionHeader
+        title={title}
+        isCustomised={options.some((option) => searchParams.has(option.id))}
+        collapsed={isCollapsed}
+        onToggle={collapsible ? () => setCollapsed((prev) => !prev) : undefined}
+      />
+      {/* collapsed options stay mounted: the form reads its values from the DOM */}
+      <div className={cx([style.options, isCollapsed && style.hidden])}>
+        {options.map((option) => (
+          <label key={option.title} className={cx([style.label, isInlineField(option) && style.inline])}>
            <span className={style.title}>{option.title}</span>
            <span className={style.description}>{option.description}</span>
            <ParamInput paramField={option} />
          </label>
-        );
-      })}
-    </>
+        ))}
+      </div>
+    </section>
+  );
+}
+
+interface SectionHeaderProps {
+  title: string;
+  isCustomised: boolean;
+  collapsed: boolean;
+  /** a header without a toggle belongs to a section which cannot collapse */
+  onToggle?: () => void;
+}
+
+function SectionHeader({ title, isCustomised, collapsed, onToggle }: SectionHeaderProps) {
+  const label = (
+    <Eyebrow className={style.sectionTitle}>
+      {title}
+      {isCustomised && <span className={style.customised} title='Contains custom values' />}
+    </Eyebrow>
+  );
+
+  if (!onToggle) {
+    return <div className={style.sectionHeader}>{label}</div>;
+  }
+
+  return (
+    <button
+      type='button'
+      className={cx([style.sectionHeader, style.collapsible])}
+      aria-expanded={!collapsed}
+      onClick={onToggle}
+    >
+      {label}
+      <IoChevronDown className={cx([style.chevron, collapsed && style.closed])} />
+    </button>
  );
 }

@@ -1,26 +1,34 @@
-import { MaybeNumber, Playback } from 'ontime-types';
+import { EntryId, MaybeNumber, Playback } from 'ontime-types';
 import { useEffect, useRef, useState } from 'react';

 import { getProgress } from '../utils/getProgress';
-import { usePlayback } from './useSocket';
+import { useIsOnline, usePlayback } from './useSocket';

 /**
 * Returns the live completion percentage (0–100) of a countdown, interpolated locally.
 */
-export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber): number {
+export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber, eventId?: EntryId | null): number {
  const playback = usePlayback();
+  const isOnline = useIsOnline();
  const isRunning = playback === Playback.Play || playback === Playback.Roll;

-  const baseline = useRef({ current, at: performance.now() });
+  const baseline = useRef({ current, duration, eventId, playback, at: performance.now() });
  const [, setTick] = useState(0);
+  const now = performance.now();

-  // there is only something to animate while a running timer is counting down towards 0
-  const shouldAnimate = isRunning && current !== null && current > 0 && duration !== null;
+  const hasAuthoritativeUpdate =
+    baseline.current.current !== current || // handle timer updates
+    baseline.current.duration !== duration || // handle duration changes
+    baseline.current.eventId !== eventId || // handle event changing
+    baseline.current.playback !== playback; // handle playback changes

-  // re-anchor to the authoritative value whenever the server pushes a new timer update
-  useEffect(() => {
-    baseline.current = { current, at: performance.now() };
-  }, [current, duration, playback]);
+  if (hasAuthoritativeUpdate) {
+    // Reset during render so an event change is reflected in this very paint.
+    baseline.current = { current, duration, eventId, playback, at: now };
+  }
+
+  // There is only something to animate while a connected timer is counting down towards 0.
+  const shouldAnimate = isOnline && isRunning && current !== null && current > 0 && duration !== null;

  // while counting down, re-render every animation frame so the derived progress stays smooth
  useEffect(() => {
@@ -34,8 +42,8 @@ export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber)
    return () => cancelAnimationFrame(frame);
  }, [shouldAnimate]);

-  // derive from the anchor plus elapsed time at render; frozen to the anchor when not running
+  // Derive from the anchor plus elapsed time at render; freeze while disconnected or not running.
  const anchored = baseline.current.current;
-  const value = isRunning && anchored !== null ? anchored - (performance.now() - baseline.current.at) : anchored;
+  const value = isOnline && isRunning && anchored !== null ? anchored - (now - baseline.current.at) : anchored;
  return getProgress(value, duration);
 }
@@ -49,6 +49,7 @@ import {
  requestEventSwap,
  requestGroupEntries,
  requestUngroup,
+  requestFitGroupTarget,
 } from '../api/rundown';
 import { logAxiosError } from '../api/utils';
 import { useEditorSettings } from '../stores/editorSettings';
@@ -466,7 +467,27 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
        return previousEnd;
      }
    },
-    [getCurrentRundownData, updateEntryMutation, queryClient],
+    [getCurrentRundownData, updateEntryMutation, queryClient, resolveCurrentRundownQueryKey],
+  );
+
+  /**
+   * Updates time of existing event so it satisfies the group target duration
+   * @param eventId {EntryId} - id of the event
+   */
+  const matchGroupDuration = useCallback(
+    async (eventId: EntryId) => {
+      const rundownId = getCurrentRundownData()?.id;
+      if (!rundownId) {
+        throw new Error('Rundown not initialised');
+      }
+
+      try {
+        await requestFitGroupTarget(rundownId, eventId);
+      } catch (error) {
+        logAxiosError('Error updating event', error);
+      }
+    },
+    [getCurrentRundownData],
  );

  /**
@@ -1009,6 +1030,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      swapEvents,
      updateEntry,
      updateTimer,
+      matchGroupDuration,
    }),
    [
      addEntry,
@@ -1026,6 +1048,7 @@ function useEntryActionsForRundown(scopedRundownId: string | undefined) {
      swapEvents,
      updateEntry,
      updateTimer,
+      matchGroupDuration,
    ],
  );
 }
@@ -163,6 +163,7 @@ export const useNextFlag = createSelector((state: RuntimeStore) => ({
 export const useProgressData = createSelector((state: RuntimeStore) => ({
  current: state.timer.current,
  duration: state.timer.duration,
+  eventId: state.eventNow?.id ?? null,
  timeWarning: state.eventNow?.timeWarning ?? null,
  timeDanger: state.eventNow?.timeDanger ?? null,
 }));
@@ -4,6 +4,10 @@ export function isKeyEnter<T>(event: KeyboardEvent<T>): boolean {
  return event.key === 'Enter';
 }

+export function isKeySpace<T>(event: KeyboardEvent<T>): boolean {
+  return event.key === ' ' || event.code === 'Space';
+}
+
 export function isKeyEscape<T>(event: KeyboardEvent<T>): boolean {
  return event.key === 'Escape';
 }
@@ -5,6 +5,7 @@ import {
  MILLIS_PER_SECOND,
  dayInMs,
  formatFromMillis,
+  getExpectedEnd,
  getExpectedStart,
 } from 'ontime-utils';

@@ -186,15 +187,13 @@ export function getExpectedTimesFromExtendedEvent(
      ...state,
    },
  );
-
+  const expectedEnd = getExpectedEnd(event, expectedStart, state.currentDay);
  const plannedEnd = event.timeStart + event.duration + event.delay;

  return {
    expectedStart,
    timeToStart: expectedStart - state.clock,
-    expectedEnd: event.countToEnd
-      ? Math.max(expectedStart + event.duration, plannedEnd)
-      : expectedStart + event.duration,
+    expectedEnd,
    plannedEnd,
  };
 }
@@ -1,5 +1,3 @@
-import { AppMode } from '../ontimeConfig';
-
 declare module '*.scss' {
  const content: Record<string, string>;
  export default content;
@@ -32,39 +30,6 @@ declare global {
  }
 }

-/**
- * Declare custom data we pass to the table
- * - `handleUpdate` callback to update the entry when the user edits a cell
- * - `handleUpdateTimer` callback to update the timer for a specific event
- * - `options-showDelayedTimes` whether to show or hide delayed times
- * - `options-hideTableSeconds` whether to hide seconds in the table
- * - `options-hideIndexColumn` whether to hide the index column
- * - `options-cuesheetMode` run or edit mode
- *
- * And metadata specific for each column
- * - `canWrite` whether the user can write to this column
- * - `colour` background colour associated with a custom field
- */
-declare module '@tanstack/react-table' {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  interface TableMeta<TData extends RowData> {
-    handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom: boolean) => void;
-    handleUpdateTimer: (eventId: string, field: TimeField, payload: string) => void;
-    options: {
-      showDelayedTimes: boolean;
-      hideTableSeconds: boolean;
-      hideIndexColumn: boolean;
-      cuesheetMode: AppMode;
-    };
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  interface ColumnMeta<TData extends RowData, TValue> {
-    canWrite: boolean;
-    colour?: string;
-  }
-}
-
 /**
 * Allow passing CSS Properties
 */
@@ -0,0 +1,21 @@
+import { describe, expect, it } from 'vitest';
+
+import { matchesSettingsOptionQuery } from '../useAppSettingsMenu';
+
+describe('matchesSettingsOptionQuery', () => {
+  const option = {
+    id: 'settings__general',
+    label: 'General settings',
+    keywords: ['pin', 'time zone'],
+  };
+
+  it('does not match an empty or whitespace-only query', () => {
+    expect(matchesSettingsOptionQuery(option, '')).toBe(false);
+    expect(matchesSettingsOptionQuery(option, '   ')).toBe(false);
+  });
+
+  it('matches keywords case-insensitively', () => {
+    expect(matchesSettingsOptionQuery(option, 'PIN')).toBe(true);
+    expect(matchesSettingsOptionQuery(option, 'TIME ZONE')).toBe(true);
+  });
+});
@@ -1,9 +1,4 @@
-.corner {
-  position: fixed;
-  top: 6rem;
-  right: 4rem;
-  z-index: $zindex-floating;
-}
+$content-max-width: 1280px;

 .contentWrapper {
  display: flex;
@@ -14,9 +9,29 @@
  position: relative;
 }

+.corner {
+  flex: 0 0 auto;
+  display: flex;
+  justify-content: flex-end;
+  // width is needed so the button can align to the right of the capped
+  // column, auto margins alone would shrink this to fit and centre it
+  width: 100%;
+  max-width: $content-max-width;
+  margin-inline: auto;
+  padding: 0 1rem 0.5rem;
+  box-sizing: border-box;
+}
+
 .content {
-  margin: 1rem;
+  box-sizing: border-box;
+  // as with .corner, the width is needed to fill the capped column, otherwise
+  // auto margins shrink this to fit and each panel ends up its own width
+  width: 100%;
+  max-width: $content-max-width;
+  margin: 0 auto 1rem;
+  padding-inline: 1rem;
  overflow-y: auto;
  flex-grow: 1;
-  padding-bottom: 300px;
+  // room for the last section to scroll to the top of the viewport
+  padding-bottom: 40vh;
 }
@@ -12,12 +12,12 @@ interface PanelContentProps {
 export default function PanelContent({ onClose, children }: PropsWithChildren<PanelContentProps>) {
  return (
    <div className={style.contentWrapper}>
-      <div className={style.content}>{children}</div>
      <div className={style.corner}>
        <Button size='large' onClick={onClose}>
          Close settings <IoClose />
        </Button>
      </div>
+      <div className={style.content}>{children}</div>
    </div>
  );
 }
@@ -1,3 +1,13 @@
+.container {
+  width: min(30vw, 300px);
+  flex: 0 0 min(30vw, 300px);
+  min-width: min(30vw, 300px);
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+  overflow-y: auto;
+}
+
 .tabs,
 ul {
  list-style: none;
@@ -6,22 +16,20 @@ ul {
 }

 .tabs {
-  width: min(30vw, 300px);
-  flex: 0 0 min(30vw, 300px);
-  min-width: min(30vw, 300px);
  display: flex;
  flex-direction: column;
-  overflow-y: auto;
 }

 .primary,
 .secondary {
  padding: 0.25rem 1rem;
  margin-right: 1rem;
+  border-radius: 2px;

-  &:focus {
+  &:focus-visible {
    background-color: $gray-1000;
-    outline: 0;
+    outline: 2px solid $blue-500;
+    outline-offset: -2px;
  }

  &:hover {
@@ -32,14 +40,21 @@ ul {

 .primary {
  font-size: 1rem;
-  border-radius: 2px;
  display: flex;
  align-items: center;
  gap: 0.5rem;
+  border-left: 3px solid transparent;
+
+  &.groupActive {
+    color: $blue-400;
+    font-weight: 600;
+  }

  &.active {
-    color: $blue-400;
-    background-color: $gray-1100;
+    color: $ui-white;
+    border-left-color: $blue-400;
+    background-color: $bg-active;
+    font-weight: 600;
  }

  &.highlight {
@@ -62,6 +77,9 @@ ul {
  font-size: $inner-section-text-size;

  &.active {
-    color: $blue-400;
+    color: $ui-white;
+    border-left-color: $blue-400;
+    background-color: $bg-active;
+    font-weight: 600;
  }
 }
@@ -1,10 +1,18 @@
-import { Fragment } from 'react';
+import { Fragment, useState } from 'react';

 import Tooltip from '../../../common/components/tooltip/Tooltip';
 import { isKeyEnter } from '../../../common/utils/keyEvent';
 import { cx } from '../../../common/utils/styleUtils';
-import { SettingsOption, SettingsOptionId, useAppSettingsMenu } from '../useAppSettingsMenu';
+import * as Panel from '../panel-utils/PanelUtils';
+import {
+  filterSettingsOptions,
+  matchesSettingsOptionQuery,
+  SettingsOption,
+  SettingsOptionId,
+  useAppSettingsMenu,
+} from '../useAppSettingsMenu';
 import useAppSettingsNavigation from '../useAppSettingsNavigation';
+import SettingsSearch from './SettingsSearch';

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

@@ -16,23 +24,57 @@ interface PanelListProps extends PanelBaseProps {
  selectedPanel: string;
 }

+/** Returns the first matching setting, preferring a matching child over its non-matching group. */
+function getFirstResultId(results: SettingsOption[], query: string): SettingsOptionId | null {
+  const firstResult = results[0];
+  if (!firstResult) {
+    return null;
+  }
+
+  if (matchesSettingsOptionQuery(firstResult, query.trim().toLowerCase())) {
+    return firstResult.id as SettingsOptionId;
+  }
+
+  return (firstResult.secondary?.[0]?.id as SettingsOptionId | undefined) ?? null;
+}
+
 export default function PanelList({ selectedPanel, location }: PanelListProps) {
  const { options } = useAppSettingsMenu();
+  const { setLocation } = useAppSettingsNavigation();
+  const [query, setQuery] = useState('');
+
+  const results = filterSettingsOptions(options, query);
+
+  const handleSearchSubmit = () => {
+    const target = getFirstResultId(results, query);
+    if (target) {
+      setLocation(target);
+      setQuery('');
+    }
+  };

  return (
-    <ul className={style.tabs}>
-      {options.map((panel) => {
-        const isSelected = selectedPanel === panel.id;
-        if (panel.highlight) {
-          return (
-            <Tooltip key={panel.id} text={panel.highlight} render={<span />}>
-              <PanelListItem panel={panel} location={location} isSelected={isSelected} />
-            </Tooltip>
-          );
-        }
-        return <PanelListItem key={panel.id} panel={panel} location={location} isSelected={isSelected} />;
-      })}
-    </ul>
+    <div className={style.container}>
+      <SettingsSearch query={query} onQueryChange={setQuery} onSubmit={handleSearchSubmit} />
+
+      {results.length === 0 ? (
+        <Panel.EmptyState title='No settings match' description={`Nothing found for "${query.trim()}"`} />
+      ) : (
+        <ul className={style.tabs}>
+          {results.map((panel) => {
+            const isSelected = selectedPanel === panel.id;
+            if (panel.highlight) {
+              return (
+                <Tooltip key={panel.id} text={panel.highlight} render={<span />}>
+                  <PanelListItem panel={panel} location={location} isSelected={isSelected} />
+                </Tooltip>
+              );
+            }
+            return <PanelListItem key={panel.id} panel={panel} location={location} isSelected={isSelected} />;
+          })}
+        </ul>
+      )}
+    </div>
  );
 }

@@ -44,7 +86,15 @@ interface PanelListItemProps {

 function PanelListItem({ panel, isSelected, location }: PanelListItemProps) {
  const { setLocation } = useAppSettingsNavigation();
-  const classes = cx([style.primary, isSelected && style.active, panel.highlight && style.highlight]);
+  const hasSelectedChild = Boolean(
+    isSelected && panel.secondary?.some((secondary) => secondary.id.split('__')[1] === location),
+  );
+  const classes = cx([
+    style.primary,
+    isSelected && !hasSelectedChild && style.active,
+    hasSelectedChild && style.groupActive,
+    panel.highlight && style.highlight,
+  ]);

  return (
    <Fragment key={panel.id}>
@@ -75,6 +125,7 @@ function PanelListItem({ panel, isSelected, location }: PanelListItemProps) {
              }
            }}
            className={secondaryClasses}
+            tabIndex={0}
            role='button'
          >
            {secondary.label}
@@ -0,0 +1,24 @@
+.search {
+  position: relative;
+  display: flex;
+  align-items: center;
+  flex: 0 0 auto;
+  margin: 0.25rem 1rem 0.25rem 0.25rem;
+}
+
+.icon {
+  position: absolute;
+  left: 0.5rem;
+  color: $gray-400;
+  pointer-events: none;
+}
+
+.input {
+  padding-left: 2rem;
+  padding-right: 2rem;
+}
+
+.clear {
+  position: absolute;
+  right: 0.25rem;
+}
@@ -0,0 +1,60 @@
+import { KeyboardEvent, useRef } from 'react';
+import { IoClose, IoSearch } from 'react-icons/io5';
+
+import IconButton from '../../../common/components/buttons/IconButton';
+import Input from '../../../common/components/input/input/Input';
+
+import style from './SettingsSearch.module.scss';
+
+interface SettingsSearchProps {
+  query: string;
+  onQueryChange: (query: string) => void;
+  onSubmit: () => void;
+}
+
+export default function SettingsSearch({ query, onQueryChange, onSubmit }: SettingsSearchProps) {
+  const searchRef = useRef<HTMLInputElement>(null);
+  const isSearching = query.trim().length > 0;
+
+  const handleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
+    if (event.key === 'Escape' && isSearching) {
+      // Do not let the settings panel close while the user is clearing a search.
+      event.stopPropagation();
+      onQueryChange('');
+      return;
+    }
+
+    if (event.key === 'Enter') {
+      onSubmit();
+    }
+  };
+
+  return (
+    <div className={style.search}>
+      <IoSearch className={style.icon} />
+      <Input
+        ref={searchRef}
+        value={query}
+        onChange={(event) => onQueryChange(event.target.value)}
+        onKeyDown={handleKeyDown}
+        placeholder='Search settings'
+        className={style.input}
+        fluid
+      />
+      {isSearching && (
+        <IconButton
+          variant='ghosted-white'
+          size='small'
+          aria-label='Clear search'
+          className={style.clear}
+          onClick={() => {
+            onQueryChange('');
+            searchRef.current?.focus();
+          }}
+        >
+          <IoClose />
+        </IconButton>
+      )}
+    </div>
+  );
+}
@@ -1,24 +1,26 @@
 $inner-padding: 1rem;
+$card-padding: 2rem;

 .header {
-  font-size: 2rem;
+  font-size: 1.5rem;
  padding-bottom: 0.5rem;
  border-bottom: 1px solid $white-10;
  font-weight: 600;
 }

 .subheader {
-  font-size: 1.5rem;
+  font-size: 1.125rem;
  padding-bottom: 0.5rem;
  font-weight: 600;
  display: flex;
  align-items: center;
  justify-content: space-between;
+  gap: 1rem;
 }

 .title {
-  font-size: 1.375rem;
-  padding: 0 2rem;
+  font-size: 1rem;
+  padding: 0 var(--panel-card-padding, #{$card-padding});
  font-weight: 600;
  display: flex;
  align-items: center;
@@ -35,10 +37,12 @@ $inner-padding: 1rem;
  color: $ui-white;
 }

+// width is owned by the panel content column, which caps and centres itself.
+// sections must stay full width so top level cards line up with Panel.Header
+// and nested sections fill their card rather than shrinking to fit
 .section {
  position: relative;
  margin-top: 2rem;
-  max-width: 1024px;
 }

 .indent {
@@ -51,8 +55,10 @@ $inner-padding: 1rem;
 }

 .card {
+  --panel-card-padding: #{$card-padding};
+
  position: relative;
-  padding: 2rem;
+  padding: var(--panel-card-padding);
  background-color: $white-3;
  border: 1px solid $gray-1100;
  border-radius: 3px;
@@ -76,10 +82,10 @@ $inner-padding: 1rem;
  color: $error-red;
 }

+// tables scroll with the panel rather than owning a nested scroll area,
+// which keeps the sticky table head anchored to the panel viewport
 .pad {
-  padding: 0 2rem;
-  max-height: 550px;
-  overflow-y: scroll;
+  padding: 0 var(--panel-card-padding, #{$card-padding});
 }

 .table {
@@ -97,10 +103,13 @@ $inner-padding: 1rem;
  }

  th {
-    font-weight: 400;
-    color: $gray-400;
+    font-weight: 600;
+    color: $gray-300;
+    font-size: calc(1rem - 3px);
+    letter-spacing: 0.02em;
+    vertical-align: bottom;
    white-space: nowrap;
-    text-transform: capitalize;
+    text-transform: uppercase;
  }

  th,
@@ -112,6 +121,17 @@ $inner-padding: 1rem;
    background-color: $white-1;
  }

+  // active rows use a panel-local class today; keep the treatment here so all
+  // settings tables share the same state without each panel owning its colours
+  tr[class*='current'] {
+    background-color: $bg-active;
+
+    > td:first-child {
+      box-shadow: inset 3px 0 $blue-400;
+      font-weight: 500;
+    }
+  }
+
  // allow highlighting table elements
  tr[data-warn='true'],
  td[data-warn='true'] {
@@ -120,7 +140,7 @@ $inner-padding: 1rem;
 }

 .listGroup {
-  padding: 0 2rem;
+  padding: 0 var(--panel-card-padding, #{$card-padding});

  > li:not(:last-child) {
    border-bottom: 1px solid $white-10;
@@ -133,6 +153,17 @@ $inner-padding: 1rem;
  align-items: center;
  gap: 1rem;
  padding: 0.5rem 0;
+
+  &.interactive {
+    margin-inline: calc(var(--panel-card-padding, #{$card-padding}) * -1);
+    padding: 0.75rem var(--panel-card-padding, #{$card-padding});
+    transition: background-color $transition-time-action;
+
+    &:hover,
+    &:focus-within {
+      background-color: $white-3;
+    }
+  }
 }

 .fieldTitle {
@@ -163,14 +194,13 @@ $inner-padding: 1rem;
 .divider {
  border: none;
  border-top: 1px solid $white-10;
-  margin: 1rem -2rem;
+  margin: 1rem calc(var(--panel-card-padding, #{$card-padding}) * -1);
 }

 .overlay {
  position: absolute;
  z-index: $zindex-backdrop;
-  width: 100%;
-  height: 100%;
+  inset: 0;
  backdrop-filter: blur(2px);
  display: grid;
  place-content: center;
@@ -188,19 +218,35 @@ $inner-padding: 1rem;
  animation: animloader 1s ease-in infinite;
 }

-.empty {
-  background-color: $black-10;
+.emptyState {
+  padding: 3rem 1.5rem;
  text-align: center;
-  color: $muted-gray;
+}

-  td {
-    padding-block: 5rem;
-  }
+.emptyMessage {
+  width: min(30rem, 100%);
+  margin-inline: auto;
+}

-  button {
-    margin-top: 1rem;
-    margin-inline: auto;
-  }
+.emptyTitle {
+  margin-bottom: 0.25rem;
+  color: rgba($gray-200, 0.72);
+  font-size: calc(1rem + 2px);
+  font-weight: 400;
+}
+
+.emptyBody {
+  color: rgba($gray-200, 0.55);
+  font-size: calc(1rem - 3px);
+  line-height: 1.5;
+}
+
+.emptyAction {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+  margin-top: 1rem;
 }

 .inlineElements {
@@ -239,14 +285,3 @@ $inner-padding: 1rem;
    opacity: 0;
  }
 }
-
-@keyframes animloader {
-  0% {
-    transform: scale(0);
-    opacity: 0.6;
-  }
-  100% {
-    transform: scale(1);
-    opacity: 0;
-  }
-}
@@ -1,7 +1,5 @@
 import { HTMLAttributes, PropsWithChildren, ReactNode } from 'react';
-import { IoAdd } from 'react-icons/io5';

-import Button from '../../../common/components/buttons/Button';
 import { cx } from '../../../common/utils/styleUtils';

 import style from './PanelUtils.module.scss';
@@ -62,16 +60,29 @@ export function Table({ className, children }: { className?: string; children: R
  );
 }

-export function TableEmpty({ label, handleClick }: { label?: string; handleClick?: () => void }) {
+export interface EmptyStateProps {
+  title: string;
+  description?: ReactNode;
+  action?: ReactNode;
+}
+
+export function EmptyState({ title, description, action }: EmptyStateProps) {
  return (
-    <tr className={style.empty}>
+    <div className={style.emptyState}>
+      <div className={style.emptyMessage}>
+        <div className={style.emptyTitle}>{title}</div>
+        {description && <div className={style.emptyBody}>{description}</div>}
+        {action && <div className={style.emptyAction}>{action}</div>}
+      </div>
+    </div>
+  );
+}
+
+export function TableEmpty(props: EmptyStateProps) {
+  return (
+    <tr>
      <td colSpan={99}>
-        <div>{label ?? 'No data yet'}</div>
-        {handleClick && (
-          <Button onClick={handleClick} disabled={!handleClick} variant='primary'>
-            New <IoAdd />
-          </Button>
-        )}
+        <EmptyState {...props} />
      </td>
    </tr>
  );
@@ -81,8 +92,8 @@ export function ListGroup({ className, children }: { className?: string; childre
  return <ul className={cx([style.listGroup, className])}>{children}</ul>;
 }

-export function ListItem({ children }: { children: ReactNode }) {
-  return <li className={style.listItem}>{children}</li>;
+export function ListItem({ children, interactive = false }: { children: ReactNode; interactive?: boolean }) {
+  return <li className={cx([style.listItem, interactive && style.interactive])}>{children}</li>;
 }

 export function Field({
@@ -1,4 +1,4 @@
-import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import Info from '../../../../common/components/info/Info';
 import {
  buyMeACoffeeUrl,
  discordUrl,
@@ -11,6 +11,8 @@ import {
 } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
 import AppVersion from './AppVersion';
+import CloudPanel from './CloudPanel';
+import ExternalLinkRow from './ExternalLinkRow';

 export default function AboutPanel() {
  return (
@@ -19,28 +21,49 @@ export default function AboutPanel() {
      <Panel.Section>
        <Panel.Card>
          <Panel.SubHeader>Ontime</Panel.SubHeader>
-          <Panel.Paragraph>
-            Free, open-source software for managing rundowns and event timers
-            <ExternalLink href={websiteUrl}>www.getontime.no</ExternalLink>
-          </Panel.Paragraph>
-          <Panel.Paragraph>
-            Considering sponsoring our work
-            <ExternalLink href={githubSponsorUrl}>GitHub Sponsors</ExternalLink>
-            <ExternalLink href={buyMeACoffeeUrl}>Buy Me a Coffee</ExternalLink>
-          </Panel.Paragraph>
-          <Panel.Paragraph>
-            If you are looking for an online version of Ontime, consider trying out our cloud service
-            <ExternalLink href={websiteUrl}>www.getontime.no</ExternalLink>
-          </Panel.Paragraph>
+          <Panel.Divider />
+          <Info>Free, open-source software for managing rundowns and event timers.</Info>
+          <Panel.ListGroup>
+            <ExternalLinkRow href={websiteUrl} title='www.getontime.no' description='App site and downloads' />
+            <ExternalLinkRow
+              href={githubSponsorUrl}
+              title='GitHub Sponsors'
+              description='Support development through GitHub'
+            />
+            <ExternalLinkRow
+              href={buyMeACoffeeUrl}
+              title='Buy Me a Coffee'
+              description='Make a one-time contribution'
+            />
+          </Panel.ListGroup>
+        </Panel.Card>
+      </Panel.Section>
+      <CloudPanel />
+      <Panel.Section>
+        <Panel.Card>
+          <Panel.SubHeader>Current version</Panel.SubHeader>
+          <Panel.Divider />
+          <Panel.ListGroup>
+            <AppVersion />
+          </Panel.ListGroup>
+        </Panel.Card>
+      </Panel.Section>
+      <Panel.Section>
+        <Panel.Card>
+          <Panel.SubHeader>Helpful links</Panel.SubHeader>
+          <Panel.Divider />
+          <Panel.ListGroup>
+            <ExternalLinkRow
+              href={documentationUrl}
+              title='Read the docs'
+              description='Setup guides and feature documentation'
+            />
+            <ExternalLinkRow href={githubUrl} title='GitHub' description='Report issues or contribute to Ontime' />
+            <ExternalLinkRow href={youtubeUrl} title='YouTube' description='Watch tutorials and feature walkthroughs' />
+            <ExternalLinkRow href={discordUrl} title='Discord' description='Get help and share suggestions' />
+            <ExternalLinkRow href={subredditUrl} title='Reddit' description='Join the Ontime community discussion' />
+          </Panel.ListGroup>
        </Panel.Card>
-        <Panel.SubHeader>Current version</Panel.SubHeader>
-        <AppVersion />
-        <Panel.SubHeader>Links</Panel.SubHeader>
-        <ExternalLink href={documentationUrl}>Read the docs</ExternalLink>
-        <ExternalLink href={githubUrl}>Follow the project on GitHub</ExternalLink>
-        <ExternalLink href={discordUrl}>Discord server</ExternalLink>
-        <ExternalLink href={youtubeUrl}>YouTube channel</ExternalLink>
-        <ExternalLink href={subredditUrl}>Subreddit</ExternalLink>
      </Panel.Section>
    </>
  );
@@ -0,0 +1,7 @@
+.updateIndicator {
+  width: 0.5em;
+  height: 0.5em;
+  flex: 0 0 auto;
+  border-radius: 99px;
+  background-color: $red-400;
+}
@@ -1,35 +1,47 @@
 import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
 import useAppVersion from '../../../../common/hooks-query/useAppVersion';
-import { appVersion, isOntimeCloud } from '../../../../externals';
+import { appVersion, isOntimeCloud, websiteUrl } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';

+import style from './AppVersion.module.scss';
+
 export default function AppVersion() {
  const { data, isError } = useAppVersion();

  if (isError) {
    return (
-      <Panel.Paragraph>
-        {`You are currently using Ontime version ${appVersion}`}
-        <Panel.Error>Could not fetch version information</Panel.Error>
-      </Panel.Paragraph>
+      <Panel.ListItem>
+        <Panel.Field title={`Ontime ${appVersion}`} description='' error='Could not fetch version information' />
+      </Panel.ListItem>
    );
  }

  if (data.hasUpdates) {
    return (
-      <Panel.Paragraph>
-        {`You are currently using Ontime version ${appVersion}.`}
-        <br />
-        <br />
-        {`A new version ${data.version} is available.`} <br />
-        {isOntimeCloud ? (
-          'You can restart your stage to get the latest available version.'
-        ) : (
-          <ExternalLink href={data.url}>Please visit the release page to download</ExternalLink>
+      <Panel.ListItem>
+        <Panel.Field
+          title={
+            <>
+              <span className={style.updateIndicator} aria-hidden='true' />
+              {`Ontime ${appVersion}`}
+            </>
+          }
+          description={
+            isOntimeCloud
+              ? `Version ${data.version} is available. Restart your stage to update.`
+              : `Version ${data.version} is available.`
+          }
+        />
+        {!isOntimeCloud && (
+          <ExternalLink href={websiteUrl}>Download the latest version from Ontime's page</ExternalLink>
        )}
-      </Panel.Paragraph>
+      </Panel.ListItem>
    );
  }

-  return <Panel.Paragraph>{`You are currently using the latest version of Ontime: ${appVersion}`}</Panel.Paragraph>;
+  return (
+    <Panel.ListItem>
+      <Panel.Field title={`Ontime ${appVersion}`} description='You are using the latest version.' />
+    </Panel.ListItem>
+  );
 }
@@ -0,0 +1,74 @@
+.card {
+  padding: 1.5rem;
+  border-color: rgba($action-blue, 0.42);
+  background-color: rgba($action-blue, 0.06);
+}
+
+.eyebrow {
+  color: $action-text-color;
+  font-size: calc(1rem - 3px);
+  font-weight: 700;
+  letter-spacing: 0.08em;
+  text-transform: uppercase;
+}
+
+.title {
+  margin-top: 0.35rem;
+  font-size: 1.5rem;
+  font-weight: 600;
+  line-height: 1.15;
+}
+
+.description {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+  max-width: 33rem;
+  margin-top: 0.9rem;
+  color: $gray-300;
+  line-height: 1.5;
+}
+
+.portability {
+  padding-top: 0.75rem;
+  border-top: 1px solid $white-10;
+  color: $gray-400;
+  font-size: calc(1rem - 2px);
+}
+
+.benefits {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 0.75rem 1rem;
+  margin-top: 1.5rem;
+  padding: 0;
+  list-style: none;
+
+  li {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.5rem;
+    line-height: 1.4;
+  }
+
+  svg {
+    flex: 0 0 auto;
+    margin-top: 0.1rem;
+    color: $action-text-color;
+    font-size: 1.1rem;
+  }
+}
+
+.actions {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 1rem;
+  margin-top: 1.5rem;
+}
+
+@media (max-width: $min-tablet) {
+  .benefits {
+    grid-template-columns: 1fr;
+  }
+}
@@ -0,0 +1,52 @@
+import { IoCheckmarkCircle } from 'react-icons/io5';
+
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import { isOntimeCloud, websiteUrl } from '../../../../externals';
+import * as Panel from '../../panel-utils/PanelUtils';
+
+import style from './CloudPanel.module.scss';
+
+export default function CloudPanel() {
+  if (isOntimeCloud) {
+    return null;
+  }
+
+  return (
+    <Panel.Section>
+      <Panel.Card className={style.card}>
+        <span className={style.eyebrow}>Ontime Cloud</span>
+        <h3 className={style.title}>Run Ontime online with zero setup</h3>
+        <p className={style.description}>
+          <span>
+            Ontime Cloud lets you run and share Ontime online with your team. Subscriptions support continued
+            development while Ontime remains fully open-source and self-hostable.
+          </span>
+          <span className={style.portability}>
+            Project files work locally and in Cloud, so your shows can move freely.
+          </span>
+        </p>
+        <ul className={style.benefits}>
+          <li>
+            <IoCheckmarkCircle />
+            Start in minutes, with no setup or maintenance
+          </li>
+          <li>
+            <IoCheckmarkCircle />
+            Coordinate multi-track rundowns with Overview views
+          </li>
+          <li>
+            <IoCheckmarkCircle />
+            Manage every instance from one dashboard
+          </li>
+          <li>
+            <IoCheckmarkCircle />
+            Share secure read-only views with collaborators
+          </li>
+        </ul>
+        <div className={style.actions}>
+          <ExternalLink href={websiteUrl}>Learn more about Ontime Cloud</ExternalLink>
+        </div>
+      </Panel.Card>
+    </Panel.Section>
+  );
+}
@@ -0,0 +1,15 @@
+.link {
+  width: calc(100% + (var(--panel-card-padding, 2rem) * 2));
+  margin: -0.75rem calc(var(--panel-card-padding, 2rem) * -1);
+  padding: 0.75rem var(--panel-card-padding, 2rem);
+
+  > :first-child {
+    flex: 1;
+    min-width: 0;
+  }
+}
+
+.action {
+  color: $action-text-color;
+  font-size: calc(1rem - 2px);
+}
@@ -0,0 +1,21 @@
+import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import * as Panel from '../../panel-utils/PanelUtils';
+
+import style from './ExternalLinkRow.module.scss';
+
+interface ExternalLinkRowProps {
+  href: string;
+  title: string;
+  description: string;
+}
+
+export default function ExternalLinkRow({ href, title, description }: ExternalLinkRowProps) {
+  return (
+    <Panel.ListItem interactive>
+      <ExternalLink href={href} className={style.link}>
+        <Panel.Field title={title} description={description} />
+        <span className={style.action}>Open</span>
+      </ExternalLink>
+    </Panel.ListItem>
+  );
+}
@@ -1,6 +1,13 @@
 .outerColumn {
+  display: flex;
+  flex-direction: column;
  gap: 2rem;
-  margin-bottom: 2rem;
+  font-size: calc(1rem - 1px);
+  color: $ui-white;
+
+  // the shared modal body owns scrolling for this regular form modal
+  min-height: 100%;
+  padding-block: 0.5rem;

  h3 {
    font-size: 1rem;
@@ -19,12 +19,12 @@ import IconButton from '../../../../common/components/buttons/IconButton';
 import Info from '../../../../common/components/info/Info';
 import Input from '../../../../common/components/input/input/Input';
 import ExternalLink from '../../../../common/components/link/external-link/ExternalLink';
+import Modal from '../../../../common/components/modal/Modal';
 import RadioGroup from '../../../../common/components/radio-group/RadioGroup';
 import Select from '../../../../common/components/select/Select';
 import Tag from '../../../../common/components/tag/Tag';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import useCustomFields from '../../../../common/hooks-query/useCustomFields';
-import { preventEscape } from '../../../../common/utils/keyEvent';
 import { startsWithHttp } from '../../../../common/utils/regex';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { isAutomation, makeFieldList } from './automationUtils';
@@ -34,6 +34,7 @@ import TemplateInput from './template-input/TemplateInput';
 import style from './AutomationForm.module.scss';

 const integrationsDocsUrl = 'https://docs.getontime.no/api/automation/#using-variables-in-automation';
+const formId = 'automation-form';

 interface AutomationFormProps {
  automation: Automation | AutomationDTO;
@@ -185,291 +186,320 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
  const canSubmit = !isSubmitting && isDirty && isValid;

  return (
-    <Panel.Indent
-      as='form'
-      name='automation-form'
-      onSubmit={handleSubmit(onSubmit)}
-      className={style.outerColumn}
-      onKeyDown={(event) => preventEscape(event, onClose)}
-    >
-      <Panel.SubHeader>{isEdit ? 'Edit automation' : 'Create automation'}</Panel.SubHeader>
-      <div className={style.innerSection}>
-        <h3>Automation options</h3>
-        <div className={style.titleSection}>
-          <label>
-            Title
-            <Input
-              {...register('title', { required: { value: true, message: 'Required field' } })}
-              fluid
-              placeholder='Load preset'
-            />
-          </label>
-          <Panel.Error>{errors.title?.message}</Panel.Error>
-        </div>
-      </div>
-
-      <div className={style.innerSection}>
-        <h3>Filters (optional)</h3>
-        <div className={style.ruleSection}>
-          <label>
-            Trigger outputs if
-            <RadioGroup
-              orientation='horizontal'
-              value={watch('filterRule')}
-              onValueChange={(value) => setValue('filterRule', value, { shouldDirty: true })}
-              items={[
-                { value: 'all', label: 'All filters pass' },
-                { value: 'any', label: 'Any filter passes' },
-              ]}
-            />
-          </label>
-          {fieldFilters.map((field, index) => {
-            const key = `filters.${index}.field.${field.id}`;
-            return (
-              <div key={key} className={style.filterSection}>
-                <label>
-                  Runtime data source
-                  <Select<string | null>
-                    // need to normalize '' to null for the Select to show the placeholder
-                    value={watch(`filters.${index}.field`) || null}
-                    onValueChange={(value) => {
-                      if (value === null) return;
-                      setValue(`filters.${index}.field`, value, { shouldDirty: true });
-                    }}
-                    options={fieldList.map(({ value, label }) => ({
-                      value,
-                      label,
-                      disabled: value === null,
-                    }))}
-                    aria-label='Event field'
-                  />
-                  <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
-                </label>
-                <label>
-                  Matching condition
-                  <Select
-                    value={watch(`filters.${index}.operator`)}
-                    onValueChange={(value: string | null) => {
-                      if (value === null) return;
-                      setValue(
-                        `filters.${index}.operator`,
-                        value as 'equals' | 'not_equals' | 'greater_than' | 'less_than' | 'contains' | 'not_contains',
-                        { shouldDirty: true },
-                      );
-                    }}
-                    options={[
-                      { value: 'equals', label: 'equals' },
-                      { value: 'not_equals', label: 'not equals' },
-                      { value: 'contains', label: 'contains' },
-                    ]}
-                    aria-label='Operator'
-                  />
-                  <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
-                </label>
-                <label>
-                  Value to match
-                  <Input {...register(`filters.${index}.value`)} fluid placeholder='<empty / no value>' />
-                </label>
-                <div>
-                  <span>&nbsp;</span>
-                  <div>
-                    <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeFilter(index)}>
-                      <IoTrash />
-                    </IconButton>
-                  </div>
-                </div>
-              </div>
-            );
-          })}
-          <div>
-            <Button onClick={handleAddNewFilter}>
-              Add filter <IoAdd />
-            </Button>
+    <Modal
+      isOpen
+      onClose={onClose}
+      showBackdrop
+      showCloseButton
+      title={isEdit ? 'Edit automation' : 'Create automation'}
+      bodyElements={
+        <form id={formId} onSubmit={handleSubmit(onSubmit)} className={style.outerColumn}>
+          <div className={style.innerColumn}>
+            <h3>Automation options</h3>
+            <div className={style.titleSection}>
+              <label>
+                Title
+                <Input
+                  {...register('title', { required: { value: true, message: 'Required field' } })}
+                  fluid
+                  placeholder='Load preset'
+                />
+              </label>
+              <Panel.Error>{errors.title?.message}</Panel.Error>
+            </div>
          </div>
-        </div>
-      </div>

-      <div className={style.innerColumn}>
-        <h3>Outputs</h3>
-        <Info>
-          Automation outputs can be used to send data from Ontime to external software <br />
-          or to change properties of Ontime itself. <br /> <br />
-          Use Ontime runtime data in these fields with template strings. Type {'{{'} to see autocomplete, or{' '}
-          <ExternalLink href={integrationsDocsUrl}>read the docs</ExternalLink>
-        </Info>
-
-        {fieldOutputs.map((output, index) => {
-          if (isOSCOutput(output)) {
-            const rowErrors = errors.outputs?.[index] as
-              | {
-                  targetIP?: { message?: string };
-                  targetPort?: { message?: string };
-                  address?: { message?: string };
-                  args?: { message?: string };
-                }
-              | undefined;
-
-            return (
-              <div key={output.id} className={style.outputCard}>
-                <Tag>OSC</Tag>
-                <div className={style.oscSection}>
-                  <label>
-                    Target IP
-                    <Input
-                      {...register(`outputs.${index}.targetIP`, {
-                        required: { value: true, message: 'Required field' },
-                      })}
-                      fluid
-                      placeholder='127.0.0.1'
-                    />
-                    <Panel.Error>{rowErrors?.targetIP?.message}</Panel.Error>
-                  </label>
-                  <label>
-                    Target Port
-                    <Input
-                      {...register(`outputs.${index}.targetPort`, {
-                        required: { value: true, message: 'Required field' },
-                        setValueAs: (value) => (value === '' ? 0 : Number(value)),
-                        max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
-                        min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
-                      })}
-                      fluid
-                      type='number'
-                      maxLength={5}
-                      placeholder='8000'
-                    />
-                    <Panel.Error>{rowErrors?.targetPort?.message}</Panel.Error>
-                  </label>
-                  <label>
-                    Address
-                    <TemplateInput
-                      {...register(`outputs.${index}.address`)}
-                      value={output.address}
-                      fluid
-                      placeholder='/cue/start'
-                    />
-                    <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
-                  </label>
-                  <label>
-                    Arguments
-                    <TemplateInput {...register(`outputs.${index}.args`)} value={output.args} fluid placeholder='1' />
-                    <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
-                  </label>
-                  <div>
-                    <span>&nbsp;</span>
-                    <Panel.InlineElements relation='inner'>
-                      <Button variant='ghosted-white' onClick={() => handleTestOSCOutput(index)}>
-                        Test
-                      </Button>
-                      <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
-                        <IoTrash />
-                      </IconButton>
-                    </Panel.InlineElements>
+          <div className={style.innerColumn}>
+            <h3>Filters (optional)</h3>
+            <div className={style.ruleSection}>
+              <label>
+                Trigger outputs if
+                <RadioGroup
+                  orientation='horizontal'
+                  value={watch('filterRule')}
+                  onValueChange={(value) => setValue('filterRule', value, { shouldDirty: true })}
+                  items={[
+                    { value: 'all', label: 'All filters pass' },
+                    { value: 'any', label: 'Any filter passes' },
+                  ]}
+                />
+              </label>
+              {fieldFilters.map((field, index) => {
+                const key = `filters.${index}.field.${field.id}`;
+                return (
+                  <div key={key} className={style.filterSection}>
+                    <label>
+                      Runtime data source
+                      <Select<string | null>
+                        // need to normalize '' to null for the Select to show the placeholder
+                        value={watch(`filters.${index}.field`) || null}
+                        onValueChange={(value) => {
+                          if (value === null) return;
+                          setValue(`filters.${index}.field`, value, { shouldDirty: true });
+                        }}
+                        options={fieldList.map(({ value, label }) => ({
+                          value,
+                          label,
+                          disabled: value === null,
+                        }))}
+                        aria-label='Event field'
+                      />
+                      <Panel.Error>{errors.filters?.[index]?.field?.message}</Panel.Error>
+                    </label>
+                    <label>
+                      Matching condition
+                      <Select
+                        value={watch(`filters.${index}.operator`)}
+                        onValueChange={(value: string | null) => {
+                          if (value === null) return;
+                          setValue(
+                            `filters.${index}.operator`,
+                            value as
+                              | 'equals'
+                              | 'not_equals'
+                              | 'greater_than'
+                              | 'less_than'
+                              | 'contains'
+                              | 'not_contains',
+                            { shouldDirty: true },
+                          );
+                        }}
+                        options={[
+                          { value: 'equals', label: 'equals' },
+                          { value: 'not_equals', label: 'not equals' },
+                          { value: 'contains', label: 'contains' },
+                        ]}
+                        aria-label='Operator'
+                      />
+                      <Panel.Error>{errors.filters?.[index]?.operator?.message}</Panel.Error>
+                    </label>
+                    <label>
+                      Value to match
+                      <Input {...register(`filters.${index}.value`)} fluid placeholder='<empty / no value>' />
+                    </label>
+                    <div>
+                      <span>&nbsp;</span>
+                      <div>
+                        <IconButton
+                          aria-label='Delete'
+                          variant='ghosted-destructive'
+                          onClick={() => removeFilter(index)}
+                        >
+                          <IoTrash />
+                        </IconButton>
+                      </div>
+                    </div>
                  </div>
-                </div>
+                );
+              })}
+              <div>
+                <Button onClick={handleAddNewFilter}>
+                  Add filter <IoAdd />
+                </Button>
              </div>
-            );
-          }
-          if (isHTTPOutput(output)) {
-            const rowErrors = errors.outputs?.[index] as
-              | {
-                  url?: { message?: string };
-                }
-              | undefined;
-            return (
-              <div key={output.id} className={style.outputCard}>
-                <Tag>HTTP</Tag>
-                <div className={style.httpSection}>
-                  <label>
-                    Target URL
-                    <TemplateInput
-                      {...register(`outputs.${index}.url`, {
-                        required: { value: true, message: 'Required field' },
-                        pattern: {
-                          value: startsWithHttp,
-                          message: 'HTTP messages should target http:// or https://',
-                        },
-                      })}
-                      value={output.url}
-                      fluid
-                      placeholder='http://127.0.0.1/start/1'
-                    />
-                    <Panel.Error>{rowErrors?.url?.message}</Panel.Error>
-                  </label>
-                  <div>
-                    <span>&nbsp;</span>
-                    <Panel.InlineElements relation='inner'>
-                      <Button variant='ghosted-white' onClick={() => handleTestHTTPOutput(index)}>
-                        Test
-                      </Button>
-                      <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
-                        <IoTrash />
-                      </IconButton>
-                    </Panel.InlineElements>
+            </div>
+          </div>
+
+          <div className={style.innerColumn}>
+            <h3>Outputs</h3>
+            <Info>
+              Automation outputs can be used to send data from Ontime to external software <br />
+              or to change properties of Ontime itself. <br /> <br />
+              Use Ontime runtime data in these fields with template strings. Type {'{{'} to see autocomplete, or{' '}
+              <ExternalLink href={integrationsDocsUrl}>read the docs</ExternalLink>
+            </Info>
+
+            {fieldOutputs.map((output, index) => {
+              if (isOSCOutput(output)) {
+                const rowErrors = errors.outputs?.[index] as
+                  | {
+                      targetIP?: { message?: string };
+                      targetPort?: { message?: string };
+                      address?: { message?: string };
+                      args?: { message?: string };
+                    }
+                  | undefined;
+
+                return (
+                  <div key={output.id} className={style.outputCard}>
+                    <Tag>OSC</Tag>
+                    <div className={style.oscSection}>
+                      <label>
+                        Target IP
+                        <Input
+                          {...register(`outputs.${index}.targetIP`, {
+                            required: { value: true, message: 'Required field' },
+                          })}
+                          fluid
+                          placeholder='127.0.0.1'
+                        />
+                        <Panel.Error>{rowErrors?.targetIP?.message}</Panel.Error>
+                      </label>
+                      <label>
+                        Target Port
+                        <Input
+                          {...register(`outputs.${index}.targetPort`, {
+                            required: { value: true, message: 'Required field' },
+                            setValueAs: (value) => (value === '' ? 0 : Number(value)),
+                            max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
+                            min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
+                          })}
+                          fluid
+                          type='number'
+                          maxLength={5}
+                          placeholder='8000'
+                        />
+                        <Panel.Error>{rowErrors?.targetPort?.message}</Panel.Error>
+                      </label>
+                      <label>
+                        Address
+                        <TemplateInput
+                          {...register(`outputs.${index}.address`)}
+                          value={output.address}
+                          fluid
+                          placeholder='/cue/start'
+                        />
+                        <Panel.Error>{rowErrors?.address?.message}</Panel.Error>
+                      </label>
+                      <label>
+                        Arguments
+                        <TemplateInput
+                          {...register(`outputs.${index}.args`)}
+                          value={output.args}
+                          fluid
+                          placeholder='1'
+                        />
+                        <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
+                      </label>
+                      <div>
+                        <span>&nbsp;</span>
+                        <Panel.InlineElements relation='inner'>
+                          <Button variant='ghosted-white' onClick={() => handleTestOSCOutput(index)}>
+                            Test
+                          </Button>
+                          <IconButton
+                            aria-label='Delete'
+                            variant='ghosted-destructive'
+                            onClick={() => removeOutput(index)}
+                          >
+                            <IoTrash />
+                          </IconButton>
+                        </Panel.InlineElements>
+                      </div>
+                    </div>
                  </div>
-                </div>
-              </div>
-            );
-          }
+                );
+              }
+              if (isHTTPOutput(output)) {
+                const rowErrors = errors.outputs?.[index] as
+                  | {
+                      url?: { message?: string };
+                    }
+                  | undefined;
+                return (
+                  <div key={output.id} className={style.outputCard}>
+                    <Tag>HTTP</Tag>
+                    <div className={style.httpSection}>
+                      <label>
+                        Target URL
+                        <TemplateInput
+                          {...register(`outputs.${index}.url`, {
+                            required: { value: true, message: 'Required field' },
+                            pattern: {
+                              value: startsWithHttp,
+                              message: 'HTTP messages should target http:// or https://',
+                            },
+                          })}
+                          value={output.url}
+                          fluid
+                          placeholder='http://127.0.0.1/start/1'
+                        />
+                        <Panel.Error>{rowErrors?.url?.message}</Panel.Error>
+                      </label>
+                      <div>
+                        <span>&nbsp;</span>
+                        <Panel.InlineElements relation='inner'>
+                          <Button variant='ghosted-white' onClick={() => handleTestHTTPOutput(index)}>
+                            Test
+                          </Button>
+                          <IconButton
+                            aria-label='Delete'
+                            variant='ghosted-destructive'
+                            onClick={() => removeOutput(index)}
+                          >
+                            <IoTrash />
+                          </IconButton>
+                        </Panel.InlineElements>
+                      </div>
+                    </div>
+                  </div>
+                );
+              }

-          if (isOntimeAction(output)) {
-            const rowErrors = errors.outputs?.[index] as
-              | {
-                  action?: { message?: string };
-                  time?: { message?: string };
-                  text?: { message?: string };
-                  visible?: { message?: string };
-                  secondarySource?: { message?: string };
-                }
-              | undefined;
-            return (
-              <div key={output.id} className={style.outputCard}>
-                <Tag>Ontime action</Tag>
-                <OntimeActionForm
-                  value={output.action}
-                  index={index}
-                  register={register}
-                  rowErrors={rowErrors}
-                  setValue={setValue}
-                  watch={watch}
-                >
-                  <span>&nbsp;</span>
-                  <Panel.InlineElements relation='inner'>
-                    <Button variant='ghosted-white' onClick={() => handleTestOntimeAction(index)}>
-                      Test
-                    </Button>
-                    <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
-                      <IoTrash />
-                    </IconButton>
-                  </Panel.InlineElements>
-                </OntimeActionForm>
-              </div>
-            );
-          }
+              if (isOntimeAction(output)) {
+                const rowErrors = errors.outputs?.[index] as
+                  | {
+                      action?: { message?: string };
+                      time?: { message?: string };
+                      text?: { message?: string };
+                      visible?: { message?: string };
+                      secondarySource?: { message?: string };
+                    }
+                  | undefined;
+                return (
+                  <div key={output.id} className={style.outputCard}>
+                    <Tag>Ontime action</Tag>
+                    <OntimeActionForm
+                      value={output.action}
+                      index={index}
+                      register={register}
+                      rowErrors={rowErrors}
+                      setValue={setValue}
+                      watch={watch}
+                    >
+                      <span>&nbsp;</span>
+                      <Panel.InlineElements relation='inner'>
+                        <Button variant='ghosted-white' onClick={() => handleTestOntimeAction(index)}>
+                          Test
+                        </Button>
+                        <IconButton
+                          aria-label='Delete'
+                          variant='ghosted-destructive'
+                          onClick={() => removeOutput(index)}
+                        >
+                          <IoTrash />
+                        </IconButton>
+                      </Panel.InlineElements>
+                    </OntimeActionForm>
+                  </div>
+                );
+              }

-          // there should be no other output types
-          return null;
-        })}
-        <Panel.InlineElements relation='inner'>
-          <Button onClick={handleAddNewOSCOutput}>
-            OSC <IoAdd />
+              return null;
+            })}
+            <Panel.InlineElements relation='inner'>
+              <Button onClick={handleAddNewOSCOutput}>
+                OSC <IoAdd />
+              </Button>
+              <Button onClick={handleAddNewHTTPOutput}>
+                HTTP <IoAdd />
+              </Button>
+              <Button onClick={handleAddnewOntimeAction}>
+                Ontime action <IoAdd />
+              </Button>
+            </Panel.InlineElements>
+          </div>
+        </form>
+      }
+      footerElements={
+        <>
+          {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+          <Button onClick={onClose}>Cancel</Button>
+          <Button variant='primary' type='submit' form={formId} disabled={!canSubmit} loading={isSubmitting}>
+            Save
          </Button>
-          <Button onClick={handleAddNewHTTPOutput}>
-            HTTP <IoAdd />
-          </Button>
-          <Button onClick={handleAddnewOntimeAction}>
-            Ontime action <IoAdd />
-          </Button>
-        </Panel.InlineElements>
-      </div>
-
-      <Panel.InlineElements align='end'>
-        {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-        <Button onClick={onClose}>Cancel</Button>
-        <Button variant='primary' type='submit' disabled={!canSubmit} loading={isSubmitting}>
-          Save
-        </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
+        </>
+      }
+    />
  );
 }
@@ -19,24 +19,27 @@ export default function AutomationPanel({ location }: PanelBaseProps) {
  return (
    <>
      <Panel.Header>Automation</Panel.Header>
-      <Panel.Section>
-        <Panel.Loader isLoading={isLoading} />
-        <div ref={settingsRef}>
-          <AutomationSettingsForm
-            enabledAutomations={data.enabledAutomations}
-            enabledOscIn={data.enabledOscIn}
-            oscPortIn={data.oscPortIn}
-            automationState={automationState}
-            oscInputState={oscInputState}
-          />
-        </div>
-        <div ref={automationsRef}>
-          <AutomationsList automations={data.automations} enabledAutomations={automationState} />
-        </div>
-        <div ref={triggersRef}>
-          <TriggersList triggers={data.triggers} automations={data.automations} enabledAutomations={automationState} />
-        </div>
-      </Panel.Section>
+      <div ref={settingsRef}>
+        <AutomationSettingsForm
+          enabledAutomations={data.enabledAutomations}
+          enabledOscIn={data.enabledOscIn}
+          oscPortIn={data.oscPortIn}
+          automationState={automationState}
+          oscInputState={oscInputState}
+          isLoading={isLoading}
+        />
+      </div>
+      <div ref={automationsRef}>
+        <AutomationsList automations={data.automations} enabledAutomations={automationState} isLoading={isLoading} />
+      </div>
+      <div ref={triggersRef}>
+        <TriggersList
+          triggers={data.triggers}
+          automations={data.automations}
+          enabledAutomations={automationState}
+          isLoading={isLoading}
+        />
+      </div>
    </>
  );
 }
@@ -21,6 +21,7 @@ interface AutomationSettingsProps {
  oscPortIn: number;
  automationState?: boolean;
  oscInputState?: boolean;
+  isLoading?: boolean;
 }

 export default function AutomationSettingsForm({
@@ -29,6 +30,7 @@ export default function AutomationSettingsForm({
  oscPortIn,
  automationState,
  oscInputState,
+  isLoading,
 }: AutomationSettingsProps) {
  const {
    handleSubmit,
@@ -65,126 +67,129 @@ export default function AutomationSettingsForm({
  const oscInputEnabled = watch('enabledOscIn');

  return (
-    <Panel.Card>
-      <Panel.SubHeader>
-        Automation settings
-        <Panel.InlineElements>
-          <Button variant='ghosted' onClick={onReset} disabled={!canSubmit}>
-            Revert to saved
-          </Button>
-          <Button
-            variant='primary'
-            type='submit'
-            form='automation-settings-form'
-            disabled={!canSubmit}
-            loading={isSubmitting}
-          >
-            Save
-          </Button>
-        </Panel.InlineElements>
-      </Panel.SubHeader>
-      {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+    <Panel.Section>
+      <Panel.Card>
+        <Panel.Loader isLoading={Boolean(isLoading)} />
+        <Panel.SubHeader>
+          Automation settings
+          <Panel.InlineElements>
+            <Button variant='ghosted' onClick={onReset} disabled={!canSubmit}>
+              Revert to saved
+            </Button>
+            <Button
+              variant='primary'
+              type='submit'
+              form='automation-settings-form'
+              disabled={!canSubmit}
+              loading={isSubmitting}
+            >
+              Save
+            </Button>
+          </Panel.InlineElements>
+        </Panel.SubHeader>
+        {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}

-      <Panel.Divider />
+        <Panel.Divider />

-      <Panel.Section>
-        <Info>
-          <span>Control Ontime and share its data with external systems in your workflow.</span>
-          <span>- Automations allow Ontime to send its data on lifecycle triggers.</span>
-          <span>- OSC Input tells Ontime to listen to messages on the specific port.</span>
-          <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
-        </Info>
-      </Panel.Section>
+        <Panel.Section>
+          <Info>
+            <span>Control Ontime and share its data with external systems in your workflow.</span>
+            <span>- Automations allow Ontime to send its data on lifecycle triggers.</span>
+            <span>- OSC Input tells Ontime to listen to messages on the specific port.</span>
+            <ExternalLink href={oscApiDocsUrl}>See the docs</ExternalLink>
+          </Info>
+        </Panel.Section>

-      <Panel.Section
-        as='form'
-        id='automation-settings-form'
-        onSubmit={handleSubmit(onSubmit)}
-        onKeyDown={(event) => preventEscape(event, onReset)}
-      >
-        <Panel.Loader isLoading={false} />
+        <Panel.Section
+          as='form'
+          id='automation-settings-form'
+          onSubmit={handleSubmit(onSubmit)}
+          onKeyDown={(event) => preventEscape(event, onReset)}
+        >
+          <Panel.Title>Automation</Panel.Title>
+          <Panel.ListGroup>
+            <Panel.ListItem>
+              <Panel.Field
+                title={
+                  <>
+                    <span>Enable automations</span>
+                    {automationState === false && <Tag variant='warning'>OFF</Tag>}
+                  </>
+                }
+                description={
+                  automationState === false
+                    ? 'Automations are OFF. Triggers stay configured, but Ontime will not send messages.'
+                    : 'Allow Ontime to send messages on lifecycle triggers'
+                }
+                descriptionTone={automationState === false ? 'warning' : 'default'}
+                error={errors.enabledAutomations?.message}
+              />
+              <Switch
+                size='large'
+                checked={automationsEnabled}
+                onCheckedChange={(value: boolean) =>
+                  setValue('enabledAutomations', value, { shouldDirty: true, shouldValidate: true })
+                }
+              />
+            </Panel.ListItem>
+          </Panel.ListGroup>
+          <Panel.Title>OSC Input</Panel.Title>

-        <Panel.Title>Automation</Panel.Title>
-        <Panel.ListGroup>
-          <Panel.ListItem>
-            <Panel.Field
-              title={
-                <>
-                  <span>Enable automations</span>
-                  {automationState === false && <Tag variant='warning'>OFF</Tag>}
-                </>
-              }
-              description={
-                automationState === false
-                  ? 'Automations are OFF. Triggers stay configured, but Ontime will not send messages.'
-                  : 'Allow Ontime to send messages on lifecycle triggers'
-              }
-              descriptionTone={automationState === false ? 'warning' : 'default'}
-              error={errors.enabledAutomations?.message}
-            />
-            <Switch
-              size='large'
-              checked={automationsEnabled}
-              onCheckedChange={(value: boolean) =>
-                setValue('enabledAutomations', value, { shouldDirty: true, shouldValidate: true })
-              }
-            />
-          </Panel.ListItem>
-        </Panel.ListGroup>
-        <Panel.Title>OSC Input</Panel.Title>
-
-        <Panel.ListGroup>
-          {isOntimeCloud && <Info>For security reasons OSC integrations are not available in the cloud service.</Info>}
-          <Panel.ListItem>
-            <Panel.Field
-              title={
-                <>
-                  <span>OSC input</span>
-                  {oscInputState === false && <Tag variant='warning'>OFF</Tag>}
-                </>
-              }
-              description={
-                oscInputState === false
-                  ? 'OSC input is OFF. Ontime will not listen for incoming OSC control messages.'
-                  : 'Allow control of Ontime through OSC'
-              }
-              descriptionTone={oscInputState === false ? 'warning' : 'default'}
-              error={errors.enabledOscIn?.message}
-            />
-            <Switch
-              size='large'
-              checked={oscInputEnabled}
-              onCheckedChange={(value: boolean) =>
-                setValue('enabledOscIn', value, { shouldDirty: true, shouldValidate: true })
-              }
-            />
-          </Panel.ListItem>
-          <Panel.ListItem>
-            <Panel.Field
-              title='Listen on port'
-              description='Port for incoming OSC. Default: 8888'
-              error={errors.oscPortIn?.message}
-            />
-            <Input
-              id='oscPortIn'
-              placeholder='8888'
-              maxLength={5}
-              style={{ textAlign: 'right', width: '5rem' }}
-              type='number'
-              fluid
-              {...register('oscPortIn', {
-                required: { value: true, message: 'Required field' },
-                max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
-                min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
-                pattern: {
-                  value: isOnlyNumbers,
-                  message: 'Value should be numeric',
-                },
-              })}
-            />
-          </Panel.ListItem>
-        </Panel.ListGroup>
-      </Panel.Section>
-    </Panel.Card>
+          <Panel.ListGroup>
+            {isOntimeCloud && (
+              <Info>For security reasons OSC integrations are not available in the cloud service.</Info>
+            )}
+            <Panel.ListItem>
+              <Panel.Field
+                title={
+                  <>
+                    <span>OSC input</span>
+                    {oscInputState === false && <Tag variant='warning'>OFF</Tag>}
+                  </>
+                }
+                description={
+                  oscInputState === false
+                    ? 'OSC input is OFF. Ontime will not listen for incoming OSC control messages.'
+                    : 'Allow control of Ontime through OSC'
+                }
+                descriptionTone={oscInputState === false ? 'warning' : 'default'}
+                error={errors.enabledOscIn?.message}
+              />
+              <Switch
+                size='large'
+                checked={oscInputEnabled}
+                onCheckedChange={(value: boolean) =>
+                  setValue('enabledOscIn', value, { shouldDirty: true, shouldValidate: true })
+                }
+              />
+            </Panel.ListItem>
+            <Panel.ListItem>
+              <Panel.Field
+                title='Listen on port'
+                description='Port for incoming OSC. Default: 8888'
+                error={errors.oscPortIn?.message}
+              />
+              <Input
+                id='oscPortIn'
+                placeholder='8888'
+                maxLength={5}
+                style={{ textAlign: 'right', width: '5rem' }}
+                type='number'
+                fluid
+                {...register('oscPortIn', {
+                  required: { value: true, message: 'Required field' },
+                  max: { value: 65535, message: 'Port must be within range 1024 - 65535' },
+                  min: { value: 1024, message: 'Port must be within range 1024 - 65535' },
+                  pattern: {
+                    value: isOnlyNumbers,
+                    message: 'Value should be numeric',
+                  },
+                })}
+              />
+            </Panel.ListItem>
+          </Panel.ListGroup>
+        </Panel.Section>
+      </Panel.Card>
+    </Panel.Section>
  );
 }
@@ -22,10 +22,10 @@ const automationPlaceholder: AutomationDTO = {
 interface AutomationsListProps {
  automations: NormalisedAutomation;
  enabledAutomations?: boolean;
+  isLoading: boolean;
 }

-export default function AutomationsList(props: AutomationsListProps) {
-  const { automations, enabledAutomations } = props;
+export default function AutomationsList({ automations, enabledAutomations, isLoading }: AutomationsListProps) {
  const { refetch } = useAutomationSettings();
  const [automationFormData, setAutomationFormData] = useState<AutomationDTO | null>(null);
  const [deleteError, setDeleteError] = useState<string | null>(null);
@@ -44,89 +44,94 @@ export default function AutomationsList(props: AutomationsListProps) {
  const arrayAutomations = Object.keys(automations);

  return (
-    <Panel.Card>
-      <Panel.SubHeader>
-        Manage automations
-        <Button
-          type='submit'
-          disabled={Boolean(automationFormData)}
-          onClick={() => setAutomationFormData(automationPlaceholder)}
-        >
-          New <IoAdd />
-        </Button>
-      </Panel.SubHeader>
+    <Panel.Section>
+      <Panel.Card>
+        {automationFormData !== null && (
+          <AutomationForm automation={automationFormData} onClose={() => setAutomationFormData(null)} />
+        )}
+        <Panel.SubHeader>
+          Manage automations
+          <Button onClick={() => setAutomationFormData(automationPlaceholder)}>
+            New <IoAdd />
+          </Button>
+        </Panel.SubHeader>

-      <Panel.Divider />
+        <Panel.Divider />

-      {enabledAutomations === false && (
-        <Info>
-          Automations are disabled. You can still manage automation definitions here, but they will not run until
-          enabled.
-        </Info>
-      )}
-
-      {automationFormData !== null && (
-        <AutomationForm automation={automationFormData} onClose={() => setAutomationFormData(null)} />
-      )}
-
-      <Panel.Table>
-        <thead>
-          <tr>
-            <th style={{ width: '45%' }}>Title</th>
-            <th style={{ width: '15%' }}>Trigger rule</th>
-            <th style={{ width: '15%' }}>Filters</th>
-            <th style={{ width: '15%' }}>Outputs</th>
-            <th />
-          </tr>
-        </thead>
-        <tbody>
-          {arrayAutomations.length === 0 && (
-            <Panel.TableEmpty
-              handleClick={!automationFormData ? () => setAutomationFormData(automationPlaceholder) : undefined}
-            />
+        <Panel.Section>
+          {enabledAutomations === false && (
+            <Info>
+              Automations are disabled. You can still manage automation definitions here, but they will not run until
+              enabled.
+            </Info>
          )}
-          {arrayAutomations.map((automationId) => {
-            if (!Object.hasOwn(automations, automationId)) {
-              return null;
-            }
-            return (
-              <Fragment key={automationId}>
+
+          <Panel.Table>
+            <thead>
+              <tr>
+                <th style={{ width: '45%' }}>Title</th>
+                <th style={{ width: '15%' }}>Trigger rule</th>
+                <th style={{ width: '15%' }}>Filters</th>
+                <th style={{ width: '15%' }}>Outputs</th>
+                <th />
+              </tr>
+            </thead>
+            <tbody>
+              {!isLoading && arrayAutomations.length === 0 && (
+                <Panel.TableEmpty
+                  title='No automations yet'
+                  description='An automation sends OSC or HTTP messages, or runs an Ontime action, whenever a trigger fires.'
+                  action={
+                    <Button variant='primary' onClick={() => setAutomationFormData(automationPlaceholder)}>
+                      Create automation <IoAdd />
+                    </Button>
+                  }
+                />
+              )}
+              {arrayAutomations.map((automationId) => {
+                if (!Object.hasOwn(automations, automationId)) {
+                  return null;
+                }
+                return (
+                  <Fragment key={automationId}>
+                    <tr>
+                      <td>{automations[automationId].title}</td>
+                      <td>
+                        <Tag>{automations[automationId].filterRule}</Tag>
+                      </td>
+                      <td>{automations[automationId].filters.length}</td>
+                      <td>{automations[automationId].outputs.length}</td>
+                      <Panel.InlineElements align='end' relation='inner' as='td'>
+                        <IconButton
+                          variant='ghosted-white'
+                          aria-label='Edit entry'
+                          onClick={() => setAutomationFormData(automations[automationId])}
+                        >
+                          <IoPencil />
+                        </IconButton>
+                        <IconButton
+                          variant='ghosted-destructive'
+                          aria-label='Delete entry'
+                          onClick={() => handleDelete(automationId)}
+                        >
+                          <IoTrash />
+                        </IconButton>
+                      </Panel.InlineElements>
+                    </tr>
+                  </Fragment>
+                );
+              })}
+              {deleteError && (
                <tr>
-                  <td>{automations[automationId].title}</td>
-                  <td>
-                    <Tag>{automations[automationId].filterRule}</Tag>
+                  <td colSpan={5}>
+                    <Panel.Error>{deleteError}</Panel.Error>
                  </td>
-                  <td>{automations[automationId].filters.length}</td>
-                  <td>{automations[automationId].outputs.length}</td>
-                  <Panel.InlineElements align='end' relation='inner' as='td'>
-                    <IconButton
-                      variant='ghosted-white'
-                      aria-label='Edit entry'
-                      onClick={() => setAutomationFormData(automations[automationId])}
-                    >
-                      <IoPencil />
-                    </IconButton>
-                    <IconButton
-                      variant='ghosted-destructive'
-                      aria-label='Delete entry'
-                      onClick={() => handleDelete(automationId)}
-                    >
-                      <IoTrash />
-                    </IconButton>
-                  </Panel.InlineElements>
                </tr>
-              </Fragment>
-            );
-          })}
-          {deleteError && (
-            <tr>
-              <td colSpan={5}>
-                <Panel.Error>{deleteError}</Panel.Error>
-              </td>
-            </tr>
-          )}
-        </tbody>
-      </Panel.Table>
-    </Panel.Card>
+              )}
+            </tbody>
+          </Panel.Table>
+        </Panel.Section>
+      </Panel.Card>
+    </Panel.Section>
  );
 }
@@ -1,4 +1,4 @@
-import { NormalisedAutomation, TimerLifeCycle, TriggerDTO } from 'ontime-types';
+import { NormalisedAutomation, TimerLifeCycle, Trigger, TriggerDTO } from 'ontime-types';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';

@@ -6,30 +6,21 @@ import { addTrigger, editTrigger } from '../../../../common/api/automation';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import Input from '../../../../common/components/input/input/Input';
+import Modal from '../../../../common/components/modal/Modal';
 import Select from '../../../../common/components/select/Select';
-import { preventEscape } from '../../../../common/utils/keyEvent';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { cycles } from './automationUtils';

+const formId = 'trigger-form';
+
 interface TriggerFormProps {
  automations: NormalisedAutomation;
-  initialId?: string;
-  initialTitle?: string;
-  initialAutomationId?: string;
-  initialTrigger?: TimerLifeCycle;
+  trigger: Trigger | null;
  onCancel: () => void;
  postSubmit: () => void;
 }

-export default function TriggerForm({
-  automations,
-  initialId,
-  initialTitle,
-  initialAutomationId,
-  initialTrigger,
-  onCancel,
-  postSubmit,
-}: TriggerFormProps) {
+export default function TriggerForm({ automations, trigger, onCancel, postSubmit }: TriggerFormProps) {
  const {
    handleSubmit,
    register,
@@ -40,9 +31,9 @@ export default function TriggerForm({
    formState: { errors, isSubmitting, isValid, isDirty },
  } = useForm<TriggerDTO>({
    defaultValues: {
-      title: initialTitle,
-      trigger: initialTrigger ?? (cycles[0].value as TimerLifeCycle | undefined),
-      automationId: initialAutomationId ?? automations?.[Object.keys(automations)[0]]?.id,
+      title: trigger?.title,
+      trigger: trigger?.trigger ?? (cycles[0].value as TimerLifeCycle | undefined),
+      automationId: trigger?.automationId ?? automations?.[Object.keys(automations)[0]]?.id,
    },
    resetOptions: {
      keepDirtyValues: true,
@@ -55,10 +46,9 @@ export default function TriggerForm({
  }, [setFocus]);

  const onSubmit = async (values: TriggerDTO) => {
-    // if we were passed an ID we are editing a Trigger
-    if (initialId) {
+    if (trigger) {
      try {
-        await editTrigger(initialId, { id: initialId, ...values });
+        await editTrigger(trigger.id, { id: trigger.id, ...values });
        postSubmit();
      } catch (error) {
        setError('root', { message: `Failed to save changes to trigger ${maybeAxiosError(error)}` });
@@ -85,56 +75,63 @@ export default function TriggerForm({
  const canSubmit = isDirty && isValid;

  return (
-    <Panel.Indent
-      as='form'
-      name='trigger-form'
-      onSubmit={handleSubmit(onSubmit)}
-      onKeyDown={(event) => preventEscape(event, onCancel)}
-    >
-      <Panel.SubHeader>{initialId ? 'Edit trigger' : 'Create trigger'}</Panel.SubHeader>
-      <label>
-        Title
-        <Input
-          {...register('title', { required: { value: true, message: 'Required field' } })}
-          fluid
-          defaultValue={initialTitle}
-        />
-        <Panel.Error>{errors.title?.message}</Panel.Error>
-      </label>
-      <label>
-        Lifecycle trigger
-        <Select
-          value={watch('trigger')}
-          onValueChange={(value) => {
-            if (value === null) return;
-            setValue('trigger', value as TimerLifeCycle, { shouldDirty: true });
-          }}
-          options={cycles.map((cycle) => ({ value: cycle.value, label: cycle.label }))}
-          aria-label='Lifecycle trigger'
-        />
-        <Panel.Error>{errors.trigger?.message}</Panel.Error>
-      </label>
-      <label>
-        Automation title
-        <Select
-          value={watch('automationId')}
-          onValueChange={(value: string | null) => {
-            if (value === null) return;
-            setValue('automationId', value, { shouldDirty: true });
-          }}
-          options={automationSelect}
-          aria-label='Automation title'
-        />
-        <Panel.Error>{errors.automationId?.message}</Panel.Error>
-      </label>
-      <Panel.InlineElements align='end'>
-        <Button disabled={isSubmitting} onClick={onCancel}>
-          Cancel
-        </Button>
-        <Button type='submit' variant='primary' disabled={!canSubmit} loading={isSubmitting}>
-          Save
-        </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
+    <Modal
+      isOpen
+      onClose={onCancel}
+      showBackdrop
+      showCloseButton
+      size='compact'
+      title={trigger ? 'Edit trigger' : 'Create trigger'}
+      bodyElements={
+        <form id={formId} onSubmit={handleSubmit(onSubmit)}>
+          <label>
+            Title
+            <Input
+              {...register('title', { required: { value: true, message: 'Required field' } })}
+              fluid
+              defaultValue={trigger?.title}
+            />
+            <Panel.Error>{errors.title?.message}</Panel.Error>
+          </label>
+          <label>
+            Lifecycle trigger
+            <Select
+              value={watch('trigger')}
+              onValueChange={(value) => {
+                if (value === null) return;
+                setValue('trigger', value as TimerLifeCycle, { shouldDirty: true });
+              }}
+              options={cycles.map((cycle) => ({ value: cycle.value, label: cycle.label }))}
+              aria-label='Lifecycle trigger'
+            />
+            <Panel.Error>{errors.trigger?.message}</Panel.Error>
+          </label>
+          <label>
+            Automation title
+            <Select
+              value={watch('automationId')}
+              onValueChange={(value: string | null) => {
+                if (value === null) return;
+                setValue('automationId', value, { shouldDirty: true });
+              }}
+              options={automationSelect}
+              aria-label='Automation title'
+            />
+            <Panel.Error>{errors.automationId?.message}</Panel.Error>
+          </label>
+        </form>
+      }
+      footerElements={
+        <>
+          {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+          <Button disabled={isSubmitting} onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button type='submit' form={formId} variant='primary' disabled={!canSubmit} loading={isSubmitting}>
+            Save
+          </Button>
+        </>
+      }
+    />
  );
 }
@@ -9,23 +9,33 @@ import Info from '../../../../common/components/info/Info';
 import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { checkDuplicates } from './automationUtils';
-import AutomationForm from './TriggerForm';
+import TriggerForm from './TriggerForm';
 import TriggersListItem from './TriggersListItem';

+type FormState = {
+  isOpen: boolean;
+  trigger?: Trigger;
+};
+
 interface TriggersListProps {
  triggers: Trigger[];
  automations: NormalisedAutomation;
  enabledAutomations?: boolean;
+  isLoading: boolean;
 }

-export default function TriggersList(props: TriggersListProps) {
-  const { triggers, automations, enabledAutomations } = props;
-  const [showForm, setShowForm] = useState(false);
+export default function TriggersList({ triggers, automations, enabledAutomations, isLoading }: TriggersListProps) {
+  const [formState, setFormState] = useState<FormState>({ isOpen: false, trigger: undefined });
  const { refetch } = useAutomationSettings();
  const [deleteError, setDeleteError] = useState<string | null>(null);

+  const openNewForm = () => setFormState({ isOpen: true });
+  const openEditForm = (trigger: Trigger) => setFormState({ isOpen: true, trigger });
+  const closeForm = () => setFormState({ isOpen: false, trigger: undefined });
+
  const handleDelete = async (id: string) => {
    try {
+      setDeleteError(null);
      await deleteTrigger(id);
    } catch (error) {
      setDeleteError(maybeAxiosError(error));
@@ -35,7 +45,7 @@ export default function TriggersList(props: TriggersListProps) {
  };

  const postSubmit = () => {
-    setShowForm(false);
+    closeForm();
    refetch();
  };

@@ -45,70 +55,86 @@ export default function TriggersList(props: TriggersListProps) {
  const canAdd = Object.keys(automations).length > 0;

  return (
-    <Panel.Card>
-      <Panel.SubHeader>
-        Manage triggers
-        <Button type='submit' form='trigger-form' disabled={!canAdd} loading={false} onClick={() => setShowForm(true)}>
-          New <IoAdd />
-        </Button>
-      </Panel.SubHeader>
-      <Panel.Divider />
-      <Panel.Section>
-        {enabledAutomations === false && (
-          <Info>
-            Automations are disabled. You can still manage triggers here, but they will not run until enabled.
-          </Info>
+    <Panel.Section>
+      <Panel.Card>
+        {formState.isOpen && (
+          <TriggerForm
+            automations={automations}
+            trigger={formState.trigger ?? null}
+            onCancel={closeForm}
+            postSubmit={postSubmit}
+          />
        )}
-        {duplicates && (
-          <Panel.Error>
-            You have created multiple links between the same trigger and automation which can performance issues.
-          </Panel.Error>
-        )}
-        {showForm && (
-          <AutomationForm automations={automations} onCancel={() => setShowForm(false)} postSubmit={postSubmit} />
-        )}
-        <Panel.Table>
-          <thead>
-            <tr>
-              <th style={{ width: '35%' }}>Title</th>
-              <th style={{ width: '25%' }}>Lifecycle trigger</th>
-              <th style={{ width: '25%' }}>Automation</th>
-              <th />
-            </tr>
-          </thead>
-          <tbody>
-            {!showForm && triggers.length === 0 && (
-              <Panel.TableEmpty
-                label='Create a trigger to run an automation'
-                handleClick={canAdd ? () => setShowForm(true) : undefined}
-              />
-            )}
-            {triggers.map((trigger, index) => {
-              return (
-                <Fragment key={trigger.id}>
-                  <TriggersListItem
-                    automations={automations}
-                    id={trigger.id}
-                    title={trigger.title}
-                    trigger={trigger.trigger}
-                    automationId={trigger.automationId}
-                    duplicate={duplicates?.includes(index)}
-                    handleDelete={() => handleDelete(trigger.id)}
-                    postSubmit={postSubmit}
-                  />
-                  {deleteError && (
-                    <tr>
-                      <td colSpan={5}>
-                        <Panel.Error>{deleteError}</Panel.Error>
-                      </td>
-                    </tr>
-                  )}
-                </Fragment>
-              );
-            })}
-          </tbody>
-        </Panel.Table>
-      </Panel.Section>
-    </Panel.Card>
+        <Panel.SubHeader>
+          Manage triggers
+          <Button disabled={!canAdd} onClick={openNewForm}>
+            New <IoAdd />
+          </Button>
+        </Panel.SubHeader>
+        <Panel.Divider />
+        <Panel.Section>
+          {enabledAutomations === false && (
+            <Info>
+              Automations are disabled. You can still manage triggers here, but they will not run until enabled.
+            </Info>
+          )}
+          {duplicates && (
+            <Panel.Error>
+              You have created multiple links between the same trigger and automation which can cause performance
+              issues.
+            </Panel.Error>
+          )}
+          <Panel.Table>
+            <thead>
+              <tr>
+                <th style={{ width: '35%' }}>Title</th>
+                <th style={{ width: '25%' }}>Lifecycle trigger</th>
+                <th style={{ width: '25%' }}>Automation</th>
+                <th />
+              </tr>
+            </thead>
+            <tbody>
+              {!isLoading && triggers.length === 0 && (
+                <Panel.TableEmpty
+                  title='No triggers yet'
+                  description={
+                    canAdd
+                      ? 'Triggers run an automation at a given point of the timer lifecycle, like when an event starts or finishes.'
+                      : 'Create an automation first, then add a trigger to decide when it should run.'
+                  }
+                  action={
+                    canAdd && (
+                      <Button variant='primary' onClick={openNewForm}>
+                        Create trigger <IoAdd />
+                      </Button>
+                    )
+                  }
+                />
+              )}
+              {triggers.map((trigger, index) => {
+                return (
+                  <Fragment key={trigger.id}>
+                    <TriggersListItem
+                      automations={automations}
+                      trigger={trigger}
+                      duplicate={duplicates?.includes(index)}
+                      handleEdit={() => openEditForm(trigger)}
+                      handleDelete={() => handleDelete(trigger.id)}
+                    />
+                  </Fragment>
+                );
+              })}
+              {deleteError && (
+                <tr>
+                  <td colSpan={5}>
+                    <Panel.Error>{deleteError}</Panel.Error>
+                  </td>
+                </tr>
+              )}
+            </tbody>
+          </Panel.Table>
+        </Panel.Section>
+      </Panel.Card>
+    </Panel.Section>
  );
 }
@@ -1,48 +1,21 @@
-import { NormalisedAutomation, TimerLifeCycle } from 'ontime-types';
-import { useState } from 'react';
+import { NormalisedAutomation, Trigger } from 'ontime-types';
 import { IoPencil, IoTrash, IoWarningOutline } from 'react-icons/io5';

 import IconButton from '../../../../common/components/buttons/IconButton';
 import Tag from '../../../../common/components/tag/Tag';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { cycles } from './automationUtils';
-import AutomationForm from './TriggerForm';

 interface TriggersListItemProps {
  automations: NormalisedAutomation;
-  id: string;
-  title: string;
-  trigger: TimerLifeCycle;
-  automationId: string;
+  trigger: Trigger;
  duplicate?: boolean;
+  handleEdit: () => void;
  handleDelete: () => void;
-  postSubmit: () => void;
 }

 export default function TriggersListItem(props: TriggersListItemProps) {
-  const { automations, id, title, trigger, automationId, duplicate, handleDelete, postSubmit } = props;
-  const [isEditing, setIsEditing] = useState(false);
-
-  if (isEditing) {
-    return (
-      <tr>
-        <td colSpan={99}>
-          <AutomationForm
-            automations={automations}
-            initialId={id}
-            initialTitle={title}
-            initialTrigger={trigger}
-            initialAutomationId={automationId}
-            onCancel={() => setIsEditing(false)}
-            postSubmit={() => {
-              setIsEditing(false);
-              postSubmit();
-            }}
-          />
-        </td>
-      </tr>
-    );
-  }
+  const { automations, trigger, duplicate, handleEdit, handleDelete } = props;

  return (
    <tr data-warn={duplicate}>
@@ -52,16 +25,16 @@ export default function TriggersListItem(props: TriggersListItemProps) {
            color='#FFBC56' // $orange-500
          />
        )}
-        {title}
+        {trigger.title}
      </Panel.InlineElements>
      <td>
-        <Tag>{cycles.find((cycle) => cycle.value === trigger)?.label}</Tag>
+        <Tag>{cycles.find((cycle) => cycle.value === trigger.trigger)?.label}</Tag>
      </td>
      <td>
-        <Tag>{automations?.[automationId]?.title}</Tag>
+        <Tag>{automations?.[trigger.automationId]?.title}</Tag>
      </td>
      <Panel.InlineElements align='end' relation='inner' as='td'>
-        <IconButton variant='ghosted-white' aria-label='Edit entry' onClick={() => setIsEditing(true)}>
+        <IconButton variant='ghosted-white' aria-label='Edit entry' onClick={handleEdit}>
          <IoPencil />
        </IconButton>
        <IconButton variant='ghosted-destructive' aria-label='Delete entry' onClick={handleDelete}>
@@ -66,7 +66,10 @@ export default function ReportSettings() {
            </thead>
            <tbody>
              {combinedReport.length === 0 && (
-                <Panel.TableEmpty label='Reports are generated when running through the show.' />
+                <Panel.TableEmpty
+                  title='No report data yet'
+                  description='Reports are generated as you run through the show, comparing scheduled times against what actually happened.'
+                />
              )}

              {combinedReport.map((entry) => {
@@ -43,6 +43,7 @@ export default function URLPresets() {
  return (
    <Panel.Section>
      <Panel.Card>
+        {formState.isOpen && <URLPresetForm urlPreset={formState.preset} onClose={closeForm} />}
        <Panel.SubHeader>
          URL presets
          <Button onClick={openNewForm}>
@@ -63,7 +64,6 @@ export default function URLPresets() {
        </Panel.Section>
        <Panel.Section>
          <Panel.Loader isLoading={status === 'pending'} />
-          {formState.isOpen && <URLPresetForm urlPreset={formState.preset} onClose={closeForm} />}
          {actionError && <Panel.Error>{actionError}</Panel.Error>}
          <Panel.Table>
            <thead>
@@ -76,7 +76,17 @@ export default function URLPresets() {
              </tr>
            </thead>
            <tbody>
-              {data.length === 0 && <Panel.TableEmpty handleClick={openNewForm} />}
+              {data.length === 0 && (
+                <Panel.TableEmpty
+                  title='No URL presets yet'
+                  description='A preset gives one of your views a short, memorable address, with all of its options baked in.'
+                  action={
+                    <Button variant='primary' onClick={openNewForm}>
+                      Create preset <IoAdd />
+                    </Button>
+                  }
+                />
+              )}
              {data.map((preset, index) => {
                const isCuesheet = preset.target === OntimeView.Cuesheet;
                return (
@@ -6,28 +6,31 @@ import { maybeAxiosError, unwrapError } from '../../../../../common/api/utils';
 import Button from '../../../../../common/components/buttons/Button';
 import Input from '../../../../../common/components/input/input/Input';
 import Textarea from '../../../../../common/components/input/textarea/Textarea';
+import Modal from '../../../../../common/components/modal/Modal';
 import Select, { SelectOption } from '../../../../../common/components/select/Select';
 import { useUpdateUrlPreset } from '../../../../../common/hooks-query/useUrlPresets';
-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 { viewLabels } from '../../../../../viewerConfig';
 import CuesheetLinkOptions, { CuesheetPermissionValues } from '../../../../sharing/composite/CuesheetLinkOptions';
 import * as Panel from '../../../panel-utils/PanelUtils';

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

 const targetOptions: SelectOption<OntimeViewPresettable>[] = [
-  { value: OntimeView.Cuesheet, label: 'Cuesheet' },
-  { value: OntimeView.Operator, label: 'Operator' },
-  { value: OntimeView.Timer, label: 'Timer' },
-  { value: OntimeView.Backstage, label: 'Backstage' },
-  { value: OntimeView.Timeline, label: 'Timeline' },
-  { value: OntimeView.StudioClock, label: 'Studio Clock' },
-  { value: OntimeView.Countdown, label: 'Countdown' },
-  { value: OntimeView.ProjectInfo, label: 'Project Info' },
+  { value: OntimeView.Cuesheet, label: viewLabels[OntimeView.Cuesheet] },
+  { value: OntimeView.Operator, label: viewLabels[OntimeView.Operator] },
+  { value: OntimeView.Timer, label: viewLabels[OntimeView.Timer] },
+  { value: OntimeView.Backstage, label: viewLabels[OntimeView.Backstage] },
+  { value: OntimeView.Timeline, label: viewLabels[OntimeView.Timeline] },
+  { value: OntimeView.StudioClock, label: viewLabels[OntimeView.StudioClock] },
+  { value: OntimeView.Countdown, label: viewLabels[OntimeView.Countdown] },
+  { value: OntimeView.ProjectInfo, label: viewLabels[OntimeView.ProjectInfo] },
 ];

+const formId = 'url-preset-form';
+
 const defaultValues: URLPreset = {
  alias: '',
  target: OntimeView.Timer,
@@ -134,95 +137,101 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
  };

  return (
-    <Panel.Indent
-      as='form'
-      onSubmit={handleSubmit(setupSubmit)}
-      onKeyDown={(event) => preventEscape(event, onClose)}
-      className={style.column}
-    >
-      <input hidden name='enabled' value='true' />
+    <Modal
+      isOpen
+      onClose={onClose}
+      showBackdrop
+      showCloseButton
+      size='compact'
+      title={urlPreset ? 'Edit URL preset' : 'Create URL preset'}
+      bodyElements={
+        <form id={formId} onSubmit={handleSubmit(setupSubmit)} className={style.column}>
+          <input hidden name='enabled' value='true' />

-      <div>1. Enter URL and let Ontime generate the preset options</div>
-      <Panel.InlineElements>
-        <div>
-          <Panel.Description>Alias</Panel.Description>
-          <Input
-            {...register('alias', {
-              required: 'Alias is required',
-              pattern: {
-                value: isUrlSafe,
-                message: 'Field can only contain URL safe characters (a-z, 0-9, _ and -)',
-              },
-            })}
-          />
-        </div>
-        <div className={style.expand}>
-          <Panel.Description>Generate options (paste URL to generate options)</Panel.Description>
+          <div>1. Enter URL and let Ontime generate the preset options</div>
          <Panel.InlineElements>
-            <Input placeholder='Paste URL' fluid ref={urlRef} disabled={isEditingCuesheet} />
-            <Button onClick={generateOptions} disabled={isEditingCuesheet}>
-              Generate
-            </Button>
+            <div>
+              <Panel.Description>Alias</Panel.Description>
+              <Input
+                {...register('alias', {
+                  required: 'Alias is required',
+                  pattern: {
+                    value: isUrlSafe,
+                    message: 'Field can only contain URL safe characters (a-z, 0-9, _ and -)',
+                  },
+                })}
+              />
+            </div>
+            <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>
+              </Panel.InlineElements>
+            </div>
          </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>
-        </>
-      )}
+          {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>
-        <Panel.Error>{errors.root?.message}</Panel.Error>
-        <Panel.InlineElements align='end'>
+          {isCuesheet && (
+            <div>
+              <Panel.Description>Permissions</Panel.Description>
+              <CuesheetLinkOptions
+                initialRead={initialPermissions.current.read}
+                initialWrite={initialPermissions.current.write}
+                onChange={setCuesheetPermissions}
+              />
+            </div>
+          )}
+        </form>
+      }
+      footerElements={
+        <>
+          <Panel.Error>{errors.root?.message}</Panel.Error>
          <Button onClick={onClose}>Cancel</Button>
          <Button
            variant='primary'
            type='submit'
+            form={formId}
            disabled={!isValid || (!isDirty && !permissionsDirty) || noReadAccess}
            loading={isSubmitting || isMutating}
          >
            Save
          </Button>
-        </Panel.InlineElements>
-      </div>
-    </Panel.Indent>
+        </>
+      }
+    />
  );
 }
@@ -13,27 +13,30 @@ import * as Panel from '../../panel-utils/PanelUtils';
 import CustomFieldEntry from './composite/CustomFieldEntry';
 import CustomFieldForm from './composite/CustomFieldForm';

+type CustomFieldEntity = CustomField & { key: CustomFieldKey };
+
+type FormState = {
+  isOpen: boolean;
+  field?: CustomFieldEntity;
+};
+
 export default function CustomFieldSettings() {
  const { data, refetch } = useCustomFields();
-  const [isAdding, setIsAdding] = useState(false);
+  const [formState, setFormState] = useState<FormState>({ isOpen: false, field: undefined });

-  const handleInitiateCreate = () => {
-    setIsAdding(true);
-  };
+  const openNewForm = () => setFormState({ isOpen: true });
+  const openEditForm = (field: CustomFieldEntity) => setFormState({ isOpen: true, field });
+  const closeForm = () => setFormState({ isOpen: false, field: undefined });

-  const handleCancel = () => {
-    setIsAdding(false);
-  };
-
-  const handleCreate = async (customField: CustomField) => {
-    await postCustomField(customField);
-    refetch();
-    setIsAdding(false);
-  };
-
-  const handleEditField = async (key: CustomFieldKey, customField: CustomField) => {
-    await editCustomField(key, customField);
+  const handleSubmit = async (customField: CustomField) => {
+    const editing = formState.field;
+    if (editing) {
+      await editCustomField(editing.key, customField);
+    } else {
+      await postCustomField(customField);
+    }
    refetch();
+    closeForm();
  };

  const handleDelete = async (key: CustomFieldKey) => {
@@ -45,12 +48,24 @@ export default function CustomFieldSettings() {
    }
  };

+  const entries = Object.entries(data);
+
  return (
    <Panel.Section>
      <Panel.Card>
+        {formState.isOpen && (
+          <CustomFieldForm
+            onSubmit={handleSubmit}
+            onCancel={closeForm}
+            initialColour={formState.field?.colour}
+            initialLabel={formState.field?.label}
+            initialKey={formState.field?.key}
+            initialType={formState.field?.type}
+          />
+        )}
        <Panel.SubHeader>
          Custom fields
-          <Button onClick={handleInitiateCreate}>
+          <Button onClick={openNewForm}>
            New <IoAdd />
          </Button>
        </Panel.SubHeader>
@@ -66,7 +81,6 @@ export default function CustomFieldSettings() {
          </Info>
        </Panel.Section>
        <Panel.Section>
-          {isAdding && <CustomFieldForm onSubmit={handleCreate} onCancel={handleCancel} />}
          <Panel.Table>
            <thead>
              <tr>
@@ -78,7 +92,18 @@ export default function CustomFieldSettings() {
              </tr>
            </thead>
            <tbody>
-              {Object.entries(data).map(([key, { colour, label, type }]) => {
+              {entries.length === 0 && (
+                <Panel.TableEmpty
+                  title='No custom fields yet'
+                  description='Custom fields add your own columns to the rundown, and can be shown in views or used in automations.'
+                  action={
+                    <Button variant='primary' onClick={openNewForm}>
+                      Create custom field <IoAdd />
+                    </Button>
+                  }
+                />
+              )}
+              {entries.map(([key, { colour, label, type }]) => {
                return (
                  <CustomFieldEntry
                    key={key}
@@ -86,7 +111,7 @@ export default function CustomFieldSettings() {
                    colour={colour}
                    label={label}
                    type={type}
-                    onEdit={handleEditField}
+                    onEdit={() => openEditForm({ key, colour, label, type })}
                    onDelete={handleDelete}
                  />
                );
@@ -5,11 +5,14 @@ import { uploadCustomView } from '../../../../common/api/customViews';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import Input from '../../../../common/components/input/input/Input';
+import Modal from '../../../../common/components/modal/Modal';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { getFileError, getSlugError, getViewUrl, maxUploadLabel } from './customViews.utils';

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

+const formId = 'custom-view-form';
+
 interface CustomViewFormProps {
  onComplete: () => void;
  onClose: () => void;
@@ -53,62 +56,72 @@ export default function CustomViewForm({ onComplete, onClose }: CustomViewFormPr
  };

  return (
-    <Panel.Indent as='form' onSubmit={handleUpload} className={style.uploadForm}>
-      <input
-        ref={fileInputRef}
-        style={{ display: 'none' }}
-        type='file'
-        onChange={handleSelectFile}
-        accept='.html,text/html'
-      />
+    <Modal
+      isOpen
+      onClose={onClose}
+      showBackdrop
+      showCloseButton
+      size='compact'
+      title='Upload custom view'
+      bodyElements={
+        <form id={formId} onSubmit={handleUpload} className={style.uploadForm}>
+          <input
+            ref={fileInputRef}
+            style={{ display: 'none' }}
+            type='file'
+            onChange={handleSelectFile}
+            accept='.html,text/html'
+          />

-      <div className={style.step}>
-        <div className={style.stepTitle}>1. Choose a name</div>
-        <Panel.Description>Name</Panel.Description>
-        <Input
-          value={slug}
-          onChange={(event) => {
-            setSlug(event.target.value);
-            setSlugDirty(true);
-          }}
-          placeholder='my-view'
-          aria-label='Custom view name'
-          autoCapitalize='off'
-          autoComplete='off'
-          fluid
-        />
-        <Panel.Description>
-          Use lowercase letters, numbers, and dashes. Example: <Panel.Highlight>my-view</Panel.Highlight>
-        </Panel.Description>
-        <Panel.Description>
-          Preview URL: <Panel.Highlight>{previewUrl}</Panel.Highlight>
-        </Panel.Description>
-        {slugDirty && slugError && <Panel.Error>{slugError}</Panel.Error>}
-      </div>
+          <div className={style.step}>
+            <div className={style.stepTitle}>1. Choose a name</div>
+            <Panel.Description>Name</Panel.Description>
+            <Input
+              value={slug}
+              onChange={(event) => {
+                setSlug(event.target.value);
+                setSlugDirty(true);
+              }}
+              placeholder='my-view'
+              aria-label='Custom view name'
+              autoCapitalize='off'
+              autoComplete='off'
+              fluid
+            />
+            <Panel.Description>
+              Use lowercase letters, numbers, and dashes. Example: <Panel.Highlight>my-view</Panel.Highlight>
+            </Panel.Description>
+            <Panel.Description>
+              Preview URL: <Panel.Highlight>{previewUrl}</Panel.Highlight>
+            </Panel.Description>
+            {slugDirty && slugError && <Panel.Error>{slugError}</Panel.Error>}
+          </div>

-      <div className={style.step}>
-        <div className={style.stepTitle}>2. Select index.html</div>
-        <Panel.Description>Upload file</Panel.Description>
-        <Panel.InlineElements wrap='wrap' className={style.filePicker}>
-          <Button onClick={() => fileInputRef.current?.click()}>
-            {selectedFile ? 'Replace index.html' : 'Choose index.html'}
+          <div className={style.step}>
+            <div className={style.stepTitle}>2. Select index.html</div>
+            <Panel.Description>Upload file</Panel.Description>
+            <Panel.InlineElements wrap='wrap' className={style.filePicker}>
+              <Button onClick={() => fileInputRef.current?.click()}>
+                {selectedFile ? 'Replace index.html' : 'Choose index.html'}
+              </Button>
+              <span className={style.fileName}>
+                {selectedFile ? `${selectedFile.name} (${Math.ceil(selectedFile.size / 1024)} KB)` : 'No file selected'}
+              </span>
+            </Panel.InlineElements>
+            <Panel.Description>Accepted: index.html only, maximum {maxUploadLabel}.</Panel.Description>
+            {fileDirty && fileError && <Panel.Error>{fileError}</Panel.Error>}
+          </div>
+        </form>
+      }
+      footerElements={
+        <>
+          {error && <Panel.Error>{error}</Panel.Error>}
+          <Button onClick={onClose}>Cancel</Button>
+          <Button variant='primary' type='submit' form={formId} loading={isUploading} disabled={!canUpload}>
+            Upload view <IoCloudUploadOutline />
          </Button>
-          <span className={style.fileName}>
-            {selectedFile ? `${selectedFile.name} (${Math.ceil(selectedFile.size / 1024)} KB)` : 'No file selected'}
-          </span>
-        </Panel.InlineElements>
-        <Panel.Description>Accepted: index.html only, maximum {maxUploadLabel}.</Panel.Description>
-        {fileDirty && fileError && <Panel.Error>{fileError}</Panel.Error>}
-      </div>
-
-      {error && <Panel.Error>{error}</Panel.Error>}
-
-      <Panel.InlineElements align='end'>
-        <Button onClick={onClose}>Cancel</Button>
-        <Button variant='primary' type='submit' loading={isUploading} disabled={!canUpload}>
-          Upload view <IoCloudUploadOutline />
-        </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
+        </>
+      }
+    />
  );
 }
@@ -37,13 +37,14 @@ export default function CustomViews() {
  return (
    <Panel.Section>
      <Panel.Card>
+        {isUploadOpen && <CustomViewForm onComplete={handleUploadComplete} onClose={() => setIsUploadOpen(false)} />}
        <Panel.SubHeader>
          Custom views
          <Panel.InlineElements>
            <Button variant='ghosted' onClick={handleRestoreDemo} disabled={hasDemoView}>
              Restore demo
            </Button>
-            <Button onClick={() => setIsUploadOpen(true)} disabled={isUploadOpen}>
+            <Button onClick={() => setIsUploadOpen(true)}>
              New <IoAdd />
            </Button>
          </Panel.InlineElements>
@@ -63,8 +64,6 @@ export default function CustomViews() {
        <Panel.Section>
          <Panel.Loader isLoading={status === 'pending'} />

-          {isUploadOpen && <CustomViewForm onComplete={handleUploadComplete} onClose={() => setIsUploadOpen(false)} />}
-
          {actionError && <Panel.Error>{actionError}</Panel.Error>}

          <CustomViewsList
@@ -1,5 +1,6 @@
 import { CustomViewSummary } from 'ontime-types';
 import { useState } from 'react';
+import { IoCloudUploadOutline } from 'react-icons/io5';

 import { deleteCustomView } from '../../../../common/api/customViews';
 import { maybeAxiosError } from '../../../../common/api/utils';
@@ -53,7 +54,17 @@ export default function CustomViewsList({ views, onOpenUpload, onMutate, onError
          </tr>
        </thead>
        <tbody>
-          {views.length === 0 && <Panel.TableEmpty handleClick={onOpenUpload} label='No custom views yet' />}
+          {views.length === 0 && (
+            <Panel.TableEmpty
+              title='No custom views yet'
+              description='Upload a self-contained index.html to serve your own view alongside the built-in ones.'
+              action={
+                <Button variant='primary' onClick={onOpenUpload}>
+                  Upload view <IoCloudUploadOutline />
+                </Button>
+              }
+            />
+          )}
          {views.map((view, index) => (
            <CustomViewsListItem
              key={view.slug}
@@ -12,6 +12,13 @@
  gap: 1rem;
 }

-.current {
-  background-color: $blue-1100 !important; // fighting zebra styles
+.formColumn {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.current {
+  // marker consumed by the shared Panel.Table active-row treatment
+  background-color: inherit;
 }
@@ -3,9 +3,12 @@ import { useForm } from 'react-hook-form';

 import Button from '../../../../common/components/buttons/Button';
 import Input from '../../../../common/components/input/input/Input';
+import Modal from '../../../../common/components/modal/Modal';
 import { useMutateProjectRundowns } from '../../../../common/hooks-query/useProjectRundowns';
 import * as Panel from '../../panel-utils/PanelUtils';

+const formId = 'new-rundown-form';
+
 type NewRundownFormState = {
  title: string;
 };
@@ -42,22 +45,32 @@ export function ManageRundownForm({ onClose }: ManageRundownForm) {
  }, [setFocus]);

  return (
-    <Panel.Indent as='form' onSubmit={handleSubmit(createRundown)}>
-      <Panel.Section>
-        <label>
-          <Panel.Description>Rundown title</Panel.Description>
-          <Input {...register('title')} fluid placeholder='Your rundown name' />
-        </label>
-      </Panel.Section>
-      <Panel.InlineElements relation='inner' align='end'>
-        <Button variant='ghosted' disabled={isSubmitting} onClick={onClose}>
-          Cancel
-        </Button>
-        <Button type='submit' variant='primary' disabled={isSubmitting}>
-          Create rundown
-        </Button>
-      </Panel.InlineElements>
-      {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-    </Panel.Indent>
+    <Modal
+      isOpen
+      onClose={onClose}
+      showBackdrop
+      showCloseButton
+      size='small'
+      title='Create rundown'
+      bodyElements={
+        <form id={formId} onSubmit={handleSubmit(createRundown)}>
+          <label>
+            <Panel.Description>Rundown title</Panel.Description>
+            <Input {...register('title')} fluid placeholder='Your rundown name' maxLength={64} />
+          </label>
+        </form>
+      }
+      footerElements={
+        <>
+          {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+          <Button variant='ghosted' disabled={isSubmitting} onClick={onClose}>
+            Cancel
+          </Button>
+          <Button type='submit' form={formId} variant='primary' disabled={isSubmitting}>
+            Create rundown
+          </Button>
+        </>
+      }
+    />
  );
 }
@@ -153,7 +153,7 @@ export default function ManageRundowns() {
                    <tr key={id} className={cx([isLoaded && style.current])}>
                      <td>{numEntries}</td>
                      <td>
-                        {title} {isLoaded && <Tag>Loaded</Tag>}
+                        {title} {isLoaded && <Tag variant='active'>Loaded</Tag>}
                      </td>
                      <td>
                        <DropdownMenu
@@ -1,5 +1,4 @@
 import { CustomField, CustomFieldKey } from 'ontime-types';
-import { useState } from 'react';
 import { IoPencil, IoTrash } from 'react-icons/io5';

 import IconButton from '../../../../../common/components/buttons/IconButton';
@@ -7,7 +6,6 @@ import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
 import Swatch from '../../../../../common/components/input/colour-input/Swatch';
 import Tag from '../../../../../common/components/tag/Tag';
 import * as Panel from '../../../panel-utils/PanelUtils';
-import CustomFieldForm from './CustomFieldForm';

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

@@ -16,35 +14,12 @@ interface CustomFieldEntryProps {
  label: string;
  fieldKey: string;
  type: CustomField['type'];
-  onEdit: (key: CustomFieldKey, patch: CustomField) => Promise<void>;
+  onEdit: () => void;
  onDelete: (key: CustomFieldKey) => Promise<void>;
 }

 export default function CustomFieldEntry(props: CustomFieldEntryProps) {
  const { colour, label, fieldKey, type, onEdit, onDelete } = props;
-  const [isEditing, setIsEditing] = useState(false);
-
-  const handleEdit = async (patch: CustomField) => {
-    await onEdit(fieldKey, patch);
-    setIsEditing(false);
-  };
-
-  if (isEditing) {
-    return (
-      <tr>
-        <td colSpan={99}>
-          <CustomFieldForm
-            onCancel={() => setIsEditing(false)}
-            onSubmit={handleEdit}
-            initialColour={colour}
-            initialLabel={label}
-            initialKey={fieldKey}
-            initialType={type}
-          />
-        </td>
-      </tr>
-    );
-  }

  return (
    <tr>
@@ -61,7 +36,7 @@ export default function CustomFieldEntry(props: CustomFieldEntryProps) {
        </CopyTag>
      </td>
      <Panel.InlineElements relation='inner' as='td'>
-        <IconButton variant='ghosted-white' aria-label='Edit entry' onClick={() => setIsEditing(true)}>
+        <IconButton variant='ghosted-white' aria-label='Edit entry' onClick={onEdit}>
          <IoPencil />
        </IconButton>
        <IconButton variant='ghosted-destructive' aria-label='Delete entry' onClick={() => onDelete(fieldKey)}>
@@ -8,13 +8,15 @@ import Button from '../../../../../common/components/buttons/Button';
 import Info from '../../../../../common/components/info/Info';
 import SwatchSelect from '../../../../../common/components/input/colour-input/SwatchSelect';
 import Input from '../../../../../common/components/input/input/Input';
+import Modal from '../../../../../common/components/modal/Modal';
 import RadioGroup from '../../../../../common/components/radio-group/RadioGroup';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-import { preventEscape } from '../../../../../common/utils/keyEvent';
 import * as Panel from '../../../panel-utils/PanelUtils';

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

+const formId = 'custom-field-form';
+
 interface CustomFieldsFormProps {
  onSubmit: (field: CustomField) => Promise<void>;
  onCancel: () => void;
@@ -85,65 +87,77 @@ export default function CustomFieldForm({
  const isEditMode = initialKey !== undefined;

  return (
-    <Panel.Indent as='form' onSubmit={handleSubmit(setupSubmit)} onKeyDown={(event) => preventEscape(event, onCancel)}>
-      <Info>
-        Please note that images can quickly deteriorate your app&apos;s performance.
-        <br />
-        Prefer using small, and compressed images.
-      </Info>
-      <div>
-        <Panel.Description>Type</Panel.Description>
-        <RadioGroup
-          orientation='horizontal'
-          disabled={isEditMode}
-          onValueChange={(value) => setValue('type', value, { shouldDirty: true })}
-          value={watch('type')}
-          items={[
-            { value: 'text', label: 'Text' },
-            { value: 'image', label: 'Image' },
-          ]}
-        />
-      </div>
-      <div className={style.twoCols}>
-        <label>
-          <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
-          {errors.label && <Panel.Error>{errors.label.message}</Panel.Error>}
-          <Input
-            {...register('label', {
-              required: { value: true, message: 'Required field' },
-              onChange: () => setValue('key', customFieldLabelToKey(getValues('label')) ?? 'N/A'),
-              validate: (value) => {
-                if (value.trim().length === 0) return 'Required field';
-                if (!checkRegex.isAlphanumericWithSpace(value))
-                  return 'Only alphanumeric characters and space are allowed';
-                if (!isEditMode) {
-                  if (isEditMode && Object.keys(data).includes(value)) return 'Custom fields must be unique';
-                }
-                return true;
-              },
-            })}
-            fluid
-          />
-        </label>
+    <Modal
+      isOpen
+      onClose={onCancel}
+      showBackdrop
+      showCloseButton
+      size='compact'
+      title={isEditMode ? 'Edit custom field' : 'Create custom field'}
+      bodyElements={
+        <form id={formId} onSubmit={handleSubmit(setupSubmit)} className={style.formColumn}>
+          <Info>
+            Please note that images can quickly deteriorate your app&apos;s performance.
+            <br />
+            Prefer using small, and compressed images.
+          </Info>
+          <div>
+            <Panel.Description>Type</Panel.Description>
+            <RadioGroup
+              orientation='horizontal'
+              disabled={isEditMode}
+              onValueChange={(value) => setValue('type', value, { shouldDirty: true })}
+              value={watch('type')}
+              items={[
+                { value: 'text', label: 'Text' },
+                { value: 'image', label: 'Image' },
+              ]}
+            />
+          </div>
+          <div className={style.twoCols}>
+            <label>
+              <Panel.Description>Label (only alphanumeric characters are allowed)</Panel.Description>
+              {errors.label && <Panel.Error>{errors.label.message}</Panel.Error>}
+              <Input
+                {...register('label', {
+                  required: { value: true, message: 'Required field' },
+                  onChange: () => setValue('key', customFieldLabelToKey(getValues('label')) ?? 'N/A'),
+                  validate: (value) => {
+                    if (value.trim().length === 0) return 'Required field';
+                    if (!checkRegex.isAlphanumericWithSpace(value))
+                      return 'Only alphanumeric characters and space are allowed';
+                    if (!isEditMode && Object.hasOwn(data, customFieldLabelToKey(value) ?? '')) {
+                      return 'Custom fields must be unique';
+                    }
+                    return true;
+                  },
+                })}
+                fluid
+              />
+            </label>

-        <label>
-          <Panel.Description>Key (use in Integrations and API)</Panel.Description>
-          <Input {...register('key')} variant='ghosted' readOnly fluid />
-        </label>
-      </div>
-      <label>
-        <Panel.Description>Colour</Panel.Description>
-        <SwatchSelect name='colour' value={colour} handleChange={(_field, value) => handleSelectColour(value)} />
-      </label>
-      {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-      <Panel.InlineElements relation='inner' align='end'>
-        <Button variant='ghosted' onClick={onCancel}>
-          Cancel
-        </Button>
-        <Button type='submit' variant='primary' disabled={!canSubmit} loading={isSubmitting}>
-          Save
-        </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
+            <label>
+              <Panel.Description>Key (use in Integrations and API)</Panel.Description>
+              <Input {...register('key')} variant='ghosted' readOnly fluid />
+            </label>
+          </div>
+          <label>
+            <Panel.Description>Colour</Panel.Description>
+            <SwatchSelect name='colour' value={colour} handleChange={(_field, value) => handleSelectColour(value)} />
+          </label>
+        </form>
+      }
+      footerElements={
+        <>
+          {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
+          <Button variant='ghosted' onClick={onCancel}>
+            Cancel
+          </Button>
+          <Button type='submit' form={formId} variant='primary' disabled={!canSubmit} loading={isSubmitting}>
+            Save
+          </Button>
+        </>
+      }
+    />
  );
 }
@@ -59,6 +59,7 @@ export default function RundownRenameForm({ onSubmit, onCancel, initialTitle }:
              return true;
            },
          })}
+          maxLength={64}
          fluid
        />
        {errors.title && <Panel.Error>{errors.title.message}</Panel.Error>}
@@ -25,6 +25,13 @@
  margin-top: 1rem;
 }

+.finishActions {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 0.5rem;
+}
+
 .sourceGrid {
  display: grid;
  grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -8,6 +8,7 @@ import type {
 import { getErrorMessage, ImportMap } from 'ontime-utils';
 import { ChangeEvent, useCallback, useRef, useState } from 'react';
 import { IoCloudOutline, IoDownloadOutline } from 'react-icons/io5';
+import { useNavigate } from 'react-router';

 import {
  getWorksheetMetadata as getExcelWorksheetMetadata,
@@ -56,9 +57,11 @@ export default function SourcesPanel() {
  const [error, setError] = useState('');
  const [hasFile, setHasFile] = useState<'none' | 'loading' | 'done'>('none');
  const [activeSource, setActiveSource] = useState<ActiveSource | null>(null);
+  const [completedRundownTitle, setCompletedRundownTitle] = useState('');

  const { data: currentRundown } = useRundown();
  const { applyImport } = useSpreadsheetImport();
+  const navigate = useNavigate();

  const fileInputRef = useRef<HTMLInputElement>(null);

@@ -101,6 +104,7 @@ export default function SourcesPanel() {
    setHasFile('none');
    setActiveSource(null);
    setError('');
+    setCompletedRundownTitle('');
  };

  const openGSheetFlow = () => {
@@ -123,11 +127,12 @@ export default function SourcesPanel() {
    }
  };

-  const handleFinished = () => {
+  const handleFinished = (rundownTitle: string) => {
    setImportFlow('finished');
    setHasFile('none');
    setActiveSource(null);
    setError('');
+    setCompletedRundownTitle(rundownTitle);
  };

  const handleApplyImport = async (
@@ -139,7 +144,7 @@ export default function SourcesPanel() {
    if (mode === 'new') {
      const title = newRundownTitle.trim() || preview.rundown.title;
      await applyImport({ mode: 'new', rundown: { ...preview.rundown, title }, customFields: preview.customFields });
-      handleFinished();
+      handleFinished(title);
      return;
    }

@@ -156,7 +161,7 @@ export default function SourcesPanel() {
      customFields: preview.customFields,
      providedFields,
    });
-    handleFinished();
+    handleFinished(currentRundown.title);
  };

  const loadWorksheetMetadata = useCallback(
@@ -289,11 +294,20 @@ export default function SourcesPanel() {
        {showCompleted && (
          <div className={style.finishSection}>
            <span className={style.finishBadge}>Import complete</span>
-            <div className={style.finishTitle}>Spreadsheet data applied.</div>
-            <div className={style.finishDescription}>You can close this flow or start another import.</div>
-            <Button variant='subtle-white' onClick={resetFlow}>
-              Reset flow
-            </Button>
+            <div className={style.finishTitle}>
+              Spreadsheet data applied to {completedRundownTitle || 'your rundown'}.
+            </div>
+            <div className={style.finishDescription}>
+              Review the imported rundown in the editor or start another import.
+            </div>
+            <div className={style.finishActions}>
+              <Button variant='primary' onClick={() => navigate('/editor')}>
+                Open editor
+              </Button>
+              <Button variant='subtle-white' onClick={resetFlow}>
+                Import another
+              </Button>
+            </div>
          </div>
        )}
        {isGSheetFlow && (
@@ -92,6 +92,10 @@
  font-weight: 600;
 }

+.toolbarWarning {
+  color: $orange-400;
+}
+
 .mappingPaneTitle {
  align-self: center;
 }
@@ -132,7 +132,16 @@ export default function SheetImportEditor({
            }
          />
        </label>
-        {toolbarStatus && <Panel.Description>{toolbarStatus}</Panel.Description>}
+        {toolbarStatus && (
+          <Panel.Description>
+            {toolbarStatus.entries === '–'
+              ? 'No import preview yet'
+              : `${toolbarStatus.entries} entries · ${toolbarStatus.groups} groups · ${toolbarStatus.milestones} milestones · ${toolbarStatus.start}–${toolbarStatus.end} · ${toolbarStatus.duration}`}
+            {toolbarStatus.warnings > 0 && (
+              <span className={style.toolbarWarning}> · {toolbarStatus.warnings} warnings</span>
+            )}
+          </Panel.Description>
+        )}
      </Panel.InlineElements>

      <div className={style.editorBody}>
@@ -150,13 +159,19 @@ export default function SheetImportEditor({

        <section className={style.previewPane}>
          <div className={style.previewPaneHeader}>
-            <span className={style.previewPaneTitle}>Import preview</span>
+            <div className={style.previewPaneHeading}>
+              <span className={style.previewPaneTitle}>Import preview</span>
+            </div>
          </div>
          <div className={style.tableShell}>
            <PreviewTable
              preview={state.preview}
              columnLabels={columnLabels}
+              canRefresh={canPreview}
              isLoadingMetadata={isLoadingMetadata}
+              isRefreshing={state.loading === 'preview'}
+              needsPreviewRefresh={state.needsPreviewRefresh}
+              onRefresh={handlePreviewSubmit}
              worksheetHeaders={worksheetHeaders}
            />
          </div>
@@ -1,27 +1,8 @@
-.emptyState {
-  height: 100%;
-  min-height: 16rem;
-  display: grid;
-  place-content: center;
-  gap: 0.35rem;
-  padding: 1.5rem;
-  text-align: center;
-}
-
-.emptyTitle {
-  color: $ui-white;
-  font-size: 1rem;
-  font-weight: 600;
-}
-
-.emptyBody {
-  color: $gray-400;
-  font-size: 0.95rem;
-}
-
 .table {
  width: 100%;
-  border-collapse: collapse;
+  border-collapse: separate;
+  border-spacing: 0;
+  color: $ui-white;
  font-size: calc(1rem - 2px);
  text-align: left;
  table-layout: auto;
@@ -34,31 +15,101 @@
  }

  th {
-    font-weight: 400;
-    color: $gray-400;
-    text-transform: capitalize;
-    vertical-align: top;
+    color: $gray-300;
+    font-size: 0.8rem;
+    font-weight: 600;
+    letter-spacing: 0.02em;
+    text-transform: uppercase;
+    vertical-align: bottom;
    white-space: normal;
  }

  th,
  td {
-    padding: 0.5rem;
+    box-sizing: border-box;
    min-width: 8rem;
-    vertical-align: top;
+    max-width: 20rem;
+    padding: 0.55rem 0.65rem;
+    border-bottom: 1px solid $white-10;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+    white-space: nowrap;
  }

-  tr:nth-child(even) {
-    background-color: $white-1;
+  tbody tr {
+    --entry-colour: transparent;
+    background-color: color-mix(in srgb, $gray-1300 96%, var(--entry-colour) 4%);
+    box-shadow: inset 3px 0 var(--entry-colour);
  }
+
+  td[data-empty='true'] {
+    color: $gray-600;
+  }
+}
+
+.rowNumber,
+.rowType {
+  position: sticky;
+  z-index: 1;
+  background-color: inherit;
 }

 .rowNumber {
-  width: 4.5rem;
-  min-width: 4.5rem;
+  left: 0;
+  width: 3.25rem;
+  min-width: 3.25rem !important;
+  color: $gray-400;
+  text-align: right;
 }

 .rowType {
-  width: 7rem;
-  min-width: 7rem;
+  left: 3.25rem;
+  width: 6.25rem;
+  min-width: 6.25rem !important;
+  color: $gray-400;
+  font-size: 0.8rem;
+  box-shadow: 1px 0 $white-10;
+}
+
+thead .rowNumber,
+thead .rowType {
+  z-index: 2;
+  background-color: $gray-1350;
+}
+
+.numericCell {
+  font-variant-numeric: tabular-nums;
+  text-align: right;
+}
+
+.multilineCell {
+  max-width: 30rem !important;
+  overflow-wrap: anywhere;
+  text-overflow: clip !important;
+  white-space: pre-wrap !important;
+}
+
+.eventRow {
+  .rowNumber {
+    font-variant-numeric: tabular-nums;
+  }
+}
+
+.groupRow {
+  background-color: color-mix(in srgb, $gray-1300 88%, var(--entry-colour) 12%) !important;
+  box-shadow: inset 4px 0 var(--entry-colour) !important;
+  font-weight: 600;
+
+  td {
+    min-height: 3.25rem;
+    border-top: 0.75rem solid $gray-1350;
+  }
+}
+
+.milestoneRow {
+  background-color: color-mix(in srgb, $gray-1300 93%, var(--entry-colour) 7%) !important;
+  box-shadow: inset 3px 0 var(--entry-colour) !important;
+  color: $gray-300;
+  font-style: italic;
 }
@@ -1,7 +1,12 @@
 import type { CustomField, CustomFieldKey, SpreadsheetPreviewResponse } from 'ontime-types';
-import { isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { isOntimeDelay, isOntimeEvent, isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import type { CSSProperties } from 'react';
 import { useMemo } from 'react';

+import Button from '../../../../../../../common/components/buttons/Button';
+import Tag from '../../../../../../../common/components/tag/Tag';
+import { getRundownMetadata } from '../../../../../../../common/utils/rundownMetadata';
+import * as Panel from '../../../../../panel-utils/PanelUtils';
 import { getCellValue } from './previewTableUtils';

 import style from './PreviewTable.module.scss';
@@ -9,14 +14,85 @@ import style from './PreviewTable.module.scss';
 interface PreviewTableProps {
  preview: SpreadsheetPreviewResponse | null;
  columnLabels: string[];
+  canRefresh: boolean;
  isLoadingMetadata: boolean;
+  isRefreshing: boolean;
+  needsPreviewRefresh: boolean;
+  onRefresh: () => void;
  worksheetHeaders: string[];
 }

+const priorityColumns = ['Title', 'Cue', 'Start', 'End', 'Duration'];
+const numericColumns = new Set(['Start', 'End', 'Duration', 'Time warning', 'Time danger']);
+const transparentColour = 'transparent';
+
+type PreviewEntry = SpreadsheetPreviewResponse['rundown']['entries'][string];
+
+function getEntryDisplay(entry: PreviewEntry, groupColour?: string) {
+  if (isOntimeGroup(entry)) {
+    return {
+      rowClassName: style.groupRow,
+      entryColour: entry.colour,
+      entryType: 'Group',
+    };
+  }
+
+  const entryColour = groupColour ?? transparentColour;
+
+  if (isOntimeMilestone(entry)) {
+    return {
+      rowClassName: style.milestoneRow,
+      entryColour,
+      entryType: 'Milestone',
+    };
+  }
+
+  if (isOntimeDelay(entry)) {
+    return {
+      rowClassName: style.eventRow,
+      entryColour,
+      entryType: 'Delay',
+    };
+  }
+
+  return {
+    rowClassName: style.eventRow,
+    entryColour,
+    entryType: 'Event',
+  };
+}
+
+function getCellClassName(label: string, value: string) {
+  if (value.includes('\n')) {
+    return style.multilineCell;
+  }
+
+  if (numericColumns.has(label)) {
+    return style.numericCell;
+  }
+
+  return undefined;
+}
+
+function getDisplayColumns(columnLabels: string[]) {
+  return [...columnLabels].sort((left, right) => {
+    const leftPriority = priorityColumns.indexOf(left);
+    const rightPriority = priorityColumns.indexOf(right);
+    return (
+      (leftPriority === -1 ? priorityColumns.length : leftPriority) -
+      (rightPriority === -1 ? priorityColumns.length : rightPriority)
+    );
+  });
+}
+
 export default function PreviewTable({
  preview,
  columnLabels,
+  canRefresh,
  isLoadingMetadata,
+  isRefreshing,
+  needsPreviewRefresh,
+  onRefresh,
  worksheetHeaders,
 }: PreviewTableProps) {
  const customFieldKeyByLabel = useMemo(() => {
@@ -24,33 +100,51 @@ export default function PreviewTable({
    return new Map(Object.entries(preview.customFields).map(([fieldId, field]) => [field.label, fieldId]));
  }, [preview]);

+  const displayColumns = useMemo(() => getDisplayColumns(columnLabels), [columnLabels]);
+
+  const previewMetadata = useMemo(() => {
+    if (!preview) return null;
+    return getRundownMetadata(preview.rundown, null);
+  }, [preview]);
+
  if (!preview) {
+    let emptyTitle = 'Preview not generated';
    let emptyContent = 'Select the fields you want to import, then click Preview import.';

    if (isLoadingMetadata) {
+      emptyTitle = 'Loading worksheet';
      emptyContent = 'Loading worksheet metadata...';
    } else if (worksheetHeaders.length === 0) {
+      emptyTitle = 'No headers found';
      emptyContent =
        'No column headers detected in this worksheet. Try a different worksheet or ensure the first row contains column headers.';
+    } else if (needsPreviewRefresh) {
+      emptyTitle = 'Preview needs updating';
+      emptyContent = 'Your column mapping changed. Preview the import again to update this table.';
    }

    return (
-      <div className={style.emptyState}>
-        <div className={style.emptyTitle}>Preview not generated</div>
-        <div className={style.emptyBody}>{emptyContent}</div>
-      </div>
+      <Panel.EmptyState
+        title={emptyTitle}
+        description={emptyContent}
+        action={
+          needsPreviewRefresh && (
+            <Button variant='primary' onClick={onRefresh} disabled={!canRefresh} loading={isRefreshing}>
+              Refresh preview
+            </Button>
+          )
+        }
+      />
    );
  }

-  let eventIndex = 0;
-
  return (
    <table className={style.table}>
      <thead>
        <tr>
          <th className={style.rowNumber}>#</th>
          <th className={style.rowType}>Type</th>
-          {columnLabels.map((label, index) => (
+          {displayColumns.map((label, index) => (
            <th key={`${label}-${index}`}>{label}</th>
          ))}
        </tr>
@@ -59,16 +153,29 @@ export default function PreviewTable({
        {preview.rundown.flatOrder.map((entryId) => {
          const entry = preview.rundown.entries[entryId];
          const isEvent = isOntimeEvent(entry);
-          if (isEvent) eventIndex++;
-          const hasType = isEvent || isOntimeGroup(entry) || isOntimeMilestone(entry);
+          const entryMetadata = previewMetadata?.[entryId];
+          const { rowClassName, entryColour, entryType } = getEntryDisplay(entry, entryMetadata?.groupColour);

          return (
-            <tr key={entryId}>
-              <td className={style.rowNumber}>{isEvent ? eventIndex : ''}</td>
-              <td className={style.rowType}>{hasType ? entry.type : ''}</td>
-              {columnLabels.map((label, colIndex) => (
-                <td key={`${entryId}-${colIndex}`}>{getCellValue(label, entry, customFieldKeyByLabel)}</td>
-              ))}
+            <tr key={entryId} className={rowClassName} style={{ '--entry-colour': entryColour } as CSSProperties}>
+              <td className={style.rowNumber}>{isEvent ? entryMetadata?.eventIndex : ''}</td>
+              <td className={style.rowType}>
+                <Tag>{entryType}</Tag>
+              </td>
+              {displayColumns.map((label, colIndex) => {
+                const value = getCellValue(label, entry, customFieldKeyByLabel);
+                const cellClassName = getCellClassName(label, value);
+                return (
+                  <td
+                    key={`${entryId}-${colIndex}`}
+                    className={cellClassName}
+                    data-empty={value === ''}
+                    title={value || undefined}
+                  >
+                    {value}
+                  </td>
+                );
+              })}
            </tr>
          );
        })}
@@ -5,7 +5,8 @@ import type {
  SpreadsheetPreviewResponse,
  SpreadsheetWorksheetMetadata,
 } from 'ontime-types';
-import { millisToString } from 'ontime-utils';
+import { isOntimeGroup, isOntimeMilestone } from 'ontime-types';
+import { millisToString, removeTrailingZero } from 'ontime-utils';
 import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';

@@ -32,7 +33,7 @@ type ImportAction =
  | { type: 'previewSuccess'; preview: SpreadsheetPreviewResponse }
  | { type: 'applySuccess' }
  | { type: 'exportSuccess' }
-  | { type: 'clearPreview'; error?: string }
+  | { type: 'clearPreview'; error?: string; needsRefresh?: boolean }
  | { type: 'failure'; error: string }
  | { type: 'reset' };

@@ -40,12 +41,14 @@ type ImportState = {
  loading: '' | 'preview' | 'apply' | 'export';
  error: string;
  preview: SpreadsheetPreviewResponse | null;
+  needsPreviewRefresh: boolean;
 };

 const initialImportState: ImportState = {
  loading: '',
  error: '',
  preview: null,
+  needsPreviewRefresh: false,
 };

 function importReducer(state: ImportState, action: ImportAction): ImportState {
@@ -57,15 +60,15 @@ function importReducer(state: ImportState, action: ImportAction): ImportState {
    case 'startExport':
      return { ...state, loading: 'export', error: '' };
    case 'previewSuccess':
-      return { loading: '', error: '', preview: action.preview };
+      return { loading: '', error: '', preview: action.preview, needsPreviewRefresh: false };
    case 'applySuccess':
    case 'exportSuccess':
      return { ...state, loading: '' };
    case 'clearPreview':
-      return { ...state, error: action.error ?? '', preview: null };
+      return { ...state, error: action.error ?? '', preview: null, needsPreviewRefresh: action.needsRefresh ?? false };
    case 'failure': {
      if (state.loading === 'preview') {
-        return { loading: '', error: action.error, preview: null };
+        return { loading: '', error: action.error, preview: null, needsPreviewRefresh: false };
      }
      return { ...state, loading: '', error: action.error };
    }
@@ -221,7 +224,7 @@ export function useSheetImportForm({
    const sub = watch(() => {
      if (!previewRef.current) return;
      previewRef.current = null;
-      dispatch({ type: 'clearPreview' });
+      dispatch({ type: 'clearPreview', needsRefresh: true });
    });
    return () => sub.unsubscribe();
  }, [watch]);
@@ -297,15 +300,37 @@ export function useSheetImportForm({
  }, [append]);

  const toolbarStatus = (() => {
-    const warningText = warningCount > 0 ? ` | warnings: ${warningCount}` : '';
-
    if (!state.preview) {
-      return `entries: – | start: – | end: – | duration: –${warningText}`;
+      return {
+        entries: '–',
+        groups: '–',
+        milestones: '–',
+        start: '–',
+        end: '–',
+        duration: '–',
+        warnings: warningCount,
+      };
    }

-    const { flatOrder } = state.preview.rundown;
+    const { entries, flatOrder } = state.preview.rundown;
    const { start, end, duration } = state.preview.summary;
-    return `entries: ${flatOrder.length} | start: ${millisToString(start)} | end: ${millisToString(end)} | duration: ${formatDuration(duration)}${warningText}`;
+    let groups = 0;
+    let milestones = 0;
+    for (const entryId of flatOrder) {
+      const entry = entries[entryId];
+      if (isOntimeGroup(entry)) groups++;
+      else if (isOntimeMilestone(entry)) milestones++;
+    }
+
+    return {
+      entries: flatOrder.length,
+      groups,
+      milestones,
+      start: removeTrailingZero(millisToString(start)),
+      end: removeTrailingZero(millisToString(end)),
+      duration: formatDuration(duration),
+      warnings: warningCount,
+    };
  })();

  return {
@@ -16,6 +16,22 @@
  user-select: text;
 }

-.self {
-  background-color: $blue-1100;
+.actionsCell {
+  width: 1%;
+  white-space: nowrap;
+  text-align: right;
+}
+
+.actionsHeader {
+  text-align: right;
+}
+
+.actionsGroup {
+  width: 100%;
+  justify-content: flex-end;
+}
+
+.current {
+  // marker consumed by the shared Panel.Table active-row treatment
+  background-color: inherit;
 }
@@ -64,50 +64,58 @@ export default function ClientList() {
            <tr>
              <td style={{ width: '20%' }}>Client Name</td>
              <td>Path</td>
-              <td />
+              <td className={style.actionsHeader} />
            </tr>
          </thead>
          <tbody>
+            {ontimeClients.length === 0 && (
+              <Panel.TableEmpty
+                title='No Ontime clients connected'
+                description='Editor, cuesheet and operator windows appear here as they connect.'
+              />
+            )}
            {ontimeClients.map(([key, client]) => {
              const { identify, name, path } = client;
              const isCurrent = id === key;
              return (
-                <tr key={key} className={cx([isCurrent && style.self])}>
+                <tr key={key} className={cx([isCurrent && style.current])}>
                  <Panel.InlineElements relation='inner' as='td'>
-                    {isCurrent && <Tag>SELF</Tag>}
+                    {isCurrent && <Tag variant='active'>SELF</Tag>}
                    {name}
                  </Panel.InlineElements>
                  <td className={style.copiable}>{path}</td>
-                  <Panel.InlineElements relation='inner' as='td'>
-                    <Button
-                      size='small'
-                      className={`${identify ? style.blink : ''}`}
-                      disabled={isCurrent}
-                      variant={identify ? 'primary' : 'subtle'}
-                      data-testid={isCurrent ? '' : 'not-self-identify'}
-                      onClick={() => {
-                        setIdentify({ target: key, identify: !identify });
-                      }}
-                    >
-                      Identify
-                    </Button>
-                    <Button
-                      size='small'
-                      data-testid={isCurrent ? '' : 'not-self-rename'}
-                      onClick={() => openRename(key)}
-                    >
-                      Rename
-                    </Button>
+                  <td className={style.actionsCell}>
+                    <Panel.InlineElements relation='inner' align='end' className={style.actionsGroup}>
+                      <Button
+                        size='small'
+                        className={`${identify ? style.blink : ''}`}
+                        disabled={isCurrent}
+                        variant={identify ? 'primary' : 'subtle'}
+                        data-testid={isCurrent ? '' : 'not-self-identify'}
+                        onClick={() => {
+                          setIdentify({ target: key, identify: !identify });
+                        }}
+                      >
+                        Identify
+                      </Button>
+                      <Button
+                        size='small'
+                        data-testid={isCurrent ? '' : 'not-self-rename'}
+                        onClick={() => openRename(key)}
+                      >
+                        Rename
+                      </Button>

-                    <Button
-                      size='small'
-                      disabled={isCurrent}
-                      data-testid={isCurrent ? '' : 'not-self-redirect'}
-                      onClick={() => openRedirect(key)}
-                    >
-                      Redirect
-                    </Button>
-                  </Panel.InlineElements>
+                      <Button
+                        size='small'
+                        disabled={isCurrent}
+                        data-testid={isCurrent ? '' : 'not-self-redirect'}
+                        onClick={() => openRedirect(key)}
+                      >
+                        Redirect
+                      </Button>
+                    </Panel.InlineElements>
+                  </td>
                </tr>
              );
            })}
@@ -125,6 +133,12 @@ export default function ClientList() {
            </tr>
          </thead>
          <tbody>
+            {otherClients.length === 0 && (
+              <Panel.TableEmpty
+                title='No other clients connected'
+                description='Views and integrations connected to this server are listed here.'
+              />
+            )}
            {otherClients.map(([key, client]) => {
              const { name, type } = client;

@@ -1,29 +1,21 @@
 import { ChangeEvent, useRef, useState } from 'react';
 import { IoAdd } from 'react-icons/io5';
-import { useSearchParams } from 'react-router';

 import { uploadProjectFile } from '../../../../common/api/db';
 import { invalidateAllCaches, maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import { validateProjectFile } from '../../../../common/utils/uploadUtils';
 import * as Panel from '../../panel-utils/PanelUtils';
-import ProjectCreateForm from './ProjectCreateForm';
+import useAppSettingsNavigation from '../../useAppSettingsNavigation';
 import ProjectList from './ProjectList';

 export default function ManageProjects() {
-  const [searchParams, setSearchParams] = useSearchParams();
+  const { setLocation } = useAppSettingsNavigation();
  const [error, setError] = useState('');
  const [loading, setLoading] = useState<'import' | null>(null);

  const fileInputRef = useRef<HTMLInputElement>(null);

-  const isCreatingProject = searchParams.get('new') === 'true';
-
-  const handleToggleCreate = () => {
-    searchParams.set('new', isCreatingProject ? 'false' : 'true');
-    setSearchParams(searchParams);
-  };
-
  const handleSelectFile = () => {
    fileInputRef.current?.click();
  };
@@ -49,11 +41,6 @@ export default function ManageProjects() {
    setLoading(null);
  };

-  const handleCloseForm = () => {
-    searchParams.delete('new');
-    setSearchParams(searchParams);
-  };
-
  return (
    <Panel.Section>
      <input
@@ -68,21 +55,16 @@ export default function ManageProjects() {
        <Panel.SubHeader>
          Manage projects
          <Panel.InlineElements>
-            <Button
-              onClick={handleSelectFile}
-              disabled={Boolean(loading) || isCreatingProject}
-              loading={loading === 'import'}
-            >
+            <Button onClick={handleSelectFile} disabled={Boolean(loading)} loading={loading === 'import'}>
              Import
            </Button>
-            <Button onClick={handleToggleCreate} disabled={Boolean(loading) || isCreatingProject}>
+            <Button onClick={() => setLocation('project__create')} disabled={Boolean(loading)}>
              New <IoAdd />
            </Button>
          </Panel.InlineElements>
        </Panel.SubHeader>
        {error && <Panel.Error>{error}</Panel.Error>}
        <Panel.Divider />
-        {isCreatingProject && <ProjectCreateForm onClose={handleCloseForm} />}
        <ProjectList />
      </Panel.Card>
    </Panel.Section>
@@ -1,84 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-
-import { createProject } from '../../../../common/api/db';
-import { maybeAxiosError } from '../../../../common/api/utils';
-import Button from '../../../../common/components/buttons/Button';
-import Input from '../../../../common/components/input/input/Input';
-import { preventEscape } from '../../../../common/utils/keyEvent';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-import style from './ProjectPanel.module.scss';
-
-interface ProjectCreateFromProps {
-  onClose: () => void;
-}
-
-type ProjectCreateFormValues = {
-  title?: string;
-  description?: string;
-  info?: string;
-  url?: string;
-  custom?: { title: string; value: string }[];
-};
-
-export default function ProjectCreateForm({ onClose }: ProjectCreateFromProps) {
-  const [error, setError] = useState<string | null>(null);
-
-  const {
-    handleSubmit,
-    register,
-    formState: { isSubmitting, isValid },
-    setFocus,
-  } = useForm<ProjectCreateFormValues>({
-    defaultValues: { title: '' },
-    values: { title: '' },
-    resetOptions: {
-      keepDirtyValues: true,
-    },
-  });
-
-  // set focus to first field
-  useEffect(() => {
-    setFocus('title');
-  }, [setFocus]);
-
-  const handleSubmitCreate = async (values: ProjectCreateFormValues) => {
-    try {
-      setError(null);
-
-      const filename = values.title ?? 'untitled';
-
-      await createProject({ filename });
-
-      onClose();
-    } catch (error) {
-      setError(maybeAxiosError(error));
-    }
-  };
-
-  return (
-    <Panel.Indent
-      as='form'
-      onSubmit={handleSubmit(handleSubmitCreate)}
-      onKeyDown={(event) => preventEscape(event, onClose)}
-    >
-      <Panel.Title>
-        Create new project
-        <Panel.InlineElements>
-          <Button onClick={onClose} variant='ghosted' disabled={isSubmitting}>
-            Cancel
-          </Button>
-          <Button disabled={!isValid} type='submit' loading={isSubmitting} variant='primary'>
-            Create project
-          </Button>
-        </Panel.InlineElements>
-      </Panel.Title>
-      {error && <Panel.Error>{error}</Panel.Error>}
-      <Panel.Section className={style.innerColumn}>
-        <Panel.Description>Project title</Panel.Description>
-        <Input fluid placeholder='Your project name' {...register('title')} />
-      </Panel.Section>
-    </Panel.Indent>
-  );
-}
@@ -40,7 +40,7 @@ export default function ProjectList() {

  if (status === 'pending') {
    return (
-      <div className={style.empty}>
+      <div className={style.loaderBox}>
        <Panel.Loader isLoading />
      </div>
    );
@@ -74,6 +74,12 @@ export default function ProjectList() {
          </tr>
        </thead>
        <tbody>
+          {numProjects === 0 && (
+            <Panel.TableEmpty
+              title='No projects yet'
+              description='Projects are the show files Ontime saves your rundown and settings into. Create one to get started.'
+            />
+          )}
          {data.reorderedProjectFiles.map((project) => (
            <ProjectListItem
              key={project.filename}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Claude	3d904f7cc6	Fix rundown-switch data loss and clone key divergence found in review Two real bugs in the clone work, both confirmed with repros before fixing and re-confirmed by reverting each fix afterwards. 1. Data loss on every rundown switch (blocker). cachedRundown was a module-level const mutated in place by init(). Once setRundown stored by reference, db.data.rundowns[loadedId] aliased that object, so loading a second rundown rewrote the first one's stored record in place. Repro: after init(A) then init(B), store['rundown-a'] had id 'rundown-b', title 'B' and order ['b1'] - A's data was gone, and both keys pointed at one object. The earlier audit missed this because it only asked whether callers mutate an object after handing it over, within one rundown's lifetime. It never considered that cachedRundown is a singleton reused across different rundowns, which is where the aliasing actually bites. Fixed at the root: cachedRundown is now reassigned rather than repurposed, so a stored record keeps pointing at the data it was stored for. Mutating in place from commit, while it still represents the same rundown, is unchanged and is what keeps the stored record current. Every getCurrentRundown() call site was checked - all are locals used within a single operation, none held across a switch. 2. cloneEntryData was not key-equal to structuredClone. For an entry without a custom/triggers/entries key, the spread-then- override form added those as own keys ('custom' as {}, 'triggers' as undefined). fast-equals deepEqual counts own keys, so a clone never compared equal to its source, which is the comparison runtime.service.ts uses to decide whether to re-broadcast - reinstating the per-tick re-broadcast and restore-save this PR had already fixed once. Dropping `?? []` earlier corrected the value but not the key. Containers are now only replaced when the entry carries them. The regression test was vacuous: toBeUndefined() passes for both an absent key and an own key holding undefined. It now asserts key equality against structuredClone plus deepEqual, and was verified to fail against the previous implementation. Typecheck, lint, format and the full suite (706 tests) pass.	2026-08-25 05:32:52 +00:00
Claude	a2ec4d0d3f	Remove the second full-rundown clone from DataProvider.setRundown setRundown deep-cloned every rundown a second time on top of the clone createTransaction already makes - the only two callers that matter for correctness are the ones passing the live cachedRundown singleton, and db.data.rundowns[key] is only ever replaced wholesale, never mutated in place, so aliasing it introduces no corruption path. The other six call sites already pass a freshly-built object they never touch again, for which the clone was pure waste. setRundown now takes ownership of `newData` and stores it by reference, documented on the function. Verified with a throwaway suite (deleted, per instructions, once green) covering: - the reference stored is the exact one passed in, not a copy - round-trip content correctness is unchanged - a mutation to the source after setRundown is visible through getRundown, which is the new contract, not a regression - pinned explicitly so it reads as intentional - the fresh-object call sites (duplicate, import, rename, etc.) are unaffected - mergeRundown / deleteRundown / not-found still behave correctly - perf: setRundown on a 1000-entry rundown dropped from ~557us/call to ~5us/call Real disk I/O could not be exercised in that suite - lowdb's JSONFilePreset forces an in-memory adapter whenever NODE_ENV=test, which vitest always sets, independent of this project's own IS_TEST flag. That's fine: this change only affects which object reference ends up at db.data.rundowns[key], not persist()'s debounce/write-scheduling logic, which is untouched, so checking that state directly is equivalent to checking what a real write would serialize. Full suite (705 tests), typecheck, and lint all pass on the final diff, which is 8 lines changed in one file.	2026-08-25 05:08:02 +00:00
Claude	2d5a328636	Simplify entry clone back to a spread, cover it with two generic tests The per-type clone functions from the previous commit listed every field of every entry type, which was a lot of code for a change meant to be a drop-in swap. They are replaced by the spread they were written to guard, keeping both review fixes and the exhaustiveness guard. The explicit literals were also weaker than they looked. They forced a new field to be named, but nothing stopped it being named as a plain alias, which is the actual bug we care about. The guarantee now comes from a test that walks a clone against its source and fails on any shared nested object or array. That covers a field added later without the clone enumerating fields, and it names the path it found: entry.triggers.0 is shared with the source Paired with a field-for-field comparison against structuredClone, the two tests pin both halves of the contract - same value, no shared references - and both were confirmed to fail when the corresponding fix is reverted. Dropping the literals also removes the `parent: undefined` divergence they introduced on entries that omit the key, since a spread copies exactly the keys that are present. Net: the diff for this PR goes from 261 to 159 added lines, with rundown.utils.ts down from 132 to 52.	2026-08-24 18:56:57 +00:00
Claude	10dffb5d72	Address PR review: deep-clone triggers, stop normalising absent values Replaces the generic type machinery around cloneEntryData with a concrete clone per entry type, and fixes two review findings. Types: ReferenceKeys / EntryOfType / ClonedReferenceFields / UnclonedReferenceFields / AssertNever are gone. There are only four entry types, so each gets its own small function listing every field explicitly - the same pattern the create*Patch functions in this file already use. Adding a field to an entry type still fails to compile until it is handled, but now with a plain "property is missing" error rather than a constraint on never, and the clone reads as the logic it is instead of type gymnastics. The exhaustiveness guard in the switch is kept, so a new SupportedEntry member is still named in a compile error. Fixes, both from review: - triggers were copied with slice(), which shares every Trigger object with the source. A mutable transaction could edit a trigger of the cached rundown before commit. Each trigger is now copied too, making the structuredClone contract actually true - custom and entries were already deep since their values are primitives. - triggers and entries were normalised from undefined to [], so an entry missing either field never compared equal to its own snapshot. That would have the runtime re-broadcast and re-save the restore point on every tick. An absent value is now left absent. Tests: cloneEntryData is compared field-for-field against structuredClone for all four entry types built from the real factories, plus aliasing coverage for custom, triggers (array and elements), and group entries, the absent-value regression, and the unknown-type throw. Each was confirmed to fail when the corresponding fix is reverted. The remaining review comment, about the missing default branch, was already fixed in `4548798`.	2026-08-24 18:51:39 +00:00
Claude	45487985be	Make cloneEntryData fail to compile when an entry shape changes cloneEntryData relies on a spread plus a hand-written list of the nested containers to copy. Nothing tied that list to the real types, so adding a reference-typed field to an entry - or a new entry type - would silently produce a clone that aliases the new field back to the source, which is the exact bug the custom clone exists to avoid. Two compile-time guards, both verified by temporarily mutating the shared types: - ClonedReferenceFields declares, per entry type, the reference-typed fields the switch copies. UnclonedReferenceFields diffs that against the fields the types actually have, computed via ReferenceKeys. Adding `attachments: string[]` to OntimeEvent now fails with `Type '"attachments"' does not satisfy the constraint 'never'`, naming the offending field. Adding a primitive field stays silent, since the spread already copies it by value and no action is needed. - A default branch in the switch asserts the entry is never. Adding a SupportedEntry member fails with `Type 'OntimeMarker' is not assignable to type 'never'`, and separately at the ClonedReferenceFields index, which is no longer total. Branded primitives such as Day (number & Brand<'day'>) correctly classify as primitives, so they are not flagged. Typecheck, lint, format and the full suite (695 tests) pass unchanged.	2026-08-23 19:59:56 +00:00
Claude	c6c25cebcc	Make createTransaction's rundown deep-readonly when not mutable Overload createTransaction() on the literal mutableRundown option: with mutableRundown: true it returns rundown: Rundown as before; otherwise it returns rundown: DeepReadonly<Rundown> (ts-essentials, already a convention in this codebase for read-only snapshots). Previously a non-mutable transaction's rundown was typed as plain Rundown even though it's the live cachedRundown reference itself (or a background rundown read straight from disk) - nothing stopped a future mutation function from writing into it outside the commit() flow, since Readonly<T> (used elsewhere for the same purpose) only blocks top-level reassignment, not nested writes like array.push() or entry.field = x. Scoped to rundown.dao.ts only: every existing call site in rundown.service.ts passes a literal mutableRundown: true, so this changes no call-site types. The one mutableRundown: false site doesn't destructure rundown at all. Verified with a throwaway probe file (removed) that mutating a non-mutable transaction's rundown is now a compile error, and that a mutable one still compiles as before. Typecheck, lint and full test suite (695 tests) pass unchanged.	2026-08-23 18:19:18 +00:00
Claude	b1059e7bff	Replace structuredClone with shape-aware clones in rundown/data hot paths structuredClone's generic serialization algorithm does far more work than plain object spreads need for these known shapes. Adds cloneEntryData() and cloneRundown() as drop-in replacements (same "independent copy" contract, same call sites) and swaps them in everywhere a rundown or a single entry was being deep-cloned via structuredClone: - createTransaction()/init() in rundown.dao.ts - the main per-mutation clone - DataProvider.setRundown() - was re-cloning the whole rundown a second time on every single commit - rundown.service.ts background-rundown clones (custom field rename/remove, duplicateExistingRundown) - the per-entry clone in processRundown's non-mutating path (rundown.parser.ts) - mergeRundownPreservingFields's per-entry clone Also: - safeMerge() (DataProvider.utils.ts) was deep-cloning the entire DatabaseModel, including all rundowns, just to read a handful of small config properties that never touch rundowns - it now only clones the properties it actually merges. - sheets.service.ts's per-row clone before building a (read-only) Google Sheets cell request was unnecessary and is removed. - runtime.service.ts's previous-state snapshot for eventNow/eventNext/ eventFlag/groupNow now uses cloneEntryData. Benchmarked on a synthetic 1000-event rundown: a cue-only edit (no reprocessing needed) went from ~5ms to ~1.2ms end to end, including the DataProvider clone. Verified against the existing test suite (695 passing) plus typecheck and lint.	2026-08-23 16:21:53 +00:00
Carlos Valente	a84b8b5530	refactor(ui): polish navigation menu and view params editor	2026-08-23 13:42:21 +02:00
Carlos Valente	c19aa4ca28	fix(cuesheet): prevent stale column width on refresh	2026-08-23 13:28:24 +02:00
Carlos Valente	805663e2ea	chore(deps): migrate to @tanstack/react-table v9	2026-08-23 13:28:24 +02:00
Carlos Valente	0f0b32d444	accept bearer token	2026-08-21 20:52:11 +02:00
Carlos Valente	703dee35a4	style: bump oxfmt to 0.63 and reformat	2026-08-18 13:56:53 +02:00
Carlos Valente	2a7f5b7872	chore(deps): upgrade dependencies	2026-08-18 13:56:53 +02:00
Carlos Valente	c6eccec30e	refactor(settings): show new app indicator	2026-08-09 16:48:20 +02:00
Carlos Valente	5220c2c374	fix(settings): prevent loader overflow	2026-08-09 16:48:20 +02:00
Carlos Valente	4eeeb294f7	chore: update electron navigation	2026-08-09 16:48:20 +02:00
Alex Christoffer Rasmussen	a006331fea	Group duration context menu utils (#1748 )	2026-08-09 16:45:47 +02:00
Carlos Valente	ac0ef06459	bump version to 4.12.0	2026-08-09 10:44:13 +02:00
Carlos Valente	4d04fe35c3	refactor(e2e): improve test stability	2026-08-09 10:41:12 +02:00
Carlos Valente	fb559ed9da	refactor(progress bar): reset when event changes	2026-08-05 15:30:22 +02:00
Carlos Valente	24be49ef66	refactor(settings): polish settings UI	2026-08-02 13:44:28 +02:00
Carlos Valente	f0c284b708	refactor(link): add row presentation variant	2026-08-02 13:44:28 +02:00
Carlos Valente	9e42f18299	feat(settings): add searchable navigation	2026-08-02 13:44:28 +02:00
Carlos Valente	bdd815678b	refactor(ui): extend link and modal variants	2026-08-02 13:44:28 +02:00
Carlos Valente	12fc76b8ff	refactor(op): simplify UI elements	2026-08-02 12:55:49 +02:00
Carlos Valente	8ed0a1689e	refactor(op): clarify settings text	2026-08-02 12:55:49 +02:00
Carlos Valente	ba18b8dba7	refactor(ui): rundown title UI polish	2026-08-02 12:55:49 +02:00
Carlos Valente	608247157b	refactor(rundown): cap rundown names to 64 characters	2026-08-02 12:55:49 +02:00
Carlos Valente	514b6c3a02	refactor(navigation): custom params indicators only for current view	2026-08-02 12:55:49 +02:00
Carlos Valente	2050735014	refactor(ui): title alignment is logo aware	2026-08-02 12:55:49 +02:00
Carlos Valente	76b1341432	refactor(logo): upload on submit form	2026-08-02 10:39:58 +02:00
Carlos Valente	c7422fc7c7	refactor(logo): improve flow for managing logo	2026-08-02 10:39:58 +02:00
Carlos Valente	c93b10cea9	chore: bump deepmerge-ts package	2026-08-02 10:39:58 +02:00
Carlos Valente	8a7f9530d2	chore: bump nanoid package	2026-08-02 10:39:58 +02:00
Carlos Valente	94d54529ee	refactor(views): consistent loading and empty states	2026-08-01 16:25:14 +02:00
Carlos Valente	f7535651f6	refactor(info): improve UI consistency and polish	2026-08-01 14:41:39 +02:00
Carlos Valente	5cf36f049a	refactor(modal): allow wider modals	2026-07-25 14:28:45 +02:00
Carlos Valente	c6248b0c72	refactor(import): improve preview UI	2026-07-25 14:28:45 +02:00
Alex Christoffer Rasmussen	2a890cf2b3	fix: issue where a countToEnd would lead to incorrect expected times (#2149 ) * fix: issue where a count-to-end would lead to incorrect expected times * fix: include add time in overtime when countToEnd * fix: ui and server use same calculation for expected end	2026-07-25 11:22:24 +02:00