diff --git a/app/views/shared/_comments.html.haml b/app/views/shared/_comments.html.haml
index 56100bcf..1b36752d 100644
--- a/app/views/shared/_comments.html.haml
+++ b/app/views/shared/_comments.html.haml
@@ -4,7 +4,27 @@
   %ul.comments
     - a.comments.all.each do |comment|
       %li{data: { comment_id: comment.id }}
-        %img.img-rounded.answerbox--img-small{src: gravatar_url(comment.user)}
+        .media
+          .pull-left
+            %img.img-rounded.answerbox--img{src: gravatar_url(comment.user)}
+          .media-body
+            %h6.media-heading.answerbox--question-user= user_screen_name comment.user
+            %p= comment.content
+          - if user_signed_in?
+            .pull-right
+              %btn-group
+                %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
+                  %span.caret
+                %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+                  - if privileged? a.user
+                    %li.text-danger
+                      %a{href: '#', name: 'ab-destroy', data: { a_id: comment.id }}
+                        %i.fa.fa-trash-o
+                        Delete
+                  %li
+                    %a{href: '#', name: 'ab-report', data: { a_id: comment.id }}
+                      %i.fa.fa-exclamation-triangle
+                      Report
         %b= user_screen_name comment.user
         = comment.content
 - if user_signed_in?