diff --git a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html b/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
index 36478bff..8347f752 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
@@ -1,40 +1,55 @@
 {{ define "repo/pulls/fragments/pullNewComment" }}
 <div
   id="pull-comment-card-{{ .RoundNumber }}"
-  class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2">
-  <div class="text-sm text-gray-500 dark:text-gray-400">
-    {{ resolve .LoggedInUser.Did }}
-  </div>
+  class="w-full flex flex-col gap-2">
+  {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }}
   <form
     hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"
-    hx-indicator="#create-comment-spinner"
     hx-swap="none"
-    class="w-full flex flex-wrap gap-2"
+    hx-on::after-request="if(event.detail.successful) this.reset()"
+    hx-disabled-elt="#reply-{{ .RoundNumber }}"
+    class="w-full flex flex-wrap gap-2 group"
   >
     <textarea
         name="body"
         class="w-full p-2 rounded border border-gray-200"
+        rows=8
         placeholder="Add to the discussion..."></textarea
     >
-    <button type="submit" class="btn flex items-center gap-2">
-        {{ i "message-square" "w-4 h-4" }}
-        <span>comment</span>
-        <span id="create-comment-spinner" class="group">
-          {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-        </span>
-    </button>
-    <button
-      type="button"
-      class="btn flex items-center gap-2 group"
-      hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"
-      hx-swap="outerHTML"
-      hx-target="#pull-comment-card-{{ .RoundNumber }}"
-    >
-      {{ i "x" "w-4 h-4" }}
-      <span>cancel</span>
-      {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-    </button>
+    {{ template "replyActions" . }}
     <div id="pull-comment"></div>
   </form>
 </div>
 {{ end }}
+
+{{ define "replyActions" }}
+  <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm w-full">
+    {{ template "cancel" . }}
+    {{ template "reply" . }}
+  </div>
+{{ end }}
+
+{{ define "cancel" }}
+  <button
+    type="button"
+    class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group"
+    hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"
+    hx-swap="outerHTML"
+    hx-target="#actions-{{.RoundNumber}}"
+  >
+    {{ i "x" "w-4 h-4" }}
+    <span>cancel</span>
+  </button>
+{{ end }}
+
+{{ define "reply" }}
+  <button
+    type="submit"
+    id="reply-{{ .RoundNumber }}"
+    class="btn-create flex items-center gap-2">
+      {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
+      {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+      reply
+  </button>
+{{ end }}
+