diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
index 0534f2e..298c5b3 100644
--- a/src/lib/components/Navigation.svelte
+++ b/src/lib/components/Navigation.svelte
@@ -19,9 +19,9 @@
     <NavHamburger class='btn-leather' />
   </div>
   <NavUl class='ul-leather'>
-    <NavLi href='./about'>About</NavLi>
-    <NavLi href='./new/edit'>New Note</NavLi>
-    <NavLi href='./visualize'>Visualize</NavLi>
+    <NavLi href='/about'>About</NavLi>
+    <NavLi href='/new/edit'>New Note</NavLi>
+    <NavLi href='/visualize'>Visualize</NavLi>
     <NavLi>
       <DarkMode btnClass='btn-leather p-0'/>
     </NavLi>
diff --git a/src/lib/components/Preview.svelte b/src/lib/components/Preview.svelte
index 5fc2b3e..581f206 100644
--- a/src/lib/components/Preview.svelte
+++ b/src/lib/components/Preview.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { parser } from "$lib/parser";
-  import { Heading, P } from "flowbite-svelte";
+  import { Button, Heading, P, Tooltip } from "flowbite-svelte";
+  import { CaretDownSolid, CaretUpSolid, EditOutline } from "flowbite-svelte-icons";
 
   export let sectionClass: string = '';
 
@@ -8,6 +9,7 @@
   export let depth: number = 0;
   export let allowEditing: boolean = false;
   // TODO: Add editing functionality.
+  const isEditing: boolean = false;
 
   const title = $parser.getIndexTitle(rootIndexId);
   const orderedChildren = $parser.getOrderedChildIds(rootIndexId);
@@ -35,11 +37,29 @@
     <Heading tag={getHeadingTag(depth)} class='h-leather'>{title}</Heading>
     {#each orderedChildren as id, index}
       {#if childIndices.includes(id)}
-        <svelte:self {$parser} rootIndexId={id} depth={depth + 1} />
+        <svelte:self rootIndexId={id} depth={depth + 1} {allowEditing} />
       {:else if (childZettels.includes(id))}
-        <P class='note-leather' firstupper={index === 0}>
-          {@html $parser.getContent(id)}
-        </P>
+        <div class='grid grid-cols-[1fr_auto] gap-2'>
+          <P class='note-leather' firstupper={index === 0}>
+            {@html $parser.getContent(id)}
+          </P>
+          {#if allowEditing}
+            <div class='flex flex-col space-y-2 justify-start'>
+              <Button class='btn-leather' size='sm' outline>
+                <CaretUpSolid />
+              </Button>
+              <Button class='btn-leather' size='sm' outline>
+                <CaretDownSolid />
+              </Button>
+              <Button class='btn-leather' size='sm' outline>
+                <EditOutline />
+              </Button>
+              <Tooltip class='tooltip-leather' type='auto' placement='top'>
+                Edit
+              </Tooltip>
+            </div>
+          {/if}
+        </div>
       {/if}
     {/each}
   {:else}
diff --git a/src/lib/parser.ts b/src/lib/parser.ts
index 7e072cb..2bfb38e 100644
--- a/src/lib/parser.ts
+++ b/src/lib/parser.ts
@@ -167,7 +167,7 @@ export default class Pharos {
    * @remarks The root index ID may be used to retrieve metadata or children from the root index.
    */
   getRootIndexId(): string {
-    return this.normalizeDTag(this.rootNodeId ?? '');
+    return this.normalizeId(this.rootNodeId) ?? '';
   }
 
   /**
@@ -309,6 +309,7 @@ export default class Pharos {
    */
   private treeProcessor(treeProcessor: Extensions.TreeProcessor, document: Document) {
     this.rootNodeId = this.generateNodeId(document);
+    document.setId(this.rootNodeId);
     this.nodes.set(this.rootNodeId, document);
     this.eventToKindMap.set(this.rootNodeId, 30040);
     this.indexToChildEventsMap.set(this.rootNodeId, new Set<string>());
@@ -339,7 +340,7 @@ export default class Pharos {
    * @remarks Sections are mapped as kind 30040 indexToChildEventsMap by default.
    */
   private processSection(section: Section): AbstractNode[] {
-    let sectionId = section.getId();
+    let sectionId = this.normalizeId(section.getId());
     if (!sectionId) {
       sectionId = this.generateNodeId(section);
     }
@@ -353,7 +354,7 @@ export default class Pharos {
     this.eventToKindMap.set(sectionId, 30040);  // Sections are indexToChildEventsMap by default.
     this.indexToChildEventsMap.set(sectionId, new Set<string>());
 
-    const parentId = section.getParent()?.getId();
+    const parentId = this.normalizeId(section.getParent()?.getId());
     if (!parentId) {
       return [];
     }
@@ -376,7 +377,7 @@ export default class Pharos {
    */
   private processBlock(block: Block): void {
     // Obtain or generate a unique ID for the block.
-    let blockId = block.getId();
+    let blockId = this.normalizeId(block.getId());
     if (!blockId) {
       blockId = this.generateNodeId(block) ;
       block.setId(blockId);
@@ -390,7 +391,7 @@ export default class Pharos {
     this.nodes.set(blockId, block);
     this.eventToKindMap.set(blockId, 30041);  // Blocks are zettels by default.
 
-    const parentId = block.getParent()?.getId();
+    const parentId = this.normalizeId(block.getParent()?.getId());
     if (!parentId) {
       return;
     }
@@ -563,17 +564,17 @@ export default class Pharos {
   // #region Utility Functions
 
   private generateNodeId(block: AbstractBlock): string {
-    let blockId: string = block.getId();
+    let blockId: string | null = this.normalizeId(block.getId());
 
     if (blockId != null && blockId.length > 0) {
       return blockId;
     }
 
-    blockId = this.normalizeNodeId(block.getTitle() ?? '');
+    blockId = this.normalizeId(block.getTitle());
 
     // Use the provided title, if possible.
     if (blockId != null && blockId.length > 0) {
-      return this.normalizeNodeId(blockId);
+      return blockId;
     }
 
     const documentId = this.rootNodeId;
@@ -754,23 +755,17 @@ export default class Pharos {
     return blockId;
   }
 
-  private normalizeNodeId(input: string): string {
-    return input
-      .toLowerCase()
-      .replace(/\s+/g, '_')  // Replace spaces with underscores.
-      .replace(/[^a-z0-9\_]/g, '');  // Remove non-alphanumeric characters except underscores.
-  }
+  private normalizeId(input?: string): string | null {
+    if (input == null || input.length === 0) {
+      return null;
+    }
 
-  /**
-   * Normalizes a string to lower-kebab-case.
-   * @param input The string to normalize.
-   * @returns The normalized string.
-   */
-  private normalizeDTag(input: string): string {
-    return input
+    return he.decode(input)
       .toLowerCase()
-      .replace(/[\s_]+/g, '-')  // Replace spaces with hyphens.
-      .replace(/[^a-z0-9\-]/g, '');  // Remove non-alphanumeric characters except hyphens.
+      .replace(/[_]/g, ' ')  // Replace underscores with spaces.
+      .trim()
+      .replace(/\s+/g, '-')  // Replace spaces with dashes.
+      .replace(/[^a-z0-9\-]/g, '');  // Remove non-alphanumeric characters except dashes.
   }
 
   private extractAndNormalizeWikilinks(content: string): string[][] {
@@ -781,8 +776,8 @@ export default class Pharos {
     // TODO: Match custom-named wikilinks as defined in NIP-54.
     while ((match = wikilinkPattern.exec(content)) !== null) {
       const linkName = match[1];
-      const normalizedText = this.normalizeDTag(linkName);
-      wikilinks.push(['wikilink', normalizedText]);
+      const normalizedText = this.normalizeId(linkName);
+      wikilinks.push(['wikilink', normalizedText!]);
     }
 
     return wikilinks;
diff --git a/src/routes/new/edit/+page.svelte b/src/routes/new/edit/+page.svelte
index 9362888..9c20737 100644
--- a/src/routes/new/edit/+page.svelte
+++ b/src/routes/new/edit/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Button, Heading, Textarea, Toolbar, ToolbarButton, Tooltip } from "flowbite-svelte";
+  import { Heading, Textarea, Toolbar, ToolbarButton, Tooltip } from "flowbite-svelte";
   import { CodeOutline, EyeSolid, PaperPlaneOutline } from "flowbite-svelte-icons";
   import { editorText } from "$lib/stores";
   import Preview from "$lib/components/Preview.svelte";
@@ -10,14 +10,13 @@
   // TODO: Prompt user to sign in before editing.
 
   let isEditing: boolean = true;
-
-  $parser = new Pharos($ndk);
-
-  $: rootIndexId = $parser?.getRootIndexId();
+  let rootIndexId: string;
 
   const showPreview = () => {
+    $parser ??= new Pharos($ndk);
     $parser.reset();
     $parser.parse($editorText);
+    rootIndexId = $parser.getRootIndexId();
     isEditing = false;
   };
 
@@ -28,7 +27,7 @@
   const prepareReview = () => {
     $parser.reset();
     $parser.parse($editorText);
-    goto('/new/review');
+    goto('/new/compose');
   }
 </script>
 
@@ -48,8 +47,8 @@
             <ToolbarButton name='Preview' on:click={showPreview}>
               <EyeSolid class='w-6 h-6' />
             </ToolbarButton>
-            <ToolbarButton name='Review' slot='end'>
-              <PaperPlaneOutline class='w=6 h-6 rotate-90' on:click={prepareReview} />
+            <ToolbarButton name='Review' slot='end' on:click={prepareReview}>
+              <PaperPlaneOutline class='w=6 h-6 rotate-90' />
             </ToolbarButton>
           </Toolbar>
         </Textarea>
@@ -60,8 +59,8 @@
           <ToolbarButton name='Edit' on:click={hidePreview}>
             <CodeOutline class='w-6 h-6' />
           </ToolbarButton>
-          <ToolbarButton name='Review' slot='end'>
-            <PaperPlaneOutline class='w=6 h-6 rotate-90' on:click={prepareReview} />
+          <ToolbarButton name='Review' slot='end' on:click={prepareReview}>
+            <PaperPlaneOutline class='w=6 h-6 rotate-90' />
           </ToolbarButton>
         </Toolbar>
         {#if rootIndexId}
diff --git a/src/routes/new/review/+page.svelte b/src/routes/new/review/+page.svelte
deleted file mode 100644
index 8f879cf..0000000
--- a/src/routes/new/review/+page.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<script lang='ts'>
-  import Preview from "$lib/components/Preview.svelte";
-  import { parser } from "$lib/parser";
-  import { Heading } from "flowbite-svelte";
-
-  
-</script>
-
-<div class='w-full flex justify-center'>
-  <main class='main-leather flex flex-col space-y-4 max-w-2xl w-full mt-4 mb-4'>
-    <Heading tag='h1' class='h-leather mb-2'>Review</Heading>
-    <Preview rootIndexId={$parser.getRootIndexId()} allowEditing={true} />
-  </main>
-</div>