diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/form-comment.html b/src/fellchensammlung/templates/fellchensammlung/forms/form-comment.html
index c21268c..18aab53 100644
--- a/src/fellchensammlung/templates/fellchensammlung/forms/form-comment.html
+++ b/src/fellchensammlung/templates/fellchensammlung/forms/form-comment.html
@@ -1,19 +1,13 @@
 {% load i18n %}
+{% load widget_tweaks %}
 
-<div class="card">
-    <div class="card-header">
-        <div class="card-header-title">
-            {% blocktrans %}
-                Als {{ user }} kommentieren
-            {% endblocktrans %}
-        </div>
+<form method="POST">
+    {% csrf_token %}
+    <input type="hidden" name="action" value="comment">
+    <div class="field">
+        {{ comment_form.text |add_class:"input textarea"|attr:"rows:3"|attr:"placeholder:Neuer Kommentar" }}
     </div>
-    <div class="card-content">
-        <form method="POST">
-            {% csrf_token %}
-            <input type="hidden" name="action" value="comment">
-            {{ comment_form }}
-            <input type="submit" class="button is-primary" value="{% trans 'Kommentieren' %}">
-        </form>
+    <div class="control">
+        <input type="submit" class="button is-primary" value="{% trans 'Kommentieren' %}">
     </div>
-</div>
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
index a1cd704..62b2b13 100644
--- a/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
+++ b/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
@@ -12,14 +12,13 @@
         {% else %}
             <p class="is-italic">{% translate 'Noch keine Kommentare' %}</p>
         {% endif %}
+        {% if user.is_authenticated %}
+            <hr>
+            {% include "fellchensammlung/forms/form-comment.html" %}
+        {% else %}
+            <div class="card-footer-item">
+                {% translate 'Du musst dich einloggen um Kommentare zu hinterlassen' %}
+            </div>
+        {% endif %}
     </div>
-</div>
-<div class="block">
-    {% if user.is_authenticated %}
-        {% include "fellchensammlung/forms/form-comment.html" %}
-    {% else %}
-        <p class="card-footer-item">
-            {% translate 'Du musst dich einloggen um Kommentare zu hinterlassen' %}
-        </p>
-    {% endif %}
 </div>
\ No newline at end of file