diff --git a/templates/comments/_comment.html b/templates/comments/_comment.html
index b81b322..5777495 100644
--- a/templates/comments/_comment.html
+++ b/templates/comments/_comment.html
@@ -1,26 +1,42 @@
-<article id="comment-{{ comment.id }}" class="bg-brand-surfaceLight dark:bg-brand-surfaceDark border border-zinc-200 dark:border-zinc-800 p-6 hover:shadow-solid-dark dark:hover:shadow-solid-light transition-all duration-300">
-  <div class="flex items-center gap-3 mb-3">
-    <div class="w-10 h-10 bg-gradient-to-tr from-brand-cyan to-brand-pink shrink-0 shadow-neon-cyan"></div>
-    <div>
-      <div class="font-display font-bold text-sm hover:text-brand-cyan transition-colors">{{ comment.author_name }}</div>
-      <div class="font-mono text-xs text-zinc-500">{{ comment.created_at|date:"M j, Y" }}</div>
-    </div>
-  </div>
-  <p class="text-zinc-700 dark:text-zinc-300 text-sm leading-relaxed">{{ comment.body }}</p>
-  {% include "comments/_reactions.html" with comment=comment counts=comment.reaction_counts user_reacted=comment.user_reacted %}
-  <div class="replies-container">
-  {% for reply in comment.replies.all %}
-  <article id="comment-{{ reply.id }}" class="mt-6 ml-8 bg-zinc-50 dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-800 border-l-2 border-l-brand-cyan p-4">
-    <div class="flex items-center gap-3 mb-2">
-      <div class="w-7 h-7 bg-gradient-to-tr from-brand-pink to-brand-cyan shrink-0"></div>
-      <div>
-        <div class="font-display font-bold text-sm">{{ reply.author_name }}</div>
-        <div class="font-mono text-xs text-zinc-500">{{ reply.created_at|date:"M j, Y" }}</div>
+<div class="group">
+  <!-- Top-level Comment -->
+  <article id="comment-{{ comment.id }}" class="relative bg-brand-surfaceLight dark:bg-brand-surfaceDark border border-zinc-200 dark:border-zinc-800 p-6 sm:p-8 hover:border-brand-pink/30 transition-colors">
+    <div class="flex items-start gap-4 mb-4">
+      <div class="w-10 h-10 bg-gradient-to-tr from-brand-cyan to-brand-pink shrink-0 rounded-sm shadow-solid-dark/10 dark:shadow-solid-light/5"></div>
+      <div class="flex-1 min-w-0">
+        <div class="flex flex-wrap items-baseline gap-x-3 gap-y-1">
+          <span class="font-display font-bold text-base text-zinc-900 dark:text-zinc-100">{{ comment.author_name }}</span>
+          <time datetime="{{ comment.created_at|date:'c' }}" class="font-mono text-xs text-zinc-500 uppercase tracking-wider">{{ comment.created_at|date:"M j, Y" }}</time>
+        </div>
+        <div class="mt-3 prose prose-sm dark:prose-invert max-w-none text-zinc-700 dark:text-zinc-300 leading-relaxed">
+          {{ comment.body|linebreaks }}
+        </div>
       </div>
     </div>
-    <p class="text-zinc-700 dark:text-zinc-300 text-sm leading-relaxed">{{ reply.body }}</p>
+
+    <div class="flex items-center justify-between mt-6">
+      {% include "comments/_reactions.html" with comment=comment counts=comment.reaction_counts user_reacted=comment.user_reacted %}
+      
+      <details class="group/details">
+        <summary class="list-none cursor-pointer flex items-center gap-2 font-mono text-xs font-bold uppercase tracking-widest text-zinc-500 hover:text-brand-pink transition-colors [&::-webkit-details-marker]:hidden">
+          <svg class="w-4 h-4 transition-transform group-open/details:-translate-y-0.5 group-open/details:translate-x-0.5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6" />
+          </svg>
+          <span class="group-open/details:hidden">Reply</span>
+          <span class="hidden group-open/details:inline text-brand-pink">Cancel Reply</span>
+        </summary>
+
+        <div class="mt-8 pt-8 border-t border-zinc-100 dark:border-zinc-800 animate-in fade-in slide-in-from-top-2 duration-300">
+          {% include "comments/_reply_form.html" with page=page comment=comment %}
+        </div>
+      </details>
+    </div>
   </article>
-  {% endfor %}
+
+  <!-- Nested Replies -->
+  <div class="replies-container relative ml-6 sm:ml-12 mt-4 space-y-4 pl-6 sm:pl-8 border-l-2 border-zinc-100 dark:border-zinc-800">
+    {% for reply in comment.replies.all %}
+      {% include "comments/_reply.html" with reply=reply %}
+    {% endfor %}
   </div>
-  {% include "comments/_reply_form.html" with page=page comment=comment %}
-</article>
+</div>
diff --git a/templates/comments/_comment_form.html b/templates/comments/_comment_form.html
index 0242865..bb54e97 100644
--- a/templates/comments/_comment_form.html
+++ b/templates/comments/_comment_form.html
@@ -1,42 +1,66 @@
 {% load static %}
-<div id="comment-form-container" class="bg-brand-surfaceLight dark:bg-brand-surfaceDark border border-zinc-200 dark:border-zinc-800 p-6">
-  <h3 class="font-display font-bold text-xl mb-6">Post a Comment</h3>
-  {% if success_message %}
-  <div class="mb-4 p-3 font-mono text-sm bg-brand-cyan/10 text-brand-cyan border border-brand-cyan/20">
-    {{ success_message }}
-  </div>
-  {% endif %}
-  {% if comment_form.errors %}
-  <div aria-label="Comment form errors" class="mb-4 p-3 font-mono text-sm bg-red-50 dark:bg-red-900/20 text-red-600 dark:text-red-400 border border-red-200 dark:border-red-800">
-    {% for error in comment_form.non_field_errors %}<p>{{ error }}</p>{% endfor %}
-    {% for field in comment_form %}{% for error in field.errors %}<p>{{ field.label }}: {{ error }}</p>{% endfor %}{% endfor %}
-  </div>
-  {% endif %}
-  <form method="post" action="{% url 'comment_post' %}" data-comment-form class="space-y-4"
-    hx-post="{% url 'comment_post' %}" hx-target="#comment-form-container" hx-swap="outerHTML">
-    {% csrf_token %}
-    <input type="hidden" name="article_id" value="{{ page.id }}" />
-    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-      <div>
-        <label class="block font-mono text-xs text-zinc-500 mb-1 uppercase tracking-wider">Name *</label>
-        <input type="text" name="author_name" value="{% if comment_form %}{{ comment_form.author_name.value|default:'' }}{% endif %}" required
-          class="w-full bg-transparent border border-zinc-300 dark:border-zinc-700 px-4 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:shadow-neon-pink transition-colors" />
-      </div>
-      <div>
-        <label class="block font-mono text-xs text-zinc-500 mb-1 uppercase tracking-wider">Email *</label>
-        <input type="email" name="author_email" value="{% if comment_form %}{{ comment_form.author_email.value|default:'' }}{% endif %}" required
-          class="w-full bg-transparent border border-zinc-300 dark:border-zinc-700 px-4 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:shadow-neon-pink transition-colors" />
-      </div>
+<div id="comment-form-container" class="relative bg-zinc-900 text-white dark:bg-white dark:text-zinc-900 p-8 sm:p-12 shadow-solid-pink">
+  <div class="max-w-2xl">
+    <h3 class="font-display font-bold text-3xl mb-2">Join the conversation</h3>
+    <p class="font-mono text-sm text-zinc-400 dark:text-zinc-500 mb-10 uppercase tracking-widest">Add your fresh comment below</p>
+
+    {% if success_message %}
+    <div class="mb-8 p-4 bg-brand-cyan/10 border border-brand-cyan/20 font-mono text-sm text-brand-cyan animate-in fade-in">
+      {{ success_message }}
     </div>
-    <div>
-      <label class="block font-mono text-xs text-zinc-500 mb-1 uppercase tracking-wider">Comment *</label>
-      <textarea name="body" required rows="5"
-        class="w-full bg-transparent border border-zinc-300 dark:border-zinc-700 px-4 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:shadow-neon-pink transition-colors resize-none">{% if comment_form %}{{ comment_form.body.value|default:'' }}{% endif %}</textarea>
-    </div>
-    <input type="text" name="honeypot" hidden />
-    {% if turnstile_site_key %}
-    <div class="cf-turnstile" data-sitekey="{{ turnstile_site_key }}" data-theme="auto"></div>
     {% endif %}
-    <button type="submit" class="px-6 py-3 bg-brand-dark text-brand-light dark:bg-brand-light dark:text-brand-dark font-display font-bold hover:-translate-y-1 hover:shadow-solid-dark dark:hover:shadow-solid-light transition-all">Post comment</button>
-  </form>
+
+    {% if comment_form.errors %}
+    <div aria-label="Comment form errors" class="mb-8 p-4 bg-red-500/10 border border-red-500/20 font-mono text-sm text-red-400">
+      <div class="font-bold mb-2 uppercase tracking-widest text-xs">There were some errors:</div>
+      <ul class="list-disc list-inside">
+        {% if comment_form.non_field_errors %}
+          {% for error in comment_form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+        {% endif %}
+        {% for field in comment_form %}
+          {% if field.errors %}
+            {% for error in field.errors %}<li>{{ field.label }}: {{ error }}</li>{% endfor %}
+          {% endif %}
+        {% endfor %}
+      </ul>
+    </div>
+    {% endif %}
+
+    <form method="post" action="{% url 'comment_post' %}" data-comment-form class="space-y-6"
+      hx-post="{% url 'comment_post' %}" hx-target="#comment-form-container" hx-swap="outerHTML">
+      {% csrf_token %}
+      <input type="hidden" name="article_id" value="{{ page.id }}" />
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+        <div class="space-y-2">
+          <label class="block font-mono text-[10px] uppercase tracking-[0.2em] opacity-60">Full Name</label>
+          <input type="text" name="author_name" value="{% if comment_form %}{{ comment_form.author_name.value|default:'' }}{% endif %}" required
+            class="w-full bg-white/5 dark:bg-black/5 border-b-2 border-white/20 dark:border-black/20 px-0 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink transition-colors" />
+        </div>
+        <div class="space-y-2">
+          <label class="block font-mono text-[10px] uppercase tracking-[0.2em] opacity-60">Email Address</label>
+          <input type="email" name="author_email" value="{% if comment_form %}{{ comment_form.author_email.value|default:'' }}{% endif %}" required
+            class="w-full bg-white/5 dark:bg-black/5 border-b-2 border-white/20 dark:border-black/20 px-0 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink transition-colors" />
+        </div>
+      </div>
+      <div class="space-y-2">
+        <label class="block font-mono text-[10px] uppercase tracking-[0.2em] opacity-60">Your Thoughts</label>
+        <textarea name="body" required rows="5"
+          class="w-full bg-white/5 dark:bg-black/5 border-b-2 border-white/20 dark:border-black/20 px-0 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink transition-colors resize-none">{% if comment_form %}{{ comment_form.body.value|default:'' }}{% endif %}</textarea>
+      </div>
+      <input type="text" name="honeypot" hidden />
+      
+      {% if turnstile_site_key %}
+      <div class="cf-turnstile" data-sitekey="{{ turnstile_site_key }}" data-theme="auto"></div>
+      {% endif %}
+
+      <div class="pt-4">
+        <button type="submit" class="group relative inline-flex items-center gap-3 px-8 py-4 bg-brand-pink text-white font-display font-bold uppercase tracking-widest text-sm hover:-translate-y-1 transition-all active:translate-y-0">
+          <span>Post comment</span>
+          <svg class="w-4 h-4 transition-transform group-hover:translate-x-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 5l7 7m0 0l-7 7m7-7H3" />
+          </svg>
+        </button>
+      </div>
+    </form>
+  </div>
 </div>
diff --git a/templates/comments/_comment_list.html b/templates/comments/_comment_list.html
index 64947e3..14dc428 100644
--- a/templates/comments/_comment_list.html
+++ b/templates/comments/_comment_list.html
@@ -1,4 +1,4 @@
-<div id="comments-list" class="space-y-8 mb-12"
+<div id="comments-list" class="space-y-12 mb-16"
   hx-get="{% url 'comment_poll' article_id=page.id %}" hx-trigger="every 30s" hx-swap="innerHTML">
   {% for comment in approved_comments %}
     {% include "comments/_comment.html" with comment=comment page=page %}
diff --git a/templates/comments/_reply.html b/templates/comments/_reply.html
index 4cf4920..8799cb6 100644
--- a/templates/comments/_reply.html
+++ b/templates/comments/_reply.html
@@ -1,10 +1,14 @@
-<article id="comment-{{ comment.id }}" class="mt-6 ml-8 bg-zinc-50 dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-800 border-l-2 border-l-brand-cyan p-4">
-  <div class="flex items-center gap-3 mb-2">
-    <div class="w-7 h-7 bg-gradient-to-tr from-brand-pink to-brand-cyan shrink-0"></div>
-    <div>
-      <div class="font-display font-bold text-sm">{{ comment.author_name }}</div>
-      <div class="font-mono text-xs text-zinc-500">{{ comment.created_at|date:"M j, Y" }}</div>
+<article id="comment-{{ reply.id }}" class="bg-zinc-50/50 dark:bg-zinc-900/30 border border-zinc-100 dark:border-zinc-800 p-5 sm:p-6">
+  <div class="flex items-start gap-3 mb-3">
+    <div class="w-8 h-8 bg-gradient-to-tr from-brand-pink to-brand-cyan shrink-0 rounded-sm"></div>
+    <div class="flex-1 min-w-0">
+      <div class="flex flex-wrap items-baseline gap-x-2">
+        <span class="font-display font-bold text-sm text-zinc-900 dark:text-zinc-100">{{ reply.author_name }}</span>
+        <time datetime="{{ reply.created_at|date:'c' }}" class="font-mono text-[10px] text-zinc-400 uppercase tracking-wider">{{ reply.created_at|date:"M j, Y" }}</time>
+      </div>
+      <div class="mt-2 prose prose-sm dark:prose-invert max-w-none text-zinc-600 dark:text-zinc-400 leading-relaxed text-sm">
+        {{ reply.body|linebreaks }}
+      </div>
     </div>
   </div>
-  <p class="text-zinc-700 dark:text-zinc-300 text-sm leading-relaxed">{{ comment.body }}</p>
 </article>
diff --git a/templates/comments/_reply_form.html b/templates/comments/_reply_form.html
index 9294503..f11a2fa 100644
--- a/templates/comments/_reply_form.html
+++ b/templates/comments/_reply_form.html
@@ -1,30 +1,46 @@
 {% load static %}
-<div id="reply-form-container-{{ comment.id }}" class="mt-4 pt-4 border-t border-zinc-100 dark:border-zinc-800">
+<div id="reply-form-container-{{ comment.id }}">
+  <h4 class="font-display font-bold text-sm mb-4 uppercase tracking-wider">Reply to {{ comment.author_name }}</h4>
+  
   {% if reply_success_message %}
-  <div class="mb-3 p-2 font-mono text-sm bg-brand-cyan/10 text-brand-cyan border border-brand-cyan/20">{{ reply_success_message }}</div>
-  {% endif %}
-  {% if reply_form_errors %}
-  <div aria-label="Comment form errors" class="mb-3 p-2 font-mono text-sm bg-red-50 dark:bg-red-900/20 text-red-600 dark:text-red-400 border border-red-200 dark:border-red-800">
-    {% for field, errors in reply_form_errors.items %}{% for error in errors %}<p>{{ error }}</p>{% endfor %}{% endfor %}
+  <div class="mb-6 p-4 bg-brand-cyan/10 border border-brand-cyan/20 font-mono text-sm text-brand-cyan animate-in fade-in">
+    {{ reply_success_message }}
   </div>
   {% endif %}
+
+  {% if reply_form_errors %}
+  <div aria-label="Comment form errors" class="mb-6 p-4 bg-red-500/10 border border-red-500/20 font-mono text-sm text-red-400 animate-in shake-1">
+    <div class="font-bold mb-2 uppercase tracking-widest text-xs">Errors:</div>
+    <ul class="list-disc list-inside">
+      {% for field, errors in reply_form_errors.items %}
+        {% for error in errors %}<li>{{ error }}</li>{% endfor %}
+      {% endfor %}
+    </ul>
+  </div>
+  {% endif %}
+
   <form method="post" action="{% url 'comment_post' %}"
-    hx-post="{% url 'comment_post' %}" hx-target="#reply-form-container-{{ comment.id }}" hx-swap="outerHTML">
+    hx-post="{% url 'comment_post' %}" hx-target="#reply-form-container-{{ comment.id }}" hx-swap="outerHTML"
+    class="space-y-4">
     {% csrf_token %}
     <input type="hidden" name="article_id" value="{{ page.id }}" />
     <input type="hidden" name="parent_id" value="{{ comment.id }}" />
-    <div class="flex gap-3 mb-3">
-      <input type="text" name="author_name" required placeholder="Your name"
-        class="flex-1 bg-transparent border border-zinc-300 dark:border-zinc-700 px-3 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:shadow-neon-pink transition-colors" />
-      <input type="email" name="author_email" required placeholder="your@email.com"
-        class="flex-1 bg-transparent border border-zinc-300 dark:border-zinc-700 px-3 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:shadow-neon-pink transition-colors" />
+    <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+      <input type="text" name="author_name" required placeholder="Name *"
+        class="bg-zinc-50 dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-800 px-4 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:ring-1 focus:ring-brand-pink transition-all" />
+      <input type="email" name="author_email" required placeholder="Email *"
+        class="bg-zinc-50 dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-800 px-4 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:ring-1 focus:ring-brand-pink transition-all" />
     </div>
-    <textarea name="body" required placeholder="Write a reply..." rows="2"
-      class="w-full bg-transparent border border-zinc-300 dark:border-zinc-700 px-3 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:shadow-neon-pink transition-colors mb-3 resize-none"></textarea>
+    <textarea name="body" required placeholder="Your reply..." rows="3"
+      class="w-full bg-zinc-50 dark:bg-zinc-900 border border-zinc-200 dark:border-zinc-800 px-4 py-2 font-mono text-sm focus:outline-none focus:border-brand-pink focus:ring-1 focus:ring-brand-pink transition-all resize-none"></textarea>
     <input type="text" name="honeypot" hidden />
+    
     {% if turnstile_site_key %}
-    <div class="cf-turnstile mb-3" data-sitekey="{{ turnstile_site_key }}" data-theme="auto" data-size="compact"></div>
+    <div class="cf-turnstile mb-4" data-sitekey="{{ turnstile_site_key }}" data-theme="auto" data-size="flexible"></div>
     {% endif %}
-    <button type="submit" class="px-4 py-2 bg-zinc-200 dark:bg-zinc-800 font-display font-bold text-sm hover:bg-brand-pink hover:text-white transition-colors">Reply</button>
+
+    <div class="flex justify-end gap-3">
+      <button type="submit" data-testid="post-reply-btn" class="px-6 py-2 bg-brand-pink text-white font-display font-bold text-sm shadow-solid-dark hover:-translate-y-0.5 hover:shadow-solid-dark/80 transition-all active:translate-y-0">Post Reply</button>
+    </div>
   </form>
 </div>