diff --git a/agaric/templates/field/field--comment.html.twig b/agaric/templates/field/field--comment.html.twig
index 6666c9c..76754d7 100644
--- a/agaric/templates/field/field--comment.html.twig
+++ b/agaric/templates/field/field--comment.html.twig
@@ -39,7 +39,7 @@
     </div>
   {% endif %}
   {% if comment_form %}
-    <div class="titlebar_links">
+    <div class="titlebar_links content">
       {% if comments %}
         <a href="#comment-form">Add new comment</a>
       {% else %}
@@ -55,12 +55,14 @@
   {% endif %}
 
   {% if comment_form %}
+  <div class="media media-comment">
     <div class="flow content">
       <div class="flow_middle">
         <h3 class="subtitle" id="comment-form">{{ 'Add new comment'|t }}</h3>
         {{ comment_form }}
       </div>
     </div>
+  </div>
   {% endif %}
   </div>