diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 9b52e51db..734a4bfe6 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1626,6 +1626,10 @@ table {
         .divider {
           color: $text-light;
         }
+
+        form {
+          margin-top: $line-height/2;
+        }
       }
 
       .comment-user {
@@ -1655,13 +1659,13 @@ table {
 
     .is-deleted {
       background: #E7E7E7;
-      margin-left: rem-calc(42);
-      padding: $line-height/4 $line-height/2;
+      margin-left: $line-height;
+      padding: $line-height/2;
     }
 
     .comment-children {
       border-left: 1px dashed $border;
-      margin-left: rem-calc(42);
+      margin-left: $line-height;
       padding-left: $line-height/4;
 
       @media only screen and (max-width: 40em) {
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index f215068ca..0acce8bd5 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -91,8 +91,8 @@
               <%= render 'comments/form', {commentable: comment.commentable, parent_id: comment.id, toggeable: true} %>
             <% end %>
           </div>
-        </li>
-      <% end %>
+        <% end %>
+      </li>
       <li>
         <ul id="<%= dom_id(comment) %>_children" class="no-bullet comment-children">
           <% child_comments_of(comment).each do |child| %>