diff --git a/src/fellchensammlung/forms.py b/src/fellchensammlung/forms.py
index 839187a..84c8668 100644
--- a/src/fellchensammlung/forms.py
+++ b/src/fellchensammlung/forms.py
@@ -164,7 +164,7 @@ class CommentForm(forms.ModelForm):
         self.helper = FormHelper()
         self.helper.form_class = 'form-comments'
         self.helper.add_input(Hidden('action', 'comment'))
-        self.helper.add_input(Submit('submit', _('Kommentieren'), css_class="btn2"))
+        self.helper.add_input(Submit('submit', _('Kommentieren'), css_class="button is-primary"))
 
     class Meta:
         model = Comment
diff --git a/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html b/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html
index 0300a86..76f9433 100644
--- a/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html
+++ b/src/fellchensammlung/templates/fellchensammlung/details/bulma-detail-adoption-notice.html
@@ -126,6 +126,6 @@
         {% endfor %}
     </div>
 
-    {% include "fellchensammlung/partials/partial-comment-section.html" %}
+    {% include "fellchensammlung/partials/bulma-partial-comment-section.html" %}
 
 {% endblock %}
diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-comment.html b/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-comment.html
new file mode 100644
index 0000000..a62f6f8
--- /dev/null
+++ b/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-comment.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+<div class="card">
+    <div class="card-header">
+        <div class="card-header-title">
+            {% blocktrans %}
+                Als {{ user }} kommentieren
+            {% endblocktrans %}
+        </div>
+    </div>
+    <div class="card-content">
+        {% crispy comment_form %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment-section.html b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment-section.html
new file mode 100644
index 0000000..a855e97
--- /dev/null
+++ b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-comment-section.html
@@ -0,0 +1,25 @@
+{% load i18n %}
+
+<div class="card">
+    <div class="card-header">
+        <h2 class="card-header-title title is-2">{% translate 'Kommentare' %}</h2>
+    </div>
+    <div class="card-content">
+        {% if adoption_notice.comments %}
+            {% for comment in adoption_notice.comments %}
+                {% include "fellchensammlung/partials/partial-comment.html" %}
+            {% endfor %}
+        {% else %}
+            <p class="is-italic">{% translate 'Noch keine Kommentare' %}</p>
+        {% endif %}
+    </div>
+    <footer class="card-footer">
+        {% if user.is_authenticated %}
+            {% include "fellchensammlung/forms/bulma-form-comment.html" %}
+        {% else %}
+            <p class="card-footer-item">
+                {% translate 'Du musst dich einloggen um Kommentare zu hinterlassen' %}
+            </p>
+        {% endif %}
+    </footer>
+</div>
\ No newline at end of file