accept bearer token

refactor(settings): show new app indicator
fix(settings): prevent loader overflow
2026-08-15 04:13:47 +00:00 · 2026-08-11 20:52:54 +02:00 · 2026-08-09 16:48:20 +02:00 · 2026-08-09 16:48:20 +02:00 · 2026-08-09 16:48:20 +02:00 · 2026-08-09 16:45:47 +02:00
138 changed files with 3579 additions and 1953 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,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "4.11.0",
+  "version": "4.12.0",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -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,21 +68,26 @@ 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}>
+          <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'
+                aria-label='Redirect to custom path'
                disabled={path === currentPath || path === ''}
                className={style.redirect}
                onClick={() => handleRedirect(path)}
@@ -89,11 +96,18 @@ export function RedirectClientModal({ id, isOpen, name, currentPath, origin, onC
                <IoArrowForward />
              </Button>
            </div>
-          <div>
-            <span className={style.label}>Select View or URL Preset</span>
+          </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}>
-                {origin}
+                <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;
 }
@@ -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(1800px, 98vw);
-  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;
@@ -2,7 +2,7 @@ import { useDisclosure, useHotkeys } from '@mantine/hooks';
 import { memo } 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';
@@ -20,8 +20,7 @@ function ViewNavigationMenu({ isNavigationLocked, suppressSettings }: ViewNaviga
  const [isMenuOpen, menuHandler] = useDisclosure();
  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);

  useHotkeys([
    [
@@ -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>) {
@@ -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,
 }));
@@ -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: rgba($blue-500, 0.16);
+    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: rgba($blue-500, 0.16);
+    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,12 +24,44 @@ 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 (
+    <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}>
-      {options.map((panel) => {
+          {results.map((panel) => {
            const isSelected = selectedPanel === panel.id;
            if (panel.highlight) {
              return (
@@ -33,6 +73,8 @@ export default function PanelList({ selectedPanel, location }: PanelListProps) {
            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: rgba($blue-500, 0.16);
+
+    > 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;
 }

-  button {
-    margin-top: 1rem;
+.emptyMessage {
+  width: min(30rem, 100%);
  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.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.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.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,15 +186,15 @@ 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}>
+    <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>
@@ -208,7 +209,7 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
            </div>
          </div>

-      <div className={style.innerSection}>
+          <div className={style.innerColumn}>
            <h3>Filters (optional)</h3>
            <div className={style.ruleSection}>
              <label>
@@ -253,7 +254,13 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                          if (value === null) return;
                          setValue(
                            `filters.${index}.operator`,
-                        value as 'equals' | 'not_equals' | 'greater_than' | 'less_than' | 'contains' | 'not_contains',
+                            value as
+                              | 'equals'
+                              | 'not_equals'
+                              | 'greater_than'
+                              | 'less_than'
+                              | 'contains'
+                              | 'not_contains',
                            { shouldDirty: true },
                          );
                        }}
@@ -273,7 +280,11 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                    <div>
                      <span>&nbsp;</span>
                      <div>
-                    <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeFilter(index)}>
+                        <IconButton
+                          aria-label='Delete'
+                          variant='ghosted-destructive'
+                          onClick={() => removeFilter(index)}
+                        >
                          <IoTrash />
                        </IconButton>
                      </div>
@@ -352,7 +363,12 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                      </label>
                      <label>
                        Arguments
-                    <TemplateInput {...register(`outputs.${index}.args`)} value={output.args} fluid placeholder='1' />
+                        <TemplateInput
+                          {...register(`outputs.${index}.args`)}
+                          value={output.args}
+                          fluid
+                          placeholder='1'
+                        />
                        <Panel.Error>{rowErrors?.args?.message}</Panel.Error>
                      </label>
                      <div>
@@ -361,7 +377,11 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                          <Button variant='ghosted-white' onClick={() => handleTestOSCOutput(index)}>
                            Test
                          </Button>
-                      <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
+                          <IconButton
+                            aria-label='Delete'
+                            variant='ghosted-destructive'
+                            onClick={() => removeOutput(index)}
+                          >
                            <IoTrash />
                          </IconButton>
                        </Panel.InlineElements>
@@ -402,7 +422,11 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                          <Button variant='ghosted-white' onClick={() => handleTestHTTPOutput(index)}>
                            Test
                          </Button>
-                      <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
+                          <IconButton
+                            aria-label='Delete'
+                            variant='ghosted-destructive'
+                            onClick={() => removeOutput(index)}
+                          >
                            <IoTrash />
                          </IconButton>
                        </Panel.InlineElements>
@@ -438,7 +462,11 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                        <Button variant='ghosted-white' onClick={() => handleTestOntimeAction(index)}>
                          Test
                        </Button>
-                    <IconButton aria-label='Delete' variant='ghosted-destructive' onClick={() => removeOutput(index)}>
+                        <IconButton
+                          aria-label='Delete'
+                          variant='ghosted-destructive'
+                          onClick={() => removeOutput(index)}
+                        >
                          <IoTrash />
                        </IconButton>
                      </Panel.InlineElements>
@@ -447,7 +475,6 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
                );
              }

-          // there should be no other output types
              return null;
            })}
            <Panel.InlineElements relation='inner'>
@@ -462,14 +489,17 @@ export default function AutomationForm({ automation, onClose }: AutomationFormPr
              </Button>
            </Panel.InlineElements>
          </div>
-
-      <Panel.InlineElements align='end'>
+        </form>
+      }
+      footerElements={
+        <>
          {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
          <Button onClick={onClose}>Cancel</Button>
-        <Button variant='primary' type='submit' disabled={!canSubmit} loading={isSubmitting}>
+          <Button variant='primary' type='submit' form={formId} disabled={!canSubmit} loading={isSubmitting}>
            Save
          </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
+        </>
+      }
+    />
  );
 }
@@ -19,8 +19,6 @@ 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}
@@ -28,15 +26,20 @@ export default function AutomationPanel({ location }: PanelBaseProps) {
          oscPortIn={data.oscPortIn}
          automationState={automationState}
          oscInputState={oscInputState}
+          isLoading={isLoading}
        />
      </div>
      <div ref={automationsRef}>
-          <AutomationsList automations={data.automations} enabledAutomations={automationState} />
+        <AutomationsList automations={data.automations} enabledAutomations={automationState} isLoading={isLoading} />
      </div>
      <div ref={triggersRef}>
-          <TriggersList triggers={data.triggers} automations={data.automations} enabledAutomations={automationState} />
+        <TriggersList
+          triggers={data.triggers}
+          automations={data.automations}
+          enabledAutomations={automationState}
+          isLoading={isLoading}
+        />
      </div>
-      </Panel.Section>
    </>
  );
 }
@@ -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,7 +67,9 @@ export default function AutomationSettingsForm({
  const oscInputEnabled = watch('enabledOscIn');

  return (
+    <Panel.Section>
      <Panel.Card>
+        <Panel.Loader isLoading={Boolean(isLoading)} />
        <Panel.SubHeader>
          Automation settings
          <Panel.InlineElements>
@@ -102,8 +106,6 @@ export default function AutomationSettingsForm({
          onSubmit={handleSubmit(onSubmit)}
          onKeyDown={(event) => preventEscape(event, onReset)}
        >
-        <Panel.Loader isLoading={false} />
-
          <Panel.Title>Automation</Panel.Title>
          <Panel.ListGroup>
            <Panel.ListItem>
@@ -134,7 +136,9 @@ export default function AutomationSettingsForm({
          <Panel.Title>OSC Input</Panel.Title>

          <Panel.ListGroup>
-          {isOntimeCloud && <Info>For security reasons OSC integrations are not available in the cloud service.</Info>}
+            {isOntimeCloud && (
+              <Info>For security reasons OSC integrations are not available in the cloud service.</Info>
+            )}
            <Panel.ListItem>
              <Panel.Field
                title={
@@ -186,5 +190,6 @@ export default function AutomationSettingsForm({
          </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,20 +44,21 @@ export default function AutomationsList(props: AutomationsListProps) {
  const arrayAutomations = Object.keys(automations);

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

        <Panel.Divider />

+        <Panel.Section>
          {enabledAutomations === false && (
            <Info>
              Automations are disabled. You can still manage automation definitions here, but they will not run until
@@ -65,10 +66,6 @@ export default function AutomationsList(props: AutomationsListProps) {
            </Info>
          )}

-      {automationFormData !== null && (
-        <AutomationForm automation={automationFormData} onClose={() => setAutomationFormData(null)} />
-      )}
-
          <Panel.Table>
            <thead>
              <tr>
@@ -80,9 +77,15 @@ export default function AutomationsList(props: AutomationsListProps) {
              </tr>
            </thead>
            <tbody>
-          {arrayAutomations.length === 0 && (
+              {!isLoading && arrayAutomations.length === 0 && (
                <Panel.TableEmpty
-              handleClick={!automationFormData ? () => setAutomationFormData(automationPlaceholder) : undefined}
+                  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) => {
@@ -127,6 +130,8 @@ export default function AutomationsList(props: AutomationsListProps) {
              )}
            </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,19 +75,21 @@ 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>
+    <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={initialTitle}
+              defaultValue={trigger?.title}
            />
            <Panel.Error>{errors.title?.message}</Panel.Error>
          </label>
@@ -127,14 +119,19 @@ export default function TriggerForm({
            />
            <Panel.Error>{errors.automationId?.message}</Panel.Error>
          </label>
-      <Panel.InlineElements align='end'>
+        </form>
+      }
+      footerElements={
+        <>
+          {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
          <Button disabled={isSubmitting} onClick={onCancel}>
            Cancel
          </Button>
-        <Button type='submit' variant='primary' disabled={!canSubmit} loading={isSubmitting}>
+          <Button type='submit' form={formId} variant='primary' disabled={!canSubmit} loading={isSubmitting}>
            Save
          </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
+        </>
+      }
+    />
  );
 }
@@ -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,10 +55,19 @@ export default function TriggersList(props: TriggersListProps) {
  const canAdd = Object.keys(automations).length > 0;

  return (
+    <Panel.Section>
      <Panel.Card>
+        {formState.isOpen && (
+          <TriggerForm
+            automations={automations}
+            trigger={formState.trigger ?? null}
+            onCancel={closeForm}
+            postSubmit={postSubmit}
+          />
+        )}
        <Panel.SubHeader>
          Manage triggers
-        <Button type='submit' form='trigger-form' disabled={!canAdd} loading={false} onClick={() => setShowForm(true)}>
+          <Button disabled={!canAdd} onClick={openNewForm}>
            New <IoAdd />
          </Button>
        </Panel.SubHeader>
@@ -61,12 +80,10 @@ export default function TriggersList(props: TriggersListProps) {
          )}
          {duplicates && (
            <Panel.Error>
-            You have created multiple links between the same trigger and automation which can performance issues.
+              You have created multiple links between the same trigger and automation which can cause performance
+              issues.
            </Panel.Error>
          )}
-        {showForm && (
-          <AutomationForm automations={automations} onCancel={() => setShowForm(false)} postSubmit={postSubmit} />
-        )}
          <Panel.Table>
            <thead>
              <tr>
@@ -77,10 +94,21 @@ export default function TriggersList(props: TriggersListProps) {
              </tr>
            </thead>
            <tbody>
-            {!showForm && triggers.length === 0 && (
+              {!isLoading && triggers.length === 0 && (
                <Panel.TableEmpty
-                label='Create a trigger to run an automation'
-                handleClick={canAdd ? () => setShowForm(true) : undefined}
+                  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) => {
@@ -88,14 +116,14 @@ export default function TriggersList(props: TriggersListProps) {
                  <Fragment key={trigger.id}>
                    <TriggersListItem
                      automations={automations}
-                    id={trigger.id}
-                    title={trigger.title}
-                    trigger={trigger.trigger}
-                    automationId={trigger.automationId}
+                      trigger={trigger}
                      duplicate={duplicates?.includes(index)}
+                      handleEdit={() => openEditForm(trigger)}
                      handleDelete={() => handleDelete(trigger.id)}
-                    postSubmit={postSubmit}
                    />
+                  </Fragment>
+                );
+              })}
              {deleteError && (
                <tr>
                  <td colSpan={5}>
@@ -103,12 +131,10 @@ export default function TriggersList(props: TriggersListProps) {
                  </td>
                </tr>
              )}
-                </Fragment>
-              );
-            })}
            </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,9 +6,9 @@ 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';
@@ -28,6 +28,8 @@ const targetOptions: SelectOption<OntimeViewPresettable>[] = [
  { value: OntimeView.ProjectInfo, label: 'Project Info' },
 ];

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

  return (
-    <Panel.Indent
-      as='form'
-      onSubmit={handleSubmit(setupSubmit)}
-      onKeyDown={(event) => preventEscape(event, onClose)}
-      className={style.column}
-    >
+    <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>
@@ -209,20 +214,23 @@ export default function URLPresetForm({ urlPreset, onClose }: URLPresetFormProps
              />
            </div>
          )}
-      <div>
+        </form>
+      }
+      footerElements={
+        <>
          <Panel.Error>{errors.root?.message}</Panel.Error>
-        <Panel.InlineElements align='end'>
          <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) => {
+  const handleSubmit = async (customField: CustomField) => {
+    const editing = formState.field;
+    if (editing) {
+      await editCustomField(editing.key, customField);
+    } else {
      await postCustomField(customField);
+    }
    refetch();
-    setIsAdding(false);
-  };
-
-  const handleEditField = async (key: CustomFieldKey, customField: CustomField) => {
-    await editCustomField(key, 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,7 +56,15 @@ export default function CustomViewForm({ onComplete, onClose }: CustomViewFormPr
  };

  return (
-    <Panel.Indent as='form' onSubmit={handleUpload} className={style.uploadForm}>
+    <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' }}
@@ -100,15 +111,17 @@ export default function CustomViewForm({ onComplete, onClose }: CustomViewFormPr
            <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>}
-
-      <Panel.InlineElements align='end'>
          <Button onClick={onClose}>Cancel</Button>
-        <Button variant='primary' type='submit' loading={isUploading} disabled={!canUpload}>
+          <Button variant='primary' type='submit' form={formId} 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>
+    <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' />
+            <Input {...register('title')} fluid placeholder='Your rundown name' maxLength={64} />
          </label>
-      </Panel.Section>
-      <Panel.InlineElements relation='inner' align='end'>
+        </form>
+      }
+      footerElements={
+        <>
+          {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
          <Button variant='ghosted' disabled={isSubmitting} onClick={onClose}>
            Cancel
          </Button>
-        <Button type='submit' variant='primary' disabled={isSubmitting}>
+          <Button type='submit' form={formId} variant='primary' disabled={isSubmitting}>
            Create rundown
          </Button>
-      </Panel.InlineElements>
-      {errors.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-    </Panel.Indent>
+        </>
+      }
+    />
  );
 }
@@ -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,7 +87,15 @@ export default function CustomFieldForm({
  const isEditMode = initialKey !== undefined;

  return (
-    <Panel.Indent as='form' onSubmit={handleSubmit(setupSubmit)} onKeyDown={(event) => preventEscape(event, onCancel)}>
+    <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 />
@@ -116,8 +126,8 @@ export default function CustomFieldForm({
                    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';
+                    if (!isEditMode && Object.hasOwn(data, customFieldLabelToKey(value) ?? '')) {
+                      return 'Custom fields must be unique';
                    }
                    return true;
                  },
@@ -135,15 +145,19 @@ export default function CustomFieldForm({
            <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>}
-      <Panel.InlineElements relation='inner' align='end'>
          <Button variant='ghosted' onClick={onCancel}>
            Cancel
          </Button>
-        <Button type='submit' variant='primary' disabled={!canSubmit} loading={isSubmitting}>
+          <Button type='submit' form={formId} variant='primary' disabled={!canSubmit} loading={isSubmitting}>
            Save
          </Button>
-      </Panel.InlineElements>
-    </Panel.Indent>
+        </>
+      }
+    />
  );
 }
@@ -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>}
@@ -1,30 +1,3 @@
-.emptyState {
-  padding: 3rem 1.5rem;
-  text-align: center;
-}
-
-.emptyMessage {
-  width: min(30rem, 100%);
-  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 {
-  margin: 1rem auto 0;
-}
-
 .table {
  width: 100%;
  border-collapse: separate;
@@ -6,6 +6,7 @@ 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';
@@ -123,23 +124,17 @@ export default function PreviewTable({
    }

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

@@ -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,21 +64,28 @@ 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'>
+                  <td className={style.actionsCell}>
+                    <Panel.InlineElements relation='inner' align='end' className={style.actionsGroup}>
                      <Button
                        size='small'
                        className={`${identify ? style.blink : ''}`}
@@ -108,6 +115,7 @@ export default function ClientList() {
                        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}
@@ -20,6 +20,7 @@ import Button from '../../../../common/components/buttons/Button';
 import IconButton from '../../../../common/components/buttons/IconButton';
 import Dialog from '../../../../common/components/dialog/Dialog';
 import { DropdownMenu } from '../../../../common/components/dropdown-menu/DropdownMenu';
+import Tag from '../../../../common/components/tag/Tag';
 import { cx } from '../../../../common/utils/styleUtils';
 import * as Panel from '../../panel-utils/PanelUtils';
 import ProjectForm, { ProjectFormValues } from './ProjectForm';
@@ -143,7 +144,7 @@ export default function ProjectListItem({
        ) : (
          <>
            <td className={style.containCell}>{filename}</td>
-            <td>{current ? 'Currently loaded' : new Date(updatedAt).toLocaleString()}</td>
+            <td>{current ? <Tag variant='active'>Loaded</Tag> : new Date(updatedAt).toLocaleString()}</td>
            <td>
              <ActionMenu
                current={current}
@@ -158,13 +159,7 @@ export default function ProjectListItem({
          </>
        )}
      </tr>
-      {showMergeForm && (
-        <tr>
-          <td colSpan={99}>
-            <ProjectMergeForm onClose={handleCancel} fileName={filename} />
-          </td>
-        </tr>
-      )}
+      {showMergeForm && <ProjectMergeForm onClose={handleCancel} fileName={filename} />}
      <Dialog
        isOpen={isDeleteOpen}
        onClose={() => setDeleteOpen(false)}
@@ -7,13 +7,15 @@ import { getDb, patchData } from '../../../../common/api/db';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import Button from '../../../../common/components/buttons/Button';
 import Info from '../../../../common/components/info/Info';
+import Modal from '../../../../common/components/modal/Modal';
 import Switch from '../../../../common/components/switch/Switch';
-import { cx } from '../../../../common/utils/styleUtils';
 import * as Panel from '../../panel-utils/PanelUtils';
 import { makeProjectPatch } from './project.utils';

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

+const formId = 'project-merge-form';
+
 interface ProjectMergeFromProps {
  onClose: () => void;
  fileName: string;
@@ -77,68 +79,122 @@ export default function ProjectMergeForm({ onClose, fileName }: ProjectMergeFrom
  };

  return (
-    <Panel.Section as='form' onSubmit={handleSubmit(handleSubmitCreate)}>
-      <Panel.Title>
-        Partial project merge
-        <Panel.InlineElements>
-          <Button onClick={onClose} variant='ghosted' disabled={isSubmitting}>
-            Cancel
-          </Button>
-          <Button type='submit' disabled={!isValid || !isDirty} loading={isSubmitting} variant='primary'>
-            Merge
-          </Button>
-        </Panel.InlineElements>
-      </Panel.Title>
-      {error && <Panel.Error>{error}</Panel.Error>}
-      <Panel.Section className={cx([style.innerColumn, style.inlineLabels])}>
+    <Modal
+      isOpen
+      onClose={onClose}
+      showBackdrop
+      showCloseButton
+      size='compact'
+      title='Partial project merge'
+      bodyElements={
+        <form id={formId} onSubmit={handleSubmit(handleSubmitCreate)}>
+          <Panel.Section className={style.mergeBody}>
+            <div className={style.mergeIntro}>
              <Panel.Description>
-          Select data from <i>{`"${fileName}"`}</i> to merge into the current project.
+                Select the sections from <span className={style.sourceFile}>{`"${fileName}"`}</span> that you want to
+                merge into the current project.
              </Panel.Description>
-        <Info type='warning'>
-          This process is irreversible and can result in data loss. <br />
-          You may want to create a duplicate backup beforehand.
+              <div className={style.mergeSummary}>
+                Only the enabled sections are copied. Existing data stays intact.
+              </div>
+            </div>
+
+            <Info type='warning' className={style.mergeWarningInfo}>
+              <Info.Title>Back up before merging</Info.Title>
+              <Info.Body>
+                This action can overwrite project data. Create a duplicate project first if you want a recovery point.
+              </Info.Body>
            </Info>
-        <label>
+
+            <Panel.ListGroup className={style.optionList}>
+              <Panel.ListItem>
+                <label className={style.optionRow}>
+                  <div className={style.optionCopy}>
+                    <span className={style.optionTitle}>Project data</span>
+                    <span className={style.optionBody}>Core project metadata and settings.</span>
+                  </div>
                  <Switch
                    size='large'
                    checked={watch('project')}
                    onCheckedChange={(value: boolean) => setValue('project', value, { shouldDirty: true })}
                  />
-          Project data
                </label>
-        <label>
+              </Panel.ListItem>
+              <Panel.ListItem>
+                <label className={style.optionRow}>
+                  <div className={style.optionCopy}>
+                    <span className={style.optionTitle}>Rundown + Custom Fields</span>
+                    <span className={style.optionBody}>Copies all rundowns and any associated custom fields.</span>
+                  </div>
                  <Switch
                    size='large'
                    checked={watch('rundowns')}
                    onCheckedChange={(value: boolean) => setValue('rundowns', value, { shouldDirty: true })}
                  />
-          Rundown + Custom Fields
                </label>
-        <label>
+              </Panel.ListItem>
+              <Panel.ListItem>
+                <label className={style.optionRow}>
+                  <div className={style.optionCopy}>
+                    <span className={style.optionTitle}>View Settings</span>
+                    <span className={style.optionBody}>View configuration, and display preferences.</span>
+                  </div>
                  <Switch
                    size='large'
                    checked={watch('viewSettings')}
                    onCheckedChange={(value: boolean) => setValue('viewSettings', value, { shouldDirty: true })}
                  />
-          View Settings
                </label>
-        <label>
+              </Panel.ListItem>
+              <Panel.ListItem>
+                <label className={style.optionRow}>
+                  <div className={style.optionCopy}>
+                    <span className={style.optionTitle}>URL Presets</span>
+                    <span className={style.optionBody}>Saved links and preset launch parameters.</span>
+                  </div>
                  <Switch
                    size='large'
                    checked={watch('urlPresets')}
                    onCheckedChange={(value: boolean) => setValue('urlPresets', value, { shouldDirty: true })}
                  />
-          URL Presets
                </label>
-        <label>
+              </Panel.ListItem>
+              <Panel.ListItem>
+                <label className={style.optionRow}>
+                  <div className={style.optionCopy}>
+                    <span className={style.optionTitle}>Automation Settings</span>
+                    <span className={style.optionBody}>Triggers and automation configuration.</span>
+                  </div>
                  <Switch
                    size='large'
                    checked={watch('automation')}
                    onCheckedChange={(value: boolean) => setValue('automation', value, { shouldDirty: true })}
                  />
-          Automation Settings
                </label>
+              </Panel.ListItem>
+            </Panel.ListGroup>
          </Panel.Section>
-    </Panel.Section>
+        </form>
+      }
+      footerElements={
+        <div className={style.footerContent}>
+          {error && <Panel.Error>{error}</Panel.Error>}
+          <div className={style.footerActions}>
+            <Button onClick={onClose} variant='ghosted' disabled={isSubmitting}>
+              Cancel
+            </Button>
+            <Button
+              type='submit'
+              form={formId}
+              disabled={!isValid || !isDirty}
+              loading={isSubmitting}
+              variant='primary'
+            >
+              Merge
+            </Button>
+          </div>
+        </div>
+      }
+    />
  );
 }
@@ -1,5 +1,6 @@
 .current {
-  background-color: $blue-1100;
+  // marker consumed by the shared Panel.Table active-row treatment
+  background-color: inherit;
 }

 .isEditing {
@@ -55,7 +56,90 @@
  margin-bottom: 1rem;
 }

-.empty {
+.loaderBox {
  height: 300px;
  position: relative;
 }
+
+.mergeBody {
+  gap: 1rem;
+}
+
+.mergeIntro {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.sourceFile {
+  padding: 0.1rem 0.45rem;
+  border-radius: 999px;
+  background-color: $white-3;
+  color: $orange-400;
+  white-space: nowrap;
+}
+
+.mergeSummary {
+  color: $gray-400;
+  font-size: calc(1rem - 2px);
+  line-height: 1.5;
+}
+
+.mergeWarningInfo {
+  margin-bottom: 0.25rem;
+}
+
+.optionList {
+  padding: 0;
+  gap: 0;
+}
+
+.optionList > li:not(:last-child) {
+  border-bottom: 1px solid $white-10;
+}
+
+.optionRow {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 1rem;
+  align-items: center;
+  width: 100%;
+  min-width: 0;
+  cursor: pointer;
+}
+
+.optionCopy {
+  display: flex;
+  flex-direction: column;
+  gap: 0.2rem;
+  min-width: 0;
+}
+
+.optionTitle {
+  color: $ui-white;
+  font-size: 0.95rem;
+  font-weight: 600;
+  line-height: 1.35;
+}
+
+.optionBody {
+  color: $gray-400;
+  font-size: calc(1rem - 3px);
+  line-height: 1.45;
+}
+
+.footerContent {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.footerActions {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 0.75rem;
+  flex-wrap: wrap;
+}
@@ -1,5 +1,5 @@
 import { type ProjectData } from 'ontime-types';
-import { ChangeEvent, useEffect, useRef } from 'react';
+import { ChangeEvent, useEffect, useRef, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import { IoAdd, IoDownloadOutline, IoTrash } from 'react-icons/io5';

@@ -17,9 +17,16 @@ import * as Panel from '../../panel-utils/PanelUtils';

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

+type PendingLogo = {
+  file: File;
+  previewUrl: string;
+  uploadedFilename?: string;
+};
+
 export default function ProjectData() {
  const { data, status } = useProjectData();
  const { updateProjectData } = useUpdateProjectData();
+  const [pendingLogo, setPendingLogo] = useState<PendingLogo | null>(null);

  const {
    handleSubmit,
@@ -45,13 +52,22 @@ export default function ProjectData() {
  });

  // reset form values if data changes
+  // Release the browser-managed preview URL when the selection changes or this form unmounts.
  useEffect(() => {
    if (data) {
      reset(data);
    }
  }, [data, reset]);

-  const handleUploadProjectLogo = async (event: ChangeEvent<HTMLInputElement>) => {
+  useEffect(() => {
+    return () => {
+      if (pendingLogo) {
+        URL.revokeObjectURL(pendingLogo.previewUrl);
+      }
+    };
+  }, [pendingLogo]);
+
+  const handleUploadProjectLogo = (event: ChangeEvent<HTMLInputElement>) => {
    const file = event.target.files?.[0];
    clearErrors('logo');

@@ -61,14 +77,16 @@ export default function ProjectData() {

    try {
      validateLogo(file);
-      const response = await uploadProjectLogo(file);
-
-      setValue('logo', response.data.logoFilename, {
-        shouldDirty: true,
+      setPendingLogo({
+        file,
+        previewUrl: URL.createObjectURL(file),
      });
    } catch (error) {
      const message = maybeAxiosError(error);
      setError('logo', { message });
+    } finally {
+      // Allow selecting the same local file again after an upload attempt.
+      event.target.value = '';
    }
  };

@@ -83,6 +101,7 @@ export default function ProjectData() {
  const handleDeleteLogo = (e: React.MouseEvent<HTMLButtonElement>) => {
    e.preventDefault();
    e.stopPropagation();
+    setPendingLogo(null);
    setValue('logo', null, {
      shouldDirty: true,
    });
@@ -92,10 +111,29 @@ export default function ProjectData() {
    append({ title: '', value: '', url: '' });
  };

+  const uploadPendingLogo = async () => {
+    if (!pendingLogo) {
+      return null;
+    }
+
+    if (pendingLogo.uploadedFilename) {
+      return pendingLogo.uploadedFilename;
+    }
+
+    const response = await uploadProjectLogo(pendingLogo.file);
+    const uploadedFilename = response.data.logoFilename;
+    setPendingLogo((currentPendingLogo) =>
+      currentPendingLogo?.file === pendingLogo.file ? { ...currentPendingLogo, uploadedFilename } : currentPendingLogo,
+    );
+    return uploadedFilename;
+  };
+
  const onSubmit = async (formData: ProjectData) => {
    try {
      clearErrors();
-      await updateProjectData(formData);
+      const logo = (await uploadPendingLogo()) ?? formData.logo;
+      await updateProjectData({ ...formData, logo });
+      setPendingLogo(null);
    } catch (error) {
      const message = maybeAxiosError(error);
      setError('root', { message });
@@ -104,10 +142,12 @@ export default function ProjectData() {

  // reset data to the initial state
  const onReset = () => {
+    setPendingLogo(null);
    reset(data);
  };

  const isLoading = status === 'pending';
+  const logo = watch('logo');

  return (
    <Panel.Section as='form' onSubmit={handleSubmit(onSubmit)} onKeyDown={(event) => preventEscape(event, onReset)}>
@@ -118,7 +158,12 @@ export default function ProjectData() {
            <Button onClick={onReset} disabled={isSubmitting || !isDirty}>
              Revert to saved
            </Button>
-            <Button variant='primary' type='submit' disabled={!isDirty || !isValid} loading={isSubmitting}>
+            <Button
+              variant='primary'
+              type='submit'
+              disabled={(!isDirty && !pendingLogo) || !isValid}
+              loading={isSubmitting}
+            >
              Save
            </Button>
          </Panel.InlineElements>
@@ -150,17 +195,24 @@ export default function ProjectData() {
                onChange={handleUploadProjectLogo}
              />
              <Panel.Card className={style.uploadLogoCard}>
-                {watch('logo') ? (
+                {logo || pendingLogo ? (
                  <>
-                    <img src={`${projectLogoPath}/${watch('logo')}`} />
+                    <img src={pendingLogo ? pendingLogo.previewUrl : `${projectLogoPath}/${logo}`} />
+                    <div className={style.logoActions}>
+                      <Button disabled={isSubmitting} onClick={handleClickUpload} type='button'>
+                        <IoDownloadOutline />
+                        Replace logo
+                      </Button>
                      <Button
                        variant='subtle-destructive'
-                      disabled={isSubmitting || !watch('logo')}
+                        disabled={isSubmitting || (!logo && !pendingLogo)}
                        onClick={handleDeleteLogo}
+                        type='button'
                      >
                        <IoTrash />
                        Delete
                      </Button>
+                    </div>
                  </>
                ) : (
                  <Button disabled={isSubmitting} onClick={handleClickUpload} type='button'>
@@ -85,10 +85,10 @@ export default function ServerPortSettings() {
            </Button>
          </Panel.InlineElements>
        </Panel.SubHeader>
-        <Panel.Loader isLoading={status === 'pending'} />
        {rootError && <Panel.Error>{rootError}</Panel.Error>}
        <Panel.Divider />
        <Panel.Section>
+          <Panel.Loader isLoading={status === 'pending'} />
          {data.pendingRestart && (
            <Info type='warning'>A port change is pending and will happen on the next restart.</Info>
          )}
@@ -15,6 +15,11 @@
  }
 }

+.logoActions {
+  display: flex;
+  gap: 0.5rem;
+}
+
 .customDataItem {
  width: 100%;
  display: flex;
@@ -90,16 +90,13 @@ export default function CustomTranslationModal({ isOpen, onClose }: CustomTransl
        <div className={style.footer}>
          {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
          <Panel.InlineElements align='apart'>
-            <Button variant='ghosted' size='large' onClick={resetToEnglish} disabled={isSubmitting}>
+            <Button variant='ghosted' onClick={resetToEnglish} disabled={isSubmitting}>
              Reset to English
            </Button>
            <Panel.InlineElements>
-              <Button size='large' onClick={onClose}>
-                Cancel
-              </Button>
+              <Button onClick={onClose}>Cancel</Button>
              <Button
                variant='primary'
-                size='large'
                type='submit'
                form='custom-translations-form'
                disabled={isSubmitting || !isDirty || !isValid}
@@ -109,19 +109,16 @@ export default function CodeEditorModal({ isOpen, onClose }: CodeEditorModalProp
          <Info>Invalid CSS will be refused by the browser</Info>
          {error && <Panel.Error className={style.right}>{`Error: ${error}`}</Panel.Error>}
          <Panel.InlineElements align='apart' className={style.editorActions}>
-            <Button variant='ghosted' size='large' onClick={handleRestore} disabled={saveLoading || resetLoading}>
+            <Button variant='ghosted' onClick={handleRestore} disabled={saveLoading || resetLoading}>
              Reset to example
            </Button>
            <Panel.InlineElements>
-              <Button variant='ghosted' size='large' onClick={clear}>
+              <Button variant='ghosted' onClick={clear}>
                Clear
              </Button>
-              <Button size='large' onClick={onClose}>
-                Cancel
-              </Button>
+              <Button onClick={onClose}>Cancel</Button>
              <Button
                variant='primary'
-                size='large'
                onClick={handleSave}
                disabled={saveLoading || resetLoading || !isDirty}
                loading={saveLoading}
@@ -3,6 +3,7 @@ import { useRef } from 'react';

 import Button from '../../../../common/components/buttons/Button';
 import Dialog from '../../../../common/components/dialog/Dialog';
+import Info from '../../../../common/components/info/Info';
 import { useElectronEvent } from '../../../../common/hooks/useElectronEvent';
 import { isLocalhost, isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -23,22 +24,29 @@ export default function ShutdownPanel() {
    <>
      <Panel.Header>Shutdown Ontime</Panel.Header>
      <Panel.Section>
+        <Panel.Card>
+          <Panel.SubHeader>Shutdown</Panel.SubHeader>
+          <Panel.Divider />
          {isOntimeCloud ? (
-          <Panel.Highlight>
+            <Info type='warning'>
              For security reasons, shutting down the server must be done from the Ontime Cloud dashboard.
-          </Panel.Highlight>
+            </Info>
          ) : (
-          <Panel.Paragraph>
-            This will shutdown the Ontime server. <br />
-            The runtime state will be lost, but your project is kept for next time.
-          </Panel.Paragraph>
+            <Panel.Field
+              title='Stop the Ontime server'
+              description='The runtime state will be lost, but your project is kept for next time.'
+            />
          )}
-        <Button variant='destructive' onClick={handler.open} disabled={!(isElectron || isLocalhost)}>
+          {!isOntimeCloud && (
+            <Panel.Section>
+              <Button variant='destructive' onClick={handler.open} disabled={!canShutdown}>
                Shutdown ontime
              </Button>
-        {!canShutdown && (
-          <Panel.Description>Note: Ontime can only be shutdown from the machine it is running in.</Panel.Description>
+              {!canShutdown && <Panel.Description>Only available from the machine running Ontime.</Panel.Description>}
+            </Panel.Section>
          )}
+        </Panel.Card>
+      </Panel.Section>
      <Dialog
        isOpen={isOpen}
        title='Shutdown Ontime'
@@ -60,7 +68,6 @@ export default function ShutdownPanel() {
          </>
        }
      />
-      </Panel.Section>
    </>
  );
 }
@@ -3,64 +3,107 @@ import { useMemo } from 'react';
 import useAppVersion from '../../common/hooks-query/useAppVersion';
 import { isDocker } from '../../externals';

-export type SettingsOption = {
+type SettingsOptionBase = {
  id: string;
  label: string;
-  secondary?: Readonly<SettingsOption[]>;
  highlight?: string;
 };

+export type SettingsOption =
+  | (SettingsOptionBase & { secondary: Readonly<SettingsOption[]>; keywords?: never })
+  | (SettingsOptionBase & { secondary?: never; keywords: Readonly<string[]> });
+
 const staticOptions = [
  {
    id: 'settings',
    label: 'Settings',
    secondary: [
-      { id: 'settings__data', label: 'Project data' },
-      { id: 'settings__general', label: 'General settings' },
-      { id: 'settings__view', label: 'View settings' },
-      { id: 'settings__custom-views', label: 'Custom views' },
-      { id: 'settings__mcp', label: 'MCP Server' },
-      ...(isDocker ? [] : [{ id: 'settings__port', label: 'Server port' }]),
+      { id: 'settings__data', label: 'Project data', keywords: ['title', 'description', 'logo', 'url', 'info'] },
+      {
+        id: 'settings__general',
+        label: 'General settings',
+        keywords: ['pin', 'password', 'lock', 'language', 'time format', 'timezone'],
+      },
+      {
+        id: 'settings__view',
+        label: 'View settings',
+        keywords: ['css', 'style', 'theme', 'translation', 'freeze', 'overtime'],
+      },
+      { id: 'settings__custom-views', label: 'Custom views', keywords: ['html', 'upload', 'external', 'embed'] },
+      { id: 'settings__mcp', label: 'MCP Server', keywords: ['ai', 'agent', 'model'] },
+      ...(isDocker ? [] : [{ id: 'settings__port', label: 'Server port', keywords: ['http', 'network', 'address'] }]),
    ],
  },
  {
    id: 'project',
    label: 'Project',
    secondary: [
-      { id: 'project__create', label: 'Create...' },
-      { id: 'project__list', label: 'Manage projects' },
+      { id: 'project__create', label: 'Create...', keywords: ['new project', 'quick start', 'wizard'] },
+      {
+        id: 'project__list',
+        label: 'Manage projects',
+        keywords: ['load', 'open', 'rename', 'duplicate', 'delete', 'download', 'import', 'backup', 'merge'],
+      },
    ],
  },
  {
    id: 'manage',
    label: 'Project settings',
    secondary: [
-      { id: 'manage__defaults', label: 'Rundown defaults' },
-      { id: 'manage__custom', label: 'Custom fields' },
-      { id: 'manage__rundowns', label: 'Manage rundowns' },
-      { id: 'manage__sheets', label: 'Import spreadsheet' },
-      { id: 'manage__sheets', label: 'Sync with Google Sheet' },
+      {
+        id: 'manage__defaults',
+        label: 'Rundown defaults',
+        keywords: ['duration', 'warning', 'danger', 'defaults'],
+      },
+      {
+        id: 'manage__custom',
+        label: 'Custom fields',
+        keywords: ['metadata', 'columns', 'extra data', 'image field'],
+      },
+      {
+        id: 'manage__rundowns',
+        label: 'Manage rundowns',
+        keywords: ['rundown', 'xlsx', 'excel', 'load', 'export'],
+      },
+      {
+        id: 'manage__sheets',
+        label: 'Import spreadsheet',
+        keywords: ['google sheet', 'sync', 'spreadsheet', 'xlsx', 'excel', 'csv', 'export'],
+      },
    ],
  },
  {
    id: 'automation',
    label: 'Automation',
    secondary: [
-      { id: 'automation__settings', label: 'Automation settings' },
-      { id: 'automation__automations', label: 'Manage automations' },
-      { id: 'automation__triggers', label: 'Manage triggers' },
+      {
+        id: 'automation__settings',
+        label: 'Automation settings',
+        keywords: ['osc input', 'port', 'enable', 'remote control'],
+      },
+      {
+        id: 'automation__automations',
+        label: 'Manage automations',
+        keywords: ['osc', 'http', 'webhook', 'integration', 'api', 'output', 'action'],
+      },
+      {
+        id: 'automation__triggers',
+        label: 'Manage triggers',
+        keywords: ['lifecycle', 'on load', 'on start', 'on finish', 'on update'],
+      },
    ],
  },
  {
    id: 'sharing',
    label: 'Sharing and reporting',
    secondary: [
-      { id: 'sharing__presets', label: 'URL Presets' },
+      { id: 'sharing__presets', label: 'URL Presets', keywords: ['alias', 'link', 'url', 'shortcut'] },
      {
        id: 'sharing__link',
        label: 'Share link',
+        keywords: ['qr code', 'guest', 'cuesheet link', 'permissions', 'read only'],
      },
-      { id: 'sharing__report', label: 'Runtime report' },
+      { id: 'sharing__report', label: 'Runtime report', keywords: ['actual times', 'csv', 'export', 'history'] },
    ],
  },
  {
@@ -70,20 +113,24 @@ const staticOptions = [
      {
        id: 'network__log',
        label: 'Event log',
+        keywords: ['debug', 'errors', 'console', 'export log'],
      },
      {
        id: 'network__clients',
        label: 'Manage clients',
+        keywords: ['redirect', 'identify', 'rename client', 'connected'],
      },
    ],
  },
  {
    id: 'about',
    label: 'About',
+    keywords: ['version', 'update', 'licence', 'license', 'credits'],
  },
  {
    id: 'shutdown',
    label: 'Shutdown',
+    keywords: ['quit', 'exit', 'close ontime'],
  },
 ] as const;

@@ -92,6 +139,51 @@ export type SettingsOptionId =
  | (typeof staticOptions)[number]['id']
  | Extract<(typeof staticOptions)[number], { secondary: object }>['secondary'][number]['id'];

+function sanitiseSearchInput(query: string): string {
+  return query.trim().toLowerCase();
+}
+
+export function matchesSettingsOptionQuery(option: SettingsOption, query: string): boolean {
+  const sanitisedQuery = sanitiseSearchInput(query);
+  if (!sanitisedQuery) {
+    return false;
+  }
+
+  const sanitisedLabel = sanitiseSearchInput(option.label);
+  if (sanitisedLabel.includes(sanitisedQuery)) {
+    return true;
+  }
+
+  // check keywords
+  return Boolean(option.keywords?.some((keyword) => keyword.includes(sanitisedQuery)));
+}
+
+/**
+ * Filters the settings menu against a user query.
+ * A group is kept if it matches itself (with all its children) or if any of its children match.
+ */
+export function filterSettingsOptions(options: Readonly<SettingsOption[]>, query: string): SettingsOption[] {
+  const sanitisedQuery = sanitiseSearchInput(query);
+  if (!sanitisedQuery) {
+    return [...options];
+  }
+
+  return options.reduce<SettingsOption[]>((accumulator, option) => {
+    if (matchesSettingsOptionQuery(option, sanitisedQuery)) {
+      accumulator.push(option);
+      return accumulator;
+    }
+
+    if (option.secondary) {
+      const secondary = option.secondary.filter((child) => matchesSettingsOptionQuery(child, sanitisedQuery));
+      if (secondary.length) {
+        accumulator.push({ ...option, secondary });
+      }
+    }
+    return accumulator;
+  }, []);
+}
+
 export function useAppSettingsMenu() {
  const { data } = useAppVersion();

@@ -1,20 +1,54 @@
 $info-gray: $secondary-text-gray;
 $info-hover: $section-white;

+.container {
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+
+.extracted {
+  height: 100%;
+  padding: 1.5rem;
+  background-color: $white-3;
+  border: 1px solid $gray-1100;
+  border-radius: $component-border-radius-md;
+
+  .log {
+    flex: 1;
+    height: auto;
+    min-height: 0;
+    max-height: none;
+  }
+}
+
 .log {
  font-size: $inner-section-text-size;
  overflow-y: auto;
  user-select: text;
-  min-height: 20vh;
+  height: 40vh;
+  min-height: 40vh;
  max-height: 40vh;
-  background-color: $gray-1350;
+  margin: 0;
  padding: 0.5rem;
+  background-color: $gray-1350;
+  border: 1px solid $gray-1100;
+  border-radius: $component-border-radius-md;
+  box-shadow: inset 0 1px 0 $white-3;
 }

 .apart {
  margin-left: auto;
 }

+.filterLabel {
+  color: $gray-400;
+  font-size: $aux-text-size;
+  font-weight: 600;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+}
+
 .logEntry {
  display: flex;

@@ -44,10 +78,19 @@ $info-hover: $section-white;

  .msg {
    flex: 1;
+    min-width: 0;
+    overflow-wrap: anywhere;
  }
 }

+.empty {
+  padding: 2.5rem 1rem;
+  color: $gray-600;
+  text-align: center;
+}
+
 .buttonBar {
  flex-wrap: wrap;
+  gap: 0.5rem;
  padding-bottom: 0.5rem;
 }
@@ -4,12 +4,14 @@ import { IoClose } from 'react-icons/io5';

 import Button from '../../common/components/buttons/Button';
 import { clearLogs, useLogData } from '../../common/stores/logger';
+import { cx } from '../../common/utils/styleUtils';
 import * as Panel from '../app-settings/panel-utils/PanelUtils';

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

 export default function Log() {
  const { logs: logData } = useLogData();
+  const isExtracted = window.location.pathname.includes('/log');

  const [showClient, setShowClient] = useState(true);
  const [showServer, setShowServer] = useState(true);
@@ -50,11 +52,14 @@ export default function Log() {
  }, []);

  return (
-    <>
+    <div className={cx([style.container, isExtracted && style.extracted])}>
      <Panel.InlineElements className={style.buttonBar}>
+        <span className={style.filterLabel}>Filter by</span>
        <Button
          variant={showUser ? 'primary' : 'subtle'}
          size='small'
+          aria-pressed={showUser}
+          aria-label={`${showUser ? 'Hide' : 'Show'} ${LogOrigin.User} events`}
          onClick={() => setShowUser((s) => !s)}
          onAuxClick={() => disableOthers(LogOrigin.User)}
          onContextMenu={(e) => e.preventDefault()}
@@ -64,6 +69,8 @@ export default function Log() {
        <Button
          variant={showClient ? 'primary' : 'subtle'}
          size='small'
+          aria-pressed={showClient}
+          aria-label={`${showClient ? 'Hide' : 'Show'} ${LogOrigin.Client} events`}
          onClick={() => setShowClient((s) => !s)}
          onAuxClick={() => disableOthers(LogOrigin.Client)}
          onContextMenu={(e) => e.preventDefault()}
@@ -73,6 +80,8 @@ export default function Log() {
        <Button
          variant={showServer ? 'primary' : 'subtle'}
          size='small'
+          aria-pressed={showServer}
+          aria-label={`${showServer ? 'Hide' : 'Show'} ${LogOrigin.Server} events`}
          onClick={() => setShowServer((s) => !s)}
          onAuxClick={() => disableOthers(LogOrigin.Server)}
          onContextMenu={(e) => e.preventDefault()}
@@ -82,6 +91,8 @@ export default function Log() {
        <Button
          variant={showPlayback ? 'primary' : 'subtle'}
          size='small'
+          aria-pressed={showPlayback}
+          aria-label={`${showPlayback ? 'Hide' : 'Show'} ${LogOrigin.Playback} events`}
          onClick={() => setShowPlayback((s) => !s)}
          onAuxClick={() => disableOthers(LogOrigin.Playback)}
          onContextMenu={(e) => e.preventDefault()}
@@ -91,6 +102,8 @@ export default function Log() {
        <Button
          variant={showRx ? 'primary' : 'subtle'}
          size='small'
+          aria-pressed={showRx}
+          aria-label={`${showRx ? 'Hide' : 'Show'} ${LogOrigin.Rx} events`}
          onClick={() => setShowRx((s) => !s)}
          onAuxClick={() => disableOthers(LogOrigin.Rx)}
          onContextMenu={(e) => e.preventDefault()}
@@ -100,6 +113,8 @@ export default function Log() {
        <Button
          variant={showTx ? 'primary' : 'subtle'}
          size='small'
+          aria-pressed={showTx}
+          aria-label={`${showTx ? 'Hide' : 'Show'} ${LogOrigin.Tx} events`}
          onClick={() => setShowTx((s) => !s)}
          onAuxClick={() => disableOthers(LogOrigin.Tx)}
          onContextMenu={(e) => e.preventDefault()}
@@ -110,7 +125,8 @@ export default function Log() {
          <IoClose /> Clear
        </Button>
      </Panel.InlineElements>
-      <ul className={style.log}>
+      <ul className={style.log} aria-label='Event log entries'>
+        {filteredData.length === 0 && <li className={style.empty}>No events match the selected filters.</li>}
        {filteredData.map((logEntry) => (
          <li key={logEntry.id} className={`${style.logEntry} ${style[logEntry.level]}`}>
            <span className={style.time}>{logEntry.time}</span>
@@ -119,6 +135,6 @@ export default function Log() {
          </li>
        ))}
      </ul>
-    </>
+    </div>
  );
 }
@@ -1,6 +1,7 @@
 import { OntimeView, isOntimeEvent, isOntimeGroup } from 'ontime-types';
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';

+import EmptyFill from '../../common/components/state/EmptyFill';
 import EmptyPage from '../../common/components/state/EmptyPage';
 import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
@@ -10,6 +11,7 @@ import { cx } from '../../common/utils/styleUtils';
 import { throttle } from '../../common/utils/throttle';
 import { getDefaultFormat } from '../../common/utils/time';
 import { isTouchDevice } from '../../externals';
+import { useTranslation } from '../../translation/TranslationProvider';
 import Loader from '../../views/common/loader/Loader';
 import CustomFieldEditModal from './custom-field-edit-modal/CustomFieldEditModal';
 import FollowButton from './follow-button/FollowButton';
@@ -35,7 +37,7 @@ export default function OperatorLoader() {
  }

  if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
  }

  return <Operator {...data} />;
@@ -43,6 +45,7 @@ export default function OperatorLoader() {

 function Operator({ rundown, rundownMetadata, customFields, settings }: OperatorData) {
  const selectedEventId = useSelectedEventId();
+  const { getLocalizedString } = useTranslation();
  const { subscribe, mainSource, secondarySource, shouldEdit, hidePast, showStart } = useOperatorOptions();

  const [showEditPrompt, setShowEditPrompt] = useState(false);
@@ -113,6 +116,7 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
  const operatorOptions = useMemo(() => getOperatorOptions(customFields, defaultFormat), [customFields, defaultFormat]);

  const canEdit = shouldEdit && subscribe.length;
+  const hasEvents = rundown.order.length > 0;

  return (
    <div className={style.operatorContainer} data-testid='operator-view'>
@@ -127,6 +131,9 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
        </div>
      )}

+      {!hasEvents ? (
+        <EmptyFill text={getLocalizedString('common.no_data')} />
+      ) : (
        <div className={style.operatorEvents} onWheel={handleScroll} onTouchMove={handleScroll} ref={scrollRef}>
          {rundown.order.map((entryId) => {
            const entry = rundown.entries[entryId];
@@ -238,6 +245,7 @@ function Operator({ rundown, rundownMetadata, customFields, settings }: Operator
            return null;
          })}
        </div>
+      )}
      <FollowButton isVisible={lockAutoScroll} onClickHandler={handleOffset} />
    </div>
  );
@@ -2,7 +2,6 @@

 .event {
  opacity: 1;
-  border-top: 1px solid $white-1;
  padding-right: 0.5rem;
  color: $white-90;
  background-color: $viewer-card-bg-color;
@@ -31,7 +30,6 @@
  }

  &.running {
-    border-top: 1px solid $gray-1300;
    background-color: var(--operator-running-bg-override, $active-green);
  }

@@ -42,8 +40,7 @@
  }

  &.past {
-    border-top: 1px solid transparent;
-    opacity: 0.2;
+    opacity: 0.4;
  }
 }

@@ -79,6 +76,7 @@

 .mainField {
  grid-area: main;
+  min-width: 0;
  font-size: 1.5rem;
  color: $ui-white;

@@ -144,6 +142,7 @@

 .fields {
  grid-area: fields;
+  min-width: 0;
  margin-top: 0;
  border-top: 0;

@@ -171,10 +170,9 @@
  &.fieldsWithContent {
    margin-top: 0.25rem;
    padding-block: 0.5rem;
-    border-top: 1px solid $white-13;

    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(14rem, 1fr));
+    grid-template-columns: repeat(auto-fit, minmax(min(14rem, 100%), 1fr));
    gap: 0.25rem 0.75rem;
    line-height: 1.25em;
    font-size: var(--operator-customfield-font-size-override, 1.25rem);
@@ -82,7 +82,7 @@ function OperatorEvent({
  const fieldGridStyle =
    columnCount > 0
      ? ({
-          gridTemplateColumns: `repeat(${columnCount}, minmax(12rem, 1fr))`,
+          gridTemplateColumns: `repeat(${columnCount}, minmax(min(12rem, 100%), 1fr))`,
        } satisfies CSSProperties)
      : undefined;

@@ -44,8 +44,8 @@ export const getOperatorOptions = (customFields: CustomFields, timeFormat: strin
        },
        {
          id: 'subscribe',
-          title: 'Highlight Fields',
-          description: 'Choose custom fields to highlight',
+          title: 'Show custom fields',
+          description: 'Choose custom fields to show on each event',
          type: 'multi-option',
          values: customFieldSelect,
        },
@@ -10,12 +10,13 @@ interface StatusBarProgressProps {
 }

 export default function StatusBarProgress({ viewSettings }: StatusBarProgressProps) {
-  const { current, duration, timeWarning, timeDanger } = useProgressData();
+  const { current, duration, eventId, timeWarning, timeDanger } = useProgressData();

  return (
    <MultiPartProgressBar
      now={current}
      complete={duration}
+      eventId={eventId}
      normalColor={viewSettings.normalColor}
      warning={timeWarning}
      warningColor={viewSettings.warningColor}
@@ -1,14 +1,43 @@
-.title {
-  font-size: 1.75rem;
-  font-weight: 600;
-  color: $ui-white;
-  line-height: 1;
+.titleOverview {
+  flex: 0 1 18rem;
+  min-width: 0;
+  width: 18rem;
+  max-width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 0.125rem;
+}
+
+.project,
+.rundown {
  @include ellipsis-overflow;
 }

-.description {
-  font-size: 1rem;
+.project {
  color: $secondary-text-gray;
+  font-size: 0.75rem;
  font-weight: 400;
-  @include ellipsis-overflow;
+  letter-spacing: 0.04em;
+  line-height: 1.1;
+  text-transform: uppercase;
+}
+
+.rundown {
+  color: $ui-white;
+  font-size: 1.5rem;
+  font-weight: 600;
+  line-height: 1.1;
+}
+
+// A lone title should still read as the primary piece of context.
+.project:only-child,
+.rundown:only-child {
+  color: $ui-white;
+  font-size: 1.5rem;
+}
+
+.project:only-child {
+  font-weight: 600;
+  letter-spacing: normal;
+  text-transform: none;
 }
@@ -8,14 +8,17 @@ export default function TitleOverview() {
  const { data: projectData } = useProjectData();
  const { data: rundownData } = useRundownAuxData();

-  if (!projectData.title && !rundownData.title) {
+  const projectTitle = projectData.title.trim();
+  const rundownTitle = rundownData.title.trim();
+
+  if (!projectTitle && !rundownTitle) {
    return null;
  }

  return (
-    <div>
-      <div className={style.title}>{projectData.title}</div>
-      <div className={style.description}>{rundownData.title}</div>
+    <div className={style.titleOverview}>
+      {projectTitle && <div className={style.project}>{projectTitle}</div>}
+      {rundownTitle && <div className={style.rundown}>{rundownTitle}</div>}
    </div>
  );
 }
@@ -1,19 +1,24 @@
 import { memo } from 'react';

-import Empty from '../../common/components/state/Empty';
+import EmptyFill from '../../common/components/state/EmptyFill';
 import { useRundownWithMetadata } from '../../common/hooks-query/useRundown';
 import { useRundownEditor } from '../../common/hooks/useSocket';
+import { useTranslation } from '../../translation/TranslationProvider';
 import Rundown from './Rundown';

 export default memo(RundownList);
 function RundownList() {
  const { data, status, rundownMetadata } = useRundownWithMetadata();
  const featureData = useRundownEditor();
+  const { getLocalizedString } = useTranslation();

-  const isLoading = status !== 'success' || !data || !rundownMetadata;
+  // avoid showing the editable empty state before we know whether the rundown is actually empty
+  if (status === 'pending') {
+    return <EmptyFill text='Loading…' />;
+  }

-  if (isLoading) {
-    return <Empty text='Connecting to server' />;
+  if (status === 'error') {
+    return <EmptyFill text={getLocalizedString('common.no_data')} />;
  }

  return (
@@ -81,7 +81,7 @@ export default function GroupEditor({ group }: GroupEditorProps) {
          <div>
            <Editor.Label htmlFor='eventId'>Plan offset</Editor.Label>
            <TextLikeInput
-              offset={planOffsetLabel}
+              offset={planOffsetLabel === 'under' ? 'over' : planOffsetLabel}
              className={cx([style.textLikeInput, planOffset === null && style.inactive])}
              disabled
            >
@@ -1,6 +1,6 @@
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { Day, EndAction, EntryId, Playback, TimeStrategy, TimerType } from 'ontime-types';
+import { Day, EndAction, EntryId, Maybe, OntimeGroup, Playback, TimeStrategy, TimerType } from 'ontime-types';
 import { isPlaybackActive } from 'ontime-utils';
 import { MouseEvent, useEffect, useRef } from 'react';
 import {
@@ -13,9 +13,10 @@ import {
  IoTrash,
  IoUnlink,
 } from 'react-icons/io5';
-import { TbFlagFilled, TbListNumbers } from 'react-icons/tb';
+import { TbClockPin, TbFlagFilled, TbListNumbers } from 'react-icons/tb';

 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
+import { useEntry } from '../../../common/hooks-query/useRundown';
 import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { useEntryCopy } from '../../../common/stores/entryCopyStore';
 import { deviceAlt, deviceMod } from '../../../common/utils/deviceUtils';
@@ -102,7 +103,10 @@ export default function RundownEvent({
  const clearSelectedEventId = useEventIdSwapping((state) => state.clearSelectedEventId);
  const openRenumberDialog = useRenumberCuesDialogStore((state) => state.onOpen);

-  const { updateEntry, batchUpdateEvents, clone, deleteEntry, groupEntries, swapEvents } = useEntryActionsContext();
+  const parentGroup = useEntry(parent) as Maybe<OntimeGroup>;
+
+  const { updateEntry, batchUpdateEvents, clone, deleteEntry, groupEntries, swapEvents, matchGroupDuration } =
+    useEntryActionsContext();

  const isSelected = useEventSelection((state) => state.selectedEvents.has(eventId));
  const unselect = useEventSelection((state) => state.unselect);
@@ -114,6 +118,15 @@ export default function RundownEvent({

  const handleRef = useRef<null | HTMLSpanElement>(null);

+  const [enableMatchDuration, groupTargetDurationDescription] = (() => {
+    if (!parentGroup || parentGroup.targetDuration === null || parentGroup.duration === parentGroup.targetDuration)
+      return [false, ''];
+    const { targetDuration, duration } = parentGroup;
+    return targetDuration > duration
+      ? [true, 'Increase event duration to fit the group target']
+      : [true, 'Decrease event duration to fit the group target'];
+  })();
+
  const [onContextMenu] = useContextMenu<HTMLDivElement>(() =>
    selectedEvents.size > 1
      ? [
@@ -172,6 +185,17 @@ export default function RundownEvent({
              updateEntry({ id: eventId, flag: !flag });
            },
          },
+          {
+            type: 'item',
+            label: 'Match Group Target Duration',
+            description: groupTargetDurationDescription,
+            icon: TbClockPin,
+            onClick: () => {
+              if (!parent) return;
+              matchGroupDuration(eventId);
+            },
+            disabled: !enableMatchDuration,
+          },
          { type: 'divider' },
          {
            type: 'item',
@@ -1,12 +1,13 @@
 import { useAnimatedProgress } from '../../../../common/hooks/useAnimatedProgress';
-import { useTimer } from '../../../../common/hooks/useSocket';
+import { useSelectedEventId, useTimer } from '../../../../common/hooks/useSocket';

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

 export default function RundownEventProgressBar() {
  const timer = useTimer();
+  const eventId = useSelectedEventId();

-  const progress = useAnimatedProgress(timer.current, timer.duration);
+  const progress = useAnimatedProgress(timer.current, timer.duration, eventId);

  return <div className={style.progressBar} style={{ width: `${progress}%` }} />;
 }
@@ -74,42 +74,36 @@
  .metaLabel {
    color: $muted-gray;
    font-size: calc(1rem - 3px);
+    display: flex;
+    align-items: center;
+    gap: 0.25rem;
  }
 }

-.strike {
-  text-decoration: wavy underline;
-  margin-right: 0.25rem;
-  color: $ui-white;
-}
-
 .duration {
  display: flex;
  align-items: center;
  gap: 0.25rem;
-}
+  color: $ui-white;

-.lockIcon {
-  opacity: 0.6;
-}
-
-.over {
-  color: $playback-over;
+  &.warning {
    .strike {
+      // color: $playback-over;
+      text-decoration: wavy underline;
      text-decoration-color: $playback-over;
    }
    .offsetLabel {
      background-color: $playback-over;
    }
  }
-.under {
-  color: $playback-under;
-  .strike {
-    text-decoration-color: $playback-under;
 }
-  .offsetLabel {
-    background-color: $playback-under;
+
+.lockIcon {
+  color: $muted-gray;
 }
+
+.target {
+  display: contents;
 }

 .drag {
@@ -2,24 +2,25 @@ import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { EntryId, OntimeGroup } from 'ontime-types';
 import { MILLIS_PER_MINUTE } from 'ontime-utils';
-import { MouseEvent, useRef } from 'react';
+import { MouseEvent, useCallback, useRef } from 'react';
 import {
  IoChevronDown,
  IoChevronUp,
  IoDuplicateOutline,
  IoFolderOpenOutline,
-  IoLockClosed,
  IoReorderTwo,
  IoTrash,
+  IoLockClosed,
 } from 'react-icons/io5';
+import { TbClockPin } from 'react-icons/tb';

 import IconButton from '../../../common/components/buttons/IconButton';
 import Tag from '../../../common/components/tag/Tag';
+import Tooltip from '../../../common/components/tooltip/Tooltip';
 import { useEntryActionsContext } from '../../../common/context/EntryActionsContext';
 import { useContextMenu } from '../../../common/hooks/useContextMenu';
 import { useEntryCopy } from '../../../common/stores/entryCopyStore';
 import { deviceAlt, deviceMod } from '../../../common/utils/deviceUtils';
-import { getOffsetState } from '../../../common/utils/offset';
 import { cx, getAccessibleColour } from '../../../common/utils/styleUtils';
 import { formatDuration, formatTime } from '../../../common/utils/time';
 import TitleEditor from '../common/TitleEditor';
@@ -40,12 +41,31 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
  'use memo';

  const handleRef = useRef<null | HTMLSpanElement>(null);
-  const { clone, ungroup, deleteEntry } = useEntryActionsContext();
+  const { clone, ungroup, deleteEntry, updateEntry } = useEntryActionsContext();

  const selectSingleEntry = useEventSelection((state) => state.setSingleEntrySelection);
  const selectedEvents = useEventSelection((state) => state.selectedEvents);
  const entryCopyId = useEntryCopy((state) => state.entryCopyId);

+  const isDurationMatching = data.targetDuration !== null && data.targetDuration === data.duration;
+
+  const [planOffset, offset] = (() => {
+    if (data.targetDuration === null) {
+      return [null, 0];
+    }
+
+    const offset = data.duration - data.targetDuration;
+    if (offset === 0) {
+      return [null, 0];
+    }
+    const absOffset = Math.abs(offset);
+    return [`${offset < 0 ? '-' : '+'}${formatDuration(absOffset, absOffset > 2 * MILLIS_PER_MINUTE)}`, offset];
+  })();
+
+  const matchDuration = useCallback(() => {
+    updateEntry({ id: data.id, targetDuration: data.duration });
+  }, [data.duration, data.id, updateEntry]);
+
  const [onContextMenu] = useContextMenu<HTMLDivElement>(() => [
    {
      type: 'item',
@@ -62,6 +82,18 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
      disabled: data.entries.length === 0,
    },
    { type: 'divider' },
+    {
+      type: 'item',
+      label: 'Match Content Duration',
+      icon: TbClockPin,
+      onClick: matchDuration,
+      disabled: isDurationMatching,
+      description:
+        offset > 0
+          ? "Increase group target duration to match it's contents"
+          : "Decrease group target duration to match it's contents",
+    },
+    { type: 'divider' },
    {
      type: 'item',
      label: 'Delete Group',
@@ -105,22 +137,6 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
  const binderColours = data.colour && getAccessibleColour(data.colour);
  const isValidDrop = isDragging && over?.id && canDrop(over.data.current?.type, over.data.current?.parent);

-  const [planOffset, planOffsetLabel] = (() => {
-    if (data.targetDuration === null) {
-      return [null, null];
-    }
-
-    const offset = data.duration - data.targetDuration;
-    if (offset === 0) {
-      return [null, 'under'];
-    }
-    const absOffset = Math.abs(offset);
-    return [
-      `${offset < 0 ? '-' : '+'}${formatDuration(absOffset, absOffset > 2 * MILLIS_PER_MINUTE)}`,
-      getOffsetState(offset),
-    ];
-  })();
-
  const dragStyle = {
    zIndex: isDragging ? 2 : 'inherit',
    transform: CSS.Translate.toString(transform),
@@ -175,21 +191,19 @@ export default function RundownGroup({ data, hasCursor, collapsed, onCollapse }:
            <div className={style.metaLabel}>End</div>
            <div>{formatTime(data.timeEnd)}</div>
          </div>
+          <Tooltip text={'Group has target duration'} disabled={data.targetDuration === null}>
            <div className={style.metaEntry}>
-            <div className={style.metaLabel}>Duration</div>
-            <div className={style.duration}>
-              {planOffset === null ? (
-                formatDuration(data.duration)
-              ) : (
-                <span className={cx([planOffsetLabel && style[planOffsetLabel]])}>
-                  <span className={style.strike}>{formatDuration(data.duration)}</span>
-                  <Tag className={style.offsetLabel}>{planOffset}</Tag>
-                </span>
-              )}
+              <div className={style.metaLabel}>
+                Duration
                {data.targetDuration !== null && <IoLockClosed className={style.lockIcon} />}
              </div>
+              <div className={cx([style.duration, planOffset && style.warning])}>
+                <span className={style.strike}>{formatDuration(data.duration)}</span>
+                {planOffset && <Tag className={style.offsetLabel}>{planOffset}</Tag>}
              </div>
            </div>
+          </Tooltip>
+        </div>
      </div>
    </div>
  );
@@ -1,6 +1,5 @@
 import { memo, useEffect, useMemo } from 'react';

-import EmptyPage from '../../../common/components/state/EmptyPage';
 import { EntryActionsProvider } from '../../../common/context/EntryActionsContext';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
 import { useLoadedRundownSource } from '../../../common/hooks-query/useScopedRundown';
@@ -13,7 +12,7 @@ import { makeRundownColumns } from './makeRundownColumns';

 export default memo(RundownTable);
 function RundownTable() {
-  const { data: customFields, status: customFieldStatus } = useCustomFields();
+  const { data: customFields } = useCustomFields();
  const setPermissions = useCuesheetPermissions((state) => state.setPermissions);
  const { editorMode } = useEditorFollowMode();
  const source = useLoadedRundownSource();
@@ -32,16 +31,10 @@ function RundownTable() {

  const columns = useMemo(() => makeRundownColumns(customFields), [customFields]);

-  const isLoading = !customFields || customFieldStatus === 'pending';
-
  return (
    <EntryActionsProvider actions={actions}>
      <CuesheetDnd columns={columns} tableRoot='editor'>
-        {isLoading ? (
-          <EmptyPage text='Loading...' />
-        ) : (
        <CuesheetTable columns={columns} source={source} cuesheetMode={editorMode} tableRoot='editor' />
-        )}
      </CuesheetDnd>
    </EntryActionsProvider>
  );
@@ -39,9 +39,21 @@
    font-size: $header-font-size;
    font-weight: 600;
    display: flex;
+    align-items: center;
    gap: 1rem;
  }

+  .project-header__brand {
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+    min-width: 0;
+  }
+
+  .project-header__brand--without-logo {
+    align-self: baseline;
+  }
+
  .logo {
    max-width: min(200px, 20vw);
  }
@@ -195,10 +207,15 @@

    .project-header {
      flex-direction: column;
+      align-items: flex-start;
      position: relative;
      gap: 0.5rem;
    }

+    .project-header__brand--without-logo {
+      align-self: flex-start;
+    }
+
    .logo img {
      height: min(50px, 10vh);
    }
@@ -35,7 +35,7 @@ export default function BackstageLoader() {
  }

  if (status === 'error') {
-    return <EmptyPage text='There was an error fetching data, please refresh the page.' />;
+    return <EmptyPage variant='error' text='There was an error fetching data, please refresh the page.' />;
  }

  return <Backstage {...data} />;
@@ -107,12 +107,21 @@ function Backstage({ events, customFields, projectData, isMirrored, settings }:
    <div className={`backstage ${isMirrored ? 'mirror' : ''}`} data-testid='backstage-view'>
      <ViewParamsEditor target={OntimeView.Backstage} viewOptions={backstageOptions} />
      <div className='project-header'>
+        <div className={cx(['project-header__brand', !projectData?.logo && 'project-header__brand--without-logo'])}>
          {projectData?.logo && <ViewLogo name={projectData.logo} className='logo' />}
          <div className='title'>{projectData.title}</div>
+        </div>
        <BackstageClock timeformat={timeformat} />
      </div>

-      {showProgress && <ProgressBar className='progress-container' current={time.current} duration={time.duration} />}
+      {showProgress && (
+        <ProgressBar
+          className='progress-container'
+          current={time.current}
+          duration={time.duration}
+          eventId={selectedEventId}
+        />
+      )}

      {!hasEvents && <Empty text={getLocalizedString('common.no_data')} className='empty-container' />}

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	beb0a1394d	accept bearer token	2026-08-11 20:52:54 +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