diff --git a/templates/administrative/feedback/modal_info.html.twig b/templates/administrative/feedback/modal_info.html.twig
index 4226d50..4a2c127 100644
--- a/templates/administrative/feedback/modal_info.html.twig
+++ b/templates/administrative/feedback/modal_info.html.twig
@@ -3,23 +3,35 @@
 {% block title %}Feedback zu {{ feedback.teamer }}{% endblock %}
 
 {% block content %}
-    <div class="text-lg pb-4">
-        Einsatz: {{ feedback.destinationName }}
-        <br>
-        Einsatzzeitraum: {{ feedback.assignmentDateFrom|date('d.m.Y') }} - {{ feedback.assignmentDateTo|date('d.m.Y') }}
-        <br>
-        Feedback von: {{ feedback.author }}
+    <div class="flex flex-col space-y-4">
+        <div class="text-lg">
+            Einsatz: {{ feedback.destinationName }}
+            <br>
+            Einsatzzeitraum: {{ feedback.assignmentDateFrom|date('d.m.Y') }} - {{ feedback.assignmentDateTo|date('d.m.Y') }}
+            <br>
+            Feedback von: {{ feedback.author }}
+        </div>
+        <table>
+            {% for entry in feedback.ratings %}
+                <tr>
+                    <td class="border-r border-gray-300">
+                        {{ entry.rating }}
+                    </td>
+                    <td class="text-center">
+                        <twig:RatingStars rating="{{ entry.mark * 100 }}"/>
+                    </td>
+                </tr>
+            {% endfor %}
+        </table>
+        {% if feedback.comment %}
+            <div>
+                <strong>Kommentar (öffentlich):</strong> {{ feedback.comment | nl2br }}
+            </div>
+        {% endif %}
+        {% if feedback.commentInternal %}
+            <div>
+                <strong>Kommentar (intern):</strong> {{ feedback.commentInternal | nl2br }}
+            </div>
+        {% endif %}
     </div>
-    <table>
-        {% for entry in feedback.ratings %}
-            <tr>
-                <td class="border-r border-gray-300">
-                    {{ entry.rating }}
-                </td>
-                <td class="text-center">
-                    <twig:RatingStars rating="{{ entry.mark * 100 }}"/>
-                </td>
-            </tr>
-        {% endfor %}
-    </table>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/teamer/feedback/modal.html.twig b/templates/teamer/feedback/modal.html.twig
index 4226d50..30a198f 100644
--- a/templates/teamer/feedback/modal.html.twig
+++ b/templates/teamer/feedback/modal.html.twig
@@ -3,23 +3,30 @@
 {% block title %}Feedback zu {{ feedback.teamer }}{% endblock %}
 
 {% block content %}
-    <div class="text-lg pb-4">
-        Einsatz: {{ feedback.destinationName }}
-        <br>
-        Einsatzzeitraum: {{ feedback.assignmentDateFrom|date('d.m.Y') }} - {{ feedback.assignmentDateTo|date('d.m.Y') }}
-        <br>
-        Feedback von: {{ feedback.author }}
+    <div class="flex flex-col space-y-4">
+        <div class="text-lg">
+            Einsatz: {{ feedback.destinationName }}
+            <br>
+            Einsatzzeitraum: {{ feedback.assignmentDateFrom|date('d.m.Y') }} - {{ feedback.assignmentDateTo|date('d.m.Y') }}
+            <br>
+            Feedback von: {{ feedback.author }}
+        </div>
+        <table>
+            {% for entry in feedback.ratings %}
+                <tr>
+                    <td class="border-r border-gray-300">
+                        {{ entry.rating }}
+                    </td>
+                    <td class="text-center">
+                        <twig:RatingStars rating="{{ entry.mark * 100 }}"/>
+                    </td>
+                </tr>
+            {% endfor %}
+        </table>
+        {% if feedback.comment %}
+            <div>
+                <strong>Kommentar:</strong> {{ feedback.comment | nl2br }}
+            </div>
+        {% endif %}
     </div>
-    <table>
-        {% for entry in feedback.ratings %}
-            <tr>
-                <td class="border-r border-gray-300">
-                    {{ entry.rating }}
-                </td>
-                <td class="text-center">
-                    <twig:RatingStars rating="{{ entry.mark * 100 }}"/>
-                </td>
-            </tr>
-        {% endfor %}
-    </table>
 {% endblock %}
\ No newline at end of file