diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6a0a17a..6e1e9b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,8 +20,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/resources/static/js/historyloader.js" 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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/EventController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/EventController.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/static/js/uianimation.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/uianimation.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" />
@@ -313,7 +316,7 @@
       <workItem from="1612442837870" duration="8318000" />
       <workItem from="1612609113694" duration="13936000" />
       <workItem from="1612777983977" duration="14203000" />
-      <workItem from="1612868404302" duration="6451000" />
+      <workItem from="1612868404302" duration="13841000" />
     </task>
     <task id="LOCAL-00077" summary="testing jenkins docker">
       <created>1601453886631</created>
diff --git a/src/main/java/com/release11/klaus/controller/EventController.java b/src/main/java/com/release11/klaus/controller/EventController.java
index 4616795..c573843 100644
--- a/src/main/java/com/release11/klaus/controller/EventController.java
+++ b/src/main/java/com/release11/klaus/controller/EventController.java
@@ -31,6 +31,7 @@ public class EventController {
     private final EtrackService etrackService;
     private final List<Event> eventList = new LinkedList<>();
 
+
     @GetMapping("/etrack/{uuid}")
     public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model,
                              BindingResult bindingResult){
diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
index 1e2385a..9899efb 100644
--- a/src/main/resources/static/css/main.css
+++ b/src/main/resources/static/css/main.css
@@ -199,7 +199,11 @@
     font-size: 24px;
     color: red;
     text-align: center;
+    cursor: pointer;
+}
 
+.btn-del-MenuItem:hover {
+    color: indianred;
 }
 
 #headerTable {
@@ -238,9 +242,20 @@
 
 .btn-table-add {
     color: green;
+    cursor: pointer;
 }
 
+.btn-table-add:hover {
+    color:lightgreen;
+}
+
+
 .btn-table-remove {
     color: red;
+    cursor: pointer;
+}
+
+.btn-table-remove:hover {
+    color:indianred;
 }
 
diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index 51b2112..40bd5b3 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -109,7 +109,7 @@ function fillStaticFields(uuid, id, mediaType, body, httpStatus){
 }
 
 function createLink(uuid, id){
-    var link = 'http://localhost:8097/klaus/v1/'+uuid+'/'+id;
+    var link = 'http://localhost:8097/klaus/v1/get/'+uuid+'/'+id;
     return link;
 }
 
diff --git a/src/main/resources/static/js/uianimation.js b/src/main/resources/static/js/uianimation.js
index 15dcc6c..bbeadd3 100644
--- a/src/main/resources/static/js/uianimation.js
+++ b/src/main/resources/static/js/uianimation.js
@@ -27,5 +27,29 @@ function createMessageTab() {
 
 $("#optional").click(changeAdvancedVisibility);
 $(".menuFactory").click(createMessageTab);
+$('#historyTab').click(showHistory);
+
+function showHistory(){
+    $('#headers').css('display', 'none');
+    $('.advancedMenuTabSelected').addClass('advancedMenuTab');
+    $('.advancedMenuTabSelected').click(showHeaders);
+    $('.advancedMenuTabSelected').removeClass('advancedMenuTabSelected');
+    $('#history').css('display', 'block');
+    $('#historyTab').addClass('advancedMenuTabSelected');
+    $('#historyTab').removeClass('advancedMenuTab');
+    $('#historyTab').off('click');
+}
+
+function showHeaders(){
+    $('#history').css('display', 'none');
+    $('.advancedMenuTabSelected').addClass('advancedMenuTab');
+    $('.advancedMenuTabSelected').click(showHistory);
+    $('.advancedMenuTabSelected').removeClass('advancedMenuTabSelected');
+    $('#headers').css('display', 'block');
+    $('#headersTab').addClass('advancedMenuTabSelected');
+    $('#headersTab').removeClass('advancedMenuTab');
+    $('#headersTab').off('click');
+}
+
 
 //TODO: Add animation for Headers and History
\ No newline at end of file
diff --git a/src/main/resources/templates/mock.html b/src/main/resources/templates/mock.html
index a3dbdcf..2421bc2 100644
--- a/src/main/resources/templates/mock.html
+++ b/src/main/resources/templates/mock.html
@@ -50,8 +50,8 @@
                 <div id="optional">&gt; show/hide advanced settings</div>
                 <div id="advanced" style="display: none;">
                     <div id="advancedMenu">
-                        <div class="advancedMenuTabSelected">Headers</div>
-                        <div class="advancedMenuTab">History</div>
+                        <div id="headersTab" class="advancedMenuTabSelected">Headers</div>
+                        <div id="historyTab" class="advancedMenuTab">History</div>
                     </div>
                     <div id="headers">
                         <table id="headerTable">
@@ -71,8 +71,6 @@
                                     <td id="btn-addRow" onclick="addRow()" class="btn-function-table btn-table-add">+</td>
                                 </tr>
                             </tfoot>
-<!--                        <input type="text" name="headerValue" id="headerValue" class="headerField" placeholder="value"/>-->
-<!--                        <input type="image" name="addHeader" src="/img/icons8-plus-48.png" style="width: 20px;"/>-->
                         </table>
                     </div>
                     <div id="history" style="display:none;"></div>