refactor: create mock data utilities

More rundown metadata (#1429 )
* add dayOffset to OntimeEvent * refactor: isNewLatest * calculate totalDays * refactor: getTimeFromPrevious * add gap as dataset in OntimeEvent * use in ui * format overlap is just a simple text formatting, big test is not needed * add new fields where needed * update apply delay * show nex day eaven if there is no gap * create test * use buildin day offset in timeline * remove todo * consistent naming * make a calculateDayOffset util for rundownCache * refactor: checkIsNextDay to use dayOffset * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * remove unneeded test * remove todo * update test db * use data-testid * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * update comments * remove null option --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>
2026-07-26 10:38:55 +00:00 · 2025-01-12 09:05:23 +01:00 · 2025-01-09 13:35:11 +01:00 · 2025-01-06 22:58:06 +01:00 · 2025-01-06 22:58:06 +01:00 · 2025-01-06 20:33:39 +01:00
179 changed files with 4945 additions and 3598 deletions
@@ -36,7 +36,7 @@ jobs:
          APPLE_TEAM_ID: ${{ secrets.TEAMID }}
          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
          CSC_LINK: ${{ secrets.CSC_LINK }}
-        run: pnpm dist-mac
+        run: pnpm dist-mac --env-mode=loose
        timeout-minutes: 60

      - name: Release
@@ -28,6 +28,7 @@ test-results
 playwright-report
 /playwright/.cache/
 automated-screenshots
+e2e/tests/fixtures/tmp/*

 # production
 build/
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.9.5",
+    "version": "3.10.3",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -11,6 +11,7 @@
    <link rel="icon" type="image/png" href="/ontime-logo.png" />
    <link rel="manifest" href="/site.webmanifest" />
    <link rel="manifest" href="/manifest.json" />
+    <meta name="robots" content="noindex" />
    <title>ontime</title>
    <style>
      body,
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "3.9.5",
+  "version": "3.10.3",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -13,10 +13,10 @@
    "@fontsource/open-sans": "^5.0.28",
    "@mantine/hooks": "^7.13.3",
    "@react-icons/all-files": "^4.1.0",
-    "@sentry/react": "^8.19.0",
-    "@tanstack/react-query": "^5.17.9",
-    "@tanstack/react-query-devtools": "^5.17.9",
-    "@tanstack/react-table": "^8.11.3",
+    "@sentry/react": "^8.43.0",
+    "@tanstack/react-query": "^5.62.7",
+    "@tanstack/react-query-devtools": "^5.62.7",
+    "@tanstack/react-table": "^8.20.5",
    "autosize": "^6.0.1",
    "axios": "^1.2.0",
    "color": "^4.2.3",
@@ -1 +1,10 @@
-{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
+{
+  "name": "",
+  "short_name": "",
+  "icons": [
+    { "src": "/ontime-logo.png", "sizes": "295x295", "type": "image/png" }
+  ],
+  "theme_color": "#2B5ABC",
+  "background_color": "#101010",
+  "display": "standalone"
+}
@@ -12,7 +12,7 @@ const dbPath = `${apiEntryUrl}/db`;
 * HTTP request to the current DB
 */
 export function getDb(filename: string): Promise<AxiosResponse<DatabaseModel>> {
-  return axios.post(`${dbPath}/download/`, { filename });
+  return axios.post(`${dbPath}/download`, { filename });
 }

 /**
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
+import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached, TransientEventPayload } from 'ontime-types';

 import { apiEntryUrl } from './constants';

@@ -16,7 +16,7 @@ export async function fetchNormalisedRundown(): Promise<RundownCached> {
 /**
 * HTTP request to post new event
 */
-export async function requestPostEvent(data: Partial<OntimeRundownEntry>): Promise<AxiosResponse<OntimeRundownEntry>> {
+export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeRundownEntry>> {
  return axios.post(rundownPath, data);
 }

@@ -9,32 +9,23 @@ import style from './DelayIndicator.module.scss';

 interface DelayIndicatorProps {
  delayValue?: number;
+  tooltipPrefix?: string;
 }

 export default function DelayIndicator(props: DelayIndicatorProps) {
-  const { delayValue } = props;
+  const { delayValue, tooltipPrefix } = props;

-  if (typeof delayValue === 'number') {
-    if (delayValue < 0) {
-      return (
-        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
-          <span className={style.delaySymbol}>
-            <IoChevronDown />
-          </span>
-        </Tooltip>
-      );
-    }
-
-    if (delayValue > 0) {
-      return (
-        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
-          <span className={style.delaySymbol}>
-            <IoChevronUp />
-          </span>
-        </Tooltip>
-      );
-    }
+  if (typeof delayValue !== 'number' || delayValue === 0) {
+    return null;
  }

-  return null;
+  const delayString = tooltipPrefix
+    ? `${tooltipPrefix} ${millisToDelayString(delayValue)}`
+    : millisToDelayString(delayValue);
+
+  return (
+    <Tooltip openDelay={tooltipDelayFast} label={delayString}>
+      <span className={style.delaySymbol}>{delayValue < 0 ? <IoChevronDown /> : <IoChevronUp />}</span>
+    </Tooltip>
+  );
 }
@@ -16,11 +16,11 @@ export default function Swatch(props: SwatchProps) {
  const handleClick = () => {
    onClick?.(color);
  };
-  const classes = cx([style.swatch, isSelected ? style.selected : null, onClick ? style.selectable : null]);
+  const classes = cx([style.swatch, isSelected && style.selected, onClick && style.selectable]);

  if (!color) {
    return (
-      <div className={`${classes} ${style.center}`} onClick={handleClick}>
+      <div className={classes} onClick={handleClick}>
        <IoBan />
      </div>
    );
@@ -0,0 +1,60 @@
+import { useCallback } from 'react';
+import { useController, UseControllerProps } from 'react-hook-form';
+import { IoEyedrop } from '@react-icons/all-files/io5/IoEyedrop';
+import { ViewSettings } from 'ontime-types';
+
+import PopoverPicker from '../../../../common/components/input/popover-picker/PopoverPicker';
+import { debounce } from '../../../../common/utils/debounce';
+import { cx, getAccessibleColour } from '../../../utils/styleUtils';
+
+import style from './SwatchSelect.module.scss';
+
+interface SwatchPickerProps {
+  color: string;
+  isSelected?: boolean;
+  onChange: (name: string) => void;
+  alwaysDisplayColor?: boolean;
+}
+
+export default function SwatchPicker(props: SwatchPickerProps) {
+  const { color, onChange, isSelected, alwaysDisplayColor } = props;
+
+  const debouncedOnChange = useCallback(
+    debounce((newValue: string) => {
+      onChange(newValue);
+    }, 500),
+    [onChange],
+  );
+
+  const displayColor = alwaysDisplayColor || isSelected ? color : '';
+  const { color: iconColor } = getAccessibleColour(displayColor);
+
+  return (
+    <PopoverPicker color={displayColor} onChange={debouncedOnChange}>
+      <div
+        className={cx([style.swatch, isSelected && style.selected, style.selectable])}
+        style={{ backgroundColor: displayColor }}
+      >
+        <IoEyedrop color={iconColor} />
+      </div>
+    </PopoverPicker>
+  );
+}
+
+export function SwatchPickerRHF(props: UseControllerProps<ViewSettings>) {
+  const { name, control } = props;
+  const {
+    field: { onChange, value },
+  } = useController({ control, name });
+
+  const displayColor = typeof value === 'string' ? value : '';
+  const { color: iconColor } = getAccessibleColour(displayColor);
+
+  return (
+    <PopoverPicker color={value as string} onChange={onChange}>
+      <div className={cx([style.swatch, style.selectable])} style={{ backgroundColor: displayColor }}>
+        <IoEyedrop color={iconColor} />
+      </div>
+    </PopoverPicker>
+  );
+}
@@ -1,15 +1,18 @@
 .list {
  display: flex;
  flex-wrap: wrap;
-  gap: 0.5rem
+  gap: 0.5rem;
 }

 .swatch {
  width: 2rem;
  height: 2rem;
-  aspect-ratio: 1;
  border-radius: 99px;
  border: 2px solid $gray-1200;
+  color: $ui-white;
+
+  display: grid;
+  place-content: center;

  &.selected {
    border: 2px solid $blue-500;
@@ -17,11 +20,9 @@

  &.selectable {
    cursor: pointer;
+
+    &:hover {
+      border: 2px solid $blue-300;
+    }
  }
 }
-
-.center {
-  display: grid;
-  place-content: center;
-  color: $ui-white;
-}
@@ -1,6 +1,7 @@
 import { useCallback } from 'react';

 import Swatch from './Swatch';
+import SwatchPicker from './SwatchPicker';

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

@@ -43,6 +44,7 @@ export default function SwatchSelect(props: ColourInputProps) {
      {colours.map((colour) => (
        <Swatch key={colour} color={colour} onClick={setColour} isSelected={value === colour} />
      ))}
+      <SwatchPicker color={value} onChange={setColour} isSelected={!colours.includes(value)} />
    </div>
  );
 }
@@ -1,16 +1,20 @@
-.swatch {
-  width: 24px;
-  height: 24px;
-  border-radius: 12px;
-  border: 1px solid white;
-  box-shadow: 0 0 0 1px $gray-300;
-  cursor: pointer;
+.input {
+  color: $gray-200;
+  border: 1px solid transparent;
+  border-radius: 0 0 8px 8px;
+  background-color: $gray-1200;
+  padding: 0 0.5rem;
+  font-size: 1rem;
+  height: 2rem;
+  outline: none;

-  transition-property: box-shadow;
-  transition-duration: $transition-time-action;
+  &:hover {
+    background-color: $gray-1100;
+  }
+
+  &:focus {
+    background-color: $gray-1000;
+    color: $gray-50;
+    border: 1px solid $blue-500;
+  }
 }
-
-.swatch:hover {
-  box-shadow: 0 0 0 1px $blue-300;
-}
-
@@ -1,34 +1,22 @@
-import { HexAlphaColorPicker } from 'react-colorful';
-import { useController, UseControllerProps } from 'react-hook-form';
+import { PropsWithChildren } from 'react';
+import { HexAlphaColorPicker, HexColorInput } from 'react-colorful';
 import { Popover, PopoverContent, PopoverTrigger } from '@chakra-ui/react';
-import { ViewSettings } from 'ontime-types';

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

-export function PopoverPickerRHF(props: UseControllerProps<ViewSettings>) {
-  const { name, control } = props;
-  const {
-    field: { onChange, value },
-  } = useController({ control, name });
-
-  return <PopoverPicker color={value as string} onChange={onChange} />;
-}
-
 interface PopoverPickerProps {
  color: string;
  onChange: (color: string) => void;
 }

-export default function PopoverPicker(props: PopoverPickerProps) {
-  const { color, onChange } = props;
-
+export default function PopoverPicker(props: PropsWithChildren<PopoverPickerProps>) {
+  const { color, onChange, children } = props;
  return (
    <Popover>
-      <PopoverTrigger>
-        <div className={style.swatch} style={{ backgroundColor: color }} />
-      </PopoverTrigger>
-      <PopoverContent style={{ width: 'auto' }}>
+      <PopoverTrigger>{children}</PopoverTrigger>
+      <PopoverContent className={style.small} style={{ borderRadius: '9px', width: 'auto' }}>
        <HexAlphaColorPicker color={color} onChange={onChange} />
+        <HexColorInput color={color} onChange={onChange} className={style.input} prefixed />
      </PopoverContent>
    </Popover>
  );
@@ -15,6 +15,8 @@ export default function useReactiveTextInput(
  options?: {
    submitOnEnter?: boolean;
    submitOnCtrlEnter?: boolean;
+    onCancelUpdate?: () => void;
+    allowSubmitSameValue?: boolean;
  },
 ): UseReactiveTextInputReturn {
  const [text, setText] = useState<string>(initialText);
@@ -47,7 +49,9 @@ export default function useReactiveTextInput(
  const handleSubmit = useCallback(
    (valueToSubmit: string) => {
      // No need to update if it hasn't changed
-      if (valueToSubmit !== initialText) {
+      if (valueToSubmit === initialText && !options?.allowSubmitSameValue) {
+        options?.onCancelUpdate?.();
+      } else {
        const cleanVal = valueToSubmit.trim();
        submitCallback(cleanVal);
        if (cleanVal !== valueToSubmit) {
@@ -56,7 +60,7 @@ export default function useReactiveTextInput(
      }
      setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
    },
-    [initialText, ref, submitCallback],
+    [initialText, options, ref, submitCallback],
  );

  /**
@@ -66,8 +70,9 @@ export default function useReactiveTextInput(
  const handleEscape = useCallback(() => {
    // No need to update if it hasn't changed
    setText(initialText);
+    options?.onCancelUpdate?.();
    setTimeout(() => ref.current?.blur()); // Immediate timeout to ensure text is set before bluring
-  }, [initialText, ref]);
+  }, [initialText, options, ref]);

  const keyHandler = useMemo(() => {
    const hotKeys: HotkeyItem[] = [['Escape', handleEscape, { preventDefault: true }]];
@@ -55,6 +55,7 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
      // we dont know the values in the rundown, escalate to handler
      if (newValue.startsWith('p') || newValue.startsWith('+')) {
        submitHandler(name, newValue);
+        return true;
      }

      const valueInMillis = parseUserTime(newValue);
@@ -2,6 +2,8 @@ $input-delayed-border-color: $ontime-delay-text;

 .timeInput {
  border: 1px solid transparent;
+  color: $label-gray;
+
  &.delayed {
    border: 1px solid $input-delayed-border-color;
  }
@@ -1,9 +1,13 @@
 .container {
+  width: 100%;
+  height: 100%;
+
  display: flex;
  flex-direction: column;
  align-items: center;
  padding-top: 25vh;

+  background: $ui-black;
  color: $ontime-color;
  font-weight: 200;
  font-size: 3rem;
@@ -42,4 +46,4 @@
  to {
    background: rgba($red-500, 0);
  }
-}
+}
@@ -1,6 +1,6 @@
 import { useState } from 'react';

-import PopoverPicker from '../input/popover-picker/PopoverPicker';
+import SwatchPicker from '../input/colour-input/SwatchPicker';

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

@@ -20,13 +20,10 @@ export default function InlineColourPicker(props: InlineColourPickerProps) {
  const { name, value } = props;
  const [colour, setColour] = useState(() => ensureHex(value));

-  const debouncedChange = (value: string) => {
-    setColour(value);
-  };
-
  return (
    <div className={style.inline}>
-      <PopoverPicker color={colour} onChange={debouncedChange} />
+      <SwatchPicker color={colour} onChange={setColour} alwaysDisplayColor />
+      <span>{colour}</span>
      <input type='hidden' name={name} value={colour} />
    </div>
  );
@@ -1,6 +1,6 @@
 .drawerFooter {
  display: flex;
-  justify-content: end;
+  justify-content: end;  
  gap: $section-spacing;

  button {
@@ -8,6 +8,23 @@
  }
 }

+.infoLabel {
+  display: flex;
+  align-items: center;
+  gap: $element-spacing;
+  padding: 1rem;
+  margin-bottom: 1rem;
+
+  background-color: $gray-1100;
+  border-radius: 2px;
+  font-size: $inner-section-text-size;
+
+  svg {
+    font-size: 1.5rem;
+    color: $info-blue;
+  }
+}
+
 .label {
  font-size: $inner-section-text-size;
  color: $label-gray;
@@ -11,6 +11,9 @@ import {
  DrawerOverlay,
  useDisclosure,
 } from '@chakra-ui/react';
+import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
+
+import useViewSettings from '../../../common/hooks-query/useViewSettings';

 import ParamInput from './ParamInput';
 import { isSection, ViewOption } from './types';
@@ -87,6 +90,8 @@ interface EditFormDrawerProps {
 // TODO: this is a good candidate for memoisation, but needs the paramFields to be stable
 export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
  const [searchParams, setSearchParams] = useSearchParams();
+  const { data: viewSettings } = useViewSettings();
+
  const { isOpen, onClose, onOpen } = useDisclosure();

  useEffect(() => {
@@ -127,6 +132,12 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
        </DrawerHeader>

        <DrawerBody>
+          {viewSettings.overrideStyles && (
+            <div className={style.infoLabel}>
+              <IoAlertCircle />
+              This view style is being modified by a custom CSS file. <br />
+            </div>
+          )}
          <form id='edit-params-form' onSubmit={onParamsFormSubmit}>
            {viewOptions.map((option) => {
              if (isSection(option)) {
@@ -1,6 +1,16 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { isOntimeEvent, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
+import {
+  isOntimeEvent,
+  OntimeBlock,
+  OntimeDelay,
+  OntimeEvent,
+  OntimeRundownEntry,
+  RundownCached,
+  TimeField,
+  TimeStrategy,
+  TransientEventPayload,
+} from 'ontime-types';
 import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';

 import { RUNDOWN } from '../api/constants';
@@ -19,6 +29,16 @@ import {
 import { logAxiosError } from '../api/utils';
 import { useEditorSettings } from '../stores/editorSettings';

+export type EventOptions = Partial<{
+  // options to any new block (event / delay / block)
+  after: string;
+  before: string;
+  // options to blocks of type OntimeEvent
+  defaultPublic: boolean;
+  linkPrevious: boolean;
+  lastEventId: string;
+}>;
+
 /**
 * @description Set of utilities for events //TODO: should this be called useEntryAction and so on
 */
@@ -47,31 +67,19 @@ export const useEventAction = () => {
    networkMode: 'always',
  });

-  // options to any new block (event / delay / block)
-  type BaseOptions = {
-    after?: string;
-  };
-
-  // options to blocks of type OntimeEvent
-  type EventOptions = BaseOptions &
-    Partial<{
-      defaultPublic: boolean;
-      linkPrevious: boolean;
-      lastEventId: string;
-    }>;
-
  /**
   * Adds an event to rundown
   */
  const addEvent = useCallback(
-    async (event: Partial<OntimeRundownEntry>, options?: EventOptions) => {
-      const newEvent: Partial<OntimeRundownEntry> = { ...event };
+    async (event: Partial<OntimeEvent | OntimeDelay | OntimeBlock>, options?: EventOptions) => {
+      const newEvent: TransientEventPayload = { ...event };

      // ************* CHECK OPTIONS specific to events
      if (isOntimeEvent(newEvent)) {
        // merge creation time options with event settings
        const applicationOptions = {
          after: options?.after,
+          before: options?.before,
          defaultPublic: options?.defaultPublic ?? defaultPublic,
          lastEventId: options?.lastEventId,
          linkPrevious: options?.linkPrevious ?? linkPrevious,
@@ -121,11 +129,16 @@ export const useEventAction = () => {

      // handle adding options that concern all event type
      if (options?.after) {
+        // @ts-expect-error -- not sure how to type this, <after> is a transient property
        newEvent.after = options.after;
      }
+      if (options?.before) {
+        // @ts-expect-error -- not sure how to type this, <before> is a transient property
+        newEvent.before = options.before;
+      }

      try {
-        await _addEventMutation.mutateAsync(newEvent);
+        await _addEventMutation.mutateAsync(newEvent as TransientEventPayload);
      } catch (error) {
        logAxiosError('Failed adding event', error);
      }
@@ -203,13 +216,75 @@ export const useEventAction = () => {
    [updateEvent],
  );

-  type TimeField = 'timeStart' | 'timeEnd' | 'duration';
  /**
   * Updates time of existing event
+   * @param eventId {string} - id of the event
+   * @param field {TimeField} - field to update
+   * @param value {string} - new value string to be parsed
+   * @param lockOnUpdate {boolean} - whether we will apply the lock / release on update
   */
  const updateTimer = useCallback(
-    async (eventId: string, field: TimeField, value: string) => {
-      const getPreviousEnd = (): number => {
+    async (eventId: string, field: TimeField, value: string, lockOnUpdate?: boolean) => {
+      // an empty value with no lock has no domain validity
+      if (!lockOnUpdate && value === '') {
+        return;
+      }
+
+      const newEvent: Partial<OntimeEvent> = {
+        id: eventId,
+      };
+
+      // check if we should lock the field
+      if (lockOnUpdate) {
+        if (field === 'timeEnd') {
+          // an empty value indicates that we should unlock the field
+          newEvent.timeStrategy = value === '' ? TimeStrategy.LockDuration : TimeStrategy.LockEnd;
+          newEvent.timeEnd = value === '' ? undefined : calculateNewValue();
+        } else if (field === 'duration') {
+          // an empty value indicates that we should unlock the field
+          newEvent.timeStrategy = value === '' ? TimeStrategy.LockEnd : TimeStrategy.LockDuration;
+          newEvent.duration = value === '' ? undefined : calculateNewValue();
+        } else if (field === 'timeStart') {
+          // an empty values means we should link to the previous
+          newEvent.linkStart = value === '' ? 'true' : null;
+          newEvent.timeStart = value === '' ? undefined : calculateNewValue();
+        }
+      } else {
+        newEvent[field] = calculateNewValue();
+      }
+
+      try {
+        await _updateEventMutation.mutateAsync(newEvent);
+      } catch (error) {
+        logAxiosError('Error updating event', error);
+      }
+
+      /**
+       * Utility function to calculate the new time value
+       */
+      function calculateNewValue(): number {
+        let newValMillis = 0;
+
+        // check for previous keyword
+        if (value === 'p' || value === 'prev' || value === 'previous') {
+          newValMillis = getPreviousEnd();
+
+          // check for adding time keyword
+        } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
+          // TODO: is this logic solid?
+          const remainingString = value.substring(1);
+          newValMillis = getPreviousEnd() + parseUserTime(remainingString);
+        } else {
+          newValMillis = parseUserTime(value);
+        }
+        // dont allow timer values over 23:59:59
+        return Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
+      }
+
+      /**
+       * Utility function to get the previous event end time
+       */
+      function getPreviousEnd(): number {
        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);

        if (!cachedRundown?.order || !cachedRundown?.rundown) {
@@ -229,34 +304,6 @@ export const useEventAction = () => {
          }
        }
        return previousEnd;
-      };
-
-      let newValMillis = 0;
-
-      // check for previous keyword
-      if (value === 'p' || value === 'prev' || value === 'previous') {
-        newValMillis = getPreviousEnd();
-
-        // check for adding time keyword
-      } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
-        // TODO: is this logic solid?
-        const remainingString = value.substring(1);
-        newValMillis = getPreviousEnd() + parseUserTime(remainingString);
-      } else {
-        newValMillis = parseUserTime(value);
-      }
-
-      // dont allow timer values over 23:59:59
-      const cappedMillis = Math.min(newValMillis, dayInMs - MILLIS_PER_SECOND);
-
-      const newEvent = {
-        id: eventId,
-        [field]: cappedMillis,
-      };
-      try {
-        await _updateEventMutation.mutateAsync(newEvent);
-      } catch (error) {
-        logAxiosError('Error updating event', error);
      }
    },
    [_updateEventMutation, queryClient],
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';

-import { debounce } from '../../common/utils/debounce';
+import { throttle } from '../../common/utils/throttle';

 export const useFadeOutOnInactivity = () => {
  const [isMouseMoved, setIsMouseMoved] = useState(false);
@@ -16,11 +16,11 @@ export const useFadeOutOnInactivity = () => {
      fadeOut = setTimeout(() => setIsMouseMoved(false), 3000);
    };

-    const debouncedShowMenu = debounce(setShowMenuTrue, 1000);
+    const throttledShowMenu = throttle(setShowMenuTrue, 1000);

-    document.addEventListener('mousemove', debouncedShowMenu);
+    document.addEventListener('mousemove', throttledShowMenu);
    return () => {
-      document.removeEventListener('mousemove', debouncedShowMenu);
+      document.removeEventListener('mousemove', throttledShowMenu);
      if (fadeOut) {
        clearTimeout(fadeOut);
      }
@@ -65,6 +65,7 @@ export const useMessagePreview = () => {
    showExternalMessage: state.message.timer.secondarySource === 'external' && Boolean(state.message.external),
    showTimerMessage: state.message.timer.visible && Boolean(state.message.timer.text),
    timerType: state.eventNow?.timerType ?? null,
+    countToEnd: state.eventNow?.countToEnd ?? false,
  });

  return useRuntimeStore(featureSelector);
@@ -148,19 +149,21 @@ export const setAuxTimer = {
  setDuration: (time: number) => socketSendJson('auxtimer', { '1': { duration: time } }),
 };

-export const useCuesheet = () => {
+export const useSelectedEventId = () => {
  const featureSelector = (state: RuntimeStore) => ({
-    playback: state.timer.playback,
-    currentBlockId: state.currentBlock.block?.id ?? null,
    selectedEventId: state.eventNow?.id ?? null,
-    selectedEventIndex: state.runtime.selectedEventIndex,
-    numEvents: state.runtime.numEvents,
-    titleNow: state.eventNow?.title || '',
  });

  return useRuntimeStore(featureSelector);
 };

+export const useCurrentBlockId = () => {
+  const featureSelector = (state: RuntimeStore) => ({
+    currentBlockId: state.currentBlock.block?.id ?? null,
+  });
+  return useRuntimeStore(featureSelector);
+};
+
 export const setEventPlayback = {
  loadEvent: (id: string) => socketSendJson('load', { id }),
  startEvent: (id: string) => socketSendJson('start', { id }),
@@ -15,4 +15,5 @@ export type ViewExtendedTimer = {

  clock: number;
  timerType: TimerType;
+  countToEnd: boolean;
 };
@@ -3,8 +3,8 @@ import { formatFromMillis, MILLIS_PER_HOUR, MILLIS_PER_MINUTE } from 'ontime-uti

 /**
 * Parses a value in millis to a string which encodes a delay
- * @param millis 
- * @param format 
+ * @param millis
+ * @param format
 */
 export function millisToDelayString(millis: MaybeNumber, format: 'compact' | 'expanded' = 'compact'): string {
  if (millis == null || millis === 0) {
@@ -1,12 +1,12 @@
-export function debounce(callback: () => void, wait: number) {
+export function debounce<T extends any[]>(callback: (...args: T) => void, wait: number) {
  let timeout: NodeJS.Timeout | null;
-  return () => {
+  return (...args: T) => {
    if (timeout) {
-      return;
+      clearTimeout(timeout);
    }
    timeout = setTimeout(() => {
      timeout = null;
-      callback();
+      callback(...args);
    }, wait);
  };
 }
@@ -7,7 +7,7 @@ import { OntimeEvent, SupportedEvent } from 'ontime-types';
 * @return {OntimeEvent} clean event
 */
 type ClonedEvent = Omit<OntimeEvent, 'id' | 'cue'>;
-export const cloneEvent = (event: OntimeEvent, after?: string): ClonedEvent => {
+export const cloneEvent = (event: OntimeEvent): ClonedEvent => {
  return {
    type: SupportedEvent.Event,
    title: event.title,
@@ -17,13 +17,16 @@ export const cloneEvent = (event: OntimeEvent, after?: string): ClonedEvent => {
    timeEnd: event.timeEnd,
    timerType: event.timerType,
    timeStrategy: event.timeStrategy,
+    countToEnd: event.countToEnd,
    linkStart: event.linkStart,
    endAction: event.endAction,
    isPublic: event.isPublic,
    skip: event.skip,
    colour: event.colour,
-    after,
    revision: 0,
+    delay: 0,
+    dayOffset: 0,
+    gap: 0,
    timeWarning: event.timeWarning,
    timeDanger: event.timeDanger,
    custom: {},
@@ -7,3 +7,11 @@ export function isKeyEnter<T>(event: KeyboardEvent<T>): boolean {
 export function isKeyEscape<T>(event: KeyboardEvent<T>): boolean {
  return event.key === 'Escape';
 }
+
+export function preventEscape<T>(event: KeyboardEvent<T>, callback?: () => void): void {
+  if (isKeyEscape(event)) {
+    event.preventDefault();
+    event.stopPropagation();
+    callback?.();
+  }
+}
@@ -0,0 +1,12 @@
+export function throttle<T extends any[]>(callback: (...args: T) => void, wait: number) {
+  let timeout: NodeJS.Timeout | null;
+  return (...args: T) => {
+    if (timeout) {
+      return;
+    }
+    timeout = setTimeout(() => {
+      timeout = null;
+      callback(...args);
+    }, wait);
+  };
+}
@@ -6,6 +6,9 @@ declare module '*.scss' {
 type ListenerType = (event: 'string', args: unknown[]) => void;

 declare global {
+  /**
+   * Register the electron properties
+   */
  interface Window {
    ipcRenderer: {
      send: (channel: string, args?: string | object) => void;
@@ -17,6 +20,24 @@ declare global {
  }
 }

+/**
+ * We pass a custom property to the table meta to allow field update
+ */
+declare module '@tanstack/react-table' {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  interface TableMeta<TData extends RowData> {
+    handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom: boolean) => void;
+    handleUpdateTimer: (eventId: string, field: TimeField, payload: string) => void;
+    options: {
+      showDelayedTimes: boolean;
+      hideTableSeconds: boolean;
+    };
+  }
+}
+
+/**
+ * Allow passing CSS Properties
+ */
 declare module 'react' {
  interface CSSProperties {
    [key: `--${string}`]: string | number;
@@ -70,7 +70,7 @@ function PanelListItem(props: PanelListItemProps) {
      </li>
      {panel.secondary?.map((secondary) => {
        const id = secondary.id.split('__')[1];
-        const secondaryClasses = cx([style.secondary, location === id ? style.active : null]);
+        const secondaryClasses = cx([style.secondary, isSelected && location === id ? style.active : null]);
        return (
          <li
            key={secondary.id}
@@ -26,15 +26,24 @@ $inner-padding: 1rem;
  color: $gray-300;
 }

-.section {
-  position: relative;
-  margin-top: 2rem;
+.section, .indent {
  font-size: calc(1rem - 1px);
-  max-width: 800px;
  display: flex;
  flex-direction: column;
  gap: 1rem;
  color: $ui-white;
+
+}
+
+.section {
+  position: relative;
+  margin-top: 2rem;
+  max-width: 800px;
+}
+
+.indent {
+  padding: 1rem;
+  background-color: $gray-1350;
 }

 .paragraph {
@@ -84,7 +93,6 @@ $inner-padding: 1rem;
    position: sticky;
    top: 0;
    z-index: 3;
-    box-shadow: 0 1px $white-10;
    background-color: $gray-1350;
  }

@@ -163,6 +171,40 @@ $inner-padding: 1rem;
  animation: animloader 1s ease-in infinite;
 }

+.empty {
+  background-color: $black-10;
+  text-align: center;
+  color: $muted-gray;
+
+  td {
+    padding: 2rem;
+  }
+
+  button {
+    margin-top: 1rem;
+  }
+}
+
+.inlineSiblings {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+}
+
+.empty {
+  background-color: $black-10;
+  text-align: center;
+  color: $muted-gray;
+  
+  td {    
+    padding: 2rem;
+  }
+
+  button {
+    margin-top: 1rem;
+  }
+}
+
@keyframes animloader {
  0% {
    transform: scale(0);
@@ -1,4 +1,6 @@
 import { HTMLAttributes, ReactNode } from 'react';
+import { Button } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';

 import { cx } from '../../../common/utils/styleUtils';

@@ -22,10 +24,19 @@ type SectionProps<C extends AllowedTags> = {
  children: ReactNode;
 } & JSX.IntrinsicElements[C];

-export function Section<C extends AllowedTags = 'div'>({ as, children, ...props }: SectionProps<C>) {
+export function Section<C extends AllowedTags = 'div'>({ as, className, children, ...props }: SectionProps<C>) {
  const Element = as ?? 'div';
  return (
-    <Element className={style.section} {...(props as HTMLAttributes<HTMLElement>)}>
+    <Element className={cx([style.section, className])} {...(props as HTMLAttributes<HTMLElement>)}>
+      {children}
+    </Element>
+  );
+}
+
+export function Indent<C extends AllowedTags = 'div'>({ as, className, children, ...props }: SectionProps<C>) {
+  const Element = as ?? 'div';
+  return (
+    <Element className={cx([style.indent, className])} {...(props as HTMLAttributes<HTMLElement>)}>
      {children}
    </Element>
  );
@@ -52,8 +63,21 @@ export function Table({ className, children }: { className?: string; children: R
  );
 }

-export function ListGroup({ children }: { children: ReactNode }) {
-  return <ul className={style.listGroup}>{children}</ul>;
+export function TableEmpty({ handleClick }: { handleClick: () => void }) {
+  return (
+    <tr className={style.empty}>
+      <td colSpan={99}>
+        <div>No data yet</div>
+        <Button onClick={handleClick} variant='ontime-subtle' rightIcon={<IoAdd />} size='sm'>
+          New
+        </Button>
+      </td>
+    </tr>
+  );
+}
+
+export function ListGroup({ className, children }: { className?: string; children: ReactNode }) {
+  return <ul className={cx([style.listGroup, className])}>{children}</ul>;
 }

 export function ListItem({ children }: { children: ReactNode }) {
@@ -74,7 +74,7 @@ export default function ClientList() {
                    )}
                    {name}
                  </td>
-                  {isCurrent ? <td /> : <td className={style.pathList}>{path}</td>}
+                  <td className={style.pathList}>{path}</td>
                  <td className={style.actionButtons}>
                    <Button
                      size='xs'
@@ -149,9 +149,14 @@ export default function UrlPresetsForm() {
              </tr>
            </thead>
            <tbody>
+              {fields.length === 0 && <Panel.TableEmpty handleClick={addNew} />}
              {fields.map((preset, index) => {
                const maybeAliasError = errors.data?.[index]?.alias?.message;
                const maybeUrlError = errors.data?.[index]?.pathAndParams?.message;
+                // only saved and enabled URLs can be tested
+                const canTest =
+                  preset.alias && preset.enabled && preset.pathAndParams && !maybeAliasError && !maybeUrlError;
+
                return (
                  <tr key={preset.id}>
                    <td className={style.fit}>
@@ -190,6 +195,7 @@ export default function UrlPresetsForm() {
                    <td className={style.flex}>
                      <TooltipActionBtn
                        size='sm'
+                        isDisabled={!canTest}
                        clickHandler={(event) => handleLinks(event, preset.alias)}
                        tooltip='Test preset'
                        aria-label='Test preset'
@@ -6,7 +6,7 @@ import { ViewSettings } from 'ontime-types';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import { postViewSettings } from '../../../../common/api/viewSettings';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import { PopoverPickerRHF } from '../../../../common/components/input/popover-picker/PopoverPicker';
+import { SwatchPickerRHF } from '../../../../common/components/input/colour-input/SwatchPicker';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useViewSettings from '../../../../common/hooks-query/useViewSettings';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -111,15 +111,15 @@ export default function ViewSettingsForm() {
          <Panel.ListGroup>
            <Panel.ListItem>
              <Panel.Field title='Timer colour' description='Default colour of a running timer' />
-              <PopoverPickerRHF name='normalColor' control={control} />
+              <SwatchPickerRHF name='normalColor' control={control} />
            </Panel.ListItem>
            <Panel.ListItem>
              <Panel.Field title='Warning colour' description='Colour of a running timer in warning mode' />
-              <PopoverPickerRHF name='warningColor' control={control} />
+              <SwatchPickerRHF name='warningColor' control={control} />
            </Panel.ListItem>
            <Panel.ListItem>
              <Panel.Field title='Danger colour' description='Colour of a running timer in danger mode' />
-              <PopoverPickerRHF name='dangerColor' control={control} />
+              <SwatchPickerRHF name='dangerColor' control={control} />
            </Panel.ListItem>
          </Panel.ListGroup>
          <Panel.ListGroup>
@@ -8,7 +8,7 @@ import { generateId } from 'ontime-utils';

 import { maybeAxiosError } from '../../../../common/api/utils';
 import useOscSettings, { useOscSettingsMutation } from '../../../../common/hooks-query/useOscSettings';
-import { isKeyEscape } from '../../../../common/utils/keyEvent';
+import { preventEscape } from '../../../../common/utils/keyEvent';
 import { isASCII, isASCIIorEmpty, isIPAddress, isOnlyNumbers, startsWithSlash } from '../../../../common/utils/regex';
 import { isOntimeCloud } from '../../../../externals';
 import * as Panel from '../../panel-utils/PanelUtils';
@@ -63,13 +63,6 @@ export default function OscIntegrations() {
    }
  };

-  const preventEscape = (event: React.KeyboardEvent) => {
-    if (isKeyEscape(event)) {
-      event.preventDefault();
-      event.stopPropagation();
-    }
-  };
-
  const handleAddNewSubscription = () => {
    prepend({
      id: generateId(),
@@ -88,7 +88,6 @@ export default function EditorSettingsForm() {
              >
                <option value={TimerType.CountDown}>Count down</option>
                <option value={TimerType.CountUp}>Count up</option>
-                <option value={TimerType.TimeToEnd}>Time to end</option>
                <option value={TimerType.Clock}>Clock</option>
                <option value={TimerType.None}>None</option>
              </Select>
@@ -11,6 +11,7 @@ export const namedImportMap = {
  Duration: 'duration',
  Cue: 'cue',
  Title: 'title',
+  'Count to end': 'count to end',
  'Is Public': 'public',
  Skip: 'skip',
  Note: 'notes',
@@ -47,6 +48,7 @@ export function convertToImportMap(namedImportMap: NamedImportMap): ImportMap {
    duration: namedImportMap.Duration,
    cue: namedImportMap.Cue,
    title: namedImportMap.Title,
+    countToEnd: namedImportMap['Count to end'],
    isPublic: namedImportMap['Is Public'],
    skip: namedImportMap.Skip,
    note: namedImportMap.Note,
@@ -40,6 +40,7 @@ export default function PreviewRundown(props: PreviewRundownProps) {
          <th>Duration</th>
          <th>Warning Time</th>
          <th>Danger Time</th>
+          <th>Count to end</th>
          <th>Is Public</th>
          <th>Skip</th>
          <th>Colour</th>
@@ -71,6 +72,7 @@ export default function PreviewRundown(props: PreviewRundownProps) {
          }
          eventIndex += 1;
          const colour = event.colour ? getAccessibleColour(event.colour) : {};
+          const countToEnd = booleanToText(event.countToEnd);
          const isPublic = booleanToText(event.isPublic);
          const skip = booleanToText(event.skip);

@@ -93,6 +95,7 @@ export default function PreviewRundown(props: PreviewRundownProps) {
                <td>{millisToString(event.duration)}</td>
                <td>{millisToString(event.timeWarning)}</td>
                <td>{millisToString(event.timeDanger)}</td>
+                <td className={style.center}>{countToEnd && <Tag>{countToEnd}</Tag>}</td>
                <td className={style.center}>{isPublic && <Tag>{isPublic}</Tag>}</td>
                <td>{skip && <Tag>{skip}</Tag>}</td>
                <td style={{ ...colour }}>{event.colour}</td>
@@ -16,7 +16,7 @@ import { Corner } from '../../editors/editor-utils/EditorUtils';
 import style from './MessageControl.module.scss';

 export default function TimerPreview() {
-  const { blink, blackout, phase, showAuxTimer, showExternalMessage, showTimerMessage, timerType } =
+  const { blink, blackout, countToEnd, phase, showAuxTimer, showExternalMessage, showTimerMessage, timerType } =
    useMessagePreview();
  const { data } = useViewSettings();

@@ -24,11 +24,11 @@ export default function TimerPreview() {

  const main = (() => {
    if (showTimerMessage) return 'Message';
+    if (timerType === TimerType.None) return timerPlaceholder;
    if (phase === TimerPhase.Pending) return 'Standby to start';
    if (phase === TimerPhase.Overtime && data.endMessage) return 'Custom end message';
-    if (timerType === TimerType.TimeToEnd) return 'Time to end';
    if (timerType === TimerType.Clock) return 'Clock';
-    if (timerType === TimerType.None) return timerPlaceholder;
+    if (countToEnd) return 'Count to End';
    return 'Timer';
  })();

@@ -74,12 +74,12 @@ export default function TimerPreview() {
        <Tooltip label='Time type: Clock' openDelay={tooltipDelayMid} shouldWrapChildren>
          <IoTime className={style.statusIcon} data-active={timerType === TimerType.Clock} />
        </Tooltip>
-        <Tooltip label='Time type: Time to end' openDelay={tooltipDelayMid} shouldWrapChildren>
-          <IoFlag className={style.statusIcon} data-active={timerType === TimerType.TimeToEnd} />
-        </Tooltip>
        <Tooltip label='Time type: None' openDelay={tooltipDelayMid} shouldWrapChildren>
          <IoBan className={style.statusIcon} data-active={timerType === TimerType.None} />
        </Tooltip>
+        <Tooltip label={countToEnd ? 'Count to end' : 'Count duration'} openDelay={tooltipDelayMid} shouldWrapChildren>
+          <IoFlag className={style.statusIcon} data-active={countToEnd} />
+        </Tooltip>
      </div>
    </div>
  );
@@ -16,4 +16,8 @@
  &.finished {
    color: $timer-finished-color;
  }
+
+  &.muted {
+    color: $muted-gray;
+  }
 }
@@ -19,7 +19,7 @@ export default function TimerDisplay(props: TimerDisplayProps) {
  const isNegative = (time ?? 0) < 0;
  const display =
    time == null ? timerPlaceholder : millisToString(time, { fallback: timerPlaceholder }).replace('-', '');
-  const classes = cx([style.timer, isNegative ? style.finished : null]);
+  const classes = cx([style.timer, isNegative ? style.finished : null, time === null && style.muted]);

  return <div className={classes}>{display}</div>;
 }
@@ -8,7 +8,7 @@
  color: $ui-white;
  transition-property: color;
  transition-duration: $transition-time-action;
-  border-radius: 99px;
+  border-radius: $component-border-radius-full;

  // similar styles to ontime-button-subtle
  background-color: $gray-1050;
@@ -27,13 +27,16 @@

 .title {
  font-size: 1rem;
-  color: $label-gray;
+  color: $title-gray;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }

 .label {
  display: block;
-  font-size: calc(1rem - 3px);
+  font-size: $aux-text-size;
  color: $label-gray;
-  margin-bottom: 0.25rem;
+  margin-bottom: $element-inner-spacing;
  max-width: max-content; // prevent label from taking entire row
 }
@@ -1,4 +1,4 @@
-import type { LabelHTMLAttributes, ReactNode } from 'react';
+import type { HTMLAttributes, LabelHTMLAttributes } from 'react';
 import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
 import { type IconBaseProps } from '@react-icons/all-files/lib';

@@ -10,8 +10,13 @@ export function Corner({ className, ...elementProps }: IconBaseProps) {
  return <IoArrowUp className={cx([style.corner, className])} {...elementProps} />;
 }

-export function Title({ children }: { children: ReactNode }) {
-  return <h3 className={style.title}>{children}</h3>;
+export function Title({ children, className, ...elementProps }: HTMLAttributes<HTMLHeadingElement>) {
+  const classes = cx([style.title, className]);
+  return (
+    <h3 className={classes} {...elementProps}>
+      {children}
+    </h3>
+  );
 }

 export function Label({ children, className, ...elementProps }: LabelHTMLAttributes<HTMLLabelElement>) {
@@ -12,7 +12,7 @@ import useCustomFields from '../../common/hooks-query/useCustomFields';
 import useProjectData from '../../common/hooks-query/useProjectData';
 import useRundown from '../../common/hooks-query/useRundown';
 import useSettings from '../../common/hooks-query/useSettings';
-import { debounce } from '../../common/utils/debounce';
+import { throttle } from '../../common/utils/throttle';
 import { getDefaultFormat } from '../../common/utils/time';
 import { getPropertyValue, isStringBoolean } from '../viewers/common/viewUtils';

@@ -85,7 +85,7 @@ export default function Operator() {
      }
    }
  };
-  const debouncedHandleScroll = debounce(handleUserScroll, 1000);
+  const throttledHandleScroll = throttle(handleUserScroll, 1000);

  const handleScroll = () => {
    if (timeoutId.current) {
@@ -97,7 +97,7 @@ export default function Operator() {

    setShowEditPrompt(true);

-    debouncedHandleScroll();
+    throttledHandleScroll();
  };

  const handleEdit = useCallback((event: EditEvent) => {
@@ -4,6 +4,23 @@
  display: flex;
 }

+.isOffline {
+  .info {
+    opacity: $opacity-disabled;
+  }
+  &::after {
+    content: 'Disconnected';
+    position: absolute;
+    padding-inline: 0.5rem;
+    bottom: 0.5rem;
+    right: 0.5rem;
+    background-color: $red-700;
+    border-radius: 2px;
+    font-size: calc(1rem - 2px);
+    z-index: 10;
+  }
+}
+
 .nav {
  display: flex;
  gap: 0.5rem;
@@ -1,10 +1,10 @@
-import { memo, useMemo } from 'react';
+import { memo, PropsWithChildren, ReactNode, useMemo } from 'react';
 import { millisToString } from 'ontime-utils';

 import ErrorBoundary from '../../common/components/error-boundary/ErrorBoundary';
-import { useRuntimeOverview, useRuntimePlaybackOverview, useTimer } from '../../common/hooks/useSocket';
+import { useIsOnline, useRuntimeOverview, useRuntimePlaybackOverview, useTimer } from '../../common/hooks/useSocket';
 import useProjectData from '../../common/hooks-query/useProjectData';
-import { enDash } from '../../common/utils/styleUtils';
+import { cx, enDash, timerPlaceholder } from '../../common/utils/styleUtils';

 import { TimeColumn, TimeRow } from './composite/TimeLayout';
 import { calculateEndAndDaySpan, formatedTime, getOffsetText } from './overviewUtils';
@@ -13,7 +13,7 @@ import style from './Overview.module.scss';

 export const EditorOverview = memo(_EditorOverview);

-function _EditorOverview({ children }: { children: React.ReactNode }) {
+function _EditorOverview({ children }: PropsWithChildren) {
  const { plannedEnd, plannedStart, actualStart, expectedEnd } = useRuntimeOverview();

  const [maybePlannedEnd, maybePlannedDaySpan] = useMemo(() => calculateEndAndDaySpan(plannedEnd), [plannedEnd]);
@@ -23,36 +23,48 @@ function _EditorOverview({ children }: { children: React.ReactNode }) {
  const expectedEndText = formatedTime(maybeExpectedEnd);

  return (
-    <div className={style.overview}>
-      <ErrorBoundary>
-        <div className={style.nav}>{children}</div>
-        <div className={style.info}>
-          <TitlesOverview />
-          <div>
-            <TimeRow label='Planned start' value={formatedTime(plannedStart)} className={style.start} />
-            <TimeRow label='Actual start' value={formatedTime(actualStart)} className={style.start} />
-          </div>
-          <ProgressOverview />
-          <CurrentBlockOverview />
-          <RuntimeOverview />
-          <div>
-            <TimeRow label='Planned end' value={plannedEndText} className={style.end} daySpan={maybePlannedDaySpan} />
-            <TimeRow
-              label='Expected end'
-              value={expectedEndText}
-              className={style.end}
-              daySpan={maybeExpectedDaySpan}
-            />
-          </div>
-        </div>
-      </ErrorBoundary>
-    </div>
+    <OverviewWrapper navElements={children}>
+      <TitlesOverview />
+      <div>
+        <TimeRow
+          label='Planned start'
+          value={formatedTime(plannedStart)}
+          className={style.start}
+          muted={plannedStart === null}
+        />
+        <TimeRow
+          label='Actual start'
+          value={formatedTime(actualStart)}
+          className={style.start}
+          muted={actualStart === null}
+        />
+      </div>
+      <ProgressOverview />
+      <CurrentBlockOverview />
+      <RuntimeOverview />
+      <div>
+        <TimeRow
+          label='Planned end'
+          value={plannedEndText}
+          className={style.end}
+          daySpan={maybePlannedDaySpan}
+          muted={maybePlannedEnd === null}
+        />
+        <TimeRow
+          label='Expected end'
+          value={expectedEndText}
+          className={style.end}
+          daySpan={maybeExpectedDaySpan}
+          muted={maybeExpectedEnd === null}
+        />
+      </div>
+    </OverviewWrapper>
  );
 }

 export const CuesheetOverview = memo(_CuesheetOverview);

-function _CuesheetOverview({ children }: { children: React.ReactNode }) {
+function _CuesheetOverview({ children }: PropsWithChildren) {
  const { plannedEnd, expectedEnd } = useRuntimeOverview();

  const [maybePlannedEnd, maybePlannedDaySpan] = useMemo(() => calculateEndAndDaySpan(plannedEnd), [plannedEnd]);
@@ -62,23 +74,41 @@ function _CuesheetOverview({ children }: { children: React.ReactNode }) {
  const expectedEndText = formatedTime(maybeExpectedEnd);

  return (
-    <div className={style.overview}>
+    <OverviewWrapper navElements={children}>
+      <TitlesOverview />
+      <TimerOverview />
+      <RuntimeOverview />
+      <div>
+        <TimeRow
+          label='Planned end'
+          value={plannedEndText}
+          className={style.end}
+          daySpan={maybePlannedDaySpan}
+          muted={maybePlannedEnd === null}
+        />
+        <TimeRow
+          label='Expected end'
+          value={expectedEndText}
+          className={style.end}
+          daySpan={maybeExpectedDaySpan}
+          muted={maybeExpectedEnd === null}
+        />
+      </div>
+    </OverviewWrapper>
+  );
+}
+
+interface OverviewWrapperProps {
+  navElements: ReactNode;
+}
+
+function OverviewWrapper({ navElements, children }: PropsWithChildren<OverviewWrapperProps>) {
+  const { isOnline } = useIsOnline();
+  return (
+    <div className={cx([style.overview, !isOnline && style.isOffline])}>
      <ErrorBoundary>
-        <div className={style.nav}>{children}</div>
-        <div className={style.info}>
-          <TitlesOverview />
-          <TimerOverview />
-          <RuntimeOverview />
-          <div>
-            <TimeRow label='Planned end' value={plannedEndText} className={style.end} daySpan={maybePlannedDaySpan} />
-            <TimeRow
-              label='Expected end'
-              value={expectedEndText}
-              className={style.end}
-              daySpan={maybeExpectedDaySpan}
-            />
-          </div>
-        </div>
+        <div className={style.nav}>{navElements}</div>
+        <div className={style.info}>{children}</div>
      </ErrorBoundary>
    </div>
  );
@@ -104,15 +134,22 @@ function CurrentBlockOverview() {

  const timeInBlock = formatedTime(currentBlock.startedAt === null ? null : clock - currentBlock.startedAt);

-  return <TimeColumn label='Time in block' value={timeInBlock} className={style.clock} />;
+  return (
+    <TimeColumn
+      label='Time in block'
+      value={timeInBlock}
+      className={style.clock}
+      muted={currentBlock.startedAt === null}
+    />
+  );
 }

 function TimerOverview() {
  const { current } = useTimer();

-  const display = millisToString(current);
+  const display = millisToString(current, { fallback: timerPlaceholder });

-  return <TimeColumn label='Running timer' value={display} />;
+  return <TimeColumn label='Running timer' value={display} muted={current === null} />;
 }

 function ProgressOverview() {
@@ -44,6 +44,10 @@
    content: "*";
    vertical-align: super;
    font-size: 0.75em;
-    color: $blue-500;
+    color: $info-blue;
  }
 }
+
+.muted {
+  color: $muted-gray;
+}
@@ -7,20 +7,21 @@ import style from './TimeLayout.module.scss';
 interface TimeLayoutProps {
  label: string;
  value: string;
+  muted?: boolean;
  daySpan?: number;
  className?: string;
 }

-export function TimeColumn({ label, value, className }: TimeLayoutProps) {
+export function TimeColumn({ label, value, muted, className }: TimeLayoutProps) {
  return (
    <div className={style.column}>
      <span className={style.label}>{label}</span>
-      <span className={cx([style.clock, className])}>{value}</span>
+      <span className={cx([style.clock, muted && style.muted, className])}>{value}</span>
    </div>
  );
 }

-export function TimeRow({ label, value, daySpan, className }: TimeLayoutProps) {
+export function TimeRow({ label, value, daySpan, muted, className }: TimeLayoutProps) {
  return (
    <div className={style.row}>
      <span className={style.label}>{label}</span>
@@ -29,7 +30,7 @@ export function TimeRow({ label, value, daySpan, className }: TimeLayoutProps) {
          <span className={cx([style.clock, style.daySpan, className])}>{value}</span>
        </Tooltip>
      ) : (
-        <span className={cx([style.clock, className])}>{value}</span>
+        <span className={cx([style.clock, muted && style.muted, className])}>{value}</span>
      )}
    </div>
  );
@@ -6,12 +6,14 @@ import {
  isOntimeBlock,
  isOntimeEvent,
  isPlayableEvent,
+  MaybeString,
  PlayableEvent,
  Playback,
  RundownCached,
  SupportedEvent,
 } from 'ontime-types';
 import {
+  checkIsNextDay,
  getFirstNormal,
  getLastNormal,
  getNextBlockNormal,
@@ -21,7 +23,7 @@ import {
  isNewLatest,
 } from 'ontime-utils';

-import { useEventAction } from '../../common/hooks/useEventAction';
+import { type EventOptions, useEventAction } from '../../common/hooks/useEventAction';
 import useFollowComponent from '../../common/hooks/useFollowComponent';
 import { useRundownEditor } from '../../common/hooks/useSocket';
 import { AppMode, useAppMode } from '../../common/stores/appModeStore';
@@ -82,36 +84,36 @@ export default function Rundown({ data }: RundownProps) {
      const cloneEntry = rundown[copyId];
      if (cloneEntry?.type === SupportedEvent.Event) {
        //if we don't have a cursor add the new event on top
-        const newEvent = cloneEvent(cloneEntry, adjustedCursor ?? undefined);
-        addEvent(newEvent);
+        const newEvent = cloneEvent(cloneEntry);
+        addEvent(newEvent, { after: adjustedCursor ?? undefined });
      }
    },
    [addEvent, order, rundown],
  );

  const insertAtId = useCallback(
-    (type: SupportedEvent, id: string | null, above = false) => {
-      const adjustedCursor = above ? getPreviousNormal(rundown, order, id ?? '').entry?.id ?? null : id;
-      if (adjustedCursor === null) {
-        // the only thing to do is adding an event at top
-        addEvent({ type });
-        return;
-      }
+    (type: SupportedEvent, id: MaybeString, above = false) => {
+      const options: EventOptions =
+        id === null
+          ? {}
+          : {
+              after: above ? undefined : id,
+              before: above ? id : undefined,
+            };

      if (type === SupportedEvent.Event) {
        const newEvent = {
          type: SupportedEvent.Event,
        };
-        const options = {
-          after: adjustedCursor,
-          lastEventId: adjustedCursor,
-        };
+        if (!above && id) {
+          options.lastEventId = id;
+        }
        addEvent(newEvent, options);
      } else {
-        addEvent({ type }, { after: adjustedCursor });
+        addEvent({ type }, options);
      }
    },
-    [rundown, order, addEvent],
+    [addEvent],
  );

  const selectBlock = useCallback(
@@ -266,7 +268,7 @@ export default function Rundown({ data }: RundownProps) {
  let eventIndex = 0;
  // all events before the current selected are in the past
  let isPast = Boolean(featureData?.selectedEventId);
-
+  let isNextDay = false;
  const isEditMode = appMode === AppMode.Edit;

  return (
@@ -285,6 +287,7 @@ export default function Rundown({ data }: RundownProps) {
              if (index === 0) {
                eventIndex = 0;
              }
+              isNextDay = false;
              previousEntryId = thisId;
              thisId = entryId;
              if (isOntimeEvent(entry)) {
@@ -293,8 +296,9 @@ export default function Rundown({ data }: RundownProps) {
                lastEvent = thisEvent;

                if (isPlayableEvent(entry)) {
-                  // populate previous entry
-                  if (isNewLatest(entry.timeStart, entry.timeEnd, lastEvent?.timeStart, lastEvent?.timeEnd)) {
+                  isNextDay = checkIsNextDay(entry, lastEvent);
+                  if (isNewLatest(entry, lastEvent)) {
+                    // populate previous entry
                    thisEvent = entry;
                  }
                }
@@ -322,12 +326,11 @@ export default function Rundown({ data }: RundownProps) {
                        loaded={isLoaded}
                        hasCursor={hasCursor}
                        isNext={isNext}
-                        previousStart={lastEvent?.timeStart}
-                        previousEnd={lastEvent?.timeEnd}
                        previousEntryId={previousEntryId}
                        previousEventId={lastEvent?.id}
                        playback={isLoaded ? featureData.playback : undefined}
                        isRolling={featureData.playback === Playback.Roll}
+                        isNextDay={isNextDay}
                      />
                    </div>
                  </div>
@@ -32,8 +32,7 @@ interface RundownEntryProps {
  eventIndex: number;
  hasCursor: boolean;
  isNext: boolean;
-  previousStart?: number;
-  previousEnd?: number;
+  isNextDay: boolean;
  previousEntryId?: string;
  previousEventId?: string;
  playback?: Playback; // we only care about this if this event is playing
@@ -47,13 +46,12 @@ export default function RundownEntry(props: RundownEntryProps) {
    loaded,
    hasCursor,
    isNext,
-    previousStart,
-    previousEnd,
    previousEntryId,
    previousEventId,
    playback,
    isRolling,
    eventIndex,
+    isNextDay,
  } = props;
  const { emitError } = useEmitLog();
  const { addEvent, updateEvent, batchUpdateEvents, deleteEvent, swapEvents } = useEventAction();
@@ -115,7 +113,7 @@ export default function RundownEntry(props: RundownEntryProps) {
        return deleteEvent([data.id]);
      }
      case 'clone': {
-        const newEvent = cloneEvent(data as OntimeEvent, data.id);
+        const newEvent = cloneEvent(data as OntimeEvent);
        addEvent(newEvent, { after: data.id });
        break;
      }
@@ -150,6 +148,7 @@ export default function RundownEntry(props: RundownEntryProps) {
  if (data.type === SupportedEvent.Event) {
    return (
      <EventBlock
+        eventId={data.id}
        eventIndex={eventIndex}
        cue={data.cue}
        timeStart={data.timeStart}
@@ -157,15 +156,13 @@ export default function RundownEntry(props: RundownEntryProps) {
        duration={data.duration}
        timeStrategy={data.timeStrategy}
        linkStart={data.linkStart}
-        eventId={data.id}
+        countToEnd={data.countToEnd}
        isPublic={data.isPublic}
        endAction={data.endAction}
        timerType={data.timerType}
        title={data.title}
        note={data.note}
        delay={data.delay ?? 0}
-        previousStart={previousStart}
-        previousEnd={previousEnd}
        colour={data.colour}
        isPast={isPast}
        isNext={isNext}
@@ -174,6 +171,8 @@ export default function RundownEntry(props: RundownEntryProps) {
        hasCursor={hasCursor}
        playback={playback}
        isRolling={isRolling}
+        gap={data.gap}
+        isNextDay={isNextDay}
        actionHandler={actionHandler}
      />
    );
@@ -36,7 +36,7 @@
 .side {
  max-height: 100%;
  max-width: 45rem;
-  margin: 2rem 0;
+  margin: 0.5rem 0;
  padding: 1rem;
  padding-right: 0;
  background-color: $gray-1325;
@@ -7,7 +7,7 @@ import { handleLinks } from '../../common/utils/linkUtils';
 import { cx } from '../../common/utils/styleUtils';
 import { Corner } from '../editors/editor-utils/EditorUtils';

-import EventEditor from './event-editor/EventEditor';
+import RundownEventEditor from './event-editor/RundownEventEditor';
 import RundownWrapper from './RundownWrapper';

 import style from './RundownExport.module.scss';
@@ -33,7 +33,7 @@ const RundownExport = () => {
        {!hideSideBar && (
          <div className={style.side}>
            <ErrorBoundary>
-              <EventEditor />
+              <RundownEventEditor />
            </ErrorBoundary>
          </div>
        )}
@@ -24,13 +24,14 @@ import RundownIndicators from './RundownIndicators';
 import style from './EventBlock.module.scss';

 interface EventBlockProps {
+  eventId: string;
  cue: string;
  timeStart: number;
  timeEnd: number;
  duration: number;
  timeStrategy: TimeStrategy;
  linkStart: MaybeString;
-  eventId: string;
+  countToEnd: boolean;
  eventIndex: number;
  isPublic: boolean;
  endAction: EndAction;
@@ -38,8 +39,6 @@ interface EventBlockProps {
  title: string;
  note: string;
  delay: number;
-  previousStart?: number;
-  previousEnd?: number;
  colour: string;
  isPast: boolean;
  isNext: boolean;
@@ -48,6 +47,8 @@ interface EventBlockProps {
  hasCursor: boolean;
  playback?: Playback;
  isRolling: boolean;
+  gap: number;
+  isNextDay: boolean;
  actionHandler: (
    action: EventItemActions,
    payload?:
@@ -68,6 +69,7 @@ export default function EventBlock(props: EventBlockProps) {
    duration,
    timeStrategy,
    linkStart,
+    countToEnd,
    isPublic = true,
    eventIndex,
    endAction,
@@ -75,8 +77,6 @@ export default function EventBlock(props: EventBlockProps) {
    title,
    note,
    delay,
-    previousStart,
-    previousEnd,
    colour,
    isPast,
    isNext,
@@ -85,6 +85,8 @@ export default function EventBlock(props: EventBlockProps) {
    hasCursor,
    playback,
    isRolling,
+    gap,
+    isNextDay,
    actionHandler,
  } = props;
  const { selectedEventId, setSelectedEventId, clearSelectedEventId } = useEventIdSwapping();
@@ -271,7 +273,7 @@ export default function EventBlock(props: EventBlockProps) {
      onContextMenu={onContextMenu}
      id='event-block'
    >
-      <RundownIndicators timeStart={timeStart} previousStart={previousStart} previousEnd={previousEnd} delay={delay} />
+      <RundownIndicators timeStart={timeStart} delay={delay} gap={gap} isNextDay={isNextDay} />

      <div className={style.binder} style={{ ...binderColours }} tabIndex={-1}>
        <span className={style.drag} ref={handleRef} {...dragAttributes} {...dragListeners}>
@@ -286,6 +288,7 @@ export default function EventBlock(props: EventBlockProps) {
          timeEnd={timeEnd}
          duration={duration}
          linkStart={linkStart}
+          countToEnd={countToEnd}
          timeStrategy={timeStrategy}
          eventId={eventId}
          eventIndex={eventIndex}
@@ -1,11 +1,4 @@
-import {
-  calculateDuration,
-  checkIsNextDay,
-  dayInMs,
-  getTimeFromPrevious,
-  millisToString,
-  removeTrailingZero,
-} from 'ontime-utils';
+import { millisToString, removeTrailingZero } from 'ontime-utils';

 import { formatDuration } from '../../../common/utils/time';

@@ -17,25 +10,15 @@ export function formatDelay(timeStart: number, delay: number): string | undefine
  const timeTag = removeTrailingZero(millisToString(delayedStart));
  return `New start ${timeTag}`;
 }
-
-export function formatOverlap(timeStart: number, previousStart?: number, previousEnd?: number): string | undefined {
-  const noPreviousElement = previousEnd === undefined || previousStart === undefined;
-  if (noPreviousElement) return;
-
-  const normalisedDuration = calculateDuration(previousStart, previousEnd);
-  const timeFromPrevious = getTimeFromPrevious(timeStart, previousStart, previousEnd, normalisedDuration);
-  if (timeFromPrevious === 0) return;
-
-  if (checkIsNextDay(previousStart, timeStart, normalisedDuration)) {
-    const previousCrossMidnight = previousStart > previousEnd;
-    const normalisedPreviousEnd = previousCrossMidnight ? previousEnd + dayInMs : previousEnd;
-
-    const gap = dayInMs - normalisedPreviousEnd + timeStart;
-    if (gap === 0) return;
-    const gapString = formatDuration(Math.abs(gap), false);
-    return `Gap ${gapString} (next day)`;
+export function formatGap(gap: number, isNextDay: boolean) {
+  if (gap === 0) {
+    if (isNextDay) {
+      // We show a next day warning even if there is no gap
+      return '(next day)';
+    }
+    return;
  }

-  const overlapString = formatDuration(Math.abs(timeFromPrevious), false);
-  return `${timeFromPrevious < 0 ? 'Overlap' : 'Gap'} ${overlapString}`;
+  const gapString = formatDuration(Math.abs(gap), false);
+  return `${gap < 0 ? 'Overlap' : 'Gap'} ${gapString}${isNextDay ? ' (next day)' : ''}`;
 }
@@ -23,12 +23,13 @@ import EventBlockProgressBar from './composite/EventBlockProgressBar';
 import style from './EventBlock.module.scss';

 interface EventBlockInnerProps {
+  eventId: string;
  timeStart: number;
  timeEnd: number;
  duration: number;
  timeStrategy: TimeStrategy;
  linkStart: MaybeString;
-  eventId: string;
+  countToEnd: boolean;
  eventIndex: number;
  isPublic: boolean;
  endAction: EndAction;
@@ -43,14 +44,15 @@ interface EventBlockInnerProps {
  isRolling: boolean;
 }

-const EventBlockInner = (props: EventBlockInnerProps) => {
+function EventBlockInner(props: EventBlockInnerProps) {
  const {
+    eventId,
    timeStart,
    timeEnd,
    duration,
    timeStrategy,
    linkStart,
-    eventId,
+    countToEnd,
    isPublic = true,
    endAction,
    timerType,
@@ -91,7 +93,7 @@ const EventBlockInner = (props: EventBlockInnerProps) => {
          delay={delay}
          timeStrategy={timeStrategy}
          linkStart={linkStart}
-          timerType={timerType}
+          countToEnd={countToEnd}
        />
      </div>
      <div className={style.titleSection}>
@@ -122,6 +124,11 @@ const EventBlockInner = (props: EventBlockInnerProps) => {
              <EndActionIcon action={endAction} className={style.statusIcon} />
            </span>
          </Tooltip>
+          <Tooltip label={`${countToEnd ? 'Count to End' : 'Count duration'}`} openDelay={tooltipDelayMid}>
+            <span>
+              <IoFlag className={`${style.statusIcon} ${countToEnd ? style.active : style.disabled}`} />
+            </span>
+          </Tooltip>
          <Tooltip label={`${isPublic ? 'Event is public' : 'Event is private'}`} openDelay={tooltipDelayMid}>
            <span>
              <IoPeople className={`${style.statusIcon} ${isPublic ? style.active : style.disabled}`} />
@@ -131,7 +138,7 @@ const EventBlockInner = (props: EventBlockInnerProps) => {
      </div>
    </>
  );
-};
+}

 export default memo(EventBlockInner);

@@ -162,9 +169,5 @@ function TimerIcon(props: { type: TimerType; className: string }) {
  if (type === TimerType.None) {
    return <IoBan className={className} />;
  }
-  if (type === TimerType.TimeToEnd) {
-    const classes = cx([style.active, className]);
-    return <IoFlag className={classes} />;
-  }
  return <IoArrowDown className={className} />;
 }
@@ -1,24 +1,24 @@
-import { formatDelay, formatOverlap } from './EventBlock.utils';
+import { formatDelay, formatGap } from './EventBlock.utils';

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

 interface RundownIndicatorProps {
  timeStart: number;
-  previousStart?: number;
-  previousEnd?: number;
+  isNextDay: boolean;
  delay: number;
+  gap: number;
 }

 export default function RundownIndicators(props: RundownIndicatorProps) {
-  const { timeStart, previousStart, previousEnd, delay } = props;
+  const { timeStart, delay, gap, isNextDay } = props;

-  const hasOverlap = formatOverlap(timeStart, previousStart, previousEnd);
+  const hasGap = formatGap(gap, isNextDay);
  const hasDelay = formatDelay(timeStart, delay);

  return (
    <div className={style.indicators}>
      {hasDelay && <div className={style.delay}>{hasDelay}</div>}
-      {hasOverlap && <div className={style.gap}>{hasOverlap}</div>}
+      {hasGap && <div className={style.gap}>{hasGap}</div>}
    </div>
  );
 }
@@ -1,6 +1,4 @@
-import { MILLIS_PER_HOUR } from 'ontime-utils';
-
-import { formatDelay, formatOverlap } from '../EventBlock.utils';
+import { formatDelay } from '../EventBlock.utils';

 describe('formatDelay()', () => {
  it('adds a given delay to the start time', () => {
@@ -10,69 +8,3 @@ describe('formatDelay()', () => {
    expect(result).toEqual('New start 00:02');
  });
 });
-
-describe('formatOverlap()', () => {
-  it('recognises an overlap between two times', () => {
-    const previousStart = 0;
-    const previousEnd = 60000; // 1 min
-    const timeStart = 30000; // 30 sec
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toEqual('Overlap 30s');
-  });
-
-  it('bug #949 recognises an overlap between two times', () => {
-    const previousStart = 46800000; // 13:00:00
-    const previousEnd = 48600000; // 13:30:00
-    const timeStart = 48300000; // 13:25:00
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toEqual('Overlap 5m');
-  });
-
-  it('handles events the day after, without overlap', () => {
-    const previousStart = 11 * MILLIS_PER_HOUR;
-    const previousEnd = 12 * MILLIS_PER_HOUR;
-    const timeStart = 6 * MILLIS_PER_HOUR;
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toBe('Gap 18h (next day)');
-  });
-
-  it('handles events the day after, with gap', () => {
-    const previousStart = 17 * MILLIS_PER_HOUR;
-    const previousEnd = 23 * MILLIS_PER_HOUR;
-    const timeStart = 9 * MILLIS_PER_HOUR;
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toBe('Gap 10h (next day)');
-  });
-
-  it('handles events the day after, with previous ending at midnight', () => {
-    const previousStart = 23 * MILLIS_PER_HOUR; // 23:00:00
-    const previousEnd = 0; // 00:00:00
-    const timeStart = 1 * MILLIS_PER_HOUR; // 01:00:00
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toBe('Gap 1h (next day)');
-  });
-
-  it('handles sequential events the day after, with previous ending over midnight', () => {
-    const previousStart = 23 * MILLIS_PER_HOUR;
-    const previousEnd = 1 * MILLIS_PER_HOUR;
-    const timeStart = 1 * MILLIS_PER_HOUR;
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toBeUndefined();
-  });
-
-  it('handles events the day after, with previous ending over midnight with overlap', () => {
-    const previousStart = 23 * MILLIS_PER_HOUR;
-    const previousEnd = 2 * MILLIS_PER_HOUR;
-    const timeStart = 1 * MILLIS_PER_HOUR;
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toBe('Overlap 1h');
-  });
-
-  it('handles events the day after, with previous ending over midnight with gap', () => {
-    const previousStart = 23 * MILLIS_PER_HOUR;
-    const previousEnd = 1 * MILLIS_PER_HOUR;
-    const timeStart = 2 * MILLIS_PER_HOUR;
-    const result = formatOverlap(timeStart, previousStart, previousEnd);
-    expect(result).toBe('Gap 1h');
-  });
-});
@@ -0,0 +1,44 @@
+import { useEffect, useState } from 'react';
+import { isOntimeEvent, OntimeEvent } from 'ontime-types';
+
+import useRundown from '../../../common/hooks-query/useRundown';
+
+import EventEditor from './EventEditor';
+
+import style from './EventEditor.module.scss';
+
+interface CuesheetEventEditorProps {
+  eventId: string;
+}
+
+export default function CuesheetEventEditor(props: CuesheetEventEditorProps) {
+  const { eventId } = props;
+  const { data } = useRundown();
+  const { order, rundown } = data;
+
+  const [event, setEvent] = useState<OntimeEvent | null>(null);
+
+  useEffect(() => {
+    if (order.length === 0) {
+      setEvent(null);
+      return;
+    }
+
+    const event = rundown[eventId];
+    if (event && isOntimeEvent(event)) {
+      setEvent(event);
+    } else {
+      setEvent(null);
+    }
+  }, [data, eventId, order, rundown]);
+
+  if (!event) {
+    return null;
+  }
+
+  return (
+    <div className={style.eventEditor} data-testid='editor-container'>
+      <EventEditor event={event} />
+    </div>
+  );
+}
@@ -1,8 +1,7 @@
 .eventEditor {
-  color: $label-gray;
  max-height: 100%;
  overflow-y: auto;
-  padding: 0.5rem;
+  padding-inline: 0.5rem;

  display: flex;
  flex-direction: column;
@@ -16,18 +15,10 @@
  flex: 1;
  display: flex;
  flex-direction: column;
-  gap: 2rem;
+  gap: 1.5rem;
  overflow-y: auto;
 }

-.footer {
-  border-top: 1px solid $white-10;
-  padding-top: 1rem;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.5rem;
-}
-
 .timeSettings {
  display: flex;
  flex-direction: column;
@@ -38,18 +29,22 @@
  display: flex;
  flex-direction: column;
  gap: 1rem;
+
+  h3 {
+    margin-bottom: -0.5rem; // bring the title closer to the section elements
+  }
 }

 .decorated {
  color: var(--decorator-color, $ui-white);
  background-color: var(--decorator-bg, $gray-1100);
  width: fit-content;
-  padding: 0 0.5rem;
-  border-radius: 2px;
+  padding-inline: 0.5rem;
+  border-radius: $component-border-radius-sm;
 }

 .delayLabel {
-  font-size: calc(1rem - 3px);
+  font-size: $aux-text-size;
  color: $ontime-delay-text;

  &::after {
@@ -63,6 +58,8 @@
  gap: 0.5rem;
  max-width: max-content;
  cursor: pointer;
+  height: 2rem; // manually match the height of a text input
+  margin-bottom: 0; // reset margin from label component
 }

 .inline {
@@ -74,6 +71,13 @@
 .splitTwo {
  display: grid;
  grid-template-columns: 1fr 1fr;
-  column-gap: 1.5rem;
+  column-gap: 1rem;
  row-gap: 1rem;
 }
+
+.tooltipIcon {
+  color: $blue-500;
+  display: inline-block;
+  font-size: 1.25em;
+  margin-left: 0.25em;
+}
@@ -1,15 +1,12 @@
-import { CSSProperties, memo, useCallback, useEffect, useState } from 'react';
+import { CSSProperties, useCallback } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { Button } from '@chakra-ui/react';
-import { CustomFieldLabel, isOntimeEvent, OntimeEvent } from 'ontime-types';
+import { CustomFieldLabel, OntimeEvent } from 'ontime-types';

-import CopyTag from '../../../common/components/copy-tag/CopyTag';
 import { useEventAction } from '../../../common/hooks/useEventAction';
 import useCustomFields from '../../../common/hooks-query/useCustomFields';
-import useRundown from '../../../common/hooks-query/useRundown';
 import { getAccessibleColour } from '../../../common/utils/styleUtils';
 import * as Editor from '../../editors/editor-utils/EditorUtils';
-import { useEventSelection } from '../useEventSelection';

 import EventEditorTimes from './composite/EventEditorTimes';
 import EventEditorTitles from './composite/EventEditorTitles';
@@ -22,35 +19,17 @@ export type EventEditorSubmitActions = keyof OntimeEvent;

 export type EditorUpdateFields = 'cue' | 'title' | 'note' | 'colour' | CustomFieldLabel;

-export default function EventEditor() {
-  const selectedEvents = useEventSelection((state) => state.selectedEvents);
-  const { data } = useRundown();
+interface EventEditorProps {
+  event: OntimeEvent;
+}
+
+export default function EventEditor(props: EventEditorProps) {
+  const { event } = props;
  const { data: customFields } = useCustomFields();
-  const { order, rundown } = data;
  const { updateEvent } = useEventAction();
  const [_searchParams, setSearchParams] = useSearchParams();

-  const [event, setEvent] = useState<OntimeEvent | null>(null);
-
-  useEffect(() => {
-    if (order.length === 0) {
-      setEvent(null);
-      return;
-    }
-
-    const selectedEventId = order.find((eventId) => selectedEvents.has(eventId));
-    if (!selectedEventId) {
-      setEvent(null);
-      return;
-    }
-    const event = rundown[selectedEventId];
-
-    if (event && isOntimeEvent(event)) {
-      setEvent(event);
-    } else {
-      setEvent(null);
-    }
-  }, [order, rundown, selectedEvents]);
+  const isEditor = window.location.pathname.includes('editor');

  const handleSubmit = useCallback(
    (field: EditorUpdateFields, value: string) => {
@@ -73,86 +52,61 @@ export default function EventEditor() {
  }

  return (
-    <div className={style.eventEditor} data-testid='editor-container'>
-      <div className={style.content}>
-        <EventEditorTimes
-          key={`${event.id}-times`}
-          eventId={event.id}
-          timeStart={event.timeStart}
-          timeEnd={event.timeEnd}
-          duration={event.duration}
-          timeStrategy={event.timeStrategy}
-          linkStart={event.linkStart}
-          delay={event.delay ?? 0}
-          isPublic={event.isPublic}
-          endAction={event.endAction}
-          timerType={event.timerType}
-          timeWarning={event.timeWarning}
-          timeDanger={event.timeDanger}
-        />
-        <EventEditorTitles
-          key={`${event.id}-titles`}
-          eventId={event.id}
-          cue={event.cue}
-          title={event.title}
-          note={event.note}
-          colour={event.colour}
-          handleSubmit={handleSubmit}
-        />
-        <div className={style.column}>
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
-            <Editor.Title>Custom Fields</Editor.Title>
+    <div className={style.content}>
+      <EventEditorTimes
+        key={`${event.id}-times`}
+        eventId={event.id}
+        timeStart={event.timeStart}
+        timeEnd={event.timeEnd}
+        duration={event.duration}
+        timeStrategy={event.timeStrategy}
+        linkStart={event.linkStart}
+        countToEnd={event.countToEnd}
+        delay={event.delay ?? 0}
+        isPublic={event.isPublic}
+        endAction={event.endAction}
+        timerType={event.timerType}
+        timeWarning={event.timeWarning}
+        timeDanger={event.timeDanger}
+      />
+      <EventEditorTitles
+        key={`${event.id}-titles`}
+        eventId={event.id}
+        cue={event.cue}
+        title={event.title}
+        note={event.note}
+        colour={event.colour}
+        handleSubmit={handleSubmit}
+      />
+      <div className={style.column}>
+        <Editor.Title>
+          Custom Fields
+          {isEditor && (
            <Button variant='ontime-subtle' size='sm' onClick={handleOpenCustomManager}>
              Manage
            </Button>
-          </div>
-          {Object.keys(customFields).map((fieldKey) => {
-            const key = `${event.id}-${fieldKey}`;
-            const fieldName = `custom-${fieldKey}`;
-            const initialValue = event.custom[fieldKey] ?? '';
-            const { backgroundColor, color } = getAccessibleColour(customFields[fieldKey].colour);
-            const labelText = customFields[fieldKey].label;
+          )}
+        </Editor.Title>
+        {Object.keys(customFields).map((fieldKey) => {
+          const key = `${event.id}-${fieldKey}`;
+          const fieldName = `custom-${fieldKey}`;
+          const initialValue = event.custom[fieldKey] ?? '';
+          const { backgroundColor, color } = getAccessibleColour(customFields[fieldKey].colour);
+          const labelText = customFields[fieldKey].label;

-            return (
-              <EventTextArea
-                key={key}
-                field={fieldName}
-                label={labelText}
-                initialValue={initialValue}
-                submitHandler={handleSubmit}
-                className={style.decorated}
-                style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
-              />
-            );
-          })}
-        </div>
+          return (
+            <EventTextArea
+              key={key}
+              field={fieldName}
+              label={labelText}
+              initialValue={initialValue}
+              submitHandler={handleSubmit}
+              className={style.decorated}
+              style={{ '--decorator-bg': backgroundColor, '--decorator-color': color } as CSSProperties}
+            />
+          );
+        })}
      </div>
-      <EventEditorFooter id={event.id} cue={event.cue} />
-    </div>
-  );
-}
-
-interface EventEditorFooterProps {
-  id: string;
-  cue: string;
-}
-
-const EventEditorFooter = memo(_EventEditorFooter);
-
-function _EventEditorFooter(props: EventEditorFooterProps) {
-  const { id, cue } = props;
-
-  const loadById = `/ontime/load/id "${id}"`;
-  const loadByCue = `/ontime/load/cue "${cue}"`;
-
-  return (
-    <div className={style.footer}>
-      <CopyTag copyValue={loadById} label='OSC trigger by ID'>
-        {loadById}
-      </CopyTag>
-      <CopyTag copyValue={loadByCue} label='OSC trigger by cue'>
-        {loadByCue}
-      </CopyTag>
    </div>
  );
 }
@@ -38,8 +38,6 @@
 }

 .prompt {
-  font-size: 1rem;
-  text-align: left;
  margin-left: 4rem;
 }

@@ -1,7 +1,8 @@
-import { memo } from 'react';
+import { memo, PropsWithChildren } from 'react';
 import { Kbd } from '@chakra-ui/react';

 import { deviceAlt, deviceMod } from '../../../common/utils/deviceUtils';
+import * as Editor from '../../editors/editor-utils/EditorUtils';

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

@@ -11,7 +12,7 @@ function EventEditorEmpty() {
  return (
    <div className={style.eventEditor} data-testid='editor-container'>
      <div className={style.shortcutSection}>
-        <div className={style.prompt}>Rundown shortcuts:</div>
+        <Editor.Title className={style.prompt}>Rundown shortcuts</Editor.Title>
        <table className={style.shortcuts}>
          <tbody>
            <tr>
@@ -168,6 +169,6 @@ function EventEditorEmpty() {
  );
 }

-function AuxKey({ children }: { children: React.ReactNode }) {
+function AuxKey({ children }: PropsWithChildren) {
  return <span className={style.divider}>{children}</span>;
 }
@@ -0,0 +1,50 @@
+import { useEffect, useState } from 'react';
+import { isOntimeEvent, OntimeEvent } from 'ontime-types';
+
+import useRundown from '../../../common/hooks-query/useRundown';
+import { useEventSelection } from '../useEventSelection';
+
+import { EventEditorFooter } from './composite/EventEditorFooter';
+import EventEditor from './EventEditor';
+import EventEditorEmpty from './EventEditorEmpty';
+
+import style from './EventEditor.module.scss';
+
+export default function RundownEventEditor() {
+  const selectedEvents = useEventSelection((state) => state.selectedEvents);
+  const { data } = useRundown();
+  const { order, rundown } = data;
+
+  const [event, setEvent] = useState<OntimeEvent | null>(null);
+
+  useEffect(() => {
+    if (order.length === 0) {
+      setEvent(null);
+      return;
+    }
+
+    const selectedEventId = order.find((eventId) => selectedEvents.has(eventId));
+    if (!selectedEventId) {
+      setEvent(null);
+      return;
+    }
+    const event = rundown[selectedEventId];
+
+    if (event && isOntimeEvent(event)) {
+      setEvent(event);
+    } else {
+      setEvent(null);
+    }
+  }, [order, rundown, selectedEvents]);
+
+  if (!event) {
+    return <EventEditorEmpty />;
+  }
+
+  return (
+    <div className={style.eventEditor} data-testid='editor-container'>
+      <EventEditor event={event} />
+      <EventEditorFooter id={event.id} cue={event.cue} />
+    </div>
+  );
+}
@@ -0,0 +1,7 @@
+.footer {
+  border-top: 1px solid $white-10;
+  padding-top: 1rem;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+}
@@ -0,0 +1,30 @@
+import { memo } from 'react';
+
+import CopyTag from '../../../../common/components/copy-tag/CopyTag';
+
+import style from './EventEditorFooter.module.scss';
+
+interface EventEditorFooterProps {
+  id: string;
+  cue: string;
+}
+
+export const EventEditorFooter = memo(_EventEditorFooter);
+
+function _EventEditorFooter(props: EventEditorFooterProps) {
+  const { id, cue } = props;
+
+  const loadById = `/ontime/load/id "${id}"`;
+  const loadByCue = `/ontime/load/cue "${cue}"`;
+
+  return (
+    <div className={style.footer}>
+      <CopyTag copyValue={loadById} label='OSC trigger by ID'>
+        {loadById}
+      </CopyTag>
+      <CopyTag copyValue={loadByCue} label='OSC trigger by cue'>
+        {loadByCue}
+      </CopyTag>
+    </div>
+  );
+}
@@ -1,5 +1,6 @@
 import { memo } from 'react';
-import { Select, Switch } from '@chakra-ui/react';
+import { Select, Switch, Tooltip } from '@chakra-ui/react';
+import { IoInformationCircle } from '@react-icons/all-files/io5/IoInformationCircle';
 import { EndAction, MaybeString, TimerType, TimeStrategy } from 'ontime-types';
 import { millisToString, parseUserTime } from 'ontime-utils';

@@ -18,6 +19,7 @@ interface EventEditorTimesProps {
  duration: number;
  timeStrategy: TimeStrategy;
  linkStart: MaybeString;
+  countToEnd: boolean;
  delay: number;
  isPublic: boolean;
  endAction: EndAction;
@@ -26,9 +28,9 @@ interface EventEditorTimesProps {
  timeDanger: number;
 }

-type HandledActions = 'timerType' | 'endAction' | 'isPublic' | 'timeWarning' | 'timeDanger';
+type HandledActions = 'countToEnd' | 'timerType' | 'endAction' | 'isPublic' | 'timeWarning' | 'timeDanger';

-const EventEditorTimes = (props: EventEditorTimesProps) => {
+function EventEditorTimes(props: EventEditorTimesProps) {
  const {
    eventId,
    timeStart,
@@ -36,6 +38,7 @@ const EventEditorTimes = (props: EventEditorTimesProps) => {
    duration,
    timeStrategy,
    linkStart,
+    countToEnd,
    delay,
    isPublic,
    endAction,
@@ -51,6 +54,11 @@ const EventEditorTimes = (props: EventEditorTimesProps) => {
      return;
    }

+    if (field === 'countToEnd') {
+      updateEvent({ id: eventId, countToEnd: !(value as boolean) });
+      return;
+    }
+
    if (field === 'timeWarning' || field === 'timeDanger') {
      const newTime = parseUserTime(value as string);
      updateEvent({ id: eventId, [field]: newTime });
@@ -71,95 +79,126 @@ const EventEditorTimes = (props: EventEditorTimesProps) => {
    : '';

  return (
-    <div className={style.column}>
-      <div>
-        <Editor.Label>Event schedule</Editor.Label>
-        <div className={style.inline}>
-          <TimeInputFlow
-            eventId={eventId}
-            timeStart={timeStart}
-            timeEnd={timeEnd}
-            duration={duration}
-            timeStrategy={timeStrategy}
-            linkStart={linkStart}
-            delay={delay}
-            timerType={timerType}
-          />
-        </div>
-        <div className={style.delayLabel}>{delayLabel}</div>
-      </div>
-
-      <div className={style.splitTwo}>
+    <>
+      <div className={style.column}>
+        <Editor.Title>Event schedule</Editor.Title>
        <div>
-          <Editor.Label htmlFor='timeWarning'>Warning Time</Editor.Label>
-          <TimeInput
-            id='timeWarning'
-            name='timeWarning'
-            submitHandler={handleSubmit}
-            time={timeWarning}
-            placeholder='Duration'
-          />
-        </div>
-        <div>
-          <Editor.Label htmlFor='timerType'>Timer Type</Editor.Label>
-          <Select
-            size='sm'
-            id='timerType'
-            name='timerType'
-            value={timerType}
-            onChange={(event) => handleSubmit('timerType', event.target.value)}
-            variant='ontime'
-          >
-            <option value={TimerType.CountDown}>Count down</option>
-            <option value={TimerType.CountUp}>Count up</option>
-            <option value={TimerType.TimeToEnd}>Time to end</option>
-            <option value={TimerType.Clock}>Clock</option>
-            <option value={TimerType.None}>None</option>
-          </Select>
-        </div>
-        <div>
-          <Editor.Label htmlFor='timeDanger'>Danger Time</Editor.Label>
-          <TimeInput
-            id='timeDanger'
-            name='timeDanger'
-            submitHandler={handleSubmit}
-            time={timeDanger}
-            placeholder='Duration'
-          />
-        </div>
-        <div>
-          <Editor.Label htmlFor='endAction'>End Action</Editor.Label>
-          <Select
-            id='endAction'
-            size='sm'
-            name='endAction'
-            value={endAction}
-            onChange={(event) => handleSubmit('endAction', event.target.value)}
-            variant='ontime'
-          >
-            <option value={EndAction.None}>None</option>
-            <option value={EndAction.Stop}>Stop</option>
-            <option value={EndAction.LoadNext}>Load Next</option>
-            <option value={EndAction.PlayNext}>Play Next</option>
-          </Select>
+          <div className={style.inline}>
+            <TimeInputFlow
+              eventId={eventId}
+              timeStart={timeStart}
+              timeEnd={timeEnd}
+              duration={duration}
+              timeStrategy={timeStrategy}
+              linkStart={linkStart}
+              delay={delay}
+              countToEnd={countToEnd}
+              showLabels
+            />
+          </div>
+          <div className={style.delayLabel}>{delayLabel}</div>
        </div>
      </div>

-      <div>
-        <Editor.Label htmlFor='isPublic'>Event Visibility</Editor.Label>
-        <Editor.Label className={style.switchLabel}>
-          <Switch
-            id='isPublic'
-            size='md'
-            isChecked={isPublic}
-            onChange={() => handleSubmit('isPublic', isPublic)}
-            variant='ontime'
-          />
-          {isPublic ? 'Public' : 'Private'}
-        </Editor.Label>
+      <div className={style.column}>
+        <Editor.Title>Event Behaviour</Editor.Title>
+        <div className={style.splitTwo}>
+          <div>
+            <Editor.Label htmlFor='endAction'>End Action</Editor.Label>
+            <Select
+              id='endAction'
+              size='sm'
+              name='endAction'
+              value={endAction}
+              onChange={(event) => handleSubmit('endAction', event.target.value)}
+              variant='ontime'
+            >
+              <option value={EndAction.None}>None</option>
+              <option value={EndAction.Stop}>Stop rundown</option>
+              <option value={EndAction.LoadNext}>Load next event</option>
+              <option value={EndAction.PlayNext}>Play next event</option>
+            </Select>
+          </div>
+          <div>
+            <Editor.Label htmlFor='countToEnd'>Count to End</Editor.Label>
+            <Editor.Label className={style.switchLabel}>
+              <Switch
+                id='countToEnd'
+                size='md'
+                isChecked={countToEnd}
+                onChange={() => handleSubmit('countToEnd', countToEnd)}
+                variant='ontime'
+              />
+              {countToEnd ? 'On' : 'Off'}
+            </Editor.Label>
+          </div>
+        </div>
      </div>
-    </div>
+
+      <div className={style.column}>
+        <Editor.Title>
+          <Tooltip label='Changes how the timer is displayed in different views. It is not reflected in the rundown'>
+            <span>
+              Display Options
+              <IoInformationCircle className={style.tooltipIcon} />
+            </span>
+          </Tooltip>
+        </Editor.Title>
+        <div className={style.splitTwo}>
+          <div>
+            <Editor.Label htmlFor='timerType'>Timer Type</Editor.Label>
+            <Select
+              size='sm'
+              id='timerType'
+              name='timerType'
+              value={timerType}
+              onChange={(event) => handleSubmit('timerType', event.target.value)}
+              variant='ontime'
+            >
+              <option value={TimerType.CountDown}>Count down</option>
+              <option value={TimerType.CountUp}>Count up</option>
+              <option value={TimerType.Clock}>Clock</option>
+              <option value={TimerType.None}>None</option>
+            </Select>
+          </div>
+          <div>
+            <Editor.Label htmlFor='timeWarning'>Warning Time</Editor.Label>
+            <TimeInput
+              id='timeWarning'
+              name='timeWarning'
+              submitHandler={handleSubmit}
+              time={timeWarning}
+              placeholder='Duration'
+            />
+          </div>
+
+          <div>
+            <Editor.Label htmlFor='isPublic'>Event Visibility</Editor.Label>
+            <Editor.Label className={style.switchLabel}>
+              <Switch
+                id='isPublic'
+                size='md'
+                isChecked={isPublic}
+                onChange={() => handleSubmit('isPublic', isPublic)}
+                variant='ontime'
+              />
+              {isPublic ? 'Public' : 'Private'}
+            </Editor.Label>
+          </div>
+          <div>
+            <Editor.Label htmlFor='timeDanger'>Danger Time</Editor.Label>
+            <TimeInput
+              id='timeDanger'
+              name='timeDanger'
+              submitHandler={handleSubmit}
+              time={timeDanger}
+              placeholder='Duration'
+            />
+          </div>
+        </div>
+      </div>
+    </>
  );
-};
+}

 export default memo(EventEditorTimes);
@@ -29,6 +29,7 @@ const EventEditorTitles = (props: EventEditorTitlesProps) => {

  return (
    <div className={style.column}>
+      <Editor.Title>Event Data</Editor.Title>
      <div className={style.splitTwo}>
        <div>
          <Editor.Label htmlFor='eventId'>Event ID (read only)</Editor.Label>
@@ -5,34 +5,35 @@ import { IoLink } from '@react-icons/all-files/io5/IoLink';
 import { IoLockClosed } from '@react-icons/all-files/io5/IoLockClosed';
 import { IoLockOpenOutline } from '@react-icons/all-files/io5/IoLockOpenOutline';
 import { IoUnlink } from '@react-icons/all-files/io5/IoUnlink';
-import { MaybeString, TimerType, TimeStrategy } from 'ontime-types';
+import { MaybeString, TimeField, TimeStrategy } from 'ontime-types';
+import { dayInMs } from 'ontime-utils';

 import TimeInputWithButton from '../../../common/components/input/time-input/TimeInputWithButton';
 import { useEventAction } from '../../../common/hooks/useEventAction';
 import { cx } from '../../../common/utils/styleUtils';
 import { tooltipDelayFast, tooltipDelayMid } from '../../../ontimeConfig';
+import * as Editor from '../../editors/editor-utils/EditorUtils';

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

 interface EventBlockTimerProps {
  eventId: string;
+  countToEnd: boolean;
  timeStart: number;
  timeEnd: number;
  duration: number;
  timeStrategy: TimeStrategy;
  linkStart: MaybeString;
  delay: number;
-  timerType: TimerType;
+  showLabels?: boolean;
 }

-type TimeActions = 'timeStart' | 'timeEnd' | 'duration';
-
-const TimeInputFlow = (props: EventBlockTimerProps) => {
-  const { eventId, timeStart, timeEnd, duration, timeStrategy, linkStart, delay, timerType } = props;
+function TimeInputFlow(props: EventBlockTimerProps) {
+  const { eventId, countToEnd, timeStart, timeEnd, duration, timeStrategy, linkStart, delay, showLabels } = props;
  const { updateEvent, updateTimer } = useEventAction();

  // In sync with EventEditorTimes
-  const handleSubmit = (field: TimeActions, value: string) => {
+  const handleSubmit = (field: TimeField, value: string) => {
    updateTimer(eventId, field, value);
  };

@@ -45,12 +46,12 @@ const TimeInputFlow = (props: EventBlockTimerProps) => {
  };

  const warnings = [];
-  if (timeStart > timeEnd) {
+  if (timeStart + duration > dayInMs) {
    warnings.push('Over midnight');
  }

-  if (timerType === TimerType.TimeToEnd) {
-    warnings.push('Time to end');
+  if (countToEnd) {
+    warnings.push('Count to End');
  }

  const hasDelay = delay !== 0;
@@ -64,63 +65,72 @@ const TimeInputFlow = (props: EventBlockTimerProps) => {

  return (
    <>
-      <TimeInputWithButton<TimeActions>
-        name='timeStart'
-        submitHandler={handleSubmit}
-        time={timeStart}
-        hasDelay={hasDelay}
-        placeholder='Start'
-        disabled={Boolean(linkStart)}
-      >
-        <Tooltip label='Link start to previous end' openDelay={tooltipDelayMid}>
-          <InputRightElement className={activeStart} onClick={() => handleLink(!linkStart)}>
-            <span className={style.timeLabel}>S</span>
-            <span className={style.fourtyfive}>{linkStart ? <IoLink /> : <IoUnlink />}</span>
-          </InputRightElement>
-        </Tooltip>
-      </TimeInputWithButton>
+      <div>
+        {showLabels && <Editor.Label className={style.sectionTitle}>Start time</Editor.Label>}
+        <TimeInputWithButton<TimeField>
+          name='timeStart'
+          submitHandler={handleSubmit}
+          time={timeStart}
+          hasDelay={hasDelay}
+          placeholder='Start'
+          disabled={Boolean(linkStart)}
+        >
+          <Tooltip label='Link start to previous end' openDelay={tooltipDelayMid}>
+            <InputRightElement className={activeStart} onClick={() => handleLink(!linkStart)}>
+              <span className={style.timeLabel}>S</span>
+              <span className={style.fourtyfive}>{linkStart ? <IoLink /> : <IoUnlink />}</span>
+            </InputRightElement>
+          </Tooltip>
+        </TimeInputWithButton>
+      </div>

-      <TimeInputWithButton<TimeActions>
-        name='timeEnd'
-        submitHandler={handleSubmit}
-        time={timeEnd}
-        hasDelay={hasDelay}
-        disabled={isLockedDuration}
-        placeholder='End'
-      >
-        <Tooltip label='Lock end' openDelay={tooltipDelayMid}>
-          <InputRightElement
-            className={activeEnd}
-            onClick={() => handleChangeStrategy(TimeStrategy.LockEnd)}
-            data-testid='lock__end'
-          >
-            <span className={style.timeLabel}>E</span>
-            {isLockedEnd ? <IoLockClosed /> : <IoLockOpenOutline />}
-          </InputRightElement>
-        </Tooltip>
-      </TimeInputWithButton>
+      <div>
+        {showLabels && <Editor.Label>End time</Editor.Label>}
+        <TimeInputWithButton<TimeField>
+          name='timeEnd'
+          submitHandler={handleSubmit}
+          time={timeEnd}
+          hasDelay={hasDelay}
+          disabled={isLockedDuration}
+          placeholder='End'
+        >
+          <Tooltip label='Lock end' openDelay={tooltipDelayMid}>
+            <InputRightElement
+              className={activeEnd}
+              onClick={() => handleChangeStrategy(TimeStrategy.LockEnd)}
+              data-testid='lock__end'
+            >
+              <span className={style.timeLabel}>E</span>
+              {isLockedEnd ? <IoLockClosed /> : <IoLockOpenOutline />}
+            </InputRightElement>
+          </Tooltip>
+        </TimeInputWithButton>
+      </div>

-      <TimeInputWithButton<TimeActions>
-        name='duration'
-        submitHandler={handleSubmit}
-        time={duration}
-        disabled={isLockedEnd}
-        placeholder='Duration'
-      >
-        <Tooltip label='Lock duration' openDelay={tooltipDelayMid}>
-          <InputRightElement
-            className={activeDuration}
-            onClick={() => handleChangeStrategy(TimeStrategy.LockDuration)}
-            data-testid='lock__duration'
-          >
-            <span className={style.timeLabel}>D</span>
-            {isLockedDuration ? <IoLockClosed /> : <IoLockOpenOutline />}
-          </InputRightElement>
-        </Tooltip>
-      </TimeInputWithButton>
+      <div>
+        {showLabels && <Editor.Label>Duration</Editor.Label>}
+        <TimeInputWithButton<TimeField>
+          name='duration'
+          submitHandler={handleSubmit}
+          time={duration}
+          disabled={isLockedEnd}
+          placeholder='Duration'
+        >
+          <Tooltip label='Lock duration' openDelay={tooltipDelayMid}>
+            <InputRightElement
+              className={activeDuration}
+              onClick={() => handleChangeStrategy(TimeStrategy.LockDuration)}
+              data-testid='lock__duration'
+            >
+              <span className={style.timeLabel}>D</span>
+              {isLockedDuration ? <IoLockClosed /> : <IoLockOpenOutline />}
+            </InputRightElement>
+          </Tooltip>
+        </TimeInputWithButton>
+      </div>

      {warnings.length > 0 && (
-        <div className={style.timerNote}>
+        <div className={style.timerNote} data-testid='event-warning'>
          <Tooltip label={warnings.join(' - ')} openDelay={tooltipDelayFast} variant='ontime-ondark' shouldWrapChildren>
            <IoAlertCircleOutline />
          </Tooltip>
@@ -128,6 +138,6 @@ const TimeInputFlow = (props: EventBlockTimerProps) => {
      )}
    </>
  );
-};
+}

 export default memo(TimeInputFlow);
@@ -9,6 +9,7 @@ import {
  Settings,
  SimpleTimerState,
  SupportedEvent,
+  TimerType,
  ViewSettings,
 } from 'ontime-types';
 import { useStore } from 'zustand';
@@ -74,16 +75,14 @@ const withData = <P extends WithDataProps>(Component: ComponentType<P>) => {
    const selectedId = eventNow?.id ?? null;
    const nextId = eventNext?.id ?? null;

-    /******************************************/
-    /***  + TimeManagerType                     ***/
-    /***  WRAP INFORMATION RELATED TO TIME  ***/
-    /***  --------------------------------  ***/
-    /******************************************/
-
-    const TimeManagerType = {
+    /**
+     * Contains an extended timer object with properties from the current event
+     */
+    const timeManagerType: ViewExtendedTimer = {
      ...timer,
      clock,
-      timerType: eventNow?.timerType ?? null,
+      timerType: eventNow?.timerType ?? TimerType.CountDown,
+      countToEnd: eventNow?.countToEnd ?? false,
    };

    return (
@@ -108,7 +107,7 @@ const withData = <P extends WithDataProps>(Component: ComponentType<P>) => {
          runtime={runtime}
          selectedId={selectedId}
          settings={settings}
-          time={TimeManagerType}
+          time={timeManagerType}
          viewSettings={viewSettings}
        />
      </>
@@ -5,16 +5,22 @@ import type { ViewExtendedTimer } from '../../../common/models/TimeManager.type'
 import { timerPlaceholder, timerPlaceholderMin } from '../../../common/utils/styleUtils';
 import { formatTime } from '../../../common/utils/time';

-type TimerTypeParams = Pick<ViewExtendedTimer, 'timerType' | 'current' | 'elapsed' | 'clock'>;
+type TimerTypeParams = Pick<ViewExtendedTimer, 'countToEnd' | 'timerType' | 'current' | 'elapsed' | 'clock'>;

 export function getTimerByType(freezeEnd: boolean, timerObject?: TimerTypeParams): number | null {
  if (!timerObject) {
    return null;
  }

+  if (timerObject.countToEnd) {
+    if (timerObject.current === null) {
+      return null;
+    }
+    return freezeEnd ? Math.max(timerObject.current, 0) : timerObject.current;
+  }
+
  switch (timerObject.timerType) {
    case TimerType.CountDown:
-    case TimerType.TimeToEnd:
      if (timerObject.current === null) {
        return null;
      }
@@ -32,6 +38,10 @@ export function getTimerByType(freezeEnd: boolean, timerObject?: TimerTypeParams
  }
 }

+/**
+ * Parses a string to semantically verify if it represents a true value
+ * Used in the context of parsing search params and local storage items which can be strings or null
+ */
 export function isStringBoolean(text: string | null) {
  if (text === null) {
    return false;
@@ -124,7 +124,7 @@ export default function MinimalTimer(props: MinimalTimerProps) {

  const isPlaying = time.playback !== Playback.Pause;

-  const shouldShowModifiers = time.timerType === TimerType.CountDown || time.timerType === TimerType.TimeToEnd;
+  const shouldShowModifiers = time.timerType === TimerType.CountDown || time.countToEnd;
  const finished = time.phase === TimerPhase.Overtime;
  const showEndMessage = shouldShowModifiers && finished && viewSettings.endMessage && !hideEndMessage;
  const showFinished =
@@ -118,7 +118,7 @@ export default function Timer(props: TimerProps) {
  const finished = time.phase === TimerPhase.Overtime;
  const totalTime = (time.duration ?? 0) + (time.addedTime ?? 0);

-  const shouldShowModifiers = time.timerType === TimerType.CountDown || time.timerType === TimerType.TimeToEnd;
+  const shouldShowModifiers = time.timerType === TimerType.CountDown || time.countToEnd;
  const showEndMessage = shouldShowModifiers && finished && viewSettings.endMessage;
  const showProgress =
    eventNow !== null &&
@@ -5,6 +5,7 @@ $transition-time-feedback: 0.3s;

 $component-border-radius-md: 3px;
 $component-border-radius-sm: 2px;
+$component-border-radius-full: 99px;

 // semantic colours
 $action-blue: #3182ce;
@@ -12,6 +13,7 @@ $action-text-color: $blue-400;
 $ontime-color: #ff7597;
 $error-red: $red-500;
 $warning-orange: $orange-500;
+$info-blue: $blue-500;
 $opacity-disabled: 0.4;
 $active-red: $red-700;

@@ -49,11 +51,14 @@ $main-spacing: 2rem;

 // interface text
 $ontime-font-family: "Open Sans", "Segoe UI", sans-serif;
+$title-gray: $gray-200;
 $label-gray: $gray-400;
 $secondary-text-gray: $gray-400;
+$muted-gray: $gray-600;
 $section-white: $ui-white;
 $inner-section-text-size: calc(1rem - 2px);
 $text-body-size: calc(1rem - 1px);
+$aux-text-size: calc(1rem - 3px);

 // media queries
 $min-tablet: 500px;
@@ -38,6 +38,16 @@ export const ontimeInputGhosted = {
  },
 };

+export const ontimeInputTransparent = {
+  field: {
+    ...commonStyles,
+    backgroundColor: 'transparent',
+    _hover: {
+      backgroundColor: '#2d2d2d', // $gray-1100
+    },
+  },
+};
+
 export const ontimeTextAreaFilled = {
  ...commonStyles,
 };
@@ -46,6 +56,6 @@ export const ontimeTextAreaTransparent = {
  ...commonStyles,
  backgroundColor: 'transparent',
  _hover: {
-    backgroundColor: 'rgba(255, 255, 255, 0.10)', // $white-10
+    backgroundColor: '#2d2d2d', // $gray-1100
  },
 };
@@ -21,6 +21,7 @@ import { ontimeTab } from './ontimeTab';
 import {
  ontimeInputFilled,
  ontimeInputGhosted,
+  ontimeInputTransparent,
  ontimeTextAreaFilled,
  ontimeTextAreaTransparent,
 } from './ontimeTextInputs';
@@ -78,6 +79,7 @@ const theme = extendTheme({
      variants: {
        'ontime-filled': { ...ontimeInputFilled },
        'ontime-ghosted': { ...ontimeInputGhosted },
+        'ontime-transparent': { ...ontimeInputTransparent },
      },
    },
    Kbd: {
@@ -1,183 +0,0 @@
-import { useCallback, useRef } from 'react';
-import { ColumnDef, flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table';
-import Color from 'color';
-import { isOntimeBlock, isOntimeDelay, isOntimeEvent, OntimeRundown, OntimeRundownEntry } from 'ontime-types';
-
-import useFollowComponent from '../../common/hooks/useFollowComponent';
-import { getAccessibleColour } from '../../common/utils/styleUtils';
-
-import BlockRow from './cuesheet-table-elements/BlockRow';
-import CuesheetHeader from './cuesheet-table-elements/CuesheetHeader';
-import DelayRow from './cuesheet-table-elements/DelayRow';
-import EventRow from './cuesheet-table-elements/EventRow';
-import CuesheetTableSettings from './cuesheet-table-settings/CuesheetTableSettings';
-import { useCuesheetSettings } from './store/cuesheetSettingsStore';
-import useColumnManager from './useColumnManager';
-
-import style from './Cuesheet.module.scss';
-
-interface CuesheetProps {
-  data: OntimeRundown;
-  columns: ColumnDef<OntimeRundownEntry>[];
-  handleUpdate: (rowIndex: number, accessor: keyof OntimeRundownEntry, payload: unknown) => void;
-  selectedId: string | null;
-  currentBlockId: string | null;
-}
-
-export default function Cuesheet({ data, columns, handleUpdate, selectedId, currentBlockId }: CuesheetProps) {
-  const { followSelected, showSettings, showDelayBlock, showPrevious, showIndexColumn } = useCuesheetSettings();
-  const {
-    columnVisibility,
-    columnOrder,
-    columnSizing,
-    resetColumnOrder,
-    setColumnVisibility,
-    saveColumnOrder,
-    setColumnSizing,
-  } = useColumnManager(columns);
-
-  const selectedRef = useRef<HTMLTableRowElement | null>(null);
-  const tableContainerRef = useRef<HTMLDivElement | null>(null);
-  useFollowComponent({ followRef: selectedRef, scrollRef: tableContainerRef, doFollow: followSelected });
-
-  const table = useReactTable({
-    data,
-    columns,
-    columnResizeMode: 'onChange',
-    state: {
-      columnOrder,
-      columnVisibility,
-      columnSizing,
-    },
-    meta: {
-      handleUpdate,
-    },
-    onColumnVisibilityChange: setColumnVisibility,
-    onColumnSizingChange: setColumnSizing,
-    getCoreRowModel: getCoreRowModel(),
-  });
-
-  const setAllVisible = () => {
-    table.toggleAllColumnsVisible(true);
-  };
-
-  const resetColumnResizing = () => {
-    setColumnSizing({});
-  };
-
-  const reorder = useCallback(
-    (fromId: string, toId: string) => {
-      // get index of from
-      const fromIndex = columnOrder.indexOf(fromId);
-
-      // get index of to
-      const toIndex = columnOrder.indexOf(toId);
-
-      if (toIndex === -1) {
-        return;
-      }
-
-      const reorderedCols = [...columnOrder];
-      const reorderedItem = reorderedCols.splice(fromIndex, 1);
-      reorderedCols.splice(toIndex, 0, reorderedItem[0]);
-      saveColumnOrder(reorderedCols);
-    },
-    [columnOrder, saveColumnOrder],
-  );
-
-  const headerGroups = table.getHeaderGroups();
-  const rowModel = table.getRowModel();
-  const allLeafColumns = table.getAllLeafColumns();
-
-  let eventIndex = 0;
-  let isPast = Boolean(selectedId);
-
-  return (
-    <>
-      {showSettings && (
-        <CuesheetTableSettings
-          columns={allLeafColumns}
-          handleResetResizing={resetColumnResizing}
-          handleResetReordering={resetColumnOrder}
-          handleClearToggles={setAllVisible}
-        />
-      )}
-      <div ref={tableContainerRef} className={style.cuesheetContainer}>
-        <table className={style.cuesheet}>
-          <CuesheetHeader headerGroups={headerGroups} saveColumnOrder={reorder} showIndexColumn={showIndexColumn} />
-          <tbody>
-            {rowModel.rows.map((row) => {
-              const key = row.original.id;
-              const isSelected = selectedId === key;
-              if (isSelected) {
-                isPast = false;
-              }
-
-              if (isOntimeBlock(row.original)) {
-                if (isPast && !showPrevious && key !== currentBlockId) {
-                  return null;
-                }
-                return <BlockRow key={key} title={row.original.title} />;
-              }
-              if (isOntimeDelay(row.original)) {
-                if (isPast && !showPrevious) {
-                  return null;
-                }
-                const delayVal = row.original.duration;
-                if (!showDelayBlock || delayVal === 0) {
-                  return null;
-                }
-
-                return <DelayRow key={key} duration={delayVal} />;
-              }
-              if (isOntimeEvent(row.original)) {
-                eventIndex++;
-                const isSelected = key === selectedId;
-
-                if (isPast && !showPrevious) {
-                  return null;
-                }
-
-                let rowBgColour: string | undefined;
-                if (isSelected) {
-                  rowBgColour = '#D20300'; // $red-700
-                } else if (row.original.colour) {
-                  try {
-                    // the colour is user defined and might be invalid
-                    const accessibleBackgroundColor = Color(getAccessibleColour(row.original.colour).backgroundColor);
-                    rowBgColour = accessibleBackgroundColor.fade(0.75).hexa();
-                  } catch (_error) {
-                    /* we do not handle errors here */
-                  }
-                }
-
-                return (
-                  <EventRow
-                    key={key}
-                    eventIndex={eventIndex}
-                    isPast={isPast}
-                    selectedRef={isSelected ? selectedRef : undefined}
-                    skip={row.original.skip}
-                    colour={row.original.colour}
-                    showIndexColumn={showIndexColumn}
-                  >
-                    {row.getVisibleCells().map((cell) => {
-                      return (
-                        <td key={cell.id} style={{ width: cell.column.getSize(), backgroundColor: rowBgColour }}>
-                          {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                        </td>
-                      );
-                    })}
-                  </EventRow>
-                );
-              }
-
-              // currently there is no scenario where entryType is not handled above, either way...
-              return null;
-            })}
-          </tbody>
-        </table>
-      </div>
-    </>
-  );
-}
@@ -5,9 +5,10 @@
  padding: 1rem 0.5rem;

  display: grid;
-  grid-template-rows: 3rem auto 1fr;
+  grid-template-rows: 3rem auto auto 1fr;
  grid-template-areas:
          'overview'
+          'progress'
          'settings'
          'table';
  gap: 1rem;
@@ -1,114 +1,97 @@
-import { useCallback, useMemo } from 'react';
-import { IconButton, useDisclosure } from '@chakra-ui/react';
+import { useCallback, useMemo, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { IconButton, Modal, ModalContent, ModalOverlay, useDisclosure } from '@chakra-ui/react';
 import { IoApps } from '@react-icons/all-files/io5/IoApps';
 import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';
-import { CustomFieldLabel, isOntimeEvent } from 'ontime-types';

 import ProductionNavigationMenu from '../../common/components/navigation-menu/ProductionNavigationMenu';
 import EmptyPage from '../../common/components/state/EmptyPage';
-import { useEventAction } from '../../common/hooks/useEventAction';
-import { useCuesheet } from '../../common/hooks/useSocket';
+import ViewParamsEditor from '../../common/components/view-params-editor/ViewParamsEditor';
 import { useWindowTitle } from '../../common/hooks/useWindowTitle';
 import useCustomFields from '../../common/hooks-query/useCustomFields';
 import { useFlatRundown } from '../../common/hooks-query/useRundown';
 import { CuesheetOverview } from '../../features/overview/Overview';
+import CuesheetEventEditor from '../../features/rundown/event-editor/CuesheetEventEditor';

+import CuesheetDnd from './cuesheet-dnd/CuesheetDnd';
 import CuesheetProgress from './cuesheet-progress/CuesheetProgress';
-import { useCuesheetSettings } from './store/cuesheetSettingsStore';
-import Cuesheet from './Cuesheet';
-import { makeCuesheetColumns } from './cuesheetCols';
+import { makeCuesheetColumns } from './cuesheet-table/cuesheet-table-elements/cuesheetCols';
+import CuesheetTable from './cuesheet-table/CuesheetTable';
+import { cuesheetOptions } from './cuesheet.options';

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

 export default function CuesheetPage() {
  // TODO: can we use the normalised rundown for the table?
-  const { data: flatRundown, status: rundownStatus } = useFlatRundown();
+  const { data: flatRundown } = useFlatRundown();
  const { data: customFields } = useCustomFields();
+  const [searchParams, setSearchParams] = useSearchParams();
  const { isOpen: isMenuOpen, onOpen, onClose } = useDisclosure();
+  const { isOpen: isEventEditorOpen, onOpen: onEventEditorOpen, onClose: onEventEditorClose } = useDisclosure();
+  const [eventId, setEventId] = useState<string | null>(null);

-  const { updateCustomField } = useEventAction();
-  const featureData = useCuesheet();
  const columns = useMemo(() => makeCuesheetColumns(customFields), [customFields]);
-  const toggleSettings = useCuesheetSettings((state) => state.toggleSettings);

  useWindowTitle('Cuesheet');

+  /** Handles showing the view params edit drawer */
+  const showEditFormDrawer = useCallback(() => {
+    searchParams.set('edit', 'true');
+    setSearchParams(searchParams);
+  }, [searchParams, setSearchParams]);
+
  /**
-   * Handles updating a field
-   * Currently, only custom fields can be updated from the cuesheet
+   * Handles setting the edit modal target and visibility
   */
-  const handleUpdate = useCallback(
-    async (rowIndex: number, accessor: CustomFieldLabel, payload: unknown) => {
-      if (!flatRundown || rundownStatus !== 'success') {
-        return;
-      }
-
-      if (rowIndex == null || accessor == null || payload == null) {
-        return;
-      }
-
-      // check if value is the same
-      const event = flatRundown[rowIndex];
-      if (!event || !isOntimeEvent(event)) {
-        return;
-      }
-
-      const previousValue = event.custom[accessor];
-
-      if (previousValue === payload) {
-        return;
-      }
-
-      // check if value is valid
-      // in anticipation to different types of event here
-      if (typeof payload !== 'string') {
-        return;
-      }
-
-      // cleanup
-      const cleanVal = payload.trim();
-
-      // submit
-      try {
-        await updateCustomField(event.id, accessor, cleanVal);
-      } catch (error) {
-        console.error(error);
+  const setShowModal = useCallback(
+    (eventId: string | null) => {
+      if (eventId) {
+        setEventId(eventId);
+        onEventEditorOpen();
+      } else {
+        setEventId(null);
+        onEventEditorClose();
      }
    },
-    [flatRundown, rundownStatus, updateCustomField],
+    [onEventEditorClose, onEventEditorOpen],
  );

-  if (!customFields || !flatRundown || rundownStatus !== 'success') {
+  if (!customFields || !flatRundown) {
    return <EmptyPage text='Loading...' />;
  }

  return (
-    <div className={styles.tableWrapper} data-testid='cuesheet'>
-      <ProductionNavigationMenu isMenuOpen={isMenuOpen} onMenuClose={onClose} />
-      <CuesheetOverview>
-        <IconButton
-          aria-label='Toggle navigation'
-          variant='ontime-subtle-white'
-          size='lg'
-          icon={<IoApps />}
-          onClick={onOpen}
-        />
-        <IconButton
-          aria-label='Toggle settings'
-          variant='ontime-subtle-white'
-          size='lg'
-          icon={<IoSettingsOutline />}
-          onClick={() => toggleSettings()}
-        />
-      </CuesheetOverview>
-      <CuesheetProgress />
-      <Cuesheet
-        data={flatRundown}
-        columns={columns}
-        handleUpdate={handleUpdate}
-        selectedId={featureData.selectedEventId}
-        currentBlockId={featureData.currentBlockId}
-      />
-    </div>
+    <>
+      <Modal isOpen={isEventEditorOpen} onClose={onEventEditorClose} variant='ontime'>
+        <ModalOverlay />
+        <ModalContent maxWidth='max(640px, 40vw)' padding='1rem'>
+          <CuesheetEventEditor eventId={eventId!} />
+        </ModalContent>
+      </Modal>
+      <div className={styles.tableWrapper} data-testid='cuesheet'>
+        <ProductionNavigationMenu isMenuOpen={isMenuOpen} onMenuClose={onClose} />
+        <ViewParamsEditor viewOptions={cuesheetOptions} />
+        <CuesheetOverview>
+          <IconButton
+            aria-label='Toggle navigation'
+            variant='ontime-subtle-white'
+            size='lg'
+            icon={<IoApps />}
+            onClick={onOpen}
+          />
+          <IconButton
+            aria-label='Toggle settings'
+            variant='ontime-subtle-white'
+            size='lg'
+            icon={<IoSettingsOutline />}
+            onClick={showEditFormDrawer}
+          />
+        </CuesheetOverview>
+        <CuesheetProgress />
+        <CuesheetDnd columns={columns}>
+          <CuesheetTable data={flatRundown} columns={columns} showModal={setShowModal} />
+        </CuesheetDnd>
+      </div>
+    </>
  );
 }
@@ -0,0 +1,69 @@
+import { PropsWithChildren } from 'react';
+import {
+  closestCorners,
+  DndContext,
+  DragEndEvent,
+  PointerSensor,
+  TouchSensor,
+  useSensor,
+  useSensors,
+} from '@dnd-kit/core';
+import { ColumnDef } from '@tanstack/react-table';
+import { OntimeRundownEntry } from 'ontime-types';
+
+import useColumnManager from '../cuesheet-table/useColumnManager';
+
+interface CuesheetDndProps {
+  columns: ColumnDef<OntimeRundownEntry>[];
+}
+
+export default function CuesheetDnd(props: PropsWithChildren<CuesheetDndProps>) {
+  const { columns, children } = props;
+
+  const { columnOrder, saveColumnOrder } = useColumnManager(columns);
+
+  const sensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: {
+        delay: 100,
+        tolerance: 50,
+      },
+    }),
+    useSensor(TouchSensor, {
+      activationConstraint: {
+        delay: 100,
+        tolerance: 50,
+      },
+    }),
+  );
+
+  const handleOnDragEnd = (event: DragEndEvent) => {
+    const { delta, active, over } = event;
+
+    // cancel if delta y is greater than 200
+    if (delta.y > 200) return;
+    // cancel if we do not have an over id
+    if (over?.id == null) return;
+
+    // get index of from
+    const fromIndex = columnOrder.indexOf(active.id as string);
+
+    // get index of to
+    const toIndex = columnOrder.indexOf(over.id as string);
+
+    if (toIndex === -1) {
+      return;
+    }
+
+    const reorderedCols = [...columnOrder];
+    const reorderedItem = reorderedCols.splice(fromIndex, 1);
+    reorderedCols.splice(toIndex, 0, reorderedItem[0]);
+    saveColumnOrder(reorderedCols);
+  };
+
+  return (
+    <DndContext sensors={sensors} collisionDetection={closestCorners} onDragEnd={handleOnDragEnd}>
+      {children}
+    </DndContext>
+  );
+}
@@ -1,3 +1,4 @@
 .progressOverride {
-    height: 1rem;
+  height: 1rem;
+  grid-area: progress;
 }
@@ -1,18 +0,0 @@
-import { memo } from 'react';
-
-import style from '../Cuesheet.module.scss';
-
-interface BlockRowProps {
-  title: string;
-}
-
-function BlockRow(props: BlockRowProps) {
-  const { title } = props;
-  return (
-    <tr className={style.blockRow}>
-      <td>{title}</td>
-    </tr>
-  );
-}
-
-export default memo(BlockRow);
@@ -1,89 +0,0 @@
-import {
-  closestCorners,
-  DndContext,
-  DragEndEvent,
-  PointerSensor,
-  TouchSensor,
-  useSensor,
-  useSensors,
-} from '@dnd-kit/core';
-import { horizontalListSortingStrategy, SortableContext } from '@dnd-kit/sortable';
-import { flexRender, HeaderGroup } from '@tanstack/react-table';
-import { OntimeRundownEntry } from 'ontime-types';
-
-import { getAccessibleColour } from '../../../common/utils/styleUtils';
-
-import { SortableCell } from './SortableCell';
-
-import style from '../Cuesheet.module.scss';
-
-interface CuesheetHeaderProps {
-  headerGroups: HeaderGroup<OntimeRundownEntry>[];
-  saveColumnOrder: (fromId: string, toId: string) => void;
-  showIndexColumn: boolean;
-}
-
-export default function CuesheetHeader(props: CuesheetHeaderProps) {
-  const { headerGroups, saveColumnOrder, showIndexColumn } = props;
-
-  const handleOnDragEnd = (event: DragEndEvent) => {
-    const { delta, active, over } = event;
-
-    // cancel if delta y is greater than 200
-    if (delta.y > 200) return;
-    // cancel if we do not have an over id
-    if (over?.id == null) return;
-
-    saveColumnOrder(active.id as string, over.id as string);
-  };
-
-  const sensors = useSensors(
-    useSensor(PointerSensor, {
-      activationConstraint: {
-        delay: 100,
-        tolerance: 50,
-      },
-    }),
-    useSensor(TouchSensor, {
-      activationConstraint: {
-        delay: 100,
-        tolerance: 50,
-      },
-    }),
-  );
-
-  return (
-    <thead className={style.tableHeader}>
-      {headerGroups.map((headerGroup) => {
-        const key = headerGroup.id;
-
-        return (
-          <DndContext key={key} sensors={sensors} collisionDetection={closestCorners} onDragEnd={handleOnDragEnd}>
-            <tr key={headerGroup.id}>
-              <th className={style.indexColumn}>{showIndexColumn && '#'}</th>
-              <SortableContext key={key} items={headerGroup.headers} strategy={horizontalListSortingStrategy}>
-                {headerGroup.headers.map((header) => {
-                  const width = header.getSize();
-                  // @ts-expect-error -- we inject this into react-table
-                  const customBackground = header.column.columnDef?.meta?.colour;
-
-                  let customStyles = {};
-                  if (customBackground) {
-                    const customColour = getAccessibleColour(customBackground);
-                    customStyles = { backgroundColor: customColour.backgroundColor, color: customColour.color };
-                  }
-
-                  return (
-                    <SortableCell key={header.column.columnDef.id} header={header} style={{ width, ...customStyles }}>
-                      {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
-                    </SortableCell>
-                  );
-                })}
-              </SortableContext>
-            </tr>
-          </DndContext>
-        );
-      })}
-    </thead>
-  );
-}
@@ -1,55 +0,0 @@
-import { ChangeEvent, memo, useCallback, useEffect, useRef, useState } from 'react';
-import { getHotkeyHandler } from '@mantine/hooks';
-
-import { AutoTextArea } from '../../../common/components/input/auto-text-area/AutoTextArea';
-
-interface EditableCellProps {
-  value: string;
-  handleUpdate: (newValue: string) => void;
-}
-
-const EditableCell = (props: EditableCellProps) => {
-  const { value: initialValue, handleUpdate } = props;
-
-  // We need to keep and update the state of the cell normally
-  const [value, setValue] = useState(initialValue);
-  const ref = useRef<HTMLAreaElement>();
-  const onChange = useCallback((event: ChangeEvent<HTMLTextAreaElement>) => setValue(event.target.value), []);
-
-  // We'll only update the external data when the input is blurred
-  const onBlur = useCallback(() => handleUpdate(value), [handleUpdate, value]);
-
-  //TODO: maybe we can unify this with `useReactiveTextInput`
-  const onKeyDown = getHotkeyHandler([
-    ['mod + Enter', () => ref.current?.blur()],
-    [
-      'Escape',
-      () => {
-        setValue(initialValue);
-        setTimeout(() => ref.current?.blur());
-      },
-    ],
-  ]);
-
-  // If the initialValue is changed external, sync it up with our state
-  useEffect(() => {
-    setValue(initialValue);
-  }, [initialValue]);
-
-  return (
-    <AutoTextArea
-      size='sm'
-      value={value}
-      inputref={ref}
-      onChange={onChange}
-      onBlur={onBlur}
-      rows={1}
-      onKeyDown={onKeyDown}
-      transition='none'
-      spellCheck={false}
-      style={{ padding: 0 }}
-    />
-  );
-};
-
-export default memo(EditableCell);
@@ -1,5 +1,5 @@
-$table-font-size: calc(1rem - 2px);
-$table-header-font-size: calc(1rem - 3px);
+$table-font-size: 1rem;
+$table-header-font-size: calc(1rem - 2px);

 .cuesheetContainer {
  grid-area: table;
@@ -32,14 +32,19 @@ $table-header-font-size: calc(1rem - 3px);

 .tableHeader,
 .eventRow {
+  .actionColumn {
+    width: calc(2rem + 0.5rem); // sm button size (--chakra-sizes-8) + 2 * padding
+    background-color: transparent;
+  }
+
  .indexColumn {
-    min-width: 2rem;
-    text-align: right;
-    font-weight: 400;
-    position: sticky;
-    left: 0;
-    z-index: 1;
-    background-color: $gray-1300;
+    display: flex;
+    align-items: center;
+    justify-content: end;
+
+    min-width: 3em; // allow for 3-digit numbers
+    font-size: $table-header-font-size;
+    background-color: $gray-1300; // will be overridden inline
  }
 }

@@ -49,7 +54,8 @@ $table-header-font-size: calc(1rem - 3px);
  z-index: 10;
  background-color: $ui-black;
  font-size: $table-header-font-size;
-  color: $label-gray;}
+  color: $label-gray;
+}

 th {
  background-color: $gray-1300;
@@ -115,16 +121,6 @@ th {
  margin: 0 auto;
 }

-.time {
-  display: flex;
-  gap: 0.5rem;
-  align-items: center;
-
-  > * {
-    @include ellipsis-overflow;
-  }
-}
-
 .delayedTime {
  color: $ontime-delay-text;
  font-size: calc(1rem - 2px);
@@ -0,0 +1,197 @@
+import { useRef } from 'react';
+import { Menu } from '@chakra-ui/react';
+import { ColumnDef, flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table';
+import Color from 'color';
+import {
+  isOntimeBlock,
+  isOntimeDelay,
+  isOntimeEvent,
+  MaybeString,
+  OntimeEvent,
+  OntimeRundown,
+  OntimeRundownEntry,
+  TimeField,
+} from 'ontime-types';
+
+import { useEventAction } from '../../../common/hooks/useEventAction';
+import useFollowComponent from '../../../common/hooks/useFollowComponent';
+import { useSelectedEventId } from '../../../common/hooks/useSocket';
+import { getAccessibleColour } from '../../../common/utils/styleUtils';
+import { useCuesheetOptions } from '../cuesheet.options';
+
+import BlockRow from './cuesheet-table-elements/BlockRow';
+import CuesheetHeader from './cuesheet-table-elements/CuesheetHeader';
+import DelayRow from './cuesheet-table-elements/DelayRow';
+import EventRow from './cuesheet-table-elements/EventRow';
+import CuesheetTableSettings from './cuesheet-table-settings/CuesheetTableSettings';
+import CuesheetTableMenu from './CuesheetTableMenu';
+import useColumnManager from './useColumnManager';
+
+import style from './CuesheetTable.module.scss';
+
+interface CuesheetTableProps {
+  data: OntimeRundown;
+  columns: ColumnDef<OntimeRundownEntry>[];
+  showModal: (eventId: MaybeString) => void;
+}
+
+export default function CuesheetTable(props: CuesheetTableProps) {
+  const { data, columns, showModal } = props;
+
+  const { updateEvent, updateTimer } = useEventAction();
+  const { selectedEventId } = useSelectedEventId();
+  const { followSelected, hideDelays, hidePast, showDelayedTimes, hideTableSeconds } = useCuesheetOptions();
+  const { columnVisibility, columnOrder, columnSizing, resetColumnOrder, setColumnVisibility, setColumnSizing } =
+    useColumnManager(columns);
+
+  const selectedRef = useRef<HTMLTableRowElement | null>(null);
+  const tableContainerRef = useRef<HTMLDivElement | null>(null);
+  useFollowComponent({ followRef: selectedRef, scrollRef: tableContainerRef, doFollow: followSelected });
+
+  const table = useReactTable({
+    data,
+    columns,
+    columnResizeMode: 'onChange',
+    state: {
+      columnOrder,
+      columnVisibility,
+      columnSizing,
+    },
+    onColumnVisibilityChange: setColumnVisibility,
+    onColumnSizingChange: setColumnSizing,
+    getCoreRowModel: getCoreRowModel(),
+    meta: {
+      handleUpdate: (rowIndex: number, accessor: string, payload: string, isCustom = false) => {
+        // check if value is the same
+        const event = data[rowIndex];
+        if (!event || !isOntimeEvent(event)) {
+          return;
+        }
+
+        // skip if there is no value change
+        const key = accessor as keyof OntimeEvent;
+        const previousValue = event[key];
+        if (previousValue === payload) {
+          return;
+        }
+
+        if (isCustom) {
+          updateEvent({ id: event.id, custom: { [accessor]: payload } });
+          return;
+        }
+
+        updateEvent({ id: event.id, [accessor]: payload });
+      },
+      handleUpdateTimer: (eventId: string, field: TimeField, payload) => {
+        // the timer element already contains logic to avoid submitting a unchanged value
+        updateTimer(eventId, field, payload, true);
+      },
+      options: {
+        showDelayedTimes,
+        hideTableSeconds,
+      },
+    },
+  });
+
+  const setAllVisible = () => {
+    table.toggleAllColumnsVisible(true);
+  };
+
+  const resetColumnResizing = () => {
+    setColumnSizing({});
+  };
+
+  const headerGroups = table.getHeaderGroups();
+  const rowModel = table.getRowModel();
+  const allLeafColumns = table.getAllLeafColumns();
+
+  let eventIndex = 0;
+  // for the first event, it will be past if there is something selected
+  let isPast = Boolean(selectedEventId);
+
+  return (
+    <>
+      <CuesheetTableSettings
+        columns={allLeafColumns}
+        handleResetResizing={resetColumnResizing}
+        handleResetReordering={resetColumnOrder}
+        handleClearToggles={setAllVisible}
+      />
+      <div ref={tableContainerRef} className={style.cuesheetContainer}>
+        <table className={style.cuesheet} id='cuesheet'>
+          <CuesheetHeader headerGroups={headerGroups} />
+          <tbody>
+            {rowModel.rows.map((row, index) => {
+              const key = row.original.id;
+              const isSelected = selectedEventId === key;
+              const entry = row.original;
+              if (isSelected) {
+                isPast = false;
+              }
+
+              if (isOntimeBlock(entry)) {
+                return <BlockRow key={key} title={entry.title} hidePast={isPast && hidePast} />;
+              }
+              if (isOntimeDelay(entry)) {
+                if (isPast && hidePast) {
+                  return null;
+                }
+                const delayVal = entry.duration;
+                if (hideDelays || delayVal === 0) {
+                  return null;
+                }
+
+                return <DelayRow key={key} duration={delayVal} />;
+              }
+              if (isOntimeEvent(entry)) {
+                eventIndex++;
+                const isSelected = key === selectedEventId;
+
+                if (isPast && hidePast) {
+                  return null;
+                }
+
+                let rowBgColour: string | undefined;
+                if (isSelected) {
+                  rowBgColour = '#D20300'; // $red-700
+                } else if (entry.colour) {
+                  try {
+                    // the colour is user defined and might be invalid
+                    const accessibleBackgroundColor = Color(getAccessibleColour(entry.colour).backgroundColor);
+                    rowBgColour = accessibleBackgroundColor.fade(0.75).hexa();
+                  } catch (_error) {
+                    /* we do not handle errors here */
+                  }
+                }
+
+                return (
+                  <Menu key={key} variant='ontime-on-dark' size='sm' isLazy>
+                    <EventRow
+                      eventIndex={eventIndex}
+                      isPast={isPast}
+                      selectedRef={isSelected ? selectedRef : undefined}
+                      skip={entry.skip}
+                      colour={entry.colour}
+                    >
+                      {row.getVisibleCells().map((cell) => {
+                        return (
+                          <td key={cell.id} style={{ width: cell.column.getSize(), backgroundColor: rowBgColour }}>
+                            {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                          </td>
+                        );
+                      })}
+                    </EventRow>
+                    <CuesheetTableMenu event={entry} entryIndex={index} showModal={showModal} />
+                  </Menu>
+                );
+              }
+
+              // currently there is no scenario where entryType is not handled above, either way...
+              return null;
+            })}
+          </tbody>
+        </table>
+      </div>
+    </>
+  );
+}
@@ -0,0 +1,63 @@
+import { MenuDivider, MenuItem, MenuList } from '@chakra-ui/react';
+import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
+import { IoArrowDown } from '@react-icons/all-files/io5/IoArrowDown';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
+import { IoDuplicateOutline } from '@react-icons/all-files/io5/IoDuplicateOutline';
+import { IoOptions } from '@react-icons/all-files/io5/IoOptions';
+import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
+import { OntimeEvent, SupportedEvent } from 'ontime-types';
+
+import { useEventAction } from '../../../common/hooks/useEventAction';
+import { cloneEvent } from '../../../common/utils/eventsManager';
+
+interface CuesheetTableMenuProps {
+  event: OntimeEvent;
+  entryIndex: number;
+  showModal: (entryId: string) => void;
+}
+
+export default function CuesheetTableMenu(props: CuesheetTableMenuProps) {
+  const { event, entryIndex, showModal } = props;
+  const { addEvent, reorderEvent, deleteEvent } = useEventAction();
+
+  const handleCloneEvent = () => {
+    const newEvent = cloneEvent(event);
+    try {
+      addEvent(newEvent, { after: event.id });
+    } catch (_error) {
+      // we do not handle errors here
+    }
+  };
+
+  return (
+    <MenuList>
+      <MenuItem icon={<IoOptions />} onClick={() => showModal(event.id)}>
+        Edit ...
+      </MenuItem>
+      <MenuDivider />
+      <MenuItem icon={<IoAdd />} onClick={() => addEvent({ type: SupportedEvent.Event }, { before: event.id })}>
+        Add event above
+      </MenuItem>
+      <MenuItem icon={<IoAdd />} onClick={() => addEvent({ type: SupportedEvent.Event }, { after: event.id })}>
+        Add event below
+      </MenuItem>
+      <MenuItem icon={<IoDuplicateOutline />} onClick={handleCloneEvent}>
+        Clone event
+      </MenuItem>
+      <MenuDivider />
+      <MenuItem
+        isDisabled={entryIndex < 1}
+        icon={<IoArrowUp />}
+        onClick={() => reorderEvent(event.id, entryIndex, entryIndex - 1)}
+      >
+        Move up
+      </MenuItem>
+      <MenuItem icon={<IoArrowDown />} onClick={() => reorderEvent(event.id, entryIndex, entryIndex + 1)}>
+        Move down
+      </MenuItem>
+      <MenuItem icon={<IoTrash />} onClick={() => deleteEvent([event.id])}>
+        Delete
+      </MenuItem>
+    </MenuList>
+  );
+}
@@ -0,0 +1,27 @@
+import { memo } from 'react';
+
+import { useCurrentBlockId } from '../../../../common/hooks/useSocket';
+
+import style from '../CuesheetTable.module.scss';
+
+interface BlockRowProps {
+  hidePast: boolean;
+  title: string;
+}
+
+function BlockRow(props: BlockRowProps) {
+  const { hidePast, title } = props;
+  const { currentBlockId } = useCurrentBlockId();
+
+  if (hidePast && !currentBlockId) {
+    return null;
+  }
+
+  return (
+    <tr className={style.blockRow}>
+      <td>{title}</td>
+    </tr>
+  );
+}
+
+export default memo(BlockRow);
@@ -0,0 +1,53 @@
+import { horizontalListSortingStrategy, SortableContext } from '@dnd-kit/sortable';
+import { flexRender, HeaderGroup } from '@tanstack/react-table';
+import { OntimeRundownEntry } from 'ontime-types';
+
+import { getAccessibleColour } from '../../../../common/utils/styleUtils';
+import { useCuesheetOptions } from '../../cuesheet.options';
+
+import { SortableCell } from './SortableCell';
+
+import style from '../CuesheetTable.module.scss';
+
+interface CuesheetHeaderProps {
+  headerGroups: HeaderGroup<OntimeRundownEntry>[];
+}
+
+export default function CuesheetHeader(props: CuesheetHeaderProps) {
+  const { headerGroups } = props;
+  const { hideIndexColumn, showActionMenu } = useCuesheetOptions();
+
+  return (
+    <thead className={style.tableHeader}>
+      {headerGroups.map((headerGroup) => {
+        const key = headerGroup.id;
+
+        return (
+          <tr key={headerGroup.id}>
+            {showActionMenu && <th className={style.actionColumn} />}
+            {!hideIndexColumn && <th className={style.indexColumn}>#</th>}
+            <SortableContext key={key} items={headerGroup.headers} strategy={horizontalListSortingStrategy}>
+              {headerGroup.headers.map((header) => {
+                const width = header.getSize();
+                // @ts-expect-error -- we inject this into react-table
+                const customBackground = header.column.columnDef?.meta?.colour;
+
+                let customStyles = {};
+                if (customBackground) {
+                  const customColour = getAccessibleColour(customBackground);
+                  customStyles = { backgroundColor: customColour.backgroundColor, color: customColour.color };
+                }
+
+                return (
+                  <SortableCell key={header.column.columnDef.id} header={header} style={{ width, ...customStyles }}>
+                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                  </SortableCell>
+                );
+              })}
+            </SortableContext>
+          </tr>
+        );
+      })}
+    </thead>
+  );
+}
@@ -1,8 +1,8 @@
 import { memo } from 'react';

-import { millisToDelayString } from '../../../common/utils/dateConfig';
+import { millisToDelayString } from '../../../../common/utils/dateConfig';

-import style from '../Cuesheet.module.scss';
+import style from '../CuesheetTable.module.scss';

 interface DelayRowProps {
  duration: number;
@@ -1,14 +1,15 @@
 import { memo, MutableRefObject, PropsWithChildren, useLayoutEffect, useRef, useState } from 'react';
+import { IconButton, MenuButton } from '@chakra-ui/react';
+import { IoEllipsisHorizontal } from '@react-icons/all-files/io5/IoEllipsisHorizontal';
+import Color from 'color';

-import { getAccessibleColour } from '../../../common/utils/styleUtils';
+import { cx, getAccessibleColour } from '../../../../common/utils/styleUtils';
+import { useCuesheetOptions } from '../../cuesheet.options';

-import style from '../Cuesheet.module.scss';
-
-const pastOpacity = '0.2';
+import style from '../CuesheetTable.module.scss';

 interface EventRowProps {
  eventIndex: number;
-  showIndexColumn: boolean;
  isPast?: boolean;
  selectedRef?: MutableRefObject<HTMLTableRowElement | null>;
  skip?: boolean;
@@ -16,13 +17,11 @@ interface EventRowProps {
 }

 function EventRow(props: PropsWithChildren<EventRowProps>) {
-  const { children, eventIndex, isPast, selectedRef, skip, colour, showIndexColumn } = props;
+  const { children, eventIndex, isPast, selectedRef, skip, colour } = props;
+  const { hideIndexColumn, showActionMenu } = useCuesheetOptions();
  const ownRef = useRef<HTMLTableRowElement>(null);
  const [isVisible, setIsVisible] = useState(false);

-  const textColour = getAccessibleColour(colour);
-  const bgColour = textColour.backgroundColor;
-
  useLayoutEffect(() => {
    const observer = new IntersectionObserver(
      ([entry]) => {
@@ -50,15 +49,31 @@ function EventRow(props: PropsWithChildren<EventRowProps>) {
    };
  }, [ownRef, selectedRef]);

+  const { color, backgroundColor } = getAccessibleColour(colour);
+  const mutedText = Color(color).fade(0.4).hexa();
+
  return (
    <tr
-      className={`${style.eventRow} ${skip ? style.skip : ''}`}
-      style={{ opacity: `${isPast ? pastOpacity : '1'}` }}
+      className={cx([style.eventRow, skip ?? style.skip])}
+      style={{ opacity: `${isPast ? '0.2' : '1'}` }}
      ref={selectedRef ?? ownRef}
    >
-      <td className={style.indexColumn} style={{ backgroundColor: bgColour, color: textColour.color }}>
-        {showIndexColumn && eventIndex}
-      </td>
+      {showActionMenu && (
+        <td className={style.actionColumn}>
+          <MenuButton
+            as={IconButton}
+            size='sm'
+            aria-label='Options'
+            icon={<IoEllipsisHorizontal />}
+            variant='ontime-subtle'
+          />
+        </td>
+      )}
+      {!hideIndexColumn && (
+        <td className={style.indexColumn} style={{ backgroundColor, color: mutedText }}>
+          {eventIndex}
+        </td>
+      )}
      {isVisible ? children : null}
    </tr>
  );
@@ -0,0 +1,42 @@
+import { memo, useCallback, useRef } from 'react';
+
+import { AutoTextArea } from '../../../../common/components/input/auto-text-area/AutoTextArea';
+import useReactiveTextInput from '../../../../common/components/input/text-input/useReactiveTextInput';
+
+interface MultiLineCellProps {
+  initialValue: string;
+  handleUpdate: (newValue: string) => void;
+}
+
+export default memo(MultiLineCell);
+
+function MultiLineCell(props: MultiLineCellProps) {
+  const { initialValue, handleUpdate } = props;
+  const ref = useRef<HTMLInputElement | null>(null);
+  const submitCallback = useCallback((newValue: string) => handleUpdate(newValue), [handleUpdate]);
+
+  const { value, onChange, onBlur, onKeyDown } = useReactiveTextInput(initialValue, submitCallback, ref, {
+    submitOnCtrlEnter: true,
+  });
+
+  return (
+    <AutoTextArea
+      inputref={ref}
+      rows={1}
+      size='sm'
+      style={{
+        minHeight: '2rem',
+        padding: '0',
+        paddingTop: '0.25rem',
+        fontSize: '1rem',
+      }}
+      transition='none'
+      variant='ontime-transparent'
+      value={value}
+      onChange={onChange}
+      onBlur={onBlur}
+      onKeyDown={onKeyDown}
+      spellCheck={false}
+    />
+  );
+}
@@ -0,0 +1,56 @@
+import { forwardRef, memo, useCallback, useImperativeHandle, useRef } from 'react';
+import { Input } from '@chakra-ui/react';
+
+import useReactiveTextInput from '../../../../common/components/input/text-input/useReactiveTextInput';
+
+interface SingleLineCellProps {
+  initialValue: string;
+  allowSubmitSameValue?: boolean;
+  handleUpdate: (newValue: string) => void;
+  handleCancelUpdate?: () => void;
+}
+
+const SingleLineCell = forwardRef((props: SingleLineCellProps, inputRef) => {
+  const { initialValue, allowSubmitSameValue, handleUpdate, handleCancelUpdate } = props;
+  const ref = useRef<HTMLInputElement | null>(null);
+  const submitCallback = useCallback((newValue: string) => handleUpdate(newValue), [handleUpdate]);
+
+  const { value, onChange, onBlur, onKeyDown } = useReactiveTextInput(initialValue, submitCallback, ref, {
+    allowSubmitSameValue,
+    submitOnEnter: true, // single line should submit on enter
+    submitOnCtrlEnter: true,
+    onCancelUpdate: handleCancelUpdate,
+  });
+
+  // expose a subset of the methods to the parent
+  useImperativeHandle(inputRef, () => {
+    return {
+      focus() {
+        ref.current?.focus();
+      },
+      select() {
+        ref.current?.select();
+      },
+    };
+  }, [ref]);
+
+  return (
+    <Input
+      ref={ref}
+      size='sm'
+      variant='ontime-transparent'
+      padding={0}
+      fontSize='md'
+      value={value}
+      onChange={onChange}
+      onBlur={onBlur}
+      onKeyDown={onKeyDown}
+      spellCheck={false}
+      autoComplete='off'
+    />
+  );
+});
+
+SingleLineCell.displayName = 'SingleLineCell';
+
+export default memo(SingleLineCell);
@@ -4,7 +4,7 @@ import { CSS } from '@dnd-kit/utilities';
 import { Header } from '@tanstack/react-table';
 import { OntimeRundownEntry } from 'ontime-types';

-import styles from '../Cuesheet.module.scss';
+import styles from '../CuesheetTable.module.scss';

 interface SortableCellProps {
  header: Header<OntimeRundownEntry, unknown>;
@@ -0,0 +1,24 @@
+/* element attempts matching input styles */
+.textInput {
+  height: 2rem;
+  background-color: transparent;
+  border-radius: 3px;
+
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+
+  &.delayed {
+    color: $ontime-delay-text;
+  }
+
+  &.muted {
+    // we use opacity instead of colour to handle delayed values
+    opacity: 0.4;
+  }
+
+  &:hover {
+    background-color: $gray-1100;
+    cursor: text;
+  }
+}
@@ -0,0 +1,22 @@
+import { HTMLAttributes, memo, PropsWithChildren } from 'react';
+
+import { cx } from '../../../../common/utils/styleUtils';
+
+import style from './TextLikeInput.module.scss';
+
+export default memo(TextLikeInput);
+
+interface TextLikeInputProps extends HTMLAttributes<HTMLSpanElement> {
+  delayed?: boolean;
+  muted?: boolean;
+}
+
+function TextLikeInput(props: PropsWithChildren<TextLikeInputProps>) {
+  const { delayed, muted, children, className, ...elementProps } = props;
+  const classes = cx([style.textInput, delayed && style.delayed, muted && style.muted, className]);
+  return (
+    <div className={classes} {...elementProps} tabIndex={0}>
+      {children}
+    </div>
+  );
+}
@@ -0,0 +1,89 @@
+import { memo, PropsWithChildren, useCallback, useEffect, useRef, useState } from 'react';
+import { millisToString, parseUserTime } from 'ontime-utils';
+
+import SingleLineCell from './SingleLineCell';
+import TextLikeInput from './TextLikeInput';
+
+interface TimeInputDurationProps {
+  initialValue: number;
+  lockedValue: boolean;
+  delayed?: boolean;
+  onSubmit: (value: string) => void;
+}
+
+export default memo(TimeInputDuration);
+
+function TimeInputDuration(props: PropsWithChildren<TimeInputDurationProps>) {
+  const { initialValue, lockedValue, delayed, onSubmit, children } = props;
+
+  const [isEditing, setIsEditing] = useState(false);
+  const [value, setValue] = useState(initialValue);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  // when we go into edit mode, set focus to the input
+  useEffect(() => {
+    if (isEditing && inputRef.current) {
+      inputRef.current.focus();
+      inputRef.current.select();
+    }
+  }, [isEditing]);
+
+  // reset value when initialValue changes, avoiding interrupting the user if we are in edit mode
+  useEffect(() => {
+    if (!isEditing) {
+      setValue(initialValue);
+    }
+  }, [initialValue, isEditing]);
+
+  const handleFakeFocus = () => setIsEditing(true);
+  const handleFakeBlur = () => setIsEditing(false);
+
+  const handleUpdate = useCallback(
+    (newValue: string) => {
+      setIsEditing(false);
+
+      // if the user sends an empty string, we want to clear the value
+      if (newValue === '') {
+        onSubmit(newValue);
+        return;
+      }
+
+      // we dont know the values in the rundown, escalate to handler
+      if (newValue.startsWith('p') || newValue.startsWith('+')) {
+        onSubmit(newValue);
+        return;
+      }
+
+      const valueInMillis = parseUserTime(newValue);
+      if (valueInMillis < 0 || isNaN(valueInMillis)) {
+        setValue(initialValue);
+        return;
+      }
+
+      // if the value is the same, we may still want to push the lock change
+      if (valueInMillis === initialValue && lockedValue) {
+        return;
+      }
+
+      onSubmit(newValue);
+      setValue(Number(newValue));
+    },
+    [initialValue, lockedValue, onSubmit],
+  );
+
+  const timeString = millisToString(value);
+
+  return isEditing ? (
+    <SingleLineCell
+      ref={inputRef}
+      initialValue={timeString}
+      allowSubmitSameValue={!lockedValue} // if the value is not locked, submitting will lock the value
+      handleUpdate={handleUpdate}
+      handleCancelUpdate={handleFakeBlur}
+    />
+  ) : (
+    <TextLikeInput onClick={handleFakeFocus} onFocus={handleFakeFocus} muted={!lockedValue} delayed={delayed}>
+      {children}
+    </TextLikeInput>
+  );
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	7d9c2a9cfd	refactor: create mock data utilities	2025-01-12 09:05:23 +01:00
Alex Christoffer Rasmussen	e9a7cd0400	More rundown metadata (#1429 ) * add dayOffset to OntimeEvent * refactor: isNewLatest * calculate totalDays * refactor: getTimeFromPrevious * add gap as dataset in OntimeEvent * use in ui * format overlap is just a simple text formatting, big test is not needed * add new fields where needed * update apply delay * show nex day eaven if there is no gap * create test * use buildin day offset in timeline * remove todo * consistent naming * make a calculateDayOffset util for rundownCache * refactor: checkIsNextDay to use dayOffset * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * remove unneeded test * remove todo * update test db * use data-testid * spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * update comments * remove null option --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-01-09 13:35:11 +01:00
Carlos Valente	9ba40c35a1	refactor: avoid matching file versions	2025-01-06 22:58:06 +01:00
Carlos Valente	f94db06812	refactor: wider sheet id length	2025-01-06 22:58:06 +01:00
Carlos Valente	35424cfff2	bump version to 3.10.3	2025-01-06 20:33:39 +01:00
Alex Christoffer Rasmussen	13eadeb0af	fix download (#1434 ) * fix download * update test db * create download test	2025-01-06 20:26:06 +01:00
Carlos Valente	9cfed5a150	fix: issue with persistent script	2025-01-06 20:11:15 +01:00
Alex Christoffer Rasmussen	a22c2d380d	bump: v3.10.2 (#1431 )	2025-01-06 14:08:36 +01:00
Alex Christoffer Rasmussen	cd913fc144	small `strict` improvements (#1428 ) * small `strict` improvements * fix type * use isObject	2025-01-06 14:07:36 +01:00
Alex Christoffer Rasmussen	743d7fa782	fix: validateLinkStart (#1430 ) * fix validateLinkStart * update comment * use fallback * cast to MaybeString * update comment Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-01-06 13:12:03 +01:00
Carlos Valente	891c43ba77	refactor: countToEnd does not cause rundown recalculation	2025-01-05 15:18:28 +01:00
Carlos Valente	fba20b889e	refactor: only allow testing saved URLs	2025-01-05 15:17:53 +01:00
Carlos Valente	bc4d913ba7	refactor: always show client path	2025-01-05 15:17:53 +01:00
Alex Christoffer Rasmussen	533f9798e8	convert to and from database type (#1410 ) * create db event type * dont use it yet * convert to and from database type * type needed in one place in client * use flatMap to filter out unknow stuff * leave revision in save file * move to utils * make test * destructur entry * simple test * throw in rundownToDatabaseRundown * clerify comment * Refactor: avoid shadowing the rundown variable in rundownCache (#1409) --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * rename to DAO * add simple edit test * only the generate function clears the state state * strict guard for custom fields * fix small strict issues * ensure deep copy * safely set isStale * todo is done * small type error * these functions can work on DAO entries * only reat rundown as DAO on initial load and the cast immediately and esure all fields are present * eslint comment Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * fix spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * fix spelling Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * comment not needed * setIsStale * remove DAO * clean up commits * remove unneeded async/await * revert test --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2025-01-05 14:35:58 +01:00
Carlos Valente	1b62ed5f2d	bump version to 3.10.1	2025-01-04 23:12:57 +01:00
Carlos Valente	bd0c951da8	declare env variables	2025-01-04 23:12:57 +01:00
Carlos Valente	2d5b86808f	refactor: cleanup pin styles	2025-01-04 16:39:47 +01:00
Carlos Valente	c69bce3e89	refactor: cleanup picker implementations	2025-01-03 13:02:26 +01:00
Carlos Valente	d62e314d19	bump version to 3.10.0	2025-01-03 12:56:37 +01:00
Shobhit-Nagpal	dbd56522f6	refactor: swatch picker and inline colour picker	2025-01-02 21:30:41 +01:00
Shobhit-Nagpal	1ba48c6a6f	refactor: inline colour picker	2025-01-02 21:30:41 +01:00
Carlos Valente	f4f24da47b	refactor: stop port change in dev	2025-01-02 14:18:19 +01:00
Carlos Valente	c3609b2aed	chore: extract middleware config	2025-01-02 14:18:19 +01:00
Carlos Valente	260d326989	chore: add noindex to app entry	2024-12-31 23:20:28 +01:00
Carlos Valente	a21e32a097	refactor: expose indent style	2024-12-31 15:01:34 +01:00
Carlos Valente	617e4b579b	refactor: introduce empty placeholder	2024-12-31 15:01:34 +01:00
Carlos Valente	44f65b2fcc	refactor: extract utility	2024-12-31 13:04:00 +01:00
Carlos Valente	760de608e3	refactor: simplify logic	2024-12-31 13:01:22 +01:00
Carlos Valente	0dfef732bf	refactor: prevent race conditions on init	2024-12-29 22:53:41 +01:00
Carlos Valente	f65ec0da3c	chore: upgrade dependencies	2024-12-29 20:02:56 +01:00
Shobhit Nagpal	6bbf8ce795	refactor: event editor color picker (#1400 ) * refactor: event editor color picker * refactor: throttle and debounce function signature	2024-12-27 10:57:48 +01:00
Carlos Valente	7f39d035fd	refactor: show delayed times	2024-12-22 21:43:37 +01:00
Carlos Valente	bdd2a62cee	feat: allow editing times in cuesheet	2024-12-22 21:43:37 +01:00
Carlos Valente	b38a7e5c92	refactor: allow submitting same value	2024-12-22 21:43:37 +01:00
Carlos Valente	b173b5a8e8	chore: update manifest	2024-12-22 20:06:35 +01:00
Alex Christoffer Rasmussen	29243e3f6c	detect `EADDRINUSE` on server start (#1348 ) * detect `EADDRINUSE` on server start * @ts-expect-error * send portError to electron * use escalateErrorFn * dont move in docker * allow errors to be sendt to electron UI * Log after the new port is found * Update comment Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * update comment Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * update comment Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * rename to escalate * extract `serverTryDesiredPort` * type check server.address() * request shutdown on `unrecoverable` `escalateError` * combine network utils * reject promise * not unrecoverable by default * unneeded assignment --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2024-12-22 16:23:47 +01:00
Carlos Valente	1af394cd49	chore: upgrade turbo	2024-12-21 22:46:07 +01:00
Carlos Valente	1c85265623	fix: section can only be selected if parent is	2024-12-21 13:56:23 +01:00
Carlos Valente	6199d0ad10	refactor: improve section style and composition	2024-12-20 21:24:34 +01:00
Carlos Valente	2f2c26ed00	chore: rename time-to-end to count-to-end	2024-12-20 21:24:34 +01:00
Carlos Valente	c9ef2465f8	refactor: visibility options	2024-12-20 21:15:26 +01:00
Carlos Valente	430b72c1d0	fix: missing return when data is handled	2024-12-20 21:15:26 +01:00
Carlos Valente	88b114020b	feat: edit duration in cuesheet	2024-12-20 21:15:26 +01:00
Carlos Valente	c445c42f8a	refactor: extract edit element in table	2024-12-20 21:15:26 +01:00
Carlos Valente	2fc4e6da16	refactor: extract utility type	2024-12-20 21:15:26 +01:00
Carlos Valente	4cbe25a845	refactor: simplify update functions	2024-12-20 21:15:26 +01:00
Carlos Valente	ab6765b332	refactor: tweak table element styles	2024-12-20 21:15:26 +01:00
Carlos Valente	fb38d82855	refactor: show cuesheet as long as we have data	2024-12-20 21:15:26 +01:00
Carlos Valente	1061ed2a0e	refactor: improve fallback timer consistency	2024-12-20 15:27:57 +01:00
Carlos Valente	3d37f42fe0	refactor: tweak styling	2024-12-20 09:03:02 +01:00
Carlos Valente	1bdea8e436	refactor: edit cue field	2024-12-20 09:03:02 +01:00
Carlos Valente	2c25910863	refactor: add table actions	2024-12-20 09:03:02 +01:00
Carlos Valente	8f30c0a7df	refactor: restructure element composition	2024-12-20 09:03:02 +01:00
Carlos Valente	67fa747aae	refactor: extract cuesheet dnd	2024-12-20 09:03:02 +01:00
Carlos Valente	8116b169b2	refactor: generalise event editor	2024-12-20 09:03:02 +01:00
Carlos Valente	ec823e0095	refactor: improve cuesheet composition refactor: simplify placing events in rundown m	2024-12-20 09:03:02 +01:00
Carlos Valente	c7faab00a3	feat: create offline indicator	2024-12-19 22:15:48 +01:00
Alex Christoffer Rasmussen	cfcf6a5684	extract isPlaybackActive to a global util function (#1393 )	2024-12-18 12:44:48 +01:00
Carlos Valente	df1cf7a96b	feat: parse timeToEnd from excel	2024-12-16 21:59:38 +01:00
Carlos Valente	0f3feca7ab	refactor: extract time-to-end	2024-12-16 21:59:38 +01:00
Carlos Valente	41fe213ebb	refactor: settings in params	2024-12-16 15:13:49 +01:00
Carlos Valente	e91d5f5cd9	refactor: always show settings	2024-12-16 15:13:49 +01:00
Carlos Valente	bedab221d9	chore: dedupe lock file	2024-12-16 15:13:49 +01:00
Carlos Valente	97208c052a	chore: upgrade dependencies	2024-12-16 15:13:49 +01:00
Alex Christoffer Rasmussen	b048d0f88d	Edit in cuesheet (#1372 ) * pass on all event edits * MakePublic * trim value in cell * edit notes * title * add key check * don't log error Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> * checkbox * refactor * remove log * fix test * use row number to test value --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com>	2024-12-16 14:27:25 +01:00
asharonbaltazar	d8f7d4bba6	feat(ui): add warning in view params when styles are overriden (#1384 ) * feat: add warning in view params when styles are overriden * refactor: style tweaks --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me>	2024-12-15 10:40:27 -05:00