diff --git a/lib/chiya_web/components/public_components.ex b/lib/chiya_web/components/public_components.ex
index 9099ff4..df22bfa 100644
--- a/lib/chiya_web/components/public_components.ex
+++ b/lib/chiya_web/components/public_components.ex
@@ -164,6 +164,64 @@ defmodule ChiyaWeb.PublicComponents do
     end
   end
 
+  def comment_form(assigns) do
+    ~H"""
+    <.simple_form
+      :let={f}
+      for={@changeset}
+      action={~p"/note/#{assigns.note.slug}/comment"}
+      class="bg-theme-background -m-3"
+    >
+      <.error :if={@changeset.action}>
+        Oops, something went wrong! Please check the errors below.
+      </.error>
+      <.input
+        field={f[:author_name]}
+        type="text"
+        placeholder="Name"
+        class="bg-theme-background dark:bg-theme-background border-theme-base/20 dark:border-theme-base/20 text-theme-base dark:text-theme-base placeholder-theme-base/40 dark:placeholder-theme-base/60 dark:focus:border-theme-base/60 dark:focus:border-theme-base/60"
+      />
+      <.input
+        field={f[:content]}
+        type="textarea"
+        placeholder="Content"
+        rows="3"
+        class="bg-theme-background dark:bg-theme-background border-theme-base/20 dark:border-theme-base/20 text-theme-base dark:text-theme-base placeholder-theme-base/60 dark:placeholder-theme-base/60 focus:border-theme-base/60 dark:focus:border-theme-base/60"
+      />
+      <.input field={f[:note_id]} type="hidden" />
+      <:actions>
+        <.button>Submit Comment</.button>
+      </:actions>
+    </.simple_form>
+    """
+  end
+
+  def comment_list(assigns) do
+    ~H"""
+    <%= if not Enum.empty?(assigns.note.comments) do %>
+      <.line />
+
+      <h2 class="mb-6 text-theme-base"><%= Enum.count(assigns.note.comments) %> Comments</h2>
+
+      <aside id="comments" class="flex flex-col gap-6">
+        <%= for comment <- assigns.note.comments do %>
+          <article class="text-theme-base bg-theme-base/10 p-1">
+            <header class="flex flex-row justify-between">
+              <strong class="text-theme-primary"><%= comment.author_name %></strong>
+              <span class="text-theme-dim"><%= from_now(comment.inserted_at) %></span>
+            </header>
+            <p><%= comment.content %></p>
+          </article>
+        <% end %>
+      </aside>
+    <% else %>
+      <.line />
+
+      <h2 class="mb-6 text-theme-base">No comments yet.</h2>
+    <% end %>
+    """
+  end
+
   defp gallery_name(note), do: "gallery-#{note.id}"
 
   defp main_image(note),
diff --git a/lib/chiya_web/controllers/comment_html/index.html.heex b/lib/chiya_web/controllers/comment_html/index.html.heex
index f791e13..ea801ad 100644
--- a/lib/chiya_web/controllers/comment_html/index.html.heex
+++ b/lib/chiya_web/controllers/comment_html/index.html.heex
@@ -12,14 +12,14 @@
       <.link navigate={~p"/admin/comments/#{comment}"}>Show</.link>
     </div>
   </:action>
-  <:action :let={comment}>
-    <.link href={~p"/admin/comments/#{comment}"} method="delete" data-confirm="Are you sure?">
+  <:action :let={_comment}>
+    <.link href="#" method="delete" data-confirm="Are you sure?">
       Delete
     </.link>
   </:action>
-  <:action :let={comment}>
+  <:action :let={_comment}>
     <div class="sr-only">
-      <.link navigate={~p"/admin/comments/#{comment}/approve"}>Approve</.link>
+      <.link href="#">Approve</.link>
     </div>
   </:action>
 </.table>
diff --git a/lib/chiya_web/controllers/comment_html/show.html.heex b/lib/chiya_web/controllers/comment_html/show.html.heex
index 962d56e..ce158e1 100644
--- a/lib/chiya_web/controllers/comment_html/show.html.heex
+++ b/lib/chiya_web/controllers/comment_html/show.html.heex
@@ -2,7 +2,7 @@
   Comment <%= @comment.id %>
   <:subtitle>This is a comment record from your database.</:subtitle>
   <:actions>
-    <.link href={~p"/admin/notes/#{@comment}/approve"}>
+    <.link href="#">
       <.button>Approve note</.button>
     </.link>
   </:actions>
@@ -15,7 +15,7 @@
   <:item title="Approved at"><%= @comment.approved_at %></:item>
   <:item title="Kind"><%= @comment.kind %></:item>
   <:item title="Note">
-    <a href={"/admin/notes/#{@comment.note.id}"}><%= @comment.note.name %></a>
+    <a href="#"><%= @comment.note.name %></a>
   </:item>
 </.list>
 
diff --git a/lib/chiya_web/controllers/page_html/note.html.heex b/lib/chiya_web/controllers/page_html/note.html.heex
index 473742d..37c09f4 100644
--- a/lib/chiya_web/controllers/page_html/note.html.heex
+++ b/lib/chiya_web/controllers/page_html/note.html.heex
@@ -56,58 +56,4 @@
       </div>
     <% end %>
   </section>
-
-  <section class="mt-8 mx-auto max-w-xl">
-    <%= if not Enum.empty?(@note.comments) do %>
-      <.line />
-
-      <h2 class="mb-6 text-theme-base"><%= Enum.count(@note.comments) %> Comments</h2>
-
-      <aside id="comments" class="flex flex-col gap-6">
-        <%= for comment <- @note.comments do %>
-          <article class="text-theme-base bg-theme-base/10 p-1">
-            <header class="flex flex-row justify-between">
-              <strong class="text-theme-primary"><%= comment.author_name %></strong>
-              <span class="text-theme-dim"><%= from_now(comment.inserted_at) %></span>
-            </header>
-            <p><%= comment.content %></p>
-          </article>
-        <% end %>
-      </aside>
-    <% else %>
-      <.line />
-
-      <h2 class="mb-6 text-theme-base">No comments yet.</h2>
-    <% end %>
-
-    <.line />
-
-    <.simple_form
-      :let={f}
-      for={@changeset}
-      action={~p"/note/#{@note.slug}/comment"}
-      class="bg-theme-background -m-3"
-    >
-      <.error :if={@changeset.action}>
-        Oops, something went wrong! Please check the errors below.
-      </.error>
-      <.input
-        field={f[:author_name]}
-        type="text"
-        placeholder="Name"
-        class="bg-theme-background dark:bg-theme-background border-theme-base/20 dark:border-theme-base/20 text-theme-base dark:text-theme-base placeholder-theme-base/40 dark:placeholder-theme-base/60 dark:focus:border-theme-base/60 dark:focus:border-theme-base/60"
-      />
-      <.input
-        field={f[:content]}
-        type="textarea"
-        placeholder="Content"
-        rows="3"
-        class="bg-theme-background dark:bg-theme-background border-theme-base/20 dark:border-theme-base/20 text-theme-base dark:text-theme-base placeholder-theme-base/60 dark:placeholder-theme-base/60 focus:border-theme-base/60 dark:focus:border-theme-base/60"
-      />
-      <.input field={f[:note_id]} type="hidden" />
-      <:actions>
-        <.button>Submit Comment</.button>
-      </:actions>
-    </.simple_form>
-  </section>
 </div>
diff --git a/lib/chiya_web/router.ex b/lib/chiya_web/router.ex
index 5ba03f9..e0fde0e 100644
--- a/lib/chiya_web/router.ex
+++ b/lib/chiya_web/router.ex
@@ -138,6 +138,8 @@ defmodule ChiyaWeb.Router do
 
     get "/about", PageController, :about
 
-    post "/note/:slug/comment", CommentController, :create
+    # TODO: Comments are disabled for now
+    # and need a better submit/approve flow
+    # post "/note/:slug/comment", CommentController, :create
   end
 end