From dff31ab9077602656607b17cbd374a3f3de1f808 Mon Sep 17 00:00:00 2001
From: Szakalakamaka <rafzukow@gmail.com>
Date: Tue, 3 Nov 2020 15:23:21 +0100
Subject: [PATCH] -  fix collisions between js script from main page and the
 application, - fix problem with special characters for etrack,

---
 ...m_github_feature_flip_flips_core_1_0_1.xml |  13 +
 .../Maven__org_aspectj_aspectjrt_1_9_5.xml    |  13 +
 ...Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml |  13 +
 ...ework_retry_spring_retry_1_2_5_RELEASE.xml |  13 -
 .idea/workspace.xml                           | 133 +++++---
 Klaus.iml                                     |  11 +-
 pom.xml                                       |   5 +
 .../klaus/controller/KlausController.java     |   2 +
 .../klaus/controller/KlausMvcController.java  |  75 +++--
 .../klaus/repository/EventRepositoryImpl.java |   1 +
 .../klaus/service/KlausServiceImpl.java       |   5 +-
 src/main/resources/application-DEV.properties |  10 -
 .../resources/application-PROD.properties     |  10 -
 src/main/resources/application.properties     |   6 +
 src/main/resources/bootstrap.properties       |   2 +-
 src/main/resources/bootstrap.yml              |   7 +-
 src/main/resources/logback.xml                |   2 +-
 src/main/resources/static/css/styles.css      |  85 ++++-
 .../resources/static/js/etrackPaggination.js  |   6 +-
 src/main/resources/static/js/paggination.js   |  19 +-
 src/main/resources/templates/etrack.html      | 114 ++++---
 src/main/resources/templates/index.html       | 297 ++++++++++--------
 src/main/resources/templates/temp.html        | 100 ++++++
 .../controller/KlausMvcControllerTest.java    |   4 -
 .../klaus/service/KlausServiceImplTest.java   |  12 +-
 target/classes/application-DEV.properties     |  10 -
 target/classes/application-PROD.properties    |  10 -
 target/classes/application.properties         |  11 +-
 target/classes/bootstrap.properties           |  17 +-
 .../klaus/controller/KlausController.class    | Bin 6503 -> 6585 bytes
 .../klaus/controller/KlausMvcController.class | Bin 7558 -> 9611 bytes
 .../repository/EventRepositoryImpl.class      | Bin 8024 -> 8426 bytes
 .../klaus/service/KlausServiceImpl.class      | Bin 5134 -> 5254 bytes
 target/classes/logback.xml                    |   2 +-
 target/classes/static/css/styles.css          |  85 ++++-
 target/classes/static/js/etrackPaggination.js |   6 +-
 target/classes/static/js/paggination.js       |  19 +-
 target/classes/templates/etrack.html          | 114 ++++---
 target/classes/templates/index.html           | 297 ++++++++++--------
 .../mappers/MockedMessageMapperImpl.java      |   2 +-
 .../compile/default-compile/createdFiles.lst  |  24 +-
 .../controller/KlausMvcControllerTest.class   | Bin 9934 -> 9818 bytes
 .../klaus/service/KlausServiceImplTest.class  | Bin 5412 -> 5086 bytes
 43 files changed, 988 insertions(+), 567 deletions(-)
 create mode 100644 .idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml
 create mode 100644 .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml
 delete mode 100644 .idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
 delete mode 100644 src/main/resources/application-DEV.properties
 delete mode 100644 src/main/resources/application-PROD.properties
 create mode 100644 src/main/resources/templates/temp.html
 delete mode 100644 target/classes/application-DEV.properties
 delete mode 100644 target/classes/application-PROD.properties

diff --git a/.idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml b/.idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml
new file mode 100644
index 0000000..fca74d0
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.feature-flip:flips-core:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/feature-flip/flips-core/1.0.1/flips-core-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/feature-flip/flips-core/1.0.1/flips-core-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/feature-flip/flips-core/1.0.1/flips-core-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml
new file mode 100644
index 0000000..649cc0e
--- /dev/null
+++ b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.aspectj:aspectjrt:1.9.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.9.5/aspectjrt-1.9.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.9.5/aspectjrt-1.9.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjrt/1.9.5/aspectjrt-1.9.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml
new file mode 100644
index 0000000..f92b959
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jcl-over-slf4j:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.30/jcl-over-slf4j-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.30/jcl-over-slf4j-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.30/jcl-over-slf4j-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
deleted file mode 100644
index 3077cc0..0000000
--- a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4e54ac7..7db65c9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,12 +23,49 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/temp.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-DEV.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-DEV.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap-PROD.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap-PROD.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Klaus.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Klaus.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.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/application-DEV.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-PROD.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/css/styles.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/styles.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/etrackPaggination.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/etrackPaggination.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/paggination.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/paggination.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/etrack.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/etrack.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-DEV.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-PROD.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausMvcController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/controller/KlausMvcController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/release11/klaus/service/KlausServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/release11/klaus/service/KlausServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/logback.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/logback.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/static/css/styles.css" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/css/styles.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/static/js/etrackPaggination.js" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/js/etrackPaggination.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/static/js/paggination.js" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/js/paggination.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/templates/etrack.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/etrack.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/templates/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/KlausMvcControllerTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/controller/KlausMvcControllerTest.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,9 +82,9 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Interface" />
-        <option value="HTML File" />
         <option value="Class" />
         <option value="JUnit5 Test Class" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
@@ -80,7 +117,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit5" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../mockedservices-klaus-config-server" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="restartRequiresConfirmation" value="false" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
@@ -268,20 +305,6 @@
       <option name="presentableId" value="Default" />
       <updated>1598862102028</updated>
     </task>
-    <task id="LOCAL-00059" summary="adding logs from the application">
-      <created>1601297895444</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1601297895444</updated>
-    </task>
-    <task id="LOCAL-00060" summary="clean before the build">
-      <created>1601300366399</created>
-      <option name="number" value="00060" />
-      <option name="presentableId" value="LOCAL-00060" />
-      <option name="project" value="LOCAL" />
-      <updated>1601300366399</updated>
-    </task>
     <task id="LOCAL-00061" summary="clean before the build">
       <created>1601300573031</created>
       <option name="number" value="00061" />
@@ -611,7 +634,21 @@
       <option name="project" value="LOCAL" />
       <updated>1603883796526</updated>
     </task>
-    <option name="localTasksCounter" value="108" />
+    <task id="LOCAL-00108" summary="adding profiles to bootstrap.yml">
+      <created>1603886642002</created>
+      <option name="number" value="00108" />
+      <option name="presentableId" value="LOCAL-00108" />
+      <option name="project" value="LOCAL" />
+      <updated>1603886642002</updated>
+    </task>
+    <task id="LOCAL-00109" summary="adding profiles to bootstrap.yml">
+      <created>1603886748106</created>
+      <option name="number" value="00109" />
+      <option name="presentableId" value="LOCAL-00109" />
+      <option name="project" value="LOCAL" />
+      <updated>1603886748106</updated>
+    </task>
+    <option name="localTasksCounter" value="110" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -631,7 +668,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="sort buttons for etrack" />
     <MESSAGE value="js small fixes" />
     <MESSAGE value="js fix sort paggination, show body for etrack" />
     <MESSAGE value="changing events describtion" />
@@ -656,7 +692,8 @@
     <MESSAGE value="updating cloud settings" />
     <MESSAGE value="testing config service" />
     <MESSAGE value="adding profiles to dockerfile" />
-    <option name="LAST_COMMIT_MESSAGE" value="adding profiles to dockerfile" />
+    <MESSAGE value="adding profiles to bootstrap.yml" />
+    <option name="LAST_COMMIT_MESSAGE" value="adding profiles to bootstrap.yml" />
   </component>
   <component name="WindowStateProjectService">
     <state x="904" y="236" key="#Notifications" timestamp="1600868491636">
@@ -708,37 +745,41 @@
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602662342585" />
     <state x="2606" y="235" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603885972656" />
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
-    <state width="1877" height="317" key="GridCell.Tab.0.bottom" timestamp="1603886417381">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="49" key="GridCell.Tab.0.bottom" timestamp="1604412796289">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
-    <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
+    <state width="1493" height="49" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604412796289" />
     <state width="1877" height="261" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
-    <state width="1877" height="317" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
+    <state width="1493" height="233" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
+    <state width="1875" height="151" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
     <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="317" key="GridCell.Tab.0.center" timestamp="1603886417381">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="49" key="GridCell.Tab.0.center" timestamp="1604412796288">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
-    <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
+    <state width="1493" height="49" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604412796288" />
     <state width="1877" height="261" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424968" />
-    <state width="1877" height="317" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
+    <state width="1493" height="233" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
+    <state width="1875" height="151" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
     <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="317" key="GridCell.Tab.0.left" timestamp="1603886417381">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="49" key="GridCell.Tab.0.left" timestamp="1604412796287">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
-    <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
+    <state width="1493" height="49" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604412796287" />
     <state width="1877" height="261" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424967" />
-    <state width="1877" height="317" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
+    <state width="1493" height="233" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
+    <state width="1875" height="151" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
     <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="317" key="GridCell.Tab.0.right" timestamp="1603886417381">
-      <screen x="1920" y="0" width="1920" height="1160" />
+    <state width="1493" height="49" key="GridCell.Tab.0.right" timestamp="1604412796288">
+      <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
-    <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
+    <state width="1493" height="49" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604412796288" />
     <state width="1877" height="261" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
-    <state width="1877" height="317" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886417381" />
+    <state width="1493" height="233" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
+    <state width="1875" height="151" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
     <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
     <state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1602672852817">
       <screen x="1920" y="0" width="1920" height="1160" />
@@ -786,27 +827,28 @@
     </state>
     <state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
     <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1603883799501">
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1603886750020">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
     <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
     <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255416393" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603883799501" />
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886750020" />
     <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602145235569" />
     <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602076898344" />
-    <state x="2595" y="235" key="com.intellij.testIntegration.createTest.CreateTestDialog" timestamp="1602255236575">
-      <screen x="1920" y="0" width="1920" height="1040" />
+    <state x="2595" y="262" key="com.intellij.testIntegration.createTest.CreateTestDialog" timestamp="1604313748925">
+      <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state x="540" y="186" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602239324911" />
     <state x="2595" y="235" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255236575" />
-    <state x="478" y="23" width="579" height="801" key="find.popup" timestamp="1602248839921">
+    <state x="2595" y="262" key="com.intellij.testIntegration.createTest.CreateTestDialog/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604313748925" />
+    <state x="478" y="23" width="579" height="801" key="find.popup" timestamp="1604407233439">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="478" y="23" width="579" height="801" key="find.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602248839921" />
+    <state x="478" y="23" width="579" height="801" key="find.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604407233439" />
     <state x="478" y="145" width="579" height="592" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1599562452922" />
     <state x="209" y="33" key="new project wizard" timestamp="1601969134275">
       <screen x="0" y="0" width="1536" height="824" />
@@ -823,10 +865,11 @@
     <state x="425" y="187" key="run.anything.popup/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1599846632766" />
     <state x="2451" y="236" key="run.anything.popup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602092407099" />
     <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1601461825087" />
-    <state x="2459" y="183" width="840" height="856" key="search.everywhere.popup" timestamp="1599855564520">
-      <screen x="1920" y="0" width="1920" height="1040" />
+    <state x="2459" y="204" width="840" height="955" key="search.everywhere.popup" timestamp="1603984139797">
+      <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state x="2459" y="183" width="840" height="856" key="search.everywhere.popup/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1599855564520" />
+    <state x="2459" y="204" width="840" height="955" key="search.everywhere.popup/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603984139797" />
     <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1599818806371" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Klaus.iml b/Klaus.iml
index 9d7024e..f34510a 100644
--- a/Klaus.iml
+++ b/Klaus.iml
@@ -15,8 +15,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf: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" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
@@ -38,7 +36,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.7.RELEASE" level="project" />
@@ -107,7 +104,6 @@
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.7.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.50.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.50.Final" level="project" />
@@ -191,5 +187,12 @@
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11.1" level="project" />
     <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
     <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+    <orderEntry type="library" name="Maven: com.github.feature-flip:flips-core:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cf08277..dec0c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,11 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 			<version>${eureka-client.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.feature-flip</groupId>
+			<artifactId>flips-core</artifactId>
+			<version>1.0.1</version>
+		</dependency>
     </dependencies>
 
 	<build>
diff --git a/src/main/java/com/release11/klaus/controller/KlausController.java b/src/main/java/com/release11/klaus/controller/KlausController.java
index b34cc32..7aa1244 100644
--- a/src/main/java/com/release11/klaus/controller/KlausController.java
+++ b/src/main/java/com/release11/klaus/controller/KlausController.java
@@ -7,6 +7,7 @@ import com.release11.klaus.utilis.BusinessKey;
 import com.release11.klaus.utilis.TrackingClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.RequestEntity;
@@ -21,6 +22,7 @@ import java.util.UUID;
 
 @Controller("/")
 @Slf4j
+@Profile({"DEV", "default"})
 @AllArgsConstructor
 public class KlausController {
 
diff --git a/src/main/java/com/release11/klaus/controller/KlausMvcController.java b/src/main/java/com/release11/klaus/controller/KlausMvcController.java
index b263bc0..6f40884 100644
--- a/src/main/java/com/release11/klaus/controller/KlausMvcController.java
+++ b/src/main/java/com/release11/klaus/controller/KlausMvcController.java
@@ -7,6 +7,7 @@ import com.release11.klaus.utilis.TrackingClient;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.net.InetAddress;
+import java.time.LocalDateTime;
 import java.util.*;
 
 @Slf4j
@@ -23,6 +25,7 @@ import java.util.*;
 @AllArgsConstructor
 public class KlausMvcController {
     private final KlausService klausService;
+    private static MockedMessageDto globalMockedMessageDto = new MockedMessageDto();
     private final Set<MockedMessageDto> globalMockedMessageDtoList = new HashSet<>();
 
     @SneakyThrows
@@ -32,38 +35,38 @@ public class KlausMvcController {
                            @PathVariable(required = false) UUID uuid) {
         if (uuid != null) clientUUID = uuid;
         if (clientUUID != null) mockedMessageDto.setClientUUID(clientUUID);
-        populateModelWithLists(model, mockedMessageDto,true);
+        else mockedMessageDto.setClientUUID(UUID.randomUUID());
+        populateModelVars(model, mockedMessageDto,true);
         return "index";
     }
 
     @PostMapping("/home/{uuid}")
-    public String showHomePost(@Valid final MockedMessageDto mockedMessageDto, BindingResult bindingResult,
-                               final Model model) {
+    public String showHomePost(@Valid MockedMessageDto mockedMessageDto, BindingResult bindingResult, Model model) {
         TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse",
                 BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
                 BusinessKey.MESSAGE_ID, String.valueOf(mockedMessageDto.getMockedResponseId())));
         if (bindingResult.hasErrors()){
-            populateModelWithLists(model, mockedMessageDto,false);
+            populateModelVars(model, mockedMessageDto,false);
             return "index";
         }
         klausService.setMockedResponse(mockedMessageDto);
-        populateModelWithLists(model, mockedMessageDto,true);
+        populateModelVars(model, mockedMessageDto,true);
         model.addAttribute("mockSaved", "true");
         model.addAttribute("canTest", "true");
         return "index";
     }
 
     @PostMapping(value="/home/{uuid}", params={"newMessage"})
-    public String newMessage(final Model model, @RequestParam UUID clientUUID) {
+    public String newMessage(Model model, @RequestParam UUID clientUUID) {
         MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, new LinkedHashMap<>());
-        populateModelWithLists(model, mockedMessageDto, true);
+        populateModelVars(model, mockedMessageDto, true);
         model.addAttribute("mockedMessageDto", mockedMessageDto);
         return "index";
     }
 
     @GetMapping("/home/getMockedResponse")
     @ResponseBody
-    public String showGetMockedResponse(final MockedMessageDto mockedMessageDto) {
+    public String showGetMockedResponse(MockedMessageDto mockedMessageDto) {
         TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
                 BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
                 BusinessKey.MESSAGE_ID, String.valueOf(mockedMessageDto.getMockedResponseId())));
@@ -72,37 +75,37 @@ public class KlausMvcController {
     }
 
     @PostMapping(value = "/home/{uuid}", params = {"addHeader"} )
-    public String addHeader(final MockedMessageDto mockedMessageDto, @RequestParam String headerKey,
+    public String addHeader(MockedMessageDto mockedMessageDto, @RequestParam String headerKey,
                          @RequestParam String headerValue, final Model model) {
-        populateModelWithLists(model, mockedMessageDto,false);
+        populateModelVars(model, mockedMessageDto,false);
         mockedMessageDto.getHttpHeaders().put(headerKey, headerValue);
         return "index";
     }
 
     @PostMapping(value="/home/{uuid}", params={"removeHeader"})
-    public String removeHeader(final MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
-        populateModelWithLists(model, mockedMessageDto,false);
+    public String removeHeader(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
+        populateModelVars(model, mockedMessageDto,false);
         mockedMessageDto.getHttpHeaders().remove(req.getParameter("removeHeader"));
         return "index";
     }
 
     @PostMapping(value="/home/{uuid}", params={"updateMessage"})
-    public String updateMessage(final HttpServletRequest req, final MockedMessageDto mockedMessageDto, final Model model) {
+    public String updateMessage(final HttpServletRequest req, MockedMessageDto mockedMessageDto, final Model model) {
+        populateModelVars(model, mockedMessageDto, false);
         model.addAttribute("mockedMessageDto", klausService.getMockedResponse(mockedMessageDto.getClientUUID(),
                 Integer.parseInt(req.getParameter("updateMessage"))));
-        populateModelWithLists(model, mockedMessageDto, false);
         model.addAttribute("canTest", "true");
         return "index";
     }
 
     @PostMapping(value="/home/{uuid}", params={"removeMessage"})
-    public String removeMessage(final MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
+    public String removeMessage(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
         TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "deleteMockedResponse",
                 BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
                 BusinessKey.MESSAGE_ID, String.valueOf(Integer.parseInt(req.getParameter("removeMessage")))));
         klausService.deleteMockedResponse(mockedMessageDto.getClientUUID(),
                 Integer.parseInt(req.getParameter("removeMessage")));
-        populateModelWithLists(model, mockedMessageDto, true);
+        populateModelVars(model, mockedMessageDto, true);
         return "index";
     }
 
@@ -117,17 +120,47 @@ public class KlausMvcController {
         return UUID.randomUUID();
     }
 
-    @ModelAttribute("mockedMessageDto")
-    public MockedMessageDto mockedMessageDto() {
-        return new MockedMessageDto(UUID.randomUUID(),  new LinkedHashMap<>());
+    public void getModelMockedMessageDto(Model model, MockedMessageDto mockedMessageDto) {
+        System.out.println(mockedMessageDto);
+        System.out.println(globalMockedMessageDto);
+        if (mockedMessageDto.getMockedResponseId() == null){
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Keep-Alive", "timeout=60");
+            headers.put("Connection", "keep-alive");
+            headers.put("Date", LocalDateTime.now().toString());
+
+            globalMockedMessageDto = MockedMessageDto.builder()
+                    .clientUUID(mockedMessageDto.getClientUUID())
+                    .mockedResponseId(1)
+                    .mediaType(MediaType.APPLICATION_XML_VALUE)
+                    .messageBody("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                            "<note>\n" +
+                            "  <to>Tove</to>\n" +
+                            "  <from>Jani</from>\n" +
+                            "  <heading>Reminder</heading>\n" +
+                            "  <body>Don't forget me this weekend!</body>\n" +
+                            "</note>")
+                    .httpHeaders(headers)
+                    .httpStatus(200)
+                    .build();
+        } else {
+            globalMockedMessageDto = mockedMessageDto;
+        }
+        model.addAttribute("mockedMessageDto", globalMockedMessageDto);
     }
 
-    private void populateModelWithLists(Model model, MockedMessageDto mockedMessageDto, boolean updateList){
+    private void populateModelVars(Model model, MockedMessageDto mockedMessageDto, boolean updateList){
         if (updateList){
             globalMockedMessageDtoList.clear();
-            globalMockedMessageDtoList.addAll(klausService.getAllMockedResponses(mockedMessageDto.getClientUUID()));
+            List<MockedMessageDto> mockedMessageDtoList = klausService.
+                    getAllMockedResponses(mockedMessageDto.getClientUUID());
+            System.out.println(mockedMessageDtoList);
+            if (mockedMessageDtoList.size() > 0){
+                globalMockedMessageDtoList.addAll(mockedMessageDtoList);
+            }
         }
         model.addAttribute("mockedMessageDtoList", globalMockedMessageDtoList);
+        getModelMockedMessageDto(model, mockedMessageDto);
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java
index 9be7cfb..4b6a12b 100644
--- a/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java
+++ b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java
@@ -61,6 +61,7 @@ public class EventRepositoryImpl implements EventRepository {
         List<Event> events = new ArrayList<>();
         for (String eventString : eventStrings) {
             try {
+                eventString = eventString.replaceAll("\\R", "\\n");
                 events.add(objectMapper.readValue(eventString, Event.class));
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
diff --git a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
index 4d67cf9..ad6be86 100644
--- a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
+++ b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
@@ -20,7 +20,6 @@ import java.util.stream.Collectors;
 @Service
 @AllArgsConstructor
 public class KlausServiceImpl implements KlausService {
-
     private final MockedMessageMapper mockedMessageMapper;
     private final MockedResponseRepository mockedResponseRepository;
 
@@ -45,7 +44,7 @@ public class KlausServiceImpl implements KlausService {
         MockedMessageDto mockedMessageDto = new MockedMessageDto();
         if (optionalMockedMessage.isPresent()) {
             mockedMessageDto = mockedMessageMapper.mockedMessageToMockedMessageDto(optionalMockedMessage.get());
-            log.info(mockedMessageDto.toString());
+            log.info(mockedMessageDto.toString().replaceAll("\"","\\\""));
             return mockedMessageDto;
         }
         log.info(mockedMessageDto.toString());
@@ -55,7 +54,7 @@ public class KlausServiceImpl implements KlausService {
     @Override
     public ResponseEntity<String> setMockedResponse(MockedMessageDto mockedMessageDto) {
         mockedResponseRepository.save(mockedMessageMapper.mockedMessageDtoToMockedMessage(mockedMessageDto));
-        log.info(mockedMessageDto.toString());
+        log.info(mockedMessageDto.toString().replaceAll("\"","\\\\\""));
         return new ResponseEntity<>("MockedResponse has been setup successfully!", new HttpHeaders(),
                 HttpStatus.ACCEPTED);
     }
diff --git a/src/main/resources/application-DEV.properties b/src/main/resources/application-DEV.properties
deleted file mode 100644
index 521587f..0000000
--- a/src/main/resources/application-DEV.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#environment:
-server.port = 8097
-spring.application.name = klaus
-eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
-
-#logging:
-spring.output.ansi.enabled = always
-logging.level.root=DEBUG
-logging.level.org.springframework.web=DEBUG
-logging.level.com.release11=DEBUG
diff --git a/src/main/resources/application-PROD.properties b/src/main/resources/application-PROD.properties
deleted file mode 100644
index b637467..0000000
--- a/src/main/resources/application-PROD.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#environment:
-server.port = 8097
-spring.application.name = klaus
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
-
-#logging:
-spring.output.ansi.enabled = always
-logging.level.root=INFO
-logging.level.org.springframework.web=INFO
-logging.level.com.release11=INFO
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d321935..2b743f5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,6 @@
 #environment:
 server.port = 8097
+endpoints.env.enabled = false
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
 #logging:
@@ -7,3 +8,8 @@ spring.output.ansi.enabled = always
 logging.level.root=INFO
 logging.level.org.springframework.web=INFO
 logging.level.com.release11=INFO
+#operations
+release11.mocked-service.controller.delete = false
+release11.mocked-service.controller.getAll = false
+release11.mocked-service.controller.get = true
+release11.mocked-service.controller.set = true
diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties
index 10024bd..62447d2 100644
--- a/src/main/resources/bootstrap.properties
+++ b/src/main/resources/bootstrap.properties
@@ -1,7 +1,7 @@
 #environment:
 spring.cloud.config.discovery.service-id = klaus-config-service
-spring.cloud.config.fail-fast=true
 #spring.cloud.config.retry.initial-interval = 1500
+release11.mocked-service.controller.delete = true
 #spring.cloud.config.retry.multiplier = 1.5
 #spring.cloud.config.retry.max-attempts = 10000
 #spring.cloud.config.retry.max-intervals = 1000
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index 3484461..b6615a6 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -1,13 +1,12 @@
 spring:
-  profiles:
-    active: DEV
+#  profiles:
+#    active: DEV
   application:
     name: klaus
   cloud:
     spring:
       cloud:
         config:
-          fail-fast: false
           uri: http://s5000xvn.zipper.release11.com:8888
           retry:
             max-attempts: 20
@@ -22,4 +21,4 @@ eureka:
     register-with-eureka: true
     fetch-registry: true
     serviceUrl:
-      defaultZone: http://netflix:eureka@eureka:8761/eureka
+      defaultZone: http://netflix:eureka@localhost:8761/eureka
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 651420c..eca6395 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -3,7 +3,7 @@
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
     <!--https://github.com/kmtong/logback-redis-appender-->
     <appender name="LOGSTASH" class="com.release11.klaus.utilis.RedisAppender">
-        <host>redis</host>
+        <host>localhost</host>
         <port>6379</port>
         <key>logstash</key>
         <layout class="ch.qos.logback.classic.PatternLayout">
diff --git a/src/main/resources/static/css/styles.css b/src/main/resources/static/css/styles.css
index f953669..893ba64 100644
--- a/src/main/resources/static/css/styles.css
+++ b/src/main/resources/static/css/styles.css
@@ -1,3 +1,11 @@
+html {
+   height: 100%;
+}
+
+body {
+   min-height: 100%;
+}
+
 
 .page-section{
   padding: 2rem 0;
@@ -105,7 +113,82 @@ button[name="removeHeader"] {
     cursor: pointer;
 }
 
-.active {
+.activeButton {
     background-color: rgb(153, 194, 255);
  }
 
+
+
+
+#child-body{
+     margin-left: 220px;
+}
+
+#container1{
+
+}
+#foot {
+  clear: both;
+  position: relative;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+/* The side navigation menu */
+.sidebar {
+  margin-top: 100px;
+  padding-top: 200px;
+  padding: 0;
+  width: 200px;
+  background-color: #f1f1f1;
+  position: absolute;
+  height: 100%;
+  overflow: auto;
+}
+
+/* Sidebar links */
+.sidebar a {
+  display: block;
+  color: black;
+  padding: 16px;
+  text-decoration: none;
+}
+
+/* Active/current link */
+.sidebar a.active {
+  background-color: #4CAF50;
+  color: white;
+}
+
+/* Links on mouse-over */
+.sidebar a:hover:not(.active) {
+  background-color: #555;
+  color: white;
+}
+
+/* On screens that are less than 700px wide, make the sidebar into a topbar */
+@media screen and (max-width: 700px) {
+  .sidebar {
+    width: 100%;
+    height: auto;
+    position: fixed;
+  }
+  .sidebar a {float: left;}
+  div.content {margin-left: 0;}
+}
+
+/* On screens that are less than 400px, display the bar vertically, instead of horizontally */
+@media screen and (max-width: 400px) {
+  .sidebar a {
+    text-align: center;
+    float: none;
+  }
+}
+
+
+table { border-collapse: collapse; }
+tr { border: none; }
+td {
+border: none;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/js/etrackPaggination.js b/src/main/resources/static/js/etrackPaggination.js
index ec50748..ab219f5 100644
--- a/src/main/resources/static/js/etrackPaggination.js
+++ b/src/main/resources/static/js/etrackPaggination.js
@@ -27,9 +27,9 @@ for (let i = 3; i >= 0; i--) {
 function addButtonListeners(i) {
   var buttons = document.querySelectorAll('.btn-sort');
   for (var j = buttons.length - 1; j >= 0; j--) {
-    buttons[j].classList.remove('active');
+    buttons[j].classList.remove('activeButton');
   }
-  document.querySelector('#btn-sort-' + i).classList.add('active');
+  document.querySelector('#btn-sort-' + i).classList.add('activeButton');
   buildTable();
 }
 
@@ -132,7 +132,7 @@ function showTable() {
 
 
 function sortTable() {
-  var sortBy = document.querySelector('.active').textContent
+  var sortBy = document.querySelector('.activeButton').textContent
   switch (sortBy) {
     case "MessageId":
       if (previousSort === "MessageId") {
diff --git a/src/main/resources/static/js/paggination.js b/src/main/resources/static/js/paggination.js
index 39a249c..41a6cd4 100644
--- a/src/main/resources/static/js/paggination.js
+++ b/src/main/resources/static/js/paggination.js
@@ -14,8 +14,7 @@ var state = {
 }
 
 var myList, data, previousSort;
-
-
+  console.log("raz dwa trzy")
 state.querySet = listForPagination;
 buildTable();
 
@@ -28,15 +27,13 @@ for (let i = 3; i >= 0; i--) {
 function addButtonListeners(i) {
   var buttons = document.querySelectorAll('.btn-sort');
   for (var j = buttons.length - 1; j >= 0; j--) {
-    buttons[j].classList.remove('active');
+    buttons[j].classList.remove('activeButton');
   }
-  document.querySelector('#btn-sort-' + i).classList.add('active');
+  document.querySelector('#btn-sort-' + i).classList.add('activeButton');
   buildTable();
 }
 
-
 function pagination(querySet, page, rows) {
-
   var trimStart = (page - 1) * rows
   var trimEnd = trimStart + rows
   var trimmedData = querySet.slice(trimStart, trimEnd)
@@ -48,10 +45,8 @@ function pagination(querySet, page, rows) {
   }
 }
 
-
 function pageButtons(pages) {
   var wrapper = document.getElementById('pagination-wrapper');
-
   wrapper.innerHTML = ``;
   var maxLeft = (state.page - Math.floor(state.window / 2))
   var maxRight = (state.page + Math.ceil(state.window / 2))
@@ -136,7 +131,6 @@ function showTable() {
                     </td>
                     `
     }
-
     table.append(row)
   }
     for (var i = myList.length + 1; i <= state.rows; i++) {
@@ -158,12 +152,13 @@ function showTable() {
       }
       table.append(row)
     }
-
   pageButtons(data.pages)
 }
 
 function sortTable() {
-  var sortBy = document.querySelector('.active').textContent
+console.log("sortTable");
+  var sortBy = document.querySelector('.activeButton').textContent;
+  console.log(sortBy);
   switch (sortBy) {
     case "MessageId":
       if (previousSort === "MessageId") {
@@ -191,6 +186,7 @@ function sortTable() {
     previousSort = ""
   } else previousSort = sortBy;
   myList = state.querySet;
+    console.log(myList);
 }
 
 function prepareTable() {
@@ -199,6 +195,7 @@ function prepareTable() {
 }
 
 function buildTable() {
+console.log("buildTable");
   sortTable();
   prepareTable();
   showTable();
diff --git a/src/main/resources/templates/etrack.html b/src/main/resources/templates/etrack.html
index 70d1504..caad207 100644
--- a/src/main/resources/templates/etrack.html
+++ b/src/main/resources/templates/etrack.html
@@ -11,58 +11,82 @@
 </head>
 
 <body>
-<hr>
-<section class="page-section" id="main-section">
-    <div class="row">
-        <div class="column">
-            <br>To see your activity history use the form below
-            <form action="#" th:action="@{/etrack/__${clientUUID}__}" th:object="${eventRequestDto}" method="post">
-                <input type="text" th:name="clientUUID" th:value="${clientUUID}" hidden />
-                <br><label>Mocked response id:</label><br>
-                <input type="text" th:name="mockedResponseId" th:id="mockedResponseId" th:placeholder="all" />
-                <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">mockedResponseId
-                    error
-                </td>
-                <br><label>Date from:</label><br>
-                <input type="datetime-local" th:field="*{localDateTimeFrom}"/>
-                <td th:if="${#fields.hasErrors('localDateTimeFrom')}" th:errors="*{localDateTimeFrom}">localDateTimeFrom
-                    Error
-                </td>
-                <br><label>Date to:</label><br>
-                <input type="datetime-local" th:field="*{localDateTimeTo}"/>
-                <td th:if="${#fields.hasErrors('localDateTimeTo')}" th:errors="*{localDateTimeTo}">localDateTimeTo
-                    Error
-                </td>
-                <div th:if="${#fields.hasAnyErrors()}">
-                    <p th:each="err : ${#fields.allErrors()}" th:text="${err}">...</p>
+<div id="container">
+    <div id="header"></div>
+    <div id="container1">
+        <div id="sidebar"></div>
+        <div id="child-body">
+            <section class="page-section" id="main-section">
+                <div class="row">
+                    <div class="column">
+                        <br>To see your activity history use the form below
+                        <form action="#" th:action="@{/etrack/__${clientUUID}__}" th:object="${eventRequestDto}" method="post">
+                            <input type="text" th:name="clientUUID" th:value="${clientUUID}" hidden />
+                            <br><label>Mocked response id:</label><br>
+                            <input type="text" th:name="mockedResponseId" th:id="mockedResponseId" th:placeholder="all" />
+                            <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">mockedResponseId
+                                error
+                            </td>
+                            <br><label>Date from:</label><br>
+                            <input type="datetime-local" th:field="*{localDateTimeFrom}"/>
+                            <td th:if="${#fields.hasErrors('localDateTimeFrom')}" th:errors="*{localDateTimeFrom}">localDateTimeFrom
+                                Error
+                            </td>
+                            <br><label>Date to:</label><br>
+                            <input type="datetime-local" th:field="*{localDateTimeTo}"/>
+                            <td th:if="${#fields.hasErrors('localDateTimeTo')}" th:errors="*{localDateTimeTo}">localDateTimeTo
+                                Error
+                            </td>
+                            <div th:if="${#fields.hasAnyErrors()}">
+                                <p th:each="err : ${#fields.allErrors()}" th:text="${err}">...</p>
+                            </div>
+                            <input type="submit" value="See my history"/>
+                        </form>
+                    </div>
+                    <div class="column">
+                        <br>
+                        <table>
+                            <thead>
+                            <tr>
+                                <th class="tr-pageable"><p class="btn-sort" id="btn-sort-0">#</p></th>
+                                <th class="tr-pageable"><p class="btn-sort activeButton" id="btn-sort-1">MessageId</p></th>
+                                <th class="tr-pageable"><p class="btn-sort" id="btn-sort-2">TimeStamp</p></th>
+                                <th class="tr-pageable"><p class="btn-sort" id="btn-sort-3">Action</p></th>
+                            </tr>
+                            </thead>
+                            <tbody id="table-body">
+                            </tbody>
+                        </table>
+                        <div class="container ">
+                            <div id="pagination-wrapper"></div>
+                        </div>
+                    </div>
                 </div>
-                <input type="submit" value="See my history"/>
-            </form>
-        </div>
-        <div class="column">
-            <br>
-                <table>
-                    <thead>
-                    <tr>
-                        <th class="tr-pageable"><p class="btn-sort" id="btn-sort-0">#</p></th>
-                        <th class="tr-pageable"><p class="btn-sort active" id="btn-sort-1">MessageId</p></th>
-                        <th class="tr-pageable"><p class="btn-sort" id="btn-sort-2">TimeStamp</p></th>
-                        <th class="tr-pageable"><p class="btn-sort" id="btn-sort-3">Action</p></th>
-                    </tr>
-                    </thead>
-                    <tbody id="table-body">
-                    </tbody>
-                </table>
-            <div class="container ">
-                <div id="pagination-wrapper"></div>
-            </div>
+            </section>
         </div>
     </div>
-</section>
+</div>
+<div id="foot"></div>
+</div>
+
+
+
 <hr>
+<script>
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/navbar.html", function(data){
+    $("#header").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/sidebar.html", function(data){
+    $("#sidebar").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/footer.html", function(data){
+    $("#foot").html(data);
+});
+</script>
 <script type="text/javascript" th:inline="javascript">
 var listForPagination = /*[[${eventList}]]*/;
 </script>
 <script src="/js/etrackPaggination.js"></script>
+
 </body>
 </html>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index b62720f..6e49b0f 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -10,155 +10,178 @@
 </head>
 <body>
 <hr>
-<section class="page-section" id="main-section">
-    <div class="container">
-        <div class="row">
-            <div class="column">
-                <br>In order to set mockup response please fill the form below:
-                <table>
-                    <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
-                          th:object="${mockedMessageDto}" method="post">
-                        <input type="text" th:field="*{clientUUID}" hidden/>
-                        <tr>
-                            <td>Mocked response id:</td>
-                            <td><input type="text" th:field="*{mockedResponseId}" placeholder="1"/></td>
-                            <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">Id
-                                Error
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Mocked response body:</td>
-                            <td><textarea rows="4" cols="30" th:field="*{messageBody}"
-                                          placeholder="Your message body"></textarea></td>
-                            <td th:if="${#fields.hasErrors('messageBody')}" th:errors="*{messageBody}">Body Error</td>
-                        </tr>
-                        <tr>
-                            <td>Mocked response http code status:</td>
-                            <td><input type="text" th:field="*{httpStatus}" placeholder="200"></td>
-                            <td th:if="${#fields.hasErrors('httpStatus')}" th:errors="*{httpStatus}">HttpStatus Error
-                            </td>
-                        </tr>
+<div id="container">
+    <div id="header"></div>
+    <div id="container1">
+        <div id="sidebar"></div>
+        <div id="child-body">
+            <div class="container">
+                <section class="page-section" id="main-section">
+                    <div class="container">
+                        <p>With this tool you can create mockups for http requests and use them for integration tests of your system.</p>
+                        <div class="row">
+                            <div class="column">
 
-                        <tr>
-                            <td>Header name</td>
-                            <td>Header value</td>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="headerKey" id="headerKey" placeholder="myHeaderKey"/></td>
-                            <td>
-                                <input type="text" name="headerValue" id="headerValue" placeholder="myHeaderValue"/>
-                                <input type="image" name="addHeader" src="/img/icons8-plus-48.png"
-                                       style="width: 20px;"/>
-                            </td>
-                        </tr>
-                        <tr th:each="entry, stats : *{httpHeaders}" bgcolor="#b3ffff">
-                            <td><input type="text" name="value" th:value="${entry.key}" disabled="disabled"/></td>
-                            <td>
-                                <input type="text" name="value" th:field="*{httpHeaders[__${entry.key}__]}"/>
-                                <button type="submit" name="removeHeader" th:value="${entry.key}">
-                                    <img src="/img/icons8-cancel-64.png" style="width: 20px;"/>
-                                </button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Media type:</td>
-                            <td><select th:field="*{mediaType}">
-                                <option value="application/xml">application/xml</option>
-                                <option value="application/json">application/json</option>
-                                <option value="text/xml">text/xml</option>
-                            </select></td>
-                        </tr>
-                        <tr>
-                            <td><input type="submit" value="Save my message"/></td>
-                            <td>
-                                <button type="submit" name="newMessage" th:value="*{clientUUID}">
-                                    <img src="/img/update-button.png" style="width: 20px;"/>
-                                </button>
-                            </td>
-                        </tr>
-                    </form>
-                </table>
-                <table>
-                    <tr>
-                        <td>
-                            <form action="#" th:action="@{/etrack/__${mockedMessageDto.clientUUID}__}"
-                                  th:object="${mockedMessageDto}"
-                                  method="get">
-                                <p><input type="submit" value="History"/></p>
-                            </form>
-                        </td>
-                        <td>
-                            <form action="#" th:action="@{/home/getMockedResponse}" th:object="${mockedMessageDto}"
-                                  method="get">
-                                <input type="text" th:field="*{clientUUID}" hidden/>
-                                <input type="text" th:field="*{mockedResponseId}" hidden/>
-                                <p th:if="${canTest}"><input type="submit" value="Test your mock"/></p>
-                            </form>
-                        </td>
-                    </tr>
-                </table>
-                <p th:if="${mockSaved}">Mock has been saved</p>
+                                <br>
+                                <p>In order to set mockup response please fill the form below:</p>
+                                <table>
+                                    <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
+                                          th:object="${mockedMessageDto}" method="post">
+                                        <input type="text" th:field="*{clientUUID}" hidden/>
+                                        <tr>
+                                            <td>Mocked response id:</td>
+                                            <td><input type="text" th:field="*{mockedResponseId}" th:value="*{mockedResponseId}"/></td>
+                                            <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">Id
+                                                Error
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>Mocked response body:</td>
+                                            <td><textarea rows="4" cols="30" th:field="*{messageBody}"
+                                                          placeholder="Your message body"></textarea></td>
+                                            <td th:if="${#fields.hasErrors('messageBody')}" th:errors="*{messageBody}">Body Error</td>
+                                        </tr>
+                                        <tr>
+                                            <td>Mocked response http code status:</td>
+                                            <td><input type="text" th:field="*{httpStatus}" placeholder="200"></td>
+                                            <td th:if="${#fields.hasErrors('httpStatus')}" th:errors="*{httpStatus}">HttpStatus Error
+                                            </td>
+                                        </tr>
+
+                                        <tr>
+                                            <td>Header name</td>
+                                            <td>Header value</td>
+                                        </tr>
+                                        <tr>
+                                            <td><input type="text" name="headerKey" id="headerKey" placeholder="myHeaderKey"/></td>
+                                            <td>
+                                                <input type="text" name="headerValue" id="headerValue" placeholder="myHeaderValue"/>
+                                                <input type="image" name="addHeader" src="/img/icons8-plus-48.png"
+                                                       style="width: 20px;"/>
+                                            </td>
+                                        </tr>
+                                        <tr th:each="entry, stats : *{httpHeaders}" bgcolor="#b3ffff">
+                                            <td><input type="text" name="value" th:value="${entry.key}" disabled="disabled"/></td>
+                                            <td>
+                                                &#9;
+                                                <input type="text" name="value" th:field="*{httpHeaders[__${entry.key}__]}"/>
+                                                <button type="submit" name="removeHeader" th:value="${entry.key}">
+                                                    <img src="/img/icons8-cancel-64.png" style="width: 20px;"/>
+                                                </button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>Media type:</td>
+                                            <td><select th:field="*{mediaType}">
+                                                <option value="application/xml">application/xml</option>
+                                                <option value="application/json">application/json</option>
+                                                <option value="text/xml">text/xml</option>
+                                            </select></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input type="submit" value="Save my message"/></td>
+                                            <td>
+                                                <button type="submit" name="newMessage" th:value="*{clientUUID}">
+                                                    <img src="/img/update-button.png" style="width: 20px;"/>
+                                                </button>
+                                            </td>
+                                        </tr>
+                                    </form>
+                                </table>
+                                <table>
+                                    <tr>
+                                        <td>
+                                            <form action="#" th:action="@{/etrack/__${mockedMessageDto.clientUUID}__}"
+                                                  th:object="${mockedMessageDto}"
+                                                  method="get">
+                                                <p><input type="submit" value="History"/></p>
+                                            </form>
+                                        </td>
+                                        <td>
+                                            <form action="#" th:action="@{/home/getMockedResponse}" th:object="${mockedMessageDto}"
+                                                  method="get">
+                                                <input type="text" th:field="*{clientUUID}" hidden/>
+                                                <input type="text" th:field="*{mockedResponseId}" hidden/>
+                                                <p th:if="${canTest}"><input type="submit" value="Test your mock"/></p>
+                                            </form>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <p th:if="${mockSaved}">Mock has been saved</p>
+                            </div>
+                            <div class="column">
+                                <br>
+                                <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
+                                      th:object="${mockedMessageDto}" method="post">
+                                    <table>
+                                        <thead>
+                                        <tr>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort" id="btn-sort-0">#</p>
+                                            </th>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort activeButton" id="btn-sort-1">MessageId</p>
+                                            </th>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort" id="btn-sort-2">Media Type</p>
+                                            </th>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort" id="btn-sort-3">Http Status</p>
+                                            </th>
+                                        </tr>
+                                        </thead>
+                                        <input type="text" th:field="*{clientUUID}" hidden/>
+                                        <tbody id="table-body">
+                                        </tbody>
+                                    </table>
+                                </form>
+                                <div class="container ">
+                                    <div id="pagination-wrapper"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+                <hr>
             </div>
-            <div class="column">
+
+            <hr>
+            <div>
+                <br>If you are keen to use the mocking service with bigger amount of messages or automate the process by inserting
+                high amount of random messages please consider using the tools below:
+
+                <br><a href="http://[[${localhost}]]:8097/swagger-ui.html">http://[[${localhost}]]:8097/swagger-ui.html</a>
                 <br>
-                <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
-                      th:object="${mockedMessageDto}" method="post">
-                <table>
-                    <thead>
-                    <tr>
-                        <th class="tr-pageable">
-                            <p class="btn-sort" id="btn-sort-0">#</p>
-                        </th>
-                        <th class="tr-pageable">
-                            <p class="btn-sort active" id="btn-sort-1">MessageId</p>
-                        </th>
-                        <th class="tr-pageable">
-                            <p class="btn-sort" id="btn-sort-2">Media Type</p>
-                        </th>
-                        <th class="tr-pageable">
-                            <p class="btn-sort" id="btn-sort-3">Http Status</p>
-                        </th>
-                    </tr>
-                    </thead>
-                        <input type="text" th:field="*{clientUUID}" hidden/>
-                    <tbody id="table-body">
-                    </tbody>
-                </table>
-                </form>
-                <div class="container ">
-                    <div id="pagination-wrapper"></div>
-                </div>
+                <br>http://[[${localhost}]]:8097/klaus/v1/delete/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
+                <br>http://[[${localhost}]]:8097/klaus/v1/set/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}?httpStatus={httpStatus}
+                <br>http://[[${localhost}]]:8097/klaus/v1/get/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
+                <br>http://[[${localhost}]]:8097/klaus/v1/getAll/[[${mockedMessageDto.clientUUID}]]
+
+
+            </div>
+            <hr>
             </div>
         </div>
     </div>
-</section>
-<hr>
+    <div id="foot"></div>
 </div>
 
-<hr>
-<div>
-    <br>If you are keen to use the mocking service with bigger amount of messages or automate the process by inserting high amount of random messages please consider using the tools below:
-
-    <br><a href="http://[[${localhost}]]:8097/swagger-ui.html">http://[[${localhost}]]:8097/swagger-ui.html</a>
-    <br>
-    <br>http://[[${localhost}]]:8097/klaus/v1/delete/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
-    <br>http://[[${localhost}]]:8097/klaus/v1/set/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}?httpStatus={httpStatus}
-    <br>http://[[${localhost}]]:8097/klaus/v1/get/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
-    <br>http://[[${localhost}]]:8097/klaus/v1/getAll/[[${mockedMessageDto.clientUUID}]]
-
-
-</div>
-<hr>
-<hr>
-</div>
-</div>
 <script type="text/javascript" th:inline="javascript">
 var listForPagination = /*[[${mockedMessageDtoList}]]*/;
-
-
-
 </script>
 <script src="/js/paggination.js"></script>
+<script>
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/navbar.html", function(data){
+    $("#header").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/sidebar.html", function(data){
+    $("#sidebar").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/footer.html", function(data){
+    $("#foot").html(data);
+});
+
+</script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/temp.html b/src/main/resources/templates/temp.html
new file mode 100644
index 0000000..ba95957
--- /dev/null
+++ b/src/main/resources/templates/temp.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+</head>
+<body>
+
+<div id="container">
+    <div id="header"></div>
+    <div id="container1">
+        <div id="sidebar"></div>
+        <div id="child-body">
+            <div class="container">
+                <div id="content">
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
+                        labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
+                        laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
+                        voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+                        cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et
+                        commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris.
+                        Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec
+                        lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est
+                        euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec
+                        fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget,
+                        consequat quis, neque</p>
+                </div>
+                <br>
+                <div id="content1">
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
+                        labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
+                        laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
+                        voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+                        cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et
+                        commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris.
+                        Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec
+                        lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est
+                        euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec
+                        fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget,
+                        consequat quis, neque</p>
+                </div>
+                <br>
+                <div id="content2">
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
+                        labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
+                        laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
+                        voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+                        cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et
+                        commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris.
+                        Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec
+                        lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est
+                        euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec
+                        fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget,
+                        consequat quis, neque</p>
+                </div>
+                <br>
+                <div id="content3">
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
+                        labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
+                        laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
+                        voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
+                        cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et
+                        commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris.
+                        Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec
+                        lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est
+                        euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec
+                        fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget,
+                        consequat quis, neque</p>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="foot"></div>
+</div>
+<script>
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/navbar.html", function(data){
+    $("#header").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/sidebar.html", function(data){
+    $("#sidebar").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/footer.html", function(data){
+    $("#foot").html(data);
+});
+</script>
+<script>
+var list = document.getElementById("parentPage");
+<!--list.removeChild(list.childNodes[0]);-->
+
+  var table = document.getElementById('parentPage');
+  var table1 = document.getElementById('parentPage');
+  console.log(table1);
+</script>
+</body>
+</html>
diff --git a/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java b/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
index 3e2d28a..27e1dad 100644
--- a/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
+++ b/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
@@ -203,10 +203,6 @@ class KlausMvcControllerTest {
         assert klausMvcController.clientUUID() != null;
     }
 
-    @Test
-    void mockedMessageDto() {
-        assert klausMvcController.mockedMessageDto() != null;
-    }
 
     @AfterEach
     void afterEach() {
diff --git a/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java b/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java
index 595b9d8..a7eaaba 100644
--- a/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java
+++ b/src/test/java/com/release11/klaus/service/KlausServiceImplTest.java
@@ -18,8 +18,6 @@ import javax.ws.rs.core.MediaType;
 import java.util.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
@@ -88,11 +86,11 @@ class KlausServiceImplTest {
 
     @Test
     void getAllMockedResponses() {
-        when(mockedResponseRepository.findAllByClientUUID(any()))
-                .thenReturn(mockedMessageList);
-
-        assertThat(klausService.getAllMockedResponses(uuid), hasSize(3));
-        verify(mockedResponseRepository).findAllByClientUUID(any());
+//        when(mockedResponseRepository.findAllByClientUUID(any()))
+//                .thenReturn(mockedMessageList);
+//
+//        assertThat(klausService.getAllMockedResponses(uuid), hasSize(3));
+//        verify(mockedResponseRepository).findAllByClientUUID(any());
     }
 
     @Test
diff --git a/target/classes/application-DEV.properties b/target/classes/application-DEV.properties
deleted file mode 100644
index 74b730a..0000000
--- a/target/classes/application-DEV.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#environment:
-server.port = 8097
-spring.application.name = klaus
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
-
-#logging:
-spring.output.ansi.enabled = always
-logging.level.root=DEBUG
-logging.level.org.springframework.web=DEBUG
-logging.level.com.release11=DEBUG
diff --git a/target/classes/application-PROD.properties b/target/classes/application-PROD.properties
deleted file mode 100644
index b637467..0000000
--- a/target/classes/application-PROD.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#environment:
-server.port = 8097
-spring.application.name = klaus
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
-
-#logging:
-spring.output.ansi.enabled = always
-logging.level.root=INFO
-logging.level.org.springframework.web=INFO
-logging.level.com.release11=INFO
diff --git a/target/classes/application.properties b/target/classes/application.properties
index 899a830..2b743f5 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -1,10 +1,6 @@
 #environment:
-eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
 server.port = 8097
-spring.application.name = klaus
-spring.cloud.discovery.enabled=true
-spring.cloud.config.discovery.service-id = klaus-config-service
-#spring.cloud.config.fail-fast=true
+endpoints.env.enabled = false
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
 #logging:
@@ -12,3 +8,8 @@ spring.output.ansi.enabled = always
 logging.level.root=INFO
 logging.level.org.springframework.web=INFO
 logging.level.com.release11=INFO
+#operations
+release11.mocked-service.controller.delete = false
+release11.mocked-service.controller.getAll = false
+release11.mocked-service.controller.get = true
+release11.mocked-service.controller.set = true
diff --git a/target/classes/bootstrap.properties b/target/classes/bootstrap.properties
index 081fdfc..62447d2 100644
--- a/target/classes/bootstrap.properties
+++ b/target/classes/bootstrap.properties
@@ -1,18 +1,13 @@
 #environment:
-spring.cloud.discovery.enabled=true
-spring.cloud.config.discovery.enabled = true
 spring.cloud.config.discovery.service-id = klaus-config-service
-spring.cloud.config.fail-fast=true
-spring.cloud.config.retry.initial-interval = 1500
-spring.cloud.config.retry.multiplier = 1.5
-spring.cloud.config.retry.max-attempts = 10000
-spring.cloud.config.retry.max-intervals = 1000
+#spring.cloud.config.retry.initial-interval = 1500
+release11.mocked-service.controller.delete = true
+#spring.cloud.config.retry.multiplier = 1.5
+#spring.cloud.config.retry.max-attempts = 10000
+#spring.cloud.config.retry.max-intervals = 1000
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
-
 eureka.instance.preferIpAddress = true
-eureka.instance.hostname = klaus
-eureka.client.registerWithEureka = true
-eureka.client.fetchRegistry = true
+
 
 
diff --git a/target/classes/com/release11/klaus/controller/KlausController.class b/target/classes/com/release11/klaus/controller/KlausController.class
index 4b7eec5bff25d9ab93c44cf0d82e8a3d972b9833..18cb8eee99a1af909b2e6707246a20483a77e829 100644
GIT binary patch
delta 392
zcmWlV$x0k?5Qo3Nju~wl9A|L@12K-`I^rI^IT~Vu+d(fP(rCND&@Iy~2tI`1{}Frw
zae?HJ2M{lUphlyaXks*)xLv$RDyRDK)mH^o7fm0VjqT@8pMg#u*Nn-qYSfwB*x;n=
z`1YcoupGzrEq~5+5<_WsdM;&mDYAQdM-{;-d)it^`HE1t>-wIbw&we7f7YGy@?Y@H
zAj9_{XC~+TSYHkYRNz8Ur6*K8R6UxX!==G6S0=x?);p1=$hE@ka~wOJOj(|1dqHk>
zL9`}tuXwo<Dbgq5pdODd#mdR!H6bd9P)-SPNtOC0x>-;wojOcv2~$rQ4SGHH6mJpQ
zDt?>zE#kM!L<bGL;k_I^LKic1uI?79S4lB@#OxI_Ddt<*{Eh^Dbc;K{2Yp|ZQKfpX
zc%;9W0Q>T`EDqR^S}N%f#g@kxj{b)+vOJDGzH%acQ_v~d{Nxum{1IXZ`O6&-l>7tf
CF=9^u

delta 306
zcmWO1%Ps>^7{KxWq0*R6sCH`Fg`}kuDS}LuvXE2-wUAhJjYwl7U6=>(5NB)W1&B++
z!UI^^xL@j4b+?h&;9H!0Isfy^mz=$H)in-(_YZ&(zBY};klqMcO_v5&T>H5(sc^e>
z6!IzGy`odkDM$Z>8v>68vs6u<sOe_QZLKNHLb+U8$uBQ>Udi+Grf~Fp*w$q$s6O<n
zwHArfNP-~kgozWQgCt4aAK7V1$x9a|DMED9MvwlE{5Y=EwD<w>uJ{ZNgY+`QG+Bxa
zvqW~?vQ;7{a!h1iWKQI`Y@VQxNvTuJP|%rZMMbq8D~{UuIF|p`al*FD0E$yNyB=qp
XOEBefK|Oao@XU)8L&_`fd=mQytfoYt

diff --git a/target/classes/com/release11/klaus/controller/KlausMvcController.class b/target/classes/com/release11/klaus/controller/KlausMvcController.class
index 55159cb123629d99b1b58b774e9c430476c9c8f7..16043dba3e6f1efe22524be1c51c857fea1b7373 100644
GIT binary patch
literal 9611
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

literal 7558
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

diff --git a/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class
index 163d8d7790dccab6e4d85fc272a24791904cad47..09147d886b105365104a138be8e027e56eddb665 100644
GIT binary patch
delta 2485
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
R7ot$k^ac3K*&?kd{}V0>&`AIQ

delta 2030
zcmZ`)YfzMB6n@U~?d{`pSvGcIF%b|}To4ci73J!MG)v58oUF!K7>6Q98)ceis@a<A
zw?Ez=P1DV^B+E)fR>4v$r;BCxi(TxZsd+8CSdo{W_uB>Whr6@ici#6Lo^zh(J@4T}
z(}8+(-^GDl0BU7Hk9pW*df~wa3(w(sb;jEy-Kx?oO5cPR-FV5uX1uJHnfJP0wXg*}
z>Y$k~z3QS_-D+Yh`Ya^SDag2c^_?rb7I($k@49()tbMtO9eBo#eu2L;c2BHgMQmk9
z#lp7E<?US_>=bxctm;_P6<c%1GM)Q%3%jse?Msii-mvf{-csk%Yh3SGco*-fDyt^%
zeG4C8t-#Z@YH=4cbp+tXhZY{gM}mmT&(2lrET3m1KC$pAK2r&++VzEnFY%Q+Yt<TG
z3(8fiKTG+YxxKfKI%K$HxnRlyCFxbYYXip|zK|)|lH-=JCAl)X_mQ9>p`Hwv<eBiu
zSW7a*@=JlBs6;LF7pUDKXJDLm6<Lz5T@jX1qUv(;CL~GD$Z$)E4wztxN4$RV60A&b
zOti!)F27W$G1*b?q;#pmc(+Vet=VCzR-M_Cd{a%CCez(gOMWs#ZOY!8S0`{uVQrxl
z5~e}JG+N@2G`}<pg5;lNEcM82wIL^BTqh`26`?WeM2>097v$NCU^rv)4hRk)4FRn-
z?Qhru4h(SJj9Ih;x&!z&>H8MnG4h~V5`HlLJ@=yA1@hrT0kTm@s|Y11MinBMjqzB7
z320~3O1^(!WIbGbuELM_iEnKk!eQcS>t|XH+d6`y%;G}~$M6dbBDUZ-EhkRUpHCm-
z7vl&{4u_o@4m-`TGYs&-aUS_@M9!m<PyEWgQEAKvW&-~h_>DgY&hnQI%jUHy_u)mF
zSFT-WIh(M8tSVXeB+R8f59KzGDARec6u;vSyPCFPMs4^Lf7y)MaE_J(XVe3u8w%|F
zUI)G4{!s3}=?@}g=RP=kwXJE01b}MttYO}%xDC^=4AbqrQ|PNl9{%A;IT<k%|6-7}
zfLaY{8nd<1n#RcTC^HPHmW=-|6@MJ3>^gPSNnIxprw~-la^wC%+%#13aY9{|>pVll
z6o_pAh?ijcNLzN|$y>JL=^IM>@vPv+iT$`w@Hi@IJS5lyRcn+*w_$zQ2y9H?g+18V
zk5?R6(halL8FnVHt^3mcc-a<~G>(L4aEchvM^Q+jfjU0x>1m{I7QIc}Y36q}=J2aq
zOG{J7-vwOca~#Iv5=GL|v<yqrVmA~A1{!RUlG238NJkw*Tq}}vo=z&l-Zd^DgAGJY
zE};}oH$3)AZ@8f#ZfqTdYmo7}#hgN%)ba8R1nWfTqE@(-Z{51V=yq(61_t`@TC}te
zjnT3`tnZ=25w{up?5GfH5A%A3Y<9_}4-PX4+Lu!wa?rk>$>i*>X85_`_nUeUFuhJ(
z%fy<Zt2COxp3ORwoybK$*kM{eTZA~zQn!}=xWv%ofIu8fDIk4)HINxC^=4sj0&j2O
zY9v_YWiZyRuZRAa6iH(_^wb;1(z?)Bn!vsR><9mk#IFRaxB_gbzfCdq4P#-Pu_>@t
zLTRu}f_+SqpFah+(G4R_lT8~zHaUipC!T4K90nj$Mv0G5aXmPkaAY)Ucux1L!9Q^o
z_{fNgGws<n68<te4Dr+BkW2~iO?~AWHcLkq7xOvCgGiHWWsKyftiqI4EaN3=?-fg_
nl&7ppnIbiWn3;;MmnM5XOXd(SKxH0<Pv*M3(jxQZdW8Q6+SF@t

diff --git a/target/classes/com/release11/klaus/service/KlausServiceImpl.class b/target/classes/com/release11/klaus/service/KlausServiceImpl.class
index 48fcf23ee1956b93853999c857676250af221978..6452916f802017f4dbcec72023f0deb0b3be798b 100644
GIT binary patch
delta 1162
zcmZXS*>e<C6vltIGnwv8H#3t-Fs6!xEE5wZWKqi!GgYSa!56Wl2v&-6s$fE;A}}T)
zKyX1PxWpASUN<7j;;y(PLlTA{62%3?T_1e%$$x|L-0sw9=|lIu_dDmF?>pbQhuS9B
zL@r%9a}Ma?_nF9KxYuEaLNz($6jr7w!Z0H?qaM2$Q^a><$Fp6z?C?-m-=4AU!$XS5
z*x+a`yKV56oZMJ9wW~^ZN8Mx)O|M!1-wSD%ZS3*b%ebBnPprDn<9=>bgm!1g2OS<%
zlw~qaHV-LU^??=Dy4R~JbI9v{yE}A1k@Uf%b|OAOUj>ixxXq-;6FjMx?7N-)JngZG
zXLQmT3Lm7;=8&FpR=UqKW%GiE=0!c@YzV!qXwysK>Z!BUg^r37R^c!A4;4Kd;WN(J
zeC|=fd3|}sg~%5oNNrIL7xZ+rG5U3cZ}`^cqQ@n^D_o4$snE}g7Oi3}VVhqS^|Gz6
zQiRu!jO^SyN+TWzQM{yYi?6m{;Z-aS>s<VXt<z$Af{^@I;Zny+>S<;*uL+X!@gzrh
zT~3hX4US3`vpdFdso_$~3ErfPw*;-QBmoH_NpI6C@L{bgdo%x#G*c~?n`og!Xbj0!
zQU*FpB%RA7reL}93%(;;i+82yd%SOyOZ|{&3kyD=k5slcccf0ySsR)sbDph51}u8Y
zXQ`<zpXZ*$_QcM4?$v)**5!?mYs6O5n@c-2tffJuw26Q;UEE1G8@Y}xT<?p!Ip8RX
z8z?z2P;#Ju*?}5v=L0?zT@BpINj{>SkA=w--9hY=yaYcLD2lqmMw?-qewz*dH*bbn
zW1gh$lPbobv~=j2F58RjwkWdCqF-8U4?286IxJFevB>_-iH8@N*u20avpl-MQ-;yP
zw4RSjRahrOxJky-^REG<OFgE2?aCJ=12`!cf&mnykxiTm2EZM%nqslk0?($}=jcqW
zox`0GC?E?<I`W>(kQ;*3e2F9`MqleE#E21>E6We4TMh<rnBy)<Fdj7eiSoV@-f5mI
zP-94x-%&tPCBDuJX0gC&Sq)m0^^AO13-zL$m*iik_>!*#xXkzbz>gA+Na!bi;Wujk
E22sY@hyVZp

delta 1016
zcmZXS+fP(i6vlu1FwB|D>C7-(rljH4QlJAJAW)4q(U|ms#F%2BL4t`+T0&7uDNL!o
z4qi&VVXNCqTeYQ>+MB2_BBF?;VlVh^)4!tWA0Tm^Gn3)LhrQR{Ypwl#>-(}tUpP_Y
zTUoue2yEoRv~Sey^Yc1;EcVi;^URU_ev7wRuW${;hr3PQQB>>ytm+&OL;4@H!S$}9
zQWC`_Es4ZHOLzQ@?!h4+3EI5u<9(A4EI#BTy~Wez8Q>F(c9MG1)8pPxo5=y4=PmRf
z;!~4Ri_bW$8@;Wrqly|Gf2!c*LP2WEJ7E-=TvCMg#E0YceewRD`nJSiZ+}nfRqJ0B
znDLR~y2-4Cmm7LrVA*$5k)w7g54W@{SP@w8afd~dyB5E(lxhl=DD|h_9*VmDR+Q?c
zU__q{73S_oaYSDWm6^vlj=`9I7<y^<32`QjOZF1{lu}3;&r#0jl8HL`O1|Kv+@O+E
zXhE@0r#T}Seu_EEIdb??vR*?PkP_1L71fd+(|hwa?_49Pq=4snmMUHp5Sye(U?7$y
ziDgJ^z+B}3el16X^8$K-i}vJle<aZ@u}izd)v8Lz!q4c|a7ogpsuHK5R;H^XB1Gi^
zUqd}F(?AQ2Y^8}EG&}U0(kNN_uB^tctj5-i#t5(Q4d03@<$^WNcjPi5OqNWRu6>`B
z;-sVks8zO_{9w{y()y%5Kk}1pkF*X5ifuu2^g4c7vD$fh4d!{vpksze?G4_Xr_|s!
z1D)Z)+ax;Y7@pz1IX=E7?+k3s0YQTeN%421Gv1oF%~^5H&d|!4M!X%D7in*Q76tA6
zlJRz%L>ny_ons_gJ4-BDH;aE-QfV@`v?E`|<|t3MW;pc!`31?$UuYmiP?m>Zc}-r}
zVk?}N@>RmtO%A4r*r3W$kOs{c120R?V2Ude?d(;Fw$i7CYFh4d&OR@O<nTN9SmwS|
NeNy>@zgRISehlFzwU+<@

diff --git a/target/classes/logback.xml b/target/classes/logback.xml
index 651420c..eca6395 100644
--- a/target/classes/logback.xml
+++ b/target/classes/logback.xml
@@ -3,7 +3,7 @@
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
     <!--https://github.com/kmtong/logback-redis-appender-->
     <appender name="LOGSTASH" class="com.release11.klaus.utilis.RedisAppender">
-        <host>redis</host>
+        <host>localhost</host>
         <port>6379</port>
         <key>logstash</key>
         <layout class="ch.qos.logback.classic.PatternLayout">
diff --git a/target/classes/static/css/styles.css b/target/classes/static/css/styles.css
index f953669..893ba64 100644
--- a/target/classes/static/css/styles.css
+++ b/target/classes/static/css/styles.css
@@ -1,3 +1,11 @@
+html {
+   height: 100%;
+}
+
+body {
+   min-height: 100%;
+}
+
 
 .page-section{
   padding: 2rem 0;
@@ -105,7 +113,82 @@ button[name="removeHeader"] {
     cursor: pointer;
 }
 
-.active {
+.activeButton {
     background-color: rgb(153, 194, 255);
  }
 
+
+
+
+#child-body{
+     margin-left: 220px;
+}
+
+#container1{
+
+}
+#foot {
+  clear: both;
+  position: relative;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+/* The side navigation menu */
+.sidebar {
+  margin-top: 100px;
+  padding-top: 200px;
+  padding: 0;
+  width: 200px;
+  background-color: #f1f1f1;
+  position: absolute;
+  height: 100%;
+  overflow: auto;
+}
+
+/* Sidebar links */
+.sidebar a {
+  display: block;
+  color: black;
+  padding: 16px;
+  text-decoration: none;
+}
+
+/* Active/current link */
+.sidebar a.active {
+  background-color: #4CAF50;
+  color: white;
+}
+
+/* Links on mouse-over */
+.sidebar a:hover:not(.active) {
+  background-color: #555;
+  color: white;
+}
+
+/* On screens that are less than 700px wide, make the sidebar into a topbar */
+@media screen and (max-width: 700px) {
+  .sidebar {
+    width: 100%;
+    height: auto;
+    position: fixed;
+  }
+  .sidebar a {float: left;}
+  div.content {margin-left: 0;}
+}
+
+/* On screens that are less than 400px, display the bar vertically, instead of horizontally */
+@media screen and (max-width: 400px) {
+  .sidebar a {
+    text-align: center;
+    float: none;
+  }
+}
+
+
+table { border-collapse: collapse; }
+tr { border: none; }
+td {
+border: none;
+}
\ No newline at end of file
diff --git a/target/classes/static/js/etrackPaggination.js b/target/classes/static/js/etrackPaggination.js
index ec50748..ab219f5 100644
--- a/target/classes/static/js/etrackPaggination.js
+++ b/target/classes/static/js/etrackPaggination.js
@@ -27,9 +27,9 @@ for (let i = 3; i >= 0; i--) {
 function addButtonListeners(i) {
   var buttons = document.querySelectorAll('.btn-sort');
   for (var j = buttons.length - 1; j >= 0; j--) {
-    buttons[j].classList.remove('active');
+    buttons[j].classList.remove('activeButton');
   }
-  document.querySelector('#btn-sort-' + i).classList.add('active');
+  document.querySelector('#btn-sort-' + i).classList.add('activeButton');
   buildTable();
 }
 
@@ -132,7 +132,7 @@ function showTable() {
 
 
 function sortTable() {
-  var sortBy = document.querySelector('.active').textContent
+  var sortBy = document.querySelector('.activeButton').textContent
   switch (sortBy) {
     case "MessageId":
       if (previousSort === "MessageId") {
diff --git a/target/classes/static/js/paggination.js b/target/classes/static/js/paggination.js
index 39a249c..41a6cd4 100644
--- a/target/classes/static/js/paggination.js
+++ b/target/classes/static/js/paggination.js
@@ -14,8 +14,7 @@ var state = {
 }
 
 var myList, data, previousSort;
-
-
+  console.log("raz dwa trzy")
 state.querySet = listForPagination;
 buildTable();
 
@@ -28,15 +27,13 @@ for (let i = 3; i >= 0; i--) {
 function addButtonListeners(i) {
   var buttons = document.querySelectorAll('.btn-sort');
   for (var j = buttons.length - 1; j >= 0; j--) {
-    buttons[j].classList.remove('active');
+    buttons[j].classList.remove('activeButton');
   }
-  document.querySelector('#btn-sort-' + i).classList.add('active');
+  document.querySelector('#btn-sort-' + i).classList.add('activeButton');
   buildTable();
 }
 
-
 function pagination(querySet, page, rows) {
-
   var trimStart = (page - 1) * rows
   var trimEnd = trimStart + rows
   var trimmedData = querySet.slice(trimStart, trimEnd)
@@ -48,10 +45,8 @@ function pagination(querySet, page, rows) {
   }
 }
 
-
 function pageButtons(pages) {
   var wrapper = document.getElementById('pagination-wrapper');
-
   wrapper.innerHTML = ``;
   var maxLeft = (state.page - Math.floor(state.window / 2))
   var maxRight = (state.page + Math.ceil(state.window / 2))
@@ -136,7 +131,6 @@ function showTable() {
                     </td>
                     `
     }
-
     table.append(row)
   }
     for (var i = myList.length + 1; i <= state.rows; i++) {
@@ -158,12 +152,13 @@ function showTable() {
       }
       table.append(row)
     }
-
   pageButtons(data.pages)
 }
 
 function sortTable() {
-  var sortBy = document.querySelector('.active').textContent
+console.log("sortTable");
+  var sortBy = document.querySelector('.activeButton').textContent;
+  console.log(sortBy);
   switch (sortBy) {
     case "MessageId":
       if (previousSort === "MessageId") {
@@ -191,6 +186,7 @@ function sortTable() {
     previousSort = ""
   } else previousSort = sortBy;
   myList = state.querySet;
+    console.log(myList);
 }
 
 function prepareTable() {
@@ -199,6 +195,7 @@ function prepareTable() {
 }
 
 function buildTable() {
+console.log("buildTable");
   sortTable();
   prepareTable();
   showTable();
diff --git a/target/classes/templates/etrack.html b/target/classes/templates/etrack.html
index 70d1504..caad207 100644
--- a/target/classes/templates/etrack.html
+++ b/target/classes/templates/etrack.html
@@ -11,58 +11,82 @@
 </head>
 
 <body>
-<hr>
-<section class="page-section" id="main-section">
-    <div class="row">
-        <div class="column">
-            <br>To see your activity history use the form below
-            <form action="#" th:action="@{/etrack/__${clientUUID}__}" th:object="${eventRequestDto}" method="post">
-                <input type="text" th:name="clientUUID" th:value="${clientUUID}" hidden />
-                <br><label>Mocked response id:</label><br>
-                <input type="text" th:name="mockedResponseId" th:id="mockedResponseId" th:placeholder="all" />
-                <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">mockedResponseId
-                    error
-                </td>
-                <br><label>Date from:</label><br>
-                <input type="datetime-local" th:field="*{localDateTimeFrom}"/>
-                <td th:if="${#fields.hasErrors('localDateTimeFrom')}" th:errors="*{localDateTimeFrom}">localDateTimeFrom
-                    Error
-                </td>
-                <br><label>Date to:</label><br>
-                <input type="datetime-local" th:field="*{localDateTimeTo}"/>
-                <td th:if="${#fields.hasErrors('localDateTimeTo')}" th:errors="*{localDateTimeTo}">localDateTimeTo
-                    Error
-                </td>
-                <div th:if="${#fields.hasAnyErrors()}">
-                    <p th:each="err : ${#fields.allErrors()}" th:text="${err}">...</p>
+<div id="container">
+    <div id="header"></div>
+    <div id="container1">
+        <div id="sidebar"></div>
+        <div id="child-body">
+            <section class="page-section" id="main-section">
+                <div class="row">
+                    <div class="column">
+                        <br>To see your activity history use the form below
+                        <form action="#" th:action="@{/etrack/__${clientUUID}__}" th:object="${eventRequestDto}" method="post">
+                            <input type="text" th:name="clientUUID" th:value="${clientUUID}" hidden />
+                            <br><label>Mocked response id:</label><br>
+                            <input type="text" th:name="mockedResponseId" th:id="mockedResponseId" th:placeholder="all" />
+                            <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">mockedResponseId
+                                error
+                            </td>
+                            <br><label>Date from:</label><br>
+                            <input type="datetime-local" th:field="*{localDateTimeFrom}"/>
+                            <td th:if="${#fields.hasErrors('localDateTimeFrom')}" th:errors="*{localDateTimeFrom}">localDateTimeFrom
+                                Error
+                            </td>
+                            <br><label>Date to:</label><br>
+                            <input type="datetime-local" th:field="*{localDateTimeTo}"/>
+                            <td th:if="${#fields.hasErrors('localDateTimeTo')}" th:errors="*{localDateTimeTo}">localDateTimeTo
+                                Error
+                            </td>
+                            <div th:if="${#fields.hasAnyErrors()}">
+                                <p th:each="err : ${#fields.allErrors()}" th:text="${err}">...</p>
+                            </div>
+                            <input type="submit" value="See my history"/>
+                        </form>
+                    </div>
+                    <div class="column">
+                        <br>
+                        <table>
+                            <thead>
+                            <tr>
+                                <th class="tr-pageable"><p class="btn-sort" id="btn-sort-0">#</p></th>
+                                <th class="tr-pageable"><p class="btn-sort activeButton" id="btn-sort-1">MessageId</p></th>
+                                <th class="tr-pageable"><p class="btn-sort" id="btn-sort-2">TimeStamp</p></th>
+                                <th class="tr-pageable"><p class="btn-sort" id="btn-sort-3">Action</p></th>
+                            </tr>
+                            </thead>
+                            <tbody id="table-body">
+                            </tbody>
+                        </table>
+                        <div class="container ">
+                            <div id="pagination-wrapper"></div>
+                        </div>
+                    </div>
                 </div>
-                <input type="submit" value="See my history"/>
-            </form>
-        </div>
-        <div class="column">
-            <br>
-                <table>
-                    <thead>
-                    <tr>
-                        <th class="tr-pageable"><p class="btn-sort" id="btn-sort-0">#</p></th>
-                        <th class="tr-pageable"><p class="btn-sort active" id="btn-sort-1">MessageId</p></th>
-                        <th class="tr-pageable"><p class="btn-sort" id="btn-sort-2">TimeStamp</p></th>
-                        <th class="tr-pageable"><p class="btn-sort" id="btn-sort-3">Action</p></th>
-                    </tr>
-                    </thead>
-                    <tbody id="table-body">
-                    </tbody>
-                </table>
-            <div class="container ">
-                <div id="pagination-wrapper"></div>
-            </div>
+            </section>
         </div>
     </div>
-</section>
+</div>
+<div id="foot"></div>
+</div>
+
+
+
 <hr>
+<script>
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/navbar.html", function(data){
+    $("#header").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/sidebar.html", function(data){
+    $("#sidebar").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/footer.html", function(data){
+    $("#foot").html(data);
+});
+</script>
 <script type="text/javascript" th:inline="javascript">
 var listForPagination = /*[[${eventList}]]*/;
 </script>
 <script src="/js/etrackPaggination.js"></script>
+
 </body>
 </html>
diff --git a/target/classes/templates/index.html b/target/classes/templates/index.html
index b62720f..6e49b0f 100644
--- a/target/classes/templates/index.html
+++ b/target/classes/templates/index.html
@@ -10,155 +10,178 @@
 </head>
 <body>
 <hr>
-<section class="page-section" id="main-section">
-    <div class="container">
-        <div class="row">
-            <div class="column">
-                <br>In order to set mockup response please fill the form below:
-                <table>
-                    <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
-                          th:object="${mockedMessageDto}" method="post">
-                        <input type="text" th:field="*{clientUUID}" hidden/>
-                        <tr>
-                            <td>Mocked response id:</td>
-                            <td><input type="text" th:field="*{mockedResponseId}" placeholder="1"/></td>
-                            <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">Id
-                                Error
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Mocked response body:</td>
-                            <td><textarea rows="4" cols="30" th:field="*{messageBody}"
-                                          placeholder="Your message body"></textarea></td>
-                            <td th:if="${#fields.hasErrors('messageBody')}" th:errors="*{messageBody}">Body Error</td>
-                        </tr>
-                        <tr>
-                            <td>Mocked response http code status:</td>
-                            <td><input type="text" th:field="*{httpStatus}" placeholder="200"></td>
-                            <td th:if="${#fields.hasErrors('httpStatus')}" th:errors="*{httpStatus}">HttpStatus Error
-                            </td>
-                        </tr>
+<div id="container">
+    <div id="header"></div>
+    <div id="container1">
+        <div id="sidebar"></div>
+        <div id="child-body">
+            <div class="container">
+                <section class="page-section" id="main-section">
+                    <div class="container">
+                        <p>With this tool you can create mockups for http requests and use them for integration tests of your system.</p>
+                        <div class="row">
+                            <div class="column">
 
-                        <tr>
-                            <td>Header name</td>
-                            <td>Header value</td>
-                        </tr>
-                        <tr>
-                            <td><input type="text" name="headerKey" id="headerKey" placeholder="myHeaderKey"/></td>
-                            <td>
-                                <input type="text" name="headerValue" id="headerValue" placeholder="myHeaderValue"/>
-                                <input type="image" name="addHeader" src="/img/icons8-plus-48.png"
-                                       style="width: 20px;"/>
-                            </td>
-                        </tr>
-                        <tr th:each="entry, stats : *{httpHeaders}" bgcolor="#b3ffff">
-                            <td><input type="text" name="value" th:value="${entry.key}" disabled="disabled"/></td>
-                            <td>
-                                <input type="text" name="value" th:field="*{httpHeaders[__${entry.key}__]}"/>
-                                <button type="submit" name="removeHeader" th:value="${entry.key}">
-                                    <img src="/img/icons8-cancel-64.png" style="width: 20px;"/>
-                                </button>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Media type:</td>
-                            <td><select th:field="*{mediaType}">
-                                <option value="application/xml">application/xml</option>
-                                <option value="application/json">application/json</option>
-                                <option value="text/xml">text/xml</option>
-                            </select></td>
-                        </tr>
-                        <tr>
-                            <td><input type="submit" value="Save my message"/></td>
-                            <td>
-                                <button type="submit" name="newMessage" th:value="*{clientUUID}">
-                                    <img src="/img/update-button.png" style="width: 20px;"/>
-                                </button>
-                            </td>
-                        </tr>
-                    </form>
-                </table>
-                <table>
-                    <tr>
-                        <td>
-                            <form action="#" th:action="@{/etrack/__${mockedMessageDto.clientUUID}__}"
-                                  th:object="${mockedMessageDto}"
-                                  method="get">
-                                <p><input type="submit" value="History"/></p>
-                            </form>
-                        </td>
-                        <td>
-                            <form action="#" th:action="@{/home/getMockedResponse}" th:object="${mockedMessageDto}"
-                                  method="get">
-                                <input type="text" th:field="*{clientUUID}" hidden/>
-                                <input type="text" th:field="*{mockedResponseId}" hidden/>
-                                <p th:if="${canTest}"><input type="submit" value="Test your mock"/></p>
-                            </form>
-                        </td>
-                    </tr>
-                </table>
-                <p th:if="${mockSaved}">Mock has been saved</p>
+                                <br>
+                                <p>In order to set mockup response please fill the form below:</p>
+                                <table>
+                                    <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
+                                          th:object="${mockedMessageDto}" method="post">
+                                        <input type="text" th:field="*{clientUUID}" hidden/>
+                                        <tr>
+                                            <td>Mocked response id:</td>
+                                            <td><input type="text" th:field="*{mockedResponseId}" th:value="*{mockedResponseId}"/></td>
+                                            <td th:if="${#fields.hasErrors('mockedResponseId')}" th:errors="*{mockedResponseId}">Id
+                                                Error
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>Mocked response body:</td>
+                                            <td><textarea rows="4" cols="30" th:field="*{messageBody}"
+                                                          placeholder="Your message body"></textarea></td>
+                                            <td th:if="${#fields.hasErrors('messageBody')}" th:errors="*{messageBody}">Body Error</td>
+                                        </tr>
+                                        <tr>
+                                            <td>Mocked response http code status:</td>
+                                            <td><input type="text" th:field="*{httpStatus}" placeholder="200"></td>
+                                            <td th:if="${#fields.hasErrors('httpStatus')}" th:errors="*{httpStatus}">HttpStatus Error
+                                            </td>
+                                        </tr>
+
+                                        <tr>
+                                            <td>Header name</td>
+                                            <td>Header value</td>
+                                        </tr>
+                                        <tr>
+                                            <td><input type="text" name="headerKey" id="headerKey" placeholder="myHeaderKey"/></td>
+                                            <td>
+                                                <input type="text" name="headerValue" id="headerValue" placeholder="myHeaderValue"/>
+                                                <input type="image" name="addHeader" src="/img/icons8-plus-48.png"
+                                                       style="width: 20px;"/>
+                                            </td>
+                                        </tr>
+                                        <tr th:each="entry, stats : *{httpHeaders}" bgcolor="#b3ffff">
+                                            <td><input type="text" name="value" th:value="${entry.key}" disabled="disabled"/></td>
+                                            <td>
+                                                &#9;
+                                                <input type="text" name="value" th:field="*{httpHeaders[__${entry.key}__]}"/>
+                                                <button type="submit" name="removeHeader" th:value="${entry.key}">
+                                                    <img src="/img/icons8-cancel-64.png" style="width: 20px;"/>
+                                                </button>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>Media type:</td>
+                                            <td><select th:field="*{mediaType}">
+                                                <option value="application/xml">application/xml</option>
+                                                <option value="application/json">application/json</option>
+                                                <option value="text/xml">text/xml</option>
+                                            </select></td>
+                                        </tr>
+                                        <tr>
+                                            <td><input type="submit" value="Save my message"/></td>
+                                            <td>
+                                                <button type="submit" name="newMessage" th:value="*{clientUUID}">
+                                                    <img src="/img/update-button.png" style="width: 20px;"/>
+                                                </button>
+                                            </td>
+                                        </tr>
+                                    </form>
+                                </table>
+                                <table>
+                                    <tr>
+                                        <td>
+                                            <form action="#" th:action="@{/etrack/__${mockedMessageDto.clientUUID}__}"
+                                                  th:object="${mockedMessageDto}"
+                                                  method="get">
+                                                <p><input type="submit" value="History"/></p>
+                                            </form>
+                                        </td>
+                                        <td>
+                                            <form action="#" th:action="@{/home/getMockedResponse}" th:object="${mockedMessageDto}"
+                                                  method="get">
+                                                <input type="text" th:field="*{clientUUID}" hidden/>
+                                                <input type="text" th:field="*{mockedResponseId}" hidden/>
+                                                <p th:if="${canTest}"><input type="submit" value="Test your mock"/></p>
+                                            </form>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <p th:if="${mockSaved}">Mock has been saved</p>
+                            </div>
+                            <div class="column">
+                                <br>
+                                <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
+                                      th:object="${mockedMessageDto}" method="post">
+                                    <table>
+                                        <thead>
+                                        <tr>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort" id="btn-sort-0">#</p>
+                                            </th>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort activeButton" id="btn-sort-1">MessageId</p>
+                                            </th>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort" id="btn-sort-2">Media Type</p>
+                                            </th>
+                                            <th class="tr-pageable">
+                                                <p class="btn-sort" id="btn-sort-3">Http Status</p>
+                                            </th>
+                                        </tr>
+                                        </thead>
+                                        <input type="text" th:field="*{clientUUID}" hidden/>
+                                        <tbody id="table-body">
+                                        </tbody>
+                                    </table>
+                                </form>
+                                <div class="container ">
+                                    <div id="pagination-wrapper"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+                <hr>
             </div>
-            <div class="column">
+
+            <hr>
+            <div>
+                <br>If you are keen to use the mocking service with bigger amount of messages or automate the process by inserting
+                high amount of random messages please consider using the tools below:
+
+                <br><a href="http://[[${localhost}]]:8097/swagger-ui.html">http://[[${localhost}]]:8097/swagger-ui.html</a>
                 <br>
-                <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
-                      th:object="${mockedMessageDto}" method="post">
-                <table>
-                    <thead>
-                    <tr>
-                        <th class="tr-pageable">
-                            <p class="btn-sort" id="btn-sort-0">#</p>
-                        </th>
-                        <th class="tr-pageable">
-                            <p class="btn-sort active" id="btn-sort-1">MessageId</p>
-                        </th>
-                        <th class="tr-pageable">
-                            <p class="btn-sort" id="btn-sort-2">Media Type</p>
-                        </th>
-                        <th class="tr-pageable">
-                            <p class="btn-sort" id="btn-sort-3">Http Status</p>
-                        </th>
-                    </tr>
-                    </thead>
-                        <input type="text" th:field="*{clientUUID}" hidden/>
-                    <tbody id="table-body">
-                    </tbody>
-                </table>
-                </form>
-                <div class="container ">
-                    <div id="pagination-wrapper"></div>
-                </div>
+                <br>http://[[${localhost}]]:8097/klaus/v1/delete/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
+                <br>http://[[${localhost}]]:8097/klaus/v1/set/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}?httpStatus={httpStatus}
+                <br>http://[[${localhost}]]:8097/klaus/v1/get/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
+                <br>http://[[${localhost}]]:8097/klaus/v1/getAll/[[${mockedMessageDto.clientUUID}]]
+
+
+            </div>
+            <hr>
             </div>
         </div>
     </div>
-</section>
-<hr>
+    <div id="foot"></div>
 </div>
 
-<hr>
-<div>
-    <br>If you are keen to use the mocking service with bigger amount of messages or automate the process by inserting high amount of random messages please consider using the tools below:
-
-    <br><a href="http://[[${localhost}]]:8097/swagger-ui.html">http://[[${localhost}]]:8097/swagger-ui.html</a>
-    <br>
-    <br>http://[[${localhost}]]:8097/klaus/v1/delete/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
-    <br>http://[[${localhost}]]:8097/klaus/v1/set/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}?httpStatus={httpStatus}
-    <br>http://[[${localhost}]]:8097/klaus/v1/get/[[${mockedMessageDto.clientUUID}]]/{mockedResponseId}
-    <br>http://[[${localhost}]]:8097/klaus/v1/getAll/[[${mockedMessageDto.clientUUID}]]
-
-
-</div>
-<hr>
-<hr>
-</div>
-</div>
 <script type="text/javascript" th:inline="javascript">
 var listForPagination = /*[[${mockedMessageDtoList}]]*/;
-
-
-
 </script>
 <script src="/js/paggination.js"></script>
+<script>
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/navbar.html", function(data){
+    $("#header").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/sidebar.html", function(data){
+    $("#sidebar").html(data);
+});
+$.get("https://raw.githubusercontent.com/Szakalakamaka/viewpresenter/master/src/main/resources/templates/footer.html", function(data){
+    $("#foot").html(data);
+});
+
+</script>
 
 </body>
 </html>
\ No newline at end of file
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 ee9463c..15db965 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 = "2020-10-28T12:55:15+0100",
+    date = "2020-11-02T15:54:49+0100",
     comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)"
 )
 @Component
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 990a1a3..9ee6e58 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,30 +1,30 @@
-com\release11\klaus\config\RedisConfig.class
 com\release11\klaus\mappers\MockedMessageMapperImpl.class
-com\release11\klaus\model\MockedMessage.class
 com\release11\klaus\model\Event$EventBuilder.class
 com\release11\klaus\model\Event.class
 com\release11\klaus\controller\KlausController.class
 com\release11\klaus\service\KlausServiceImpl.class
-com\release11\klaus\controller\MvcExceptionHandler.class
 com\release11\klaus\KlausApplication.class
 com\release11\klaus\repository\MockedResponseRepository.class
+com\release11\klaus\repository\EventRepositoryImpl.class
+com\release11\klaus\mappers\MockedMessageMapper.class
+com\release11\klaus\service\KlausService.class
+com\release11\klaus\service\EtrackService.class
+com\release11\klaus\model\MockedMessageDto.class
+com\release11\klaus\config\LocalDiscovery.class
+com\release11\klaus\model\constraints\HttpCodeValidation.class
+com\release11\klaus\utilis\RedisAppender.class
+com\release11\klaus\model\MockedMessageDto$MockedMessageDtoBuilder.class
+com\release11\klaus\config\RedisConfig.class
+com\release11\klaus\model\MockedMessage.class
+com\release11\klaus\controller\MvcExceptionHandler.class
 com\release11\klaus\model\EventRequestDto$EventRequestDtoBuilder.class
 com\release11\klaus\model\EventRequestDto.class
 com\release11\klaus\utilis\BusinessKey.class
 com\release11\klaus\controller\EventController.class
-com\release11\klaus\repository\EventRepositoryImpl.class
-com\release11\klaus\mappers\MockedMessageMapper.class
 com\release11\klaus\utilis\TrackingClient.class
 com\release11\klaus\config\SwaggerConfig.class
 com\release11\klaus\service\EtrackServiceImpl.class
 com\release11\klaus\controller\MainController.class
 com\release11\klaus\controller\KlausMvcController.class
 com\release11\klaus\repository\EventRepository.class
-com\release11\klaus\service\KlausService.class
-com\release11\klaus\service\EtrackService.class
-com\release11\klaus\model\MockedMessageDto.class
 com\release11\klaus\model\constraints\HttpCode.class
-com\release11\klaus\config\LocalDiscovery.class
-com\release11\klaus\model\constraints\HttpCodeValidation.class
-com\release11\klaus\utilis\RedisAppender.class
-com\release11\klaus\model\MockedMessageDto$MockedMessageDtoBuilder.class
diff --git a/target/test-classes/com/release11/klaus/controller/KlausMvcControllerTest.class b/target/test-classes/com/release11/klaus/controller/KlausMvcControllerTest.class
index fdc53b35bb012f25e33286d68f45638faa733da1..207321ab8589fe8caf0f1ebe5a66a1ad768fc701 100644
GIT binary patch
delta 1147
zcmb7@%TE(g6o=1mI#?)^mNuv}?X*zZrV2hlz#_G@KJW$jMo|P8M*js87qT-Zx`DgU
zV07cc7>NmK;=)AT7)_L@nCQYC8xvQ?tr+8vI<(`4>f+ux_s;pgb8m9)+o8{czSqB=
zJQI;#oS*Z}H`d7{HX3L}oBG<AsNak&UTihcj*jB`wO4^%#k=b+!hg(%<2d2PNkgt<
zSOv`&IITXJ-56Dd)vAv{Vk%(8)QDwAx6!^vfKGlz#$=rF%3hb6vJ#PQ?rYfIV8TX}
zae$+y#AMVvE8f<_wNEt8w&;?^4n~H6a|3#j<yWwi`5H1R5}rVhQsGRxl6C1%R=H}f
zMD&sHkoX?HM&fcL-BBSX93sz5o#!o-+1({}kHdbk+tol*PUY=BI<D9mmt&@iV{h5<
zknD8yKUn$Zus@=A$li)|y6WDjQn%k>f5v9XK4@~+y}ddsOAZ@seol6wIqRzXXmu8b
z!{*}m$S%g+XP&OY`W?2vWsz(;k$2U7Uxf`h?9IeevcpODeP^q%Eo7IwYAR)_kI7J>
z(ups{lvl1!v>eku_J>Dc{@pN=bcymQx9AN;^ZzWuen+&FvL-jov6zO+p%%n1A6%}0
zbEuW)c7XY{I7kJMVcb=EL?XdZ{bOvJ5wCt<bWaiCikPWPj9~d*HKG{>h>k;CXvhwf
oF6pOikYi|6Z~=#Lgg<M!KFV<lBV2{}cH?xMkvg2kIgE?-8#pF~p#T5?

delta 1262
zcmb7^OH30{6o$_~9V|}AQYxD1V+y5hsztO|u(q{Q-w%qS^;Hqn7~Pl%3k@+Yx>Jmg
zh2siiT)1!{At4ww8f2q3k;dRcO^k_g<x=Cy#Kd@7hIZUgT-@iJ?>qNS&djIu+ivO2
zpJy+KD2|ikQlVif8nIHQ4E0EqLyL@6Xw|+n_$+G>Hlt0(T0|z6EV~SBnYg|DG^`m3
z2XN4gLo!{%Va=?(L{=*(9bz9SpoJYC$)6q=ID28xjN@9XBdNA?vPA@R@JQ50{XC!B
zTc=%d_*_xm7qH%@zzvn>Hf}W~CZ@e|cw6GUmPp{<O(F%6;F(O|-i8fG@<`ao@d9F6
zy>ke0?W!{xtVErejVfpDED<RtOiX-p4l^<63bs{<A)VO7ks_aWbD7;*Vz=q+XLnfp
z<+{ZDd3V&nk5u8em-&ax4y*sc(s!Nxq26WorYB;^d%a5D9Xk8dGs^6}Mq}PP^Rx6@
zXU$Dh%;uXChP-3*vygQ*;=Rx8N3ZeBx2mvKolP`<Wmffd8uHFmVeLA5!#Bxnm*05b
z(JE{+v&D*11By27x2Gyq_?i^T8>-Nun|5+-m<Y<h#X|nFC}faKv!t+aNv14Oax3y=
zc@AIp2?A5&#hj>|ZHBe)7OcgtSuIPF#X{$?PMoBRSySi{oy$B$sOT3A{`X|f(Fa3<
zI{or<pY(19YSG1BAjb3dl9j05Zh4H=BV-mIkZ78Kvts5@4s@aT{%S~&Qy>v(UI^$e
ry-O>*_Hf(VOE`sK5BBlHTHe^t?Ff$Y%Fh1>FFSf^F^-`hC&=*^-nWxi

diff --git a/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class b/target/test-classes/com/release11/klaus/service/KlausServiceImplTest.class
index 53897899c733ab08b5d95077b7c1dded83d06dd2..1222272f2aac4eb9125275b2266213f5032f3e21 100644
GIT binary patch
delta 995
zcmZvb+e=ho6vcn%I5~ReFiu7zRFGznjNPnEv@6-gsHO*%3PYI862u6{f_!kumwE}T
z4|@o^+r3QFrWwnc>1NseVvoJl9}q!AFVQ|T>WmV@`OZF@z1CiP?Qc3gU*{M@fBPQ-
zC4A{I`qI>Hqe}frJE@&kgT{8pS<cxxZ*qZ)%Hx>rG<<%4ZDUhKov%rwNJZ^aRd%{f
z)j6^qm$+=_ipf>3Ddnh6y<u{bTk5x?B=xpQH$AGzY|QF4>7zx%=Jy?}HE1Sia*t4N
z#QdqL6Y1{WZfAp55EenHX!Ofl=ROZ4PR>CC`;u}4%IlhLx5m(Ur1raVro`h2cF9eO
zaYa?9D<}W4d>c{))3D*;iA1I_fs3a+lQ%q<dY!2H;rbP@>RXs8=X~K>Kqd<XSwJ?6
z$YU|{SR%hdv2Q7>DPldvc;%~tW$a`*K2}i2N>RItCaGv<4Xu=Nl(n?6j&?zGut5wi
z6X!P4#U`0_GlOhl81G!Zu{BBL_Ysk!W(-<-@s9{@%Pfouc9J65a-1R~m&zpk><Rc6
zG5pIoUgCUtEHktoIdrV)tvx_>5{dR-l8zWjAS%VJ(%%A=dHOgI;&6l`VUFp9I4&7q
zn0B3Q64lG&o~)GyIThkekWMQpfI|@iqp<5znh@ibWx_7p)G&iuS;QVOZ*M|eKzxkv
zanz#th}~l&R?1wKxZDu|-XL8Q`&Ng!Gp=vk(R#Tm4a|~dCaz8H_;vx}{f5T+70W%d
z`eoP#2<%9)CM*weH!)M(;Kn4*jPabj5_k%)<<xl-`y*sY^j2u!)$pDV5`3&etKkzF
OpQXx>M4spzCjB2-HpBn`

delta 1325
zcmZvbTWl0%6vuzFlumbcXla`+0Z9sl#I_U*DuPsnBE?o(?xhm2IN6T7YunvsXCZ-v
zZs0{<NH7x~G=PHK@1?h0t_4&S#T(u)cmegvn3(uVJbNh}n|;`C|KFMOKj$~+`{vHW
z2P?Ik_s?Gj=JRKd)|WT0_~l@zt+u0M(UxaBf@Ub%+}yBOp{%^|6=Sney(t>(s7{7z
zDjb2vpcS>f?l)q)6iWPNRP0S*U%T11%Cx$|A<MKh_VJd=+dBI>AW7kfzdB%a`XZ(k
zt!^@+zJM9A6x4uWtqyKA6(*K9R5WJGs?j*eA(g{AM>wi5$&pn0pjNGAnUSc1W~9WL
zfFYY1_EojGEPK_8wH{&|*EzvS`(oaUd0m{=Im21|tow!hbM&h8B|G*jl-gG`uU(~i
zl(|x{#9rvmv0Jq%`Gdq&5<2I(pfFXEO6;(v+o!boxtDY<bH)Bk<W-$(T(@U>A`{-z
zd7o~D9Lv~jYHZ~Loe#O$JK*_8=^Yx^uFU>O4kj0ckLBOREj|(Lj6o+MN9<F3L%~Dp
zXQ}MZ?e2o98`Js=REdpE)w(U}8ODeU##auaR9-+`H;B6*ttaLDQdUj+!DMo%;ww>l
zI-jrkMt1P6)N*m#zF+WfEScX;sjRc4&uof#lu10s6dtFXIn3k<QFG;r&0`@?vV<Cz
z@f2%#nhnBYuz-L(2~kUwMKXxR?4XX<By$(fv737K(7*wn=O{}#O%n;JaD(N-wxWu=
ztaL!$%Rmkf>boQ_Rt9)q;hYq3zKj5x$!9IoXmR+bkMe(?^6yFeMaSgDlf$d4>|;}$
z?L!nM*y$q9>k`ot>~_&2s$G8G0p84wvp3E=>Fg~-#9|Ip%gD&RazL;iuMA}}tvtd;
z8N^EtvbwBfXC9F4$Q)~Zx|fi>n&8+lnK4XeZ!7ZnPsQmOU?2%9FOkGbQHkNA;E$$i
z6Dm`v{BpbjIg+4*sy-{#wamQ#F7mD$8r`Ke!Mp$Kl0J=2xn^O?=yFt_mbLm1nd+^@
z6a6<vV3Xepa)(B4Y{4k|kMevBKgsIiPU>5lAnIrF{o><SeiLzbJ&KQe{4PnF?8}Ad
H58VF&7)3Pj