diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa5f63f..e3dad8d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,9 +21,11 @@
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/service/KlausServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/css/main.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/main.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -313,7 +315,8 @@
       <workItem from="1612279535476" duration="5692000" />
       <workItem from="1612442837870" duration="8318000" />
       <workItem from="1612609113694" duration="13936000" />
-      <workItem from="1612777983977" duration="12996000" />
+      <workItem from="1612777983977" duration="14203000" />
+      <workItem from="1612868404302" duration="3619000" />
     </task>
     <task id="LOCAL-00077" summary="testing jenkins docker">
       <created>1601453886631</created>
diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java
index b2c0fef..ce2f77f 100644
--- a/src/main/java/com/release11/klaus/controller/MockController.java
+++ b/src/main/java/com/release11/klaus/controller/MockController.java
@@ -20,21 +20,8 @@ import java.util.*;
 @AllArgsConstructor
 public class MockController {
     private final KlausService klausService;
-    //TODO: Write a method
     private final MockedMessageDto defaultMessage = MockedMessageDto.builder().build();
 
-
-    /*
-        1. GET request to get the page
-        2. Javascripts checks for cookies if not it sends empty UUID on GetMapping /mock/json
-        3. When Javascript:
-        - 1. Saves: PUT request, then GET request
-        - 2. Deletes: DELETE request, then GET request
-        - 3. Adds new message: POST request, then GET request
-        4. After each action cookie is updated
-        Cookie holds uuid, last displayed message
-     */
-    //TODO: Add cookie in javascript
     /**
      * Responds to first user request. If UUID is given then it's set if it's not, then new one is generated.
      * Next recalls method that populates model based on UUID
@@ -77,6 +64,17 @@ public class MockController {
         return klausService.setMockedResponse(nextMessage);
     }
 
+    @ResponseBody
+    @DeleteMapping("/mock/json/{uuidValue}/{idValue}")
+    public ResponseEntity<String> removeMessage(@PathVariable String uuidValue,
+                                                @PathVariable String idValue){
+        UUID clientUUID = UUID.fromString(uuidValue);
+        int id = Integer.parseInt(idValue);
+        return klausService.deleteMockedResponse(clientUUID, id);
+    }
+
+
+
     private static MockedMessageDto buildDefaultMessage(UUID uuid, int id){
         MockedMessageDto message = buildDefaultMessage(uuid);
         message.setMockedResponseId(id);
diff --git a/src/main/java/com/release11/klaus/service/KlausService.java b/src/main/java/com/release11/klaus/service/KlausService.java
index bf2f661..57499e8 100644
--- a/src/main/java/com/release11/klaus/service/KlausService.java
+++ b/src/main/java/com/release11/klaus/service/KlausService.java
@@ -9,7 +9,7 @@ import java.util.UUID;
 
 @Service
 public interface KlausService {
-    void deleteMockedResponse(UUID clientUUID, int mockedResponseId);
+    ResponseEntity<String> deleteMockedResponse(UUID clientUUID, int mockedResponseId);
     List<MockedMessageDto> getAllMockedResponses(UUID clientUUID);
     MockedMessageDto getMockedResponse(UUID clientUUID, int mockedResponseId);
     ResponseEntity<String> setMockedResponse(MockedMessageDto mockedMessageDto);
diff --git a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
index 132f6de..76950be 100644
--- a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
+++ b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
@@ -28,10 +28,12 @@ public class KlausServiceImpl implements KlausService {
     private final ObjectMapper objectMapper;
 
     @Override
-    public void deleteMockedResponse(UUID clientUUID, int mockedResponseId) {
+    public ResponseEntity<String> deleteMockedResponse(UUID clientUUID, int mockedResponseId) {
         String key = clientUUID.toString() + "_" + mockedResponseId;
         mockedResponseRepository.deleteById(key);
         log.info("Message " + mockedResponseId + " has been removed.");
+        return new ResponseEntity<>("MockedResponse has been removed successfully",
+                new HttpHeaders(), HttpStatus.ACCEPTED);
     }
 
     @Override
diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
index 9d71bfd..1e2385a 100644
--- a/src/main/resources/static/css/main.css
+++ b/src/main/resources/static/css/main.css
@@ -157,7 +157,8 @@
 }
 
 .menuItem {
-    width: 180px;
+    float: left;
+    width: 150px;
     padding: 10px;
     height: 42px;
     font-size: 14px;
@@ -180,7 +181,8 @@
 }
 
 .menuItemSelected {
-    width: 180px;
+    float: left;
+    width: 150px;
     padding: 10px;
     height: 42px;
     font-size: 14px;
@@ -192,6 +194,14 @@
     font-weight: 400;
 }
 
+.btn-del-MenuItem {
+    float: left;
+    font-size: 24px;
+    color: red;
+    text-align: center;
+
+}
+
 #headerTable {
     margin-top: 40px;
     margin-bottom: 20px;
diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index 3e7e234..51b2112 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -1,6 +1,3 @@
-//TODO: Add button to add new header
-//TODO: Update cookie when displayed message is changed
-//TODO: Add delete buttons for headers
 //TODO: Add delete buttons for messages
 var clientUUID;
 var json;
@@ -8,7 +5,6 @@ var jsonIndex = 0;
 var htable_row = 0;
 const C_UUID = 'mock-uuid';
 function getData(){
-    // sleep(5000);
     loadCookies();
     $.getJSON('http://localhost:8097/mock/json/'+clientUUID, function(data) {
         json = data;
@@ -76,6 +72,16 @@ function addMessage(){
     getData();
 }
 
+function removeTile(id){
+    var jsonObject = findJsonById(id);
+    $.ajax({
+        url: 'http://localhost:8097/mock/json/'+clientUUID + '/' + id,
+        type: 'DELETE',
+        success: getData(),
+    });
+    getData();
+}
+
 
 function clearMock(){
     fillStaticFields('','','','');
@@ -177,6 +183,17 @@ function fillMessageList(){
     $("#listItems").append(innerHTML);
 }
 
+
+//TODO: Implement methods where its possible
+function findJsonById(id){
+    return json[findJsonIndexById(id)];
+}
+
+function findJsonIndexById(id){
+    for(let i=0; i<json.length; i++)
+        if(id == json[i].mockedResponseId) return i;
+}
+
 function loadMessage(id){
     for(let i=0; i<json.length; i++){
         if(id == json[i].mockedResponseId){
@@ -209,14 +226,16 @@ function generateMessageTileHtml(id, httpStatus, mediaType){
     var innerHTML = '<div class="menuItem" id="item_' + id + '" onclick="loadMessage('+ id +')">' +
         '<table><tr><td>Id: '+ id +'</td></tr>' +
         '<tr><td>Http-status: '+ httpStatus +'</td></tr>' +
-        '</table></div>';
+        '</table></div><div class="btn-del-MenuItem" onclick="removeTile(' + id + ')">X</div>' +
+        '<div style="clear: both;"></div>';
     return innerHTML;
 }
 
+
+
 function onbuild(){
     getData();
     sleep(1000);
-    // $('#btn-save').bind('click', generateJson);
 }
 
 $(document).ready(onbuild());
@@ -243,7 +262,6 @@ function generateJson(){
     return newJson;
 }
 
-// $("table tr").eq(row).find("td").eq(i%2).append("<img src='"+dataJson[i].imagen+"' width='100'/>");
 
 function convertTableToJson(){
     var rows = $('.httpStatusValue');