diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee6a5d8..0ba2749 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v1.2.9
+## 13/05/2024
+
+1. [](#improved)
+    * Changed icon to ["text bubble"](https://fontawesome.com/icons/comment?f=classic&s=solid) in grav admin menu
+    * The "Load more" button under the "Comments in the last 7 days" table was fixed
+    * The styling of comments is improved
+1. [](#bugfix)
+    * Fix for escaping problem [#107](https://github.com/getgrav/grav-plugin-comments/issues/107)
+
 # v1.2.8
 ## 09/10/2020
 
diff --git a/admin/templates/comments.html.twig b/admin/templates/comments.html.twig
index 6fea510..0b853fb 100644
--- a/admin/templates/comments.html.twig
+++ b/admin/templates/comments.html.twig
@@ -5,7 +5,7 @@
 {% endif %}
 
 {% block titlebar %}
-    <h1><i class="fa fa-fw fa-file-text-o"></i> {{ "PLUGIN_COMMENTS.COMMENTS"|tu }}</h1>
+    <h1><i class="fa fa-fw fa-comment"></i> {{ "PLUGIN_COMMENTS.COMMENTS"|tu }}</h1>
 {% endblock %}
 
 {% block content %}
@@ -42,12 +42,13 @@
     </style>
 
     <script>
+        let totalRetrieved = 30;
         $(function() {
             var currentPage = 0;
 
             $(document).on('click tap', '.js__load-more', function(event) {
                $.getJSON(window.location + '/page:' + (currentPage + 1))
-                .success(function(response) {
+                .done(function(response) {
                     currentPage = parseInt(response.page);
 
                     response.comments.forEach(function(comment) {
@@ -59,7 +60,7 @@
                             '</tr>');
                     })
 
-                    var totalRetrieved = response.totalRetrieved * (parseInt(response.page) + 1);
+                    totalRetrieved += response.comments.length;
 
                     $('.totalRetrieved').html(totalRetrieved);
                     $('.totalAvailable').html(response.totalAvailable);
@@ -68,7 +69,7 @@
                         $('.js__load-more').hide();
                     }
                 })
-                .error(function() {
+                .fail(function() {
                     alert('Unexpected error');
                 });
             });
@@ -88,7 +89,7 @@
                 {% for comment in grav.twig.comments.comments %}
                     <tr>
                         <td class="author">{{comment.author}}</td>
-                        <td class="comment">{{comment.text}}</td>
+                        <td class="comment">{{comment.text|raw}}</td>
                         <td class="details"><strong>Page</strong>: {{comment.pageTitle}}<br>
                         <strong>Date</strong>: {{comment.date}}</td>
                     </tr>
diff --git a/comments.php b/comments.php
index f7f44eb..522d089 100644
--- a/comments.php
+++ b/comments.php
@@ -200,11 +200,11 @@ public function onFormProcessed(Event $event)
 
                 $path = $this->grav['uri']->path();
 
-                $lang = filter_var(urldecode($post['lang']), FILTER_SANITIZE_STRING);
-                $text = filter_var(urldecode($post['text']), FILTER_SANITIZE_STRING);
-                $name = filter_var(urldecode($post['name']), FILTER_SANITIZE_STRING);
-                $email = filter_var(urldecode($post['email']), FILTER_SANITIZE_STRING);
-                $title = filter_var(urldecode($post['title']), FILTER_SANITIZE_STRING);
+                $lang = htmlspecialchars(urldecode($post['lang']), ENT_QUOTES);
+                $text = htmlspecialchars(urldecode($post['text']), ENT_QUOTES);
+                $name = htmlspecialchars(urldecode($post['name']), ENT_QUOTES);
+                $email = filter_var(urldecode($post['email']), FILTER_SANITIZE_EMAIL);
+                $title = htmlspecialchars(urldecode($post['title']), ENT_QUOTES);
 
                 if (isset($this->grav['user'])) {
                     $user = $this->grav['user'];
@@ -361,6 +361,17 @@ private function fetchComments() {
         $comments = isset($data['comments']) ? $data['comments'] : null;
         //save to cache if enabled
         $cache->save($this->comments_cache_id, $comments);
+
+        $pattern = '/\r\n/i';
+        $replacement = '<br>';
+
+        // Iterate through each element of the array and apply preg_replace
+        if ($comments != null) {
+            foreach ($comments as &$value) {
+                $value = preg_replace($pattern, $replacement, $value);
+            }
+        }
+    
         return $comments;
     }
 
@@ -422,7 +433,7 @@ public function onTwigAdminTemplatePaths()
      */
     public function onAdminMenu()
     {
-        $this->grav['twig']->plugins_hooked_nav['PLUGIN_COMMENTS.COMMENTS'] = ['route' => $this->route, 'icon' => 'fa-file-text'];
+        $this->grav['twig']->plugins_hooked_nav['PLUGIN_COMMENTS.COMMENTS'] = ['route' => $this->route, 'icon' => 'fa-comment'];
     }
 
     /**
diff --git a/templates/partials/comments.html.twig b/templates/partials/comments.html.twig
index b1ff904..5ba91e2 100644
--- a/templates/partials/comments.html.twig
+++ b/templates/partials/comments.html.twig
@@ -1,6 +1,19 @@
 {% if enable_comments_plugin %}
     {% set scope = scope ?: 'data.' %}
 
+    <style>
+        table {
+            border-collapse:separate;
+            border-spacing: 0 10px;
+        }
+
+        td {
+            padding: 10px;
+            border: solid 1px #caced7;
+            border-radius: 5px;
+        }
+    </style>
+
     <h3>{{'PLUGIN_COMMENTS.ADD_COMMENT'|t}}</h3>
 
     <form name="{{ grav.config.plugins.comments.form.name }}"
@@ -29,6 +42,8 @@
             {% endif %}
         {% endfor %}
         {% include "forms/fields/formname/formname.html.twig" %}
+    
+        <br />
 
         <div class="buttons">
         {% for button in grav.config.plugins.comments.form.buttons %}
@@ -49,9 +64,10 @@
             {% for comment in comments|array_reverse %}
             <tr>
                 <td>
-                    {{comment.text}}
+                    {{comment.text|raw}}
+                    <br />
                     <br />
-                    {{'PLUGIN_COMMENTS.WRITTEN_ON'|t}} {{comment.date|e}} {{'PLUGIN_COMMENTS.BY'|t}} {{comment.author}}
+                    <small>{{'PLUGIN_COMMENTS.WRITTEN_ON'|t}} {{comment.date|e}} {{'PLUGIN_COMMENTS.BY'|t}} {{comment.author}}</small>
                 </td>
             </tr>
             {% endfor %}