diff --git a/tasks/guestBook/components/comment.php b/tasks/guestBook/components/comment.php
index 68db2d9..176abb8 100644
--- a/tasks/guestBook/components/comment.php
+++ b/tasks/guestBook/components/comment.php
@@ -1,11 +1,11 @@
 <div class="col">
-  <div class="card h-100">
+  <div class="card h-100 shadow-sm">
     <div class="card-header">
-      <h5 class="card-title lh-base text-truncate"><?= $comment->title ?></h5>
-      <h6 class="card-subtitle mb-2 text-muted"><?= $comment->name ?></h6>
+      <h5 class="card-title lh-base text-truncate"><?= htmlspecialchars($comment->title) ?></h5>
+      <h6 class="card-subtitle mb-2 text-muted"><?= htmlspecialchars($comment->name) ?></h6>
     </div>
     <div class="card-body">
-      <p class="card-text"><?= $comment->comment ?></p>
+      <p class="card-text"><?= nl2br(htmlspecialchars($comment->comment)) ?></p>
     </div>
     <div class="card-footer">
       <small class="text-muted">
diff --git a/tasks/guestBook/components/newComment.php b/tasks/guestBook/components/newComment.php
index 52e5e90..2656c27 100644
--- a/tasks/guestBook/components/newComment.php
+++ b/tasks/guestBook/components/newComment.php
@@ -1,5 +1,5 @@
 <form action="./actions/comment.php" method="post" class="needs-validation row m-0" novalidate>
-  <div class="col">
+  <div class="col m-0 g-3">
     <h4 class="mb-3">Leave a Comment!</h4>
     <div class="mb-3">
       <input class="form-control" type="text" name="title" required placeholder="A catching title" />
@@ -19,7 +19,7 @@
         Please enter text.
       </div>
     </div>
-    <div class="progress mb-3">
+    <div class="progress mb-2">
       <div class="progress-bar" id="comment-count" style="width: 0;"></div>
     </div>
     <button type="submit" class="btn btn-primary mb-3">Comment</button>
diff --git a/tasks/guestBook/data/data.json b/tasks/guestBook/data/data.json
index 1095930..cedb69b 100644
--- a/tasks/guestBook/data/data.json
+++ b/tasks/guestBook/data/data.json
@@ -1 +1 @@
-[{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715338381,"title":"sdf","name":"dsaf","comment":"dsg"},{"time":1715339761,"title":"Witzige Aufgabe","name":"Kilian","comment":"nun ja, also das funktioniert ja schon recht gut gell."},{"time":1716539658,"title":"Progress Bar","name":"Kilian","comment":"Jetzt auch mit einem etwas geileren Progress Bar der einem die Character-Anzahl anzeigt.\r\nWesentlich geiler, wesentlich nicer, und Bootstraped"},{"time":1716541941,"title":"New layout","name":"Kilian","comment":"New folder structure"}]
\ No newline at end of file
+[{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715338381,"title":"sdf","name":"dsaf","comment":"dsg"},{"time":1715339761,"title":"Witzige Aufgabe","name":"Kilian","comment":"nun ja, also das funktioniert ja schon recht gut gell."},{"time":1716539658,"title":"Progress Bar","name":"Kilian","comment":"Jetzt auch mit einem etwas geileren Progress Bar der einem die Character-Anzahl anzeigt.\r\nWesentlich geiler, wesentlich nicer, und Bootstraped"},{"time":1716541941,"title":"New layout","name":"Kilian","comment":"New folder structure"},{"time":1716545229,"title":"More consistent padding","name":"Kilian","comment":"More unified padding across the sections of the page"},{"time":1716545296,"title":"Inject","name":"Kilian","comment":"<?php echo \"injection time!\" ?>"},{"time":1716546110,"title":"JS Inject","name":"Kilian","comment":"<script>\r\nconsole.log(\"BAD\");\r\n<\/script\/>"}]
\ No newline at end of file