diff --git a/Klaus.iml b/Klaus.iml
index b9413d4..223e11d 100644
--- a/Klaus.iml
+++ b/Klaus.iml
@@ -34,6 +34,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.1.RELEASE" level="project" />
diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
index 9141794..87f3276 100644
--- a/src/main/resources/static/css/main.css
+++ b/src/main/resources/static/css/main.css
@@ -202,6 +202,7 @@ label {
 
 /*TODO add style to general stylesheet. Gray if inactive red if hover*/
 .btn-del-MenuItem {
+    margin-left: -20px;
     float: left;
     font-size: 24px;
     color: lightgray;
@@ -244,6 +245,7 @@ label {
 
 /*TODO add to general styles. Gray if inactive green if hover*/
 .btn-table-add {
+    font-weight: 700;
     color: lightgray;
     cursor: pointer;
 }
diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html
index b8c41d3..3b54cdf 100644
--- a/src/main/resources/static/html/mock.html
+++ b/src/main/resources/static/html/mock.html
@@ -92,15 +92,22 @@
                     <div id="history" style="display:none;">
                         <div id="historyDisplay">
                             <div>
-                                <div><input type="text" name="dateFrom" id="historyFrom" placeholder="rrrr-mm-dd"/></div>
-                                <div><input type="text" name="dateTo" id="historyTo" placeholder="rrrr-mm-dd"/></div>
+                                <div>
+                                    <label for="historyFrom">From</label>
+                                    <input type="datetime" name="dateFrom" id="historyFrom"/>
+                                </div>
+                                <div>
+                                    <label for="historyTo">To</label>
+                                    <input type="datetime" name="dateTo" id="historyTo"/>
+                                </div>
+                                <button>Search</button>
                             </div>
                             <div>
                                 <table id="historyTable">
                                     <thead>
                                         <tr>
-                                            <td></td>
-                                            <td></td>
+                                            <td>Timestamp</td>
+                                            <td>Status</td>
                                         </tr>
                                     </thead>
                                     <tbody></tbody>
diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index 787bb56..b3dd6e8 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -260,7 +260,7 @@ function generateHeaderTable(headers){
                     '<input type="text" name="headerKey" placeholder="key" class="tableField textField-key" value="' + keys[i] + '"/></td>' +
                 '<td>' +
                     '<input type="text" name="headerValue" placeholder="value" class="tableField" value="' + values[i] + '"/></td>' +
-            '<td class="btn-function-table btn-table-remove" onclick="removeRow(' + htable_row + ')">X</td>' +
+            '<td class="btn-function-table btn-table-remove" onclick="removeRow(' + htable_row + ')">&times;</td>' +
             '</tr>';
         htable_row++;
     }
@@ -358,7 +358,7 @@ function generateMessageTileHtml(id, httpStatus, mediaType){
     var innerHTML = '<div class="menuItem" id="item_' + id + '" onclick="callLoadMessage('+ id +')">' +
         '<table><tr><td>Id: '+ id +'</td></tr>' +
         '<tr><td>Http-status: '+ httpStatus +'</td></tr>' +
-        '</table></div><div class="btn-del-MenuItem" onclick="callRemoveMessage(' + id + ')">X</div>' +
+        '</table></div><div class="btn-del-MenuItem" onclick="callRemoveMessage(' + id + ')">&times;</div>' +
         '<div style="clear: both;"></div>';
     return innerHTML;
 }
diff --git a/target/classes/static/css/main.css b/target/classes/static/css/main.css
index 9141794..87f3276 100644
--- a/target/classes/static/css/main.css
+++ b/target/classes/static/css/main.css
@@ -202,6 +202,7 @@ label {
 
 /*TODO add style to general stylesheet. Gray if inactive red if hover*/
 .btn-del-MenuItem {
+    margin-left: -20px;
     float: left;
     font-size: 24px;
     color: lightgray;
@@ -244,6 +245,7 @@ label {
 
 /*TODO add to general styles. Gray if inactive green if hover*/
 .btn-table-add {
+    font-weight: 700;
     color: lightgray;
     cursor: pointer;
 }
diff --git a/target/classes/static/html/mock.html b/target/classes/static/html/mock.html
index b8c41d3..3b54cdf 100644
--- a/target/classes/static/html/mock.html
+++ b/target/classes/static/html/mock.html
@@ -92,15 +92,22 @@
                     <div id="history" style="display:none;">
                         <div id="historyDisplay">
                             <div>
-                                <div><input type="text" name="dateFrom" id="historyFrom" placeholder="rrrr-mm-dd"/></div>
-                                <div><input type="text" name="dateTo" id="historyTo" placeholder="rrrr-mm-dd"/></div>
+                                <div>
+                                    <label for="historyFrom">From</label>
+                                    <input type="datetime" name="dateFrom" id="historyFrom"/>
+                                </div>
+                                <div>
+                                    <label for="historyTo">To</label>
+                                    <input type="datetime" name="dateTo" id="historyTo"/>
+                                </div>
+                                <button>Search</button>
                             </div>
                             <div>
                                 <table id="historyTable">
                                     <thead>
                                         <tr>
-                                            <td></td>
-                                            <td></td>
+                                            <td>Timestamp</td>
+                                            <td>Status</td>
                                         </tr>
                                     </thead>
                                     <tbody></tbody>
diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js
index 787bb56..b3dd6e8 100644
--- a/target/classes/static/js/datatransfer.js
+++ b/target/classes/static/js/datatransfer.js
@@ -260,7 +260,7 @@ function generateHeaderTable(headers){
                     '<input type="text" name="headerKey" placeholder="key" class="tableField textField-key" value="' + keys[i] + '"/></td>' +
                 '<td>' +
                     '<input type="text" name="headerValue" placeholder="value" class="tableField" value="' + values[i] + '"/></td>' +
-            '<td class="btn-function-table btn-table-remove" onclick="removeRow(' + htable_row + ')">X</td>' +
+            '<td class="btn-function-table btn-table-remove" onclick="removeRow(' + htable_row + ')">&times;</td>' +
             '</tr>';
         htable_row++;
     }
@@ -358,7 +358,7 @@ function generateMessageTileHtml(id, httpStatus, mediaType){
     var innerHTML = '<div class="menuItem" id="item_' + id + '" onclick="callLoadMessage('+ id +')">' +
         '<table><tr><td>Id: '+ id +'</td></tr>' +
         '<tr><td>Http-status: '+ httpStatus +'</td></tr>' +
-        '</table></div><div class="btn-del-MenuItem" onclick="callRemoveMessage(' + id + ')">X</div>' +
+        '</table></div><div class="btn-del-MenuItem" onclick="callRemoveMessage(' + id + ')">&times;</div>' +
         '<div style="clear: both;"></div>';
     return innerHTML;
 }
diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
index 7381712..207368f 100644
--- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
+++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2021-03-04T12:41:49+0100",
+    date = "2021-03-05T13:19:11+0100",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)"
 )
 @Component