diff --git a/src/lib/components/Actions.svelte b/src/lib/components/Actions.svelte
new file mode 100644
index 00000000..13fefaa7
--- /dev/null
+++ b/src/lib/components/Actions.svelte
@@ -0,0 +1,260 @@
+<script lang="ts">
+  import { browser } from '$app/environment';
+  import Card from '$lib/components/Card/Card.svelte';
+  import { env } from '$lib/util/env';
+  import { pakoSerde } from '$lib/util/serde';
+  import { stateStore } from '$lib/util/state';
+  import { logEvent } from '$lib/util/stats';
+  import { toBase64 } from 'js-base64';
+  import moment from 'moment';
+  const { krokiRendererUrl, rendererUrl } = env;
+
+  type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
+
+  const getFileName = (ext: string) =>
+    `mermaid-diagram-${moment().format('YYYY-MM-DD-HHmmss')}.${ext}`;
+
+  const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
+    svg?.setAttribute('height', `${height}px`);
+    svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
+    if (!svg) {
+      svg = getSvgEl();
+    }
+    const svgString = svg.outerHTML
+      .replaceAll('<br>', '<br/>')
+      .replaceAll(/<img([^>]*)>/g, (m, g: string) => `<img ${g} />`);
+    return toBase64(svgString);
+  };
+
+  const exportImage = (event: Event, exporter: Exporter) => {
+    const canvas: HTMLCanvasElement = document.createElement('canvas');
+    const svg: HTMLElement = document.querySelector('#container svg');
+    const box: DOMRect = svg.getBoundingClientRect();
+    canvas.width = box.width;
+    canvas.height = box.height;
+    if (imagemodeselected === 'width') {
+      const ratio = box.height / box.width;
+      canvas.width = userimagesize;
+      canvas.height = userimagesize * ratio;
+    } else if (imagemodeselected === 'height') {
+      const ratio = box.width / box.height;
+      canvas.width = userimagesize * ratio;
+      canvas.height = userimagesize;
+    }
+
+    const context = canvas.getContext('2d');
+    context.fillStyle = 'white';
+    context.fillRect(0, 0, canvas.width, canvas.height);
+
+    const image = new Image();
+    image.onload = exporter(context, image);
+    image.src = `data:image/svg+xml;base64,${getBase64SVG(svg, canvas.width, canvas.height)}`;
+
+    event.stopPropagation();
+    event.preventDefault();
+  };
+
+  const getSvgEl = () => {
+    const svgEl: HTMLElement = document
+      .querySelector('#container svg')
+      .cloneNode(true) as HTMLElement;
+    svgEl.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+    const fontAwesomeCdnUrl = Array.from(document.head.getElementsByTagName('link'))
+      .map((l) => l.href)
+      .find((h) => h && h.includes('font-awesome'));
+    if (fontAwesomeCdnUrl == null) {
+      return svgEl;
+    }
+    const styleEl = document.createElement('style');
+    styleEl.innerText = `@import url("${fontAwesomeCdnUrl}");'`;
+    svgEl.prepend(styleEl);
+    return svgEl;
+  };
+
+  const simulateDownload = (download: string, href: string): void => {
+    const a = document.createElement('a');
+    a.download = download;
+    a.href = href;
+    a.click();
+    a.remove();
+  };
+  const downloadImage: Exporter = (context, image) => {
+    return () => {
+      const { canvas } = context;
+      context.drawImage(image, 0, 0, canvas.width, canvas.height);
+      simulateDownload(
+        getFileName('png'),
+        canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream')
+      );
+    };
+  };
+
+  const isClipboardAvailable = (): boolean => {
+    return Object.prototype.hasOwnProperty.call(window, 'ClipboardItem') as boolean;
+  };
+
+  const clipboardCopy: Exporter = (context, image) => {
+    return () => {
+      const { canvas } = context;
+      context.drawImage(image, 0, 0, canvas.width, canvas.height);
+      canvas.toBlob((blob) => {
+        try {
+          // @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1004/files
+          void navigator.clipboard.write([
+            /* eslint-disable no-undef */
+            // @ts-ignore: https://github.com/microsoft/TypeScript/issues/43821
+            new ClipboardItem({
+              [blob.type]: blob
+            })
+          ]);
+        } catch (error) {
+          console.error(error);
+        }
+      });
+    };
+  };
+
+  const onCopyClipboard = (event: Event) => {
+    exportImage(event, clipboardCopy);
+    logEvent('copyClipboard');
+  };
+
+  const onDownloadPNG = (event: Event) => {
+    exportImage(event, downloadImage);
+    logEvent('download', {
+      type: 'png'
+    });
+  };
+
+  const onDownloadSVG = () => {
+    simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
+    logEvent('download', {
+      type: 'svg'
+    });
+  };
+
+  const onCopyMarkdown = () => {
+    (document.getElementById('markdown') as HTMLInputElement).select();
+    document.execCommand('Copy');
+    logEvent('copyMarkdown');
+  };
+
+  let gistURL = '';
+  stateStore.subscribe(({ loader }) => {
+    if (loader?.type === 'gist') {
+      // @ts-ignore Gist will have url
+      gistURL = loader.config.url;
+    }
+  });
+
+  const loadGist = () => {
+    if (!gistURL) {
+      alert('Please enter a Gist URL first');
+    }
+    window.location.href = `${window.location.pathname}?gist=${gistURL}`;
+    logEvent('loadGist');
+  };
+
+  let iUrl: string;
+  let svgUrl: string;
+  let krokiUrl: string;
+  let mdCode: string;
+  let imagemodeselected = 'auto';
+  let userimagesize = 1080;
+
+  let isNetlify = false;
+  if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
+    isNetlify = true;
+  }
+  stateStore.subscribe(async (state) => {
+    const { code, serialized } = await state;
+    iUrl = `${rendererUrl}/img/${serialized}?type=png`;
+    svgUrl = `${rendererUrl}/svg/${serialized}`;
+    krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
+    mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
+  });
+</script>
+
+<Card title="Actions" isOpen={true}>
+  <div class="flex flex-wrap gap-2 m-2">
+    {#if isClipboardAvailable()}
+      <button class="action-btn w-full" on:click={onCopyClipboard}
+        ><i class="far fa-copy mr-2" /> Copy Image to clipboard
+      </button>
+    {/if}
+    <button id="downloadPNG" class="action-btn flex-grow" on:click={onDownloadPNG}>
+      <i class="fas fa-download mr-2" /> PNG
+    </button>
+    <button id="downloadSVG" class="action-btn flex-grow" on:click={onDownloadSVG}>
+      <i class="fas fa-download mr-2" /> SVG
+    </button>
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={iUrl}>
+      <button class="action-btn w-full">
+        <i class="fas fa-external-link-alt mr-2" /> PNG
+      </button>
+    </a>
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={svgUrl}>
+      <button class="action-btn w-full">
+        <i class="fas fa-external-link-alt mr-2" /> SVG
+      </button>
+    </a>
+    <a target="_blank" rel="noreferrer" class="flex-grow" href={krokiUrl}>
+      <button class="action-btn w-full">
+        <i class="fas fa-external-link-alt mr-2" /> Kroki
+      </button>
+    </a>
+
+    <div class="flex gap-2 items-center">
+      PNG size
+      <label for="autosize">
+        <input type="radio" value="auto" id="autosize" bind:group={imagemodeselected} /> Auto
+      </label>
+
+      <label for="width">
+        <input type="radio" value="width" id="width" bind:group={imagemodeselected} /> Width
+      </label>
+
+      <label for="height">
+        <input type="radio" value="height" id="height" bind:group={imagemodeselected} /> Height
+      </label>
+
+      {#if imagemodeselected !== 'auto'}
+        <input
+          id="height"
+          class="input"
+          type="number"
+          min="3"
+          max="10000"
+          bind:value={userimagesize} />
+      {/if}
+    </div>
+
+    <div class="w-full flex gap-2 items-center">
+      <input class="input" id="markdown" type="text" value={mdCode} on:click={onCopyMarkdown} />
+      <label for="markdown">
+        <button class="btn btn-primary btn-md flex-auto" on:click={onCopyMarkdown}>
+          Copy Markdown
+        </button>
+      </label>
+    </div>
+
+    <div class="w-full flex gap-2 items-center">
+      <input
+        class="input"
+        id="gist"
+        type="text"
+        bind:value={gistURL}
+        placeholder="Enter Gist URL" />
+      <label for="gist">
+        <button class="btn btn-primary btn-md flex-auto" on:click={loadGist}> Load Gist </button>
+      </label>
+    </div>
+    {#if isNetlify}
+      <div class="w-full flex items-center justify-center">
+        <a class="link underline text-gray-500 text-sm" href="https://netlify.com">
+          This site is powered by Netlify
+        </a>
+      </div>
+    {/if}
+  </div>
+</Card>
diff --git a/src/lib/components/Card/Card.svelte b/src/lib/components/Card/Card.svelte
new file mode 100644
index 00000000..89173cdd
--- /dev/null
+++ b/src/lib/components/Card/Card.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+  import type { Tab } from '$lib/types';
+  import { slide } from 'svelte/transition';
+  import Tabs from './Tabs.svelte';
+  export let isCloseable = true;
+  export let isOpen = true;
+  export let tabs: Tab[] = [];
+  export let activeTabID: string = '';
+  export let title: string;
+  $: isOpen = isCloseable ? isOpen : true;
+  $: isTabsShown = isOpen && tabs.length > 0;
+</script>
+
+<div class="card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl">
+  <div
+    class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer"
+    on:click={() => (isOpen = !isOpen)}
+    on:keypress={() => (isOpen = !isOpen)}>
+    <div class="flex justify-between">
+      <Tabs on:select {tabs} bind:isOpen {title} {isCloseable} {activeTabID} />
+      <div class="flex gap-x-4 items-center {isTabsShown ? '-mt-2' : ''}">
+        <slot name="actions" />
+      </div>
+    </div>
+  </div>
+  {#if isOpen}
+    <div class="card-body p-0 flex-grow overflow-auto text-base-content" transition:slide>
+      <slot />
+    </div>
+  {/if}
+</div>
diff --git a/src/lib/components/Card/Tabs.svelte b/src/lib/components/Card/Tabs.svelte
new file mode 100644
index 00000000..3c7c8f9d
--- /dev/null
+++ b/src/lib/components/Card/Tabs.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+  import type { Tab, TabEvents } from '$lib/types';
+  import { createEventDispatcher } from 'svelte';
+  import { fade } from 'svelte/transition';
+  export let isCloseable = true;
+  export let tabs: Tab[];
+  export let title: string;
+  export let isOpen = false;
+  export let activeTabID: string;
+
+  if (!activeTabID && tabs.length > 0) {
+    activeTabID = tabs[0].id;
+  }
+  const dispatch = createEventDispatcher<TabEvents>();
+  const toggleTabs = (tab: Tab) => {
+    activeTabID = tab.id;
+    dispatch('select', tab);
+  };
+</script>
+
+<div class="flex cursor-default">
+  <span
+    class="mr-2 font-semibold"
+    on:click|stopPropagation={() => (isOpen = !isOpen)}
+    on:keypress|stopPropagation={() => (isOpen = !isOpen)}>
+    {#if isCloseable}
+      <i class="fas fa-chevron-right icon" class:isOpen />
+    {/if}
+    {title}</span>
+  {#if isOpen && tabs}
+    <ul class="tabs" transition:fade>
+      {#each tabs as tab}
+        <div
+          class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
+          on:click|stopPropagation={() => toggleTabs(tab)}
+          on:keypress|stopPropagation={() => toggleTabs(tab)}>
+          <i class="mr-1 {tab.icon}" />
+          {tab.title}
+        </div>
+      {/each}
+    </ul>
+  {/if}
+</div>
+
+<style>
+  .icon {
+    transition-duration: 0.5s;
+  }
+  .isOpen {
+    transform: rotate(90deg);
+  }
+</style>
diff --git a/src/lib/components/Card/__snapshots__/card.test.ts.snap b/src/lib/components/Card/__snapshots__/card.test.ts.snap
new file mode 100644
index 00000000..eb662c95
--- /dev/null
+++ b/src/lib/components/Card/__snapshots__/card.test.ts.snap
@@ -0,0 +1,3 @@
+// Vitest Snapshot v1
+
+exports[`card.svelte > mounts 1`] = `"<div><div class=\\"card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl\\"><div class=\\"bg-primary p-2 pb-0 flex-none cursor-pointer\\"><div class=\\"flex justify-between\\"><div class=\\"flex cursor-default s-_wx1E_JHsCoF\\"><span class=\\"mr-2 font-semibold s-_wx1E_JHsCoF\\"><i class=\\"fas fa-chevron-right icon s-_wx1E_JHsCoF isOpen\\"></i> TabTest</span> <ul class=\\"tabs s-_wx1E_JHsCoF\\"><div class=\\"tab tab-lifted tab-active s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title1 </div><div class=\\"tab tab-lifted text-primary-content s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title2 </div></ul></div><!--<Tabs>--> <div class=\\"flex gap-x-4 items-center -mt-2\\"></div></div></div> <div class=\\"card-body p-0 flex-grow overflow-auto text-base-content\\"></div></div><!--<Card>--></div>"`;
diff --git a/src/lib/components/Card/card.test.ts b/src/lib/components/Card/card.test.ts
new file mode 100644
index 00000000..4624ab48
--- /dev/null
+++ b/src/lib/components/Card/card.test.ts
@@ -0,0 +1,24 @@
+import { cleanup, render } from '@testing-library/svelte';
+import { describe, expect, it, afterEach } from 'vitest';
+import Card from './Card.svelte';
+
+describe('card.svelte', () => {
+  // TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach
+  afterEach(() => cleanup());
+
+  it('mounts', () => {
+    const { container } = render(Card, {
+      title: 'TabTest',
+      tabs: [
+        { id: 't1', title: 'title1' },
+        { id: 't2', title: 'title2' }
+      ]
+    });
+    expect(container).toBeTruthy();
+    expect(container).toHaveTextContent('TabTest');
+    expect(container).toHaveTextContent('title1');
+    expect(container).toHaveTextContent('title2');
+    expect(container).not.toHaveTextContent('title3');
+    expect(container.innerHTML).toMatchSnapshot();
+  });
+});
diff --git a/src/lib/components/editor.svelte b/src/lib/components/Editor.svelte
similarity index 100%
rename from src/lib/components/editor.svelte
rename to src/lib/components/Editor.svelte
diff --git a/src/lib/components/History/History.svelte b/src/lib/components/History/History.svelte
new file mode 100644
index 00000000..87500041
--- /dev/null
+++ b/src/lib/components/History/History.svelte
@@ -0,0 +1,192 @@
+<script lang="ts">
+  import Card from '$lib/components/Card/Card.svelte';
+  import { inputStateStore, getStateString } from '$lib/util/state';
+  import {
+    addHistoryEntry,
+    historyModeStore,
+    clearHistoryData,
+    getPreviousState,
+    historyStore,
+    loaderHistoryStore,
+    restoreHistory
+  } from './history';
+  import { notify, prompt } from '$lib/util/notify';
+  import { onMount } from 'svelte';
+  import { get } from 'svelte/store';
+  import moment from 'moment';
+  import type { HistoryType, State, Tab } from '$lib/types';
+  import { logEvent } from '$lib/util/stats';
+
+  const HISTORY_SAVE_INTERVAL = 60000;
+
+  const tabSelectHandler = (message: CustomEvent<Tab>) => {
+    historyModeStore.set(message.detail.id as HistoryType);
+  };
+  let tabs: Tab[] = [
+    {
+      id: 'manual',
+      title: 'Saved',
+      icon: 'far fa-bookmark'
+    },
+    {
+      id: 'auto',
+      title: 'Timeline',
+      icon: 'fas fa-history'
+    }
+  ];
+
+  const downloadHistory = () => {
+    const data = get(historyStore);
+    const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = `mermaid-history-${moment().format('YYYY-MM-DD-HHmmss')}.json`;
+    a.click();
+    URL.revokeObjectURL(url);
+    logEvent('history', {
+      action: 'download'
+    });
+  };
+
+  const uploadHistory = () => {
+    const input = document.createElement('input');
+    input.type = 'file';
+    input.accept = 'application/json';
+    input.addEventListener('change', ({ target }: Event) => {
+      const file = (<HTMLInputElement>target).files[0];
+      if (!file) {
+        return;
+      }
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        const data = JSON.parse(e.target.result as string);
+        restoreHistory(data);
+      };
+      reader.readAsText(file);
+    });
+    input.click();
+  };
+
+  const saveHistory = (auto = false) => {
+    const currentState: string = getStateString();
+    const previousState: string = getPreviousState(auto);
+    if (previousState !== currentState) {
+      addHistoryEntry({
+        state: $inputStateStore,
+        time: Date.now(),
+        type: auto ? 'auto' : 'manual'
+      });
+    } else if (!auto) {
+      notify('State already saved.');
+    }
+  };
+
+  const clearHistory = (id?: string): void => {
+    if (!id && !prompt('Clear all saved items?')) {
+      return;
+    }
+    clearHistoryData(id);
+  };
+
+  const restoreHistoryItem = (state: State): void => {
+    inputStateStore.set({ ...state, updateDiagram: true });
+  };
+
+  const relativeTime = (time: number) => {
+    const t = new Date(time);
+    return `${new Date(t).toLocaleString()} (${moment(t).fromNow()})`;
+  };
+
+  onMount(() => {
+    historyModeStore.set('manual');
+    setInterval(() => {
+      saveHistory(true);
+    }, HISTORY_SAVE_INTERVAL);
+  });
+
+  loaderHistoryStore.subscribe((entries) => {
+    if (entries.length > 0 && tabs.length === 2) {
+      tabs = [
+        {
+          id: 'loader',
+          title: 'Revisions',
+          icon: 'fab fa-git-alt'
+        },
+        ...tabs
+      ];
+      historyModeStore.set('loader');
+    }
+  });
+
+  let isOpen = false;
+</script>
+
+<Card on:select={tabSelectHandler} bind:isOpen {tabs} title="History">
+  <div slot="actions">
+    <button
+      id="uploadHistory"
+      class="btn btn-xs btn-secondary w-12"
+      on:click|stopPropagation={() => uploadHistory()}
+      title="Upload history"><i class="fa fa-upload" /></button>
+    {#if $historyStore.length > 0}
+      <button
+        id="downloadHistory"
+        class="btn btn-xs btn-secondary w-12"
+        on:click|stopPropagation={() => downloadHistory()}
+        title="Download history"><i class="fa fa-download" /></button>
+    {/if}
+    |
+    <button
+      id="saveHistory"
+      class="btn btn-xs btn-success w-12"
+      on:click|stopPropagation={() => saveHistory()}
+      title="Save current state"><i class="far fa-save" /></button>
+    {#if $historyModeStore !== 'loader'}
+      <button
+        id="clearHistory"
+        class="btn btn-xs btn-error w-12"
+        on:click|stopPropagation={() => clearHistory()}
+        title="Delete all saved states"><i class="fas fa-trash-alt" /></button>
+    {/if}
+  </div>
+  <ul class="p-2 space-y-2 overflow-auto h-56" id="historyList">
+    {#if $historyStore.length > 0}
+      {#each $historyStore as { id, state, time, name, url, type }}
+        <li class="rounded p-2 shadow flex-col">
+          <div class="flex">
+            <div class="flex-1">
+              <div class="flex flex-col text-base-content">
+                {#if url}
+                  <a
+                    href={url}
+                    target="_blank"
+                    rel="noreferrer"
+                    title="Open revision in new tab"
+                    class="hover:underline text-blue-500">{name}</a>
+                {:else}
+                  <span>{name}</span>
+                {/if}
+                <span class="text-gray-400 text-sm">{relativeTime(time)}</span>
+              </div>
+            </div>
+            <div class="flex gap-2 content-center">
+              <button class="btn btn-success" on:click={() => restoreHistoryItem(state)}
+                ><i class="fas fa-undo mr-1" />Restore</button>
+              {#if type !== 'loader'}
+                <button class="btn btn-error" on:click={() => clearHistory(id)}
+                  ><i class="fas fa-trash-alt mr-1" />Delete</button>
+              {/if}
+            </div>
+          </div>
+        </li>
+      {/each}
+    {:else}
+      <div class="m-2">
+        No items in History<br />
+        Click the Save button to save current state and restore it later.<br />
+        Timeline will automatically be saved every minute.
+      </div>
+    {/if}
+  </ul>
+</Card>
diff --git a/src/lib/components/History/history.test.ts b/src/lib/components/History/history.test.ts
new file mode 100644
index 00000000..cdb50830
--- /dev/null
+++ b/src/lib/components/History/history.test.ts
@@ -0,0 +1,120 @@
+import type { HistoryEntry } from '$lib/types';
+import { describe, it, expect } from 'vitest';
+import {
+  addHistoryEntry,
+  injectHistoryIDs,
+  clearHistoryData,
+  historyModeStore,
+  historyStore
+} from './history';
+import { defaultState } from '$lib/util/state';
+import { get } from 'svelte/store';
+
+describe('history', () => {
+  it('should handle saving individual history entry', () => {
+    expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+    expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+
+    addHistoryEntry({
+      state: defaultState,
+      time: 12345,
+      type: 'manual'
+    });
+
+    const [manualEntry]: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('manualHistoryStore')
+    );
+
+    expect(manualEntry.time).toBe(12345);
+    expect(manualEntry.type).toBe('manual');
+    expect(manualEntry.name).not.toBeNull();
+    expect(manualEntry.state).not.toBeNull();
+
+    addHistoryEntry({
+      state: defaultState,
+      time: 54321,
+      type: 'auto'
+    });
+
+    const [autoEntry]: HistoryEntry[] = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+
+    expect(autoEntry.time).toBe(54321);
+    expect(autoEntry.type).toBe('auto');
+    expect(autoEntry.name).not.toBeNull();
+    expect(autoEntry.state).not.toBeNull();
+
+    historyModeStore.set('manual');
+    clearHistoryData();
+    historyModeStore.set('auto');
+    clearHistoryData();
+    expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+    expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+  });
+
+  it('should clear history entries', () => {
+    addHistoryEntry({
+      state: defaultState,
+      time: 12345,
+      type: 'manual'
+    });
+    addHistoryEntry({
+      state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+      time: 123456,
+      type: 'manual'
+    });
+
+    historyModeStore.set('manual');
+    const store: HistoryEntry[] = get(historyStore);
+    expect(store.length).toBe(2);
+    clearHistoryData(store[1].id);
+    expect(get(historyStore).length).toBe(1);
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+
+    historyModeStore.set('auto');
+    addHistoryEntry({
+      state: defaultState,
+      time: 54321,
+      type: 'auto'
+    });
+    addHistoryEntry({
+      state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+      time: 654321,
+      type: 'auto'
+    });
+    expect(get(historyStore).length).toBe(2);
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+    // Test calling when history is empty
+    clearHistoryData();
+    expect(get(historyStore).length).toBe(0);
+  });
+});
+
+describe('history migration', () => {
+  it('should inject history IDs as migration', () => {
+    window.localStorage.setItem(
+      'manualHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","name":"hollow-art"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"helpful-ocean"}]'
+    );
+    window.localStorage.setItem(
+      'autoHistoryStore',
+      '[{"state":{"code":"graph TD\\n    A[New Year] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"auto","name":"barking-dog"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"needy-mosquito"}]'
+    );
+    let manualHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('manualHistoryStore')
+    );
+    let autoHistoryStore: HistoryEntry[] = JSON.parse(
+      window.localStorage.getItem('autoHistoryStore')
+    );
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+
+    injectHistoryIDs();
+
+    manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+    autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+    expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+    expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+  });
+});
diff --git a/src/lib/components/History/history.ts b/src/lib/components/History/history.ts
new file mode 100644
index 00000000..20f19ba3
--- /dev/null
+++ b/src/lib/components/History/history.ts
@@ -0,0 +1,141 @@
+import { derived, writable, get } from 'svelte/store';
+import type { Readable, Writable } from 'svelte/store';
+import { persist, localStorage } from '$lib/util/persist';
+import { generateSlug } from 'random-word-slugs';
+import type { HistoryEntry, HistoryType, Optional } from '$lib/types';
+import { v4 as uuidV4 } from 'uuid';
+import { logEvent } from '$lib/util/stats';
+
+const MAX_AUTO_HISTORY_LENGTH = 30;
+
+export const historyModeStore: Writable<HistoryType> = persist(
+  writable('manual'),
+  localStorage(),
+  'autoHistoryMode'
+);
+
+const autoHistoryStore: Writable<HistoryEntry[]> = persist(
+  writable([]),
+  localStorage(),
+  'autoHistoryStore'
+);
+
+const manualHistoryStore: Writable<HistoryEntry[]> = persist(
+  writable([]),
+  localStorage(),
+  'manualHistoryStore'
+);
+
+export const loaderHistoryStore: Writable<HistoryEntry[]> = writable([] as HistoryEntry[]);
+
+export const historyStore: Readable<HistoryEntry[]> = derived(
+  [historyModeStore, autoHistoryStore, manualHistoryStore, loaderHistoryStore],
+  ([historyMode, autoHistories, manualHistories, loadedHistories], set) => {
+    if (historyMode === 'auto') {
+      set(autoHistories);
+    } else if (historyMode === 'manual') {
+      set(manualHistories);
+    } else if (historyMode === 'loader') {
+      set(loadedHistories);
+    } else {
+      set(autoHistories);
+    }
+  }
+);
+
+export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void => {
+  const entry: HistoryEntry = {
+    ...entryToAdd,
+    id: uuidV4()
+  };
+
+  if (entry.type === 'loader') {
+    loaderHistoryStore.update((entries) => [entry, ...entries]);
+    return;
+  }
+
+  if (!entry.name) {
+    entry.name = generateSlug(2);
+  }
+
+  if (entry.type === 'auto') {
+    autoHistoryStore.update((entries) => {
+      if (entries.length >= MAX_AUTO_HISTORY_LENGTH) {
+        entries = entries.slice(0, MAX_AUTO_HISTORY_LENGTH - 1);
+      }
+      return [entry, ...entries];
+    });
+  } else if (entry.type === 'manual') {
+    manualHistoryStore.update((entries) => [entry, ...entries]);
+    logEvent('history', { action: 'save' });
+  }
+};
+
+export const clearHistoryData = (idToClear?: string): void => {
+  (get(historyModeStore) === 'auto' ? autoHistoryStore : manualHistoryStore).update((entries) => {
+    if (get(historyModeStore) !== 'loader') {
+      entries = entries.filter(({ id }) => idToClear && id != idToClear);
+      logEvent('history', { action: 'clear', type: idToClear ? 'single' : 'all' });
+    }
+    return entries;
+  });
+};
+
+export const getPreviousState = (auto: boolean): string => {
+  const entries = get(auto ? autoHistoryStore : manualHistoryStore);
+  if (entries.length > 0) {
+    return JSON.stringify(entries[0].state);
+  }
+  return '';
+};
+
+export const restoreHistory = (data: HistoryEntry[]) => {
+  const entries = data.filter(validateEntry);
+  const invalidEntryCount = data.length - entries.length;
+  if (invalidEntryCount > 0) {
+    console.error(`${invalidEntryCount} invalid history entries were removed.`);
+    console.error(data);
+  }
+  if (entries.length > 0) {
+    let entryCount = 0;
+    (entries[0].type === 'auto' ? autoHistoryStore : manualHistoryStore).update((existing) => {
+      const existingIDs = new Set(existing.map(({ id }) => id));
+      const newEntries = entries.filter(({ id }) => !existingIDs.has(id));
+      entryCount = newEntries.length;
+      const combined = [...existing, ...newEntries];
+      combined.sort((a, b) => b.time - a.time);
+      return combined;
+    });
+
+    alert(
+      `${entryCount} entries restored. ${invalidEntryCount} invalid, ${
+        entries.length - entryCount
+      } duplicates.`
+    );
+    logEvent('history', {
+      action: 'restore',
+      success: entryCount,
+      invalid: invalidEntryCount,
+      duplicates: entries.length - entryCount
+    });
+  } else {
+    alert('No valid entries found.');
+  }
+};
+
+export const injectHistoryIDs = (): void => {
+  const setIDs = (entries: HistoryEntry[]) => {
+    for (const entry of entries) {
+      if (!entry.id) {
+        entry.id = uuidV4();
+      }
+    }
+    return entries;
+  };
+  autoHistoryStore.update(setIDs);
+  manualHistoryStore.update(setIDs);
+};
+
+const validateEntry = (entry: HistoryEntry): boolean => {
+  return entry.type && entry.state && entry.time && true;
+};
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte
new file mode 100644
index 00000000..c434b7e4
--- /dev/null
+++ b/src/lib/components/Navbar.svelte
@@ -0,0 +1,82 @@
+<script context="module">
+  import { version } from 'mermaid/package.json';
+  import { analytics } from '$lib/util/stats';
+  analytics?.track('version', {
+    mermaidVersion: version
+  });
+</script>
+
+<script lang="ts">
+  import Theme from './Theme.svelte';
+
+  interface Link {
+    title: string;
+    href: string;
+    icon?: string;
+  }
+  const links: Link[] = [
+    {
+      title: 'Documentation',
+      href: 'https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted'
+    },
+    {
+      title: 'Tutorial',
+      href: 'https://github.com/mermaid-js/mermaid/blob/develop/docs/Tutorials.md'
+    },
+    {
+      title: 'Mermaid',
+      href: 'https://github.com/mermaid-js/mermaid'
+    },
+    {
+      title: 'CLI',
+      href: 'https://github.com/mermaid-js/mermaid-cli'
+    },
+    {
+      title: '',
+      href: 'https://github.com/mermaid-js/mermaid-live-editor',
+      icon: 'fab fa-github fa-lg'
+    }
+  ];
+</script>
+
+<div class="navbar shadow-lg bg-primary p-0">
+  <div class="flex-1 px-2 mx-2">
+    <span class="text-lg font-bold">
+      <a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a>
+    </span>
+  </div>
+  <label for="menu-toggle" class="pointer-cursor lg:hidden block"
+    ><svg
+      class="fill-current "
+      xmlns="http://www.w3.org/2000/svg"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      ><title>Menu</title><path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z" /></svg
+    ></label>
+  <input class="hidden" type="checkbox" id="menu-toggle" />
+
+  <Theme />
+  <div class="hidden lg:flex lg:items-center lg:w-auto w-full" id="menu">
+    <ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
+      {#each links as { title, href, icon }}
+        <li>
+          <a class="btn btn-ghost" target="_blank" rel="noreferrer" {href}>
+            {#if icon}
+              <i class={icon} />
+            {/if}
+            {title}</a>
+        </li>
+      {/each}
+    </ul>
+  </div>
+</div>
+
+<style>
+  #menu-toggle:checked + #menu {
+    display: block;
+  }
+  .navbar {
+    z-index: 10000;
+  }
+</style>
diff --git a/src/lib/components/Preset.svelte b/src/lib/components/Preset.svelte
new file mode 100644
index 00000000..059b0134
--- /dev/null
+++ b/src/lib/components/Preset.svelte
@@ -0,0 +1,144 @@
+<script lang="ts">
+  import { updateCode } from '$lib/util/state';
+  import Card from '$lib/components/Card/Card.svelte';
+  import { logEvent } from '$lib/util/stats';
+
+  const samples = {
+    Flow: `graph TD
+    A[Christmas] -->|Get money| B(Go shopping)
+    B --> C{Let me think}
+    C -->|One| D[Laptop]
+    C -->|Two| E[iPhone]
+    C -->|Three| F[fa:fa-car Car]`,
+    Sequence: `sequenceDiagram
+    Alice->>+John: Hello John, how are you?
+    Alice->>+John: John, can you hear me?
+    John-->>-Alice: Hi Alice, I can hear you!
+    John-->>-Alice: I feel great!`,
+    Class: `classDiagram
+    Animal <|-- Duck
+    Animal <|-- Fish
+    Animal <|-- Zebra
+    Animal : +int age
+    Animal : +String gender
+    Animal: +isMammal()
+    Animal: +mate()
+    class Duck{
+      +String beakColor
+      +swim()
+      +quack()
+    }
+    class Fish{
+      -int sizeInFeet
+      -canEat()
+    }
+    class Zebra{
+      +bool is_wild
+      +run()
+    }`,
+    State: `stateDiagram-v2
+    [*] --> Still
+    Still --> [*]
+    Still --> Moving
+    Moving --> Still
+    Moving --> Crash
+    Crash --> [*]`,
+    Gantt: `gantt
+    title A Gantt Diagram
+    dateFormat  YYYY-MM-DD
+    section Section
+    A task           :a1, 2014-01-01, 30d
+    Another task     :after a1  , 20d
+    section Another
+    Task in sec      :2014-01-12  , 12d
+    another task      : 24d`,
+    Pie: `pie title Pets adopted by volunteers
+    "Dogs" : 386
+    "Cats" : 85
+    "Rats" : 15`,
+    ER: `erDiagram
+    CUSTOMER }|..|{ DELIVERY-ADDRESS : has
+    CUSTOMER ||--o{ ORDER : places
+    CUSTOMER ||--o{ INVOICE : "liable for"
+    DELIVERY-ADDRESS ||--o{ ORDER : receives
+    INVOICE ||--|{ ORDER : covers
+    ORDER ||--|{ ORDER-ITEM : includes
+    PRODUCT-CATEGORY ||--|{ PRODUCT : contains
+    PRODUCT ||--o{ ORDER-ITEM : "ordered in"`,
+    'User Journey': `journey
+    title My working day
+    section Go to work
+      Make tea: 5: Me
+      Go upstairs: 3: Me
+      Do work: 1: Me, Cat
+    section Go home
+      Go downstairs: 5: Me
+      Sit down: 3: Me`,
+    Git: `gitGraph
+    commit
+    commit
+    branch develop
+    checkout develop
+    commit
+    commit
+    checkout main
+    merge develop
+    commit
+    commit`,
+    Mindmap: `mindmap
+  root((mindmap))
+    Origins
+      Long history
+      ::icon(fa fa-book)
+      Popularisation
+        British popular psychology author Tony Buzan
+    Research
+      On effectivness<br/>and features
+      On Automatic creation
+        Uses
+            Creative techniques
+            Strategic planning
+            Argument mapping
+    Tools
+      Pen and paper
+      Mermaid`
+  };
+
+  const loadSampleDiagram = (diagramType: string): void => {
+    updateCode(samples[diagramType], {
+      updateDiagram: true,
+      resetPanZoom: true
+    });
+    logEvent('loadSampleDiagram', { diagramType });
+  };
+
+  // Adding in this array will add an icon to the preset menu
+  const newDiagrams: Array<keyof typeof samples> = ['Mindmap'];
+  const diagramOrder: Array<keyof typeof samples> = [
+    'Sequence',
+    'Flow',
+    'Class',
+    'State',
+    'ER',
+    'Gantt',
+    'User Journey',
+    'Git',
+    'Pie',
+    'Mindmap'
+  ];
+</script>
+
+<Card title="Sample Diagrams" isOpen={false}>
+  <div class="flex flex-wrap p-2 gap-2">
+    {#each diagramOrder as sample}
+      <button
+        class="btn btn-sm btn-primary w-28 normal-case flex-grow"
+        on:click={() => loadSampleDiagram(sample)}>
+        {sample}
+        {#if newDiagrams.includes(sample)}
+          <span class="ml-2 fa fa-heart" />
+        {/if}
+      </button>
+    {/each}
+  </div>
+</Card>
diff --git a/src/lib/components/Theme.svelte b/src/lib/components/Theme.svelte
new file mode 100644
index 00000000..2e860077
--- /dev/null
+++ b/src/lib/components/Theme.svelte
@@ -0,0 +1,64 @@
+<script>
+  import { setTheme, themeStore } from '$lib/util/theme';
+
+  const themes = [
+    '🌝 light',
+    '🌚 dark',
+    '🧁 cupcake',
+    '🐝 bumblebee',
+    '✳️ emerald',
+    '🏢 corporate',
+    '🌃 synthwave',
+    '👴 retro',
+    '🤖 cyberpunk',
+    '🌸 valentine',
+    '🎃 halloween',
+    '🌷 garden',
+    '🌲 forest',
+    '🐟 aqua',
+    '👓 lofi',
+    '🖍 pastel',
+    '🧚‍♀️ fantasy',
+    '📝 wireframe',
+    '🏴 black',
+    '💎 luxury',
+    '🧛‍♂️ dracula'
+  ];
+</script>
+
+<div class="hidden lg:block dropdown">
+  <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+  <div tabindex="0" class="btn btn-ghost ">
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      fill="none"
+      viewBox="0 0 24 24"
+      class="inline-block w-6 h-6 stroke-current md:mr-2"
+      ><path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        stroke-width="2"
+        d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" /></svg>
+    <span class="hidden md:inline"> Change Theme </span>
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 1792 1792"
+      class="inline-block w-4 h-4 ml-1 fill-current"
+      ><path
+        d="M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z" /></svg>
+  </div>
+  <div
+    class="mt-14 overflow-y-auto shadow-2xl top-px dropdown-content h-96 w-56 bg-base-200 text-base-content">
+    <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+    <ul tabindex="0" class="p-4 menu compact">
+      {#each themes as theme}
+        <li class={theme.includes($themeStore.theme) ? 'bordered' : ''}>
+          <span
+            class="btn btn-ghost justify-start"
+            on:click={() => setTheme(theme)}
+            on:keypress={() => setTheme(theme)}>{theme}</span>
+        </li>
+      {/each}
+    </ul>
+  </div>
+</div>
diff --git a/src/lib/components/View.svelte b/src/lib/components/View.svelte
new file mode 100644
index 00000000..dc5cfc6d
--- /dev/null
+++ b/src/lib/components/View.svelte
@@ -0,0 +1,157 @@
+<script lang="ts">
+  import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
+  import { onMount } from 'svelte';
+  import panzoom from 'svg-pan-zoom';
+  import type { State, ValidatedState } from '$lib/types';
+  import { logEvent } from '$lib/util/stats';
+  import { AsyncQueue, cmdKey } from '$lib/util/util';
+  import { render as renderDiagram } from '$lib/util/mermaid';
+
+  let code = '';
+  let config = '';
+  let container: HTMLDivElement;
+  let view: HTMLDivElement;
+  let error = false;
+  let outOfSync = false;
+  let hide = false;
+  let manualUpdate = true;
+  let panZoomEnabled = $stateStore.panZoom;
+  let pzoom: SvgPanZoom.Instance;
+
+  const handlePanZoomChange = () => {
+    const pan = pzoom.getPan();
+    const zoom = pzoom.getZoom();
+    updateCodeStore({ pan, zoom });
+    logEvent('panZoom');
+  };
+
+  const handlePanZoom = (state: State) => {
+    if (!state.panZoom) {
+      return;
+    }
+    hide = true;
+    pzoom?.destroy();
+    pzoom = undefined;
+    Promise.resolve().then(() => {
+      const graphDiv = document.getElementById('graph-div');
+      pzoom = panzoom(graphDiv, {
+        onPan: handlePanZoomChange,
+        onZoom: handlePanZoomChange,
+        controlIconsEnabled: true,
+        fit: true,
+        center: true
+      });
+      const { pan, zoom } = state;
+      if (pan !== undefined && zoom !== undefined && Number.isFinite(zoom)) {
+        pzoom.zoom(zoom);
+        pzoom.pan(pan);
+      }
+      hide = false;
+    });
+  };
+
+  const handleStateChange = async (state: ValidatedState) => {
+    if (state.error !== undefined) {
+      error = true;
+      return;
+    }
+    error = false;
+    try {
+      if (container && state && (state.updateDiagram || state.autoSync)) {
+        if (!state.autoSync) {
+          $inputStateStore.updateDiagram = false;
+        }
+        outOfSync = false;
+        manualUpdate = true;
+        // Do not render if there is no change in Code/Config/PanZoom
+        if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
+          return;
+        }
+        code = state.code;
+        config = state.mermaid;
+        panZoomEnabled = state.panZoom;
+        const scroll = view.parentElement.scrollTop;
+        delete container.dataset.processed;
+        await renderDiagram(
+          Object.assign({}, JSON.parse(state.mermaid)),
+          code,
+          'graph-div',
+          (svgCode, bindFunctions) => {
+            if (svgCode.length > 0) {
+              handlePanZoom(state);
+              container.innerHTML = svgCode;
+              // console.log(container.innerHTML);
+              const graphDiv = document.getElementById('graph-div');
+              graphDiv.setAttribute('height', '100%');
+              graphDiv.style.maxWidth = '100%';
+              if (bindFunctions) {
+                bindFunctions(graphDiv);
+              }
+            }
+          }
+        );
+        view.parentElement.scrollTop = scroll;
+        error = false;
+      } else if (manualUpdate) {
+        manualUpdate = false;
+      } else if (code !== state.code || config !== state.mermaid) {
+        outOfSync = true;
+      }
+    } catch (e) {
+      console.error('view fail', e);
+      error = true;
+    }
+  };
+
+  const q = new AsyncQueue(handleStateChange);
+
+  onMount(() => {
+    stateStore.subscribe(async (state) => {
+      await q.process(state);
+    });
+    window.addEventListener('resize', () => {
+      if ($stateStore.panZoom && pzoom) {
+        pzoom.resize();
+      }
+    });
+    console.log('View mounted');
+  });
+</script>
+
+{#if (error && $stateStore.error instanceof Error) || outOfSync}
+  <div
+    class="absolute w-full p-2 z-10 {error
+      ? 'text-red-600'
+      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
+    id="errorContainer">
+    {#if error}
+      {$stateStore.error}
+    {:else}
+      Diagram out of sync. <br />
+      Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
+    {/if}
+  </div>
+{/if}
+
+<div id="view" bind:this={view} class="p-2 h-full" class:error class:outOfSync>
+  <div id="container" bind:this={container} class="h-full overflow-auto" class:hide />
+</div>
+
+<style>
+  #view {
+    flex: 1;
+  }
+
+  #container {
+    transition: visibility 0.3s;
+  }
+
+  .error,
+  .outOfSync {
+    opacity: 0.5;
+  }
+
+  .hide {
+    visibility: hidden;
+  }
+</style>
diff --git a/src/lib/components/history/history.test.ts b/src/lib/components/history/history.test.ts
index d5a0242b..cdb50830 100644
--- a/src/lib/components/history/history.test.ts
+++ b/src/lib/components/history/history.test.ts
@@ -7,7 +7,7 @@ import {
   historyModeStore,
   historyStore
 } from './history';
-import { defaultState } from '../../util/state';
+import { defaultState } from '$lib/util/state';
 import { get } from 'svelte/store';
 
 describe('history', () => {