diff --git a/media/default.css b/media/default.css
index 3b9a9c8..3130646 100644
--- a/media/default.css
+++ b/media/default.css
@@ -116,9 +116,6 @@ table.diff tr.annotation td {
     width: 90%;
     height: 3em;
 }
-.comment-buttons {
-    text-align: right;
-}
 .comment .header {
     font-weight: bold;
 }
diff --git a/templates/components/comment.html b/templates/components/comment.html
index 145511b..2b0ad19 100644
--- a/templates/components/comment.html
+++ b/templates/components/comment.html
@@ -5,6 +5,9 @@
     <div class="text ui-widget-content">
         {{ comment.text|linebreaks }}
     </div>
+    <div class="comment-buttons">
+        <a class="button" href="#comment-{{ comment.pk }}" rel="respond">Reply</a>
+    </div>
 </div>
 {% for response in comment.response_set.all %}
     <div class="comment response ui-widget">
@@ -16,6 +19,3 @@
         </div>
     </div>
 {% endfor %}
-<div class="comment-buttons">
-    <a class="button" href="#comment-{{ comment.pk }}" rel="respond">Reply</a>
-</div>
diff --git a/templates/review/edit.html b/templates/review/edit.html
index 96fefb1..ec3317c 100644
--- a/templates/review/edit.html
+++ b/templates/review/edit.html
@@ -47,7 +47,7 @@
                         $('<tr class="comment-form" id="' + form_id + '" ></tr>')
                         .append($('<td colspan="3"></td>').append(form))
                     );
-                    updateButtons();
+                    styleButtons();
                 }
             });
             updateButtons();
@@ -79,8 +79,8 @@
                     });
                     return false;
                 });
-                $(this).parent().before($('<div class="comment-form"></div>').append(form));
-                updateButtons();
+                $(this).parents('.comment').parent().append($('<div class="comment-form"></div>').append(form));
+                styleButtons();
             }
         });
         styleButtons();