diff --git a/src/lib/a/forms/ACommentForm.svelte b/src/lib/a/forms/ACommentForm.svelte
index 291af8e..03d075a 100644
--- a/src/lib/a/forms/ACommentForm.svelte
+++ b/src/lib/a/forms/ACommentForm.svelte
@@ -6,7 +6,11 @@
     List, ListOrdered
   } from "@lucide/svelte";
   import { userStore } from "$lib/stores/userStore.ts";
-  import { parseBasicmarkup } from "$lib/utils/markup/basicMarkupParser.ts";
+  import { parseBasicMarkup } from "$lib/utils/markup/basicMarkupParser.ts";
+  import { basicMarkup } from "$lib/snippets/MarkupSnippets.svelte";
+  import { getNdkContext } from "$lib/ndk.ts";
+
+  const ndk = getNdkContext();
 
   let {
     // make content bindable
@@ -87,7 +91,7 @@
       return;
     }
 
-    parseBasicmarkup(content).then((html) => {
+    parseBasicMarkup(content).then((html) => {
       preview = html;
     });
   });
@@ -147,7 +151,7 @@
 
 <div class="prose dark:prose-invert max-w-none p-4 border border-primary-500 border-s-4 rounded-lg">
   {#if preview}
-    {@html preview}
+    {@render basicMarkup(preview, ndk)}
   {:else}
     <P class="text-xs text-gray-500">Preview will appear here...</P>
   {/if}
diff --git a/src/lib/components/CommentBox.svelte b/src/lib/components/CommentBox.svelte
index 86313bf..a9aa1bf 100644
--- a/src/lib/components/CommentBox.svelte
+++ b/src/lib/components/CommentBox.svelte
@@ -21,7 +21,6 @@
   import { tick } from "svelte";
   import { goto } from "$app/navigation";
   import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
-  import { basicMarkup } from "$lib/snippets/MarkupSnippets.svelte";
   import { ACommentForm } from "$lib/a";
   import { AtSign } from "@lucide/svelte";
 
@@ -573,22 +572,6 @@
     </div>
   </Modal>
 
-  <div class="space-y-4">
-    <div>
-      <Textarea
-        bind:value={content}
-        placeholder="Write your comment..."
-        rows={10}
-        class="w-full"
-      />
-    </div>
-    <div
-      class="prose dark:prose-invert max-w-none p-4 border border-gray-300 dark:border-gray-700 rounded-lg"
-    >
-      {@render basicMarkup(content, ndk)}
-    </div>
-  </div>
-
   {#if error}
     <Alert color="red" dismissable>
       {error}
diff --git a/src/lib/utils/markup/basicMarkupParser.ts b/src/lib/utils/markup/basicMarkupParser.ts
index 4e8a96a..be96f2f 100644
--- a/src/lib/utils/markup/basicMarkupParser.ts
+++ b/src/lib/utils/markup/basicMarkupParser.ts
@@ -1,6 +1,6 @@
 import NDK from "@nostr-dev-kit/ndk";
 import {
-processBasicFormatting,
+  processBasicFormatting,
   processBlockquotes,
   processEmojiShortcodes,
   processNostrIdentifiersInText,
diff --git a/src/routes/profile/+page.svelte b/src/routes/profile/+page.svelte
index 401ed79..5ce7af1 100644
--- a/src/routes/profile/+page.svelte
+++ b/src/routes/profile/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Heading, P } from "flowbite-svelte";
-  import { AAlert, ACommentForm } from "$lib/a";
+  import { AAlert } from "$lib/a";
   import CommentBox from "$lib/components/CommentBox.svelte";
   import CommentViewer from "$lib/components/CommentViewer.svelte";
   import CopyToClipboard from "$lib/components/util/CopyToClipboard.svelte";