diff --git a/src/lib/components/MainLayout.svelte b/src/lib/components/MainLayout.svelte
index 4608d7c..765d1ef 100644
--- a/src/lib/components/MainLayout.svelte
+++ b/src/lib/components/MainLayout.svelte
@@ -7,7 +7,7 @@
     <div class="tabs in left-align">
       <a
         class="spaced"
-        class:active={currentPath.startsWith("/editor")}
+        class:active={!currentPath.startsWith("/about")}
         href="/editor">Editor</a
       >
       <!--
@@ -17,11 +17,6 @@
         href="/import">Import</a
       >
       -->
-      <a
-        class="spaced"
-        class:active={currentPath.startsWith("/export")}
-        href="/export/print">Export</a
-      >
       <a
         class="spaced"
         class:active={currentPath.startsWith("/about")}
diff --git a/src/routes/about/+layout.svelte b/src/routes/(about)/about/+layout.svelte
similarity index 100%
rename from src/routes/about/+layout.svelte
rename to src/routes/(about)/about/+layout.svelte
diff --git a/src/routes/about/+page.svelte b/src/routes/(about)/about/+page.svelte
similarity index 100%
rename from src/routes/about/+page.svelte
rename to src/routes/(about)/about/+page.svelte
diff --git a/src/routes/about/about.test.js b/src/routes/(about)/about/about.test.js
similarity index 100%
rename from src/routes/about/about.test.js
rename to src/routes/(about)/about/about.test.js
diff --git a/src/routes/about/layout.test.js b/src/routes/(about)/about/layout.test.js
similarity index 100%
rename from src/routes/about/layout.test.js
rename to src/routes/(about)/about/layout.test.js
diff --git a/src/routes/about/see-also/+page.svelte b/src/routes/(about)/about/see-also/+page.svelte
similarity index 100%
rename from src/routes/about/see-also/+page.svelte
rename to src/routes/(about)/about/see-also/+page.svelte
diff --git a/src/routes/export/+layout.svelte b/src/routes/(editor)/+layout.svelte
similarity index 50%
rename from src/routes/export/+layout.svelte
rename to src/routes/(editor)/+layout.svelte
index 079350c..c7c339a 100644
--- a/src/routes/export/+layout.svelte
+++ b/src/routes/(editor)/+layout.svelte
@@ -1,27 +1,21 @@
 <nav class="m l left">
   <!-- set them as active -->
+  <a href="/editor">
+    <i>edit</i>
+    <span>editor</span>
+  </a>
   <a href="/export/print">
     <i>print</i>
     <span>print</span>
   </a>
   <a href="/export/json">
     <i>output</i>
-    <span>json</span>
+    <span>export</span>
   </a>
-  <a href="/export/yaml">
-    <i>output</i>
-    <span>yaml</span>
+  <a href="/import">
+    <i>input</i>
+    <span>import</span>
   </a>
-  <!-- TODO
-    <a>
-      <i>Quiz</i>
-      <span>See also</span>
-    </a>
-    <a>
-      <i>Format_List_Bulleted</i>
-      <span>Changelog</span>
-    </a>
-    -->
 </nav>
 <slot />
 
diff --git a/src/routes/editor/+page.svelte b/src/routes/(editor)/editor/+page.svelte
similarity index 100%
rename from src/routes/editor/+page.svelte
rename to src/routes/(editor)/editor/+page.svelte
diff --git a/src/routes/editor/page.test.js b/src/routes/(editor)/editor/page.test.js
similarity index 100%
rename from src/routes/editor/page.test.js
rename to src/routes/(editor)/editor/page.test.js
diff --git a/src/routes/(editor)/export/+page.svelte b/src/routes/(editor)/export/+page.svelte
new file mode 100644
index 0000000..6ace38a
--- /dev/null
+++ b/src/routes/(editor)/export/+page.svelte
@@ -0,0 +1,11 @@
+<Serialized data={$shipData} />
+
+<script>
+  import { getContext } from "svelte";
+
+  import Serialized from "./Serialized.svelte";
+
+  const api = getContext("api");
+
+  let shipData = api.svelteStore;
+</script>
diff --git a/src/routes/export/[format=outputFormat]/Serialized.svelte b/src/routes/(editor)/export/Serialized.svelte
similarity index 58%
rename from src/routes/export/[format=outputFormat]/Serialized.svelte
rename to src/routes/(editor)/export/Serialized.svelte
index b2f5d07..866287a 100644
--- a/src/routes/export/[format=outputFormat]/Serialized.svelte
+++ b/src/routes/(editor)/export/Serialized.svelte
@@ -6,16 +6,25 @@
       on:error={copyError}>{copyLabel} <i>content_paste</i></button
     >
     <button on:click={handleSave}>download <i>download</i></button>
+    <div class="field suffix border">
+      <select bind:value={format}>
+        <option>json</option>
+        <option>yaml</option>
+      </select>
+      <i>arrow_drop_down</i>
+    </div>
   </nav>
-  <pre><code>{data}</code></pre>
+  <pre><code>{serialized}</code></pre>
   <a hidden {href} {download} bind:this={fileDownload} />
 </article>
 
 <script>
   import { clipboard } from "$lib/actions/clipboard.js";
+  import yaml from "yaml";
 
-  export let data = "Loading...";
-  export let format;
+  export let data = {};
+  export let serialized = "Loading...";
+  export let format = "json";
 
   let copyLabel = "clipboard";
 
@@ -37,6 +46,14 @@
   function handleSave() {
     fileDownload?.click();
   }
+
+  const serialize = async (data, format) => {
+    if (format === "json") return JSON.stringify(data, null, 2);
+
+    return yaml.stringify(data);
+  };
+
+  $: serialize(data, format).then((s) => (serialized = s));
 </script>
 
 <style>
@@ -50,4 +67,15 @@
     position: absolute;
     right: 5em;
   }
+  .my-switch {
+    display: flex;
+    align-items: center;
+  }
+  .my-switch > span {
+    display: inline-block;
+    font-size: var(--font-scale-10);
+  }
+  label {
+    margin: 0px 0.5rem;
+  }
 </style>
diff --git a/src/routes/export/[format=outputFormat]/Serialized.test.js b/src/routes/(editor)/export/Serialized.test.js
similarity index 51%
rename from src/routes/export/[format=outputFormat]/Serialized.test.js
rename to src/routes/(editor)/export/Serialized.test.js
index 786b8b9..beca2e0 100644
--- a/src/routes/export/[format=outputFormat]/Serialized.test.js
+++ b/src/routes/(editor)/export/Serialized.test.js
@@ -1,4 +1,4 @@
-import { render } from "@testing-library/svelte";
+import { render, waitFor } from "@testing-library/svelte";
 import "@testing-library/jest-dom";
 
 import Serialized from "./Serialized.svelte";
@@ -6,9 +6,8 @@ import Serialized from "./Serialized.svelte";
 test("basic", () => {
     const { getByText } = render(Serialized, {
         props: {
-            data: "hello world",
-            format: "json",
+            data: { greeting: "hello world" },
         },
     });
-    expect(getByText("hello world")).toBeInTheDocument();
+    waitFor(() => expect(getByText("hello world")).toBeInTheDocument());
 });
diff --git a/src/routes/export/print/+page.svelte b/src/routes/(editor)/export/print/+page.svelte
similarity index 100%
rename from src/routes/export/print/+page.svelte
rename to src/routes/(editor)/export/print/+page.svelte
diff --git a/src/routes/export/print/PrintShip/Armor/index.story.svelte b/src/routes/(editor)/export/print/PrintShip/Armor/index.story.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Armor/index.story.svelte
rename to src/routes/(editor)/export/print/PrintShip/Armor/index.story.svelte
diff --git a/src/routes/export/print/PrintShip/Armor/index.svelte b/src/routes/(editor)/export/print/PrintShip/Armor/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Armor/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/Armor/index.svelte
diff --git a/src/routes/export/print/PrintShip/Cargo.svelte b/src/routes/(editor)/export/print/PrintShip/Cargo.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Cargo.svelte
rename to src/routes/(editor)/export/print/PrintShip/Cargo.svelte
diff --git a/src/routes/export/print/PrintShip/Firecons/index.svelte b/src/routes/(editor)/export/print/PrintShip/Firecons/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Firecons/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/Firecons/index.svelte
diff --git a/src/routes/export/print/PrintShip/Hull/index.story.svelte b/src/routes/(editor)/export/print/PrintShip/Hull/index.story.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Hull/index.story.svelte
rename to src/routes/(editor)/export/print/PrintShip/Hull/index.story.svelte
diff --git a/src/routes/export/print/PrintShip/Hull/index.svelte b/src/routes/(editor)/export/print/PrintShip/Hull/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Hull/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/Hull/index.svelte
diff --git a/src/routes/export/print/PrintShip/Identification.svelte b/src/routes/(editor)/export/print/PrintShip/Identification.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Identification.svelte
rename to src/routes/(editor)/export/print/PrintShip/Identification.svelte
diff --git a/src/routes/export/print/PrintShip/MainSystems/Drive.svelte b/src/routes/(editor)/export/print/PrintShip/MainSystems/Drive.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/MainSystems/Drive.svelte
rename to src/routes/(editor)/export/print/PrintShip/MainSystems/Drive.svelte
diff --git a/src/routes/export/print/PrintShip/MainSystems/Ftl.svelte b/src/routes/(editor)/export/print/PrintShip/MainSystems/Ftl.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/MainSystems/Ftl.svelte
rename to src/routes/(editor)/export/print/PrintShip/MainSystems/Ftl.svelte
diff --git a/src/routes/export/print/PrintShip/MainSystems/index.svelte b/src/routes/(editor)/export/print/PrintShip/MainSystems/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/MainSystems/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/MainSystems/index.svelte
diff --git a/src/routes/export/print/PrintShip/Screens/index.story.svelte b/src/routes/(editor)/export/print/PrintShip/Screens/index.story.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Screens/index.story.svelte
rename to src/routes/(editor)/export/print/PrintShip/Screens/index.story.svelte
diff --git a/src/routes/export/print/PrintShip/Screens/index.svelte b/src/routes/(editor)/export/print/PrintShip/Screens/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Screens/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/Screens/index.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Beam.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Beam.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Beam.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Beam.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Beams.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Beams.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Beams.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Beams.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Graser/index.story.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Graser/index.story.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Graser/index.story.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Graser/index.story.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Graser/index.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Graser/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Graser/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Graser/index.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Needlebeam.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Needlebeam.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Needlebeam.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Needlebeam.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/PDS.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/PDS.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/PDS.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/PDS.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Scattergun.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Scattergun.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Scattergun.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Scattergun.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Submunition.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Submunition.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Submunition.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Submunition.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Torpedo/index.story.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Torpedo/index.story.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Torpedo/index.story.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Torpedo/index.story.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/Torpedo/index.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/Torpedo/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/Torpedo/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/Torpedo/index.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/index.story.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/index.story.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/index.story.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/index.story.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/index.svelte b/src/routes/(editor)/export/print/PrintShip/Weapons/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/Weapons/index.svelte
diff --git a/src/routes/export/print/PrintShip/Weapons/index.test.js b/src/routes/(editor)/export/print/PrintShip/Weapons/index.test.js
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/index.test.js
rename to src/routes/(editor)/export/print/PrintShip/Weapons/index.test.js
diff --git a/src/routes/export/print/PrintShip/Weapons/printComps.js b/src/routes/(editor)/export/print/PrintShip/Weapons/printComps.js
similarity index 100%
rename from src/routes/export/print/PrintShip/Weapons/printComps.js
rename to src/routes/(editor)/export/print/PrintShip/Weapons/printComps.js
diff --git a/src/routes/export/print/PrintShip/index.story.svelte b/src/routes/(editor)/export/print/PrintShip/index.story.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/index.story.svelte
rename to src/routes/(editor)/export/print/PrintShip/index.story.svelte
diff --git a/src/routes/export/print/PrintShip/index.svelte b/src/routes/(editor)/export/print/PrintShip/index.svelte
similarity index 100%
rename from src/routes/export/print/PrintShip/index.svelte
rename to src/routes/(editor)/export/print/PrintShip/index.svelte
diff --git a/src/routes/export/print/PrintShip/index.test.ts b/src/routes/(editor)/export/print/PrintShip/index.test.ts
similarity index 100%
rename from src/routes/export/print/PrintShip/index.test.ts
rename to src/routes/(editor)/export/print/PrintShip/index.test.ts
diff --git a/src/routes/export/print/PrintShip/sample-ship.ts b/src/routes/(editor)/export/print/PrintShip/sample-ship.ts
similarity index 100%
rename from src/routes/export/print/PrintShip/sample-ship.ts
rename to src/routes/(editor)/export/print/PrintShip/sample-ship.ts
diff --git a/src/routes/export/[format=outputFormat]/+page.js b/src/routes/export/[format=outputFormat]/+page.js
deleted file mode 100644
index 96002e4..0000000
--- a/src/routes/export/[format=outputFormat]/+page.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('./$types').PageLoad} */
-export function load({ params }) {
-  return {
-    format: params.format,
-  };
-}
diff --git a/src/routes/export/[format=outputFormat]/+page.svelte b/src/routes/export/[format=outputFormat]/+page.svelte
deleted file mode 100644
index 40ced7a..0000000
--- a/src/routes/export/[format=outputFormat]/+page.svelte
+++ /dev/null
@@ -1,21 +0,0 @@
-<Serialized data={serializedShip} format={data.format} />
-
-<script>
-  import { getContext } from "svelte";
-
-  import Serialized from "./Serialized.svelte";
-
-  const api = getContext("api");
-
-  let shipData = api.svelteStore;
-  export let data;
-
-  const serialize = async (data, format) => {
-    if (format === "json") return JSON.stringify(data, null, 2);
-
-    return import("yaml").then(({ stringify }) => stringify(data));
-  };
-
-  let serializedShip;
-  $: serialize($shipData, data.format).then((s) => (serializedShip = s));
-</script>