diff --git a/src/main/resources/static/html/mock.html b/src/main/resources/static/html/mock.html
index 41ee687..04cce43 100644
--- a/src/main/resources/static/html/mock.html
+++ b/src/main/resources/static/html/mock.html
@@ -38,7 +38,7 @@
                             <!-- status -->
                             <div class="max-width  small-vertical-margin">
                                 <label for="httpStatus">Http Status</label>
-                                <input id="httpStatus" class="bordered-field max-width" type="text" value="200" list="httpStatusSuggestion">
+                                <input id="httpStatus" class="bordered-field max-width data-field" type="text" value="200" list="httpStatusSuggestion">
                                 <datalist id="httpStatusSuggestion">
                                     <option value="200">
                                     <option value="300">
@@ -51,7 +51,7 @@
                             <!-- content type -->
                             <div class="max-width  small-vertical-margin">
                                 <label for="typeSelector">Content Type</label>
-                                <input id="typeSelector" class="bordered-field max-width" type="text" value="application/xml" list="contentTypes">
+                                <input id="typeSelector" class="bordered-field max-width data-field" type="text" value="application/xml" list="contentTypes">
                                 <datalist id="contentTypes">
                                     <option value="application/xml">
                                     <option value="application/json">
@@ -59,12 +59,12 @@
                                 </datalist>
                             </div>
                         </div>
-                        <button class="small-margins half-width with-padding action-button active">Save</button>
+                        <button id="btn-save" class="small-margins half-width with-padding action-button">Save</button>
                     </div>
                     <!-- body -->
                     <div class="small-vertical-margin">
                         <label for="bodyEditor">Body</label>
-                        <textarea id="bodyEditor" class="bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
+                        <textarea id="bodyEditor" class="data-field bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
                     </div>
                     <!-- show/hide -->
                     <div id="optional" class="clickable-text highlight">
diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index 11fcc19..aa1dc5a 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -64,18 +64,16 @@ function getDomain(){
 function setDataModified(){
     if(dataModified) return;
     dataModified = true;
-    $('#btn-save').removeClass('btn-inactive');
-    $('#btn-save').addClass('btn-action');
+    $('#btn-save').addClass('active');
     $('#btn-save').click(getUpdate);
 }
 
 //Adding change listener to fields
-$('.field').change(setModified);
+$('.data-field').change(setModified);
 
 function setDataOrigin(){
     dataModified = false;
-    $('#btn-save').addClass('btn-inactive');
-    $('#btn-save').removeClass('btn-action');
+    $('#btn-save').removeClass('active');
     $('#btn-save').off();
 }
 
diff --git a/target/classes/static/html/mock.html b/target/classes/static/html/mock.html
index 41ee687..04cce43 100644
--- a/target/classes/static/html/mock.html
+++ b/target/classes/static/html/mock.html
@@ -38,7 +38,7 @@
                             <!-- status -->
                             <div class="max-width  small-vertical-margin">
                                 <label for="httpStatus">Http Status</label>
-                                <input id="httpStatus" class="bordered-field max-width" type="text" value="200" list="httpStatusSuggestion">
+                                <input id="httpStatus" class="bordered-field max-width data-field" type="text" value="200" list="httpStatusSuggestion">
                                 <datalist id="httpStatusSuggestion">
                                     <option value="200">
                                     <option value="300">
@@ -51,7 +51,7 @@
                             <!-- content type -->
                             <div class="max-width  small-vertical-margin">
                                 <label for="typeSelector">Content Type</label>
-                                <input id="typeSelector" class="bordered-field max-width" type="text" value="application/xml" list="contentTypes">
+                                <input id="typeSelector" class="bordered-field max-width data-field" type="text" value="application/xml" list="contentTypes">
                                 <datalist id="contentTypes">
                                     <option value="application/xml">
                                     <option value="application/json">
@@ -59,12 +59,12 @@
                                 </datalist>
                             </div>
                         </div>
-                        <button class="small-margins half-width with-padding action-button active">Save</button>
+                        <button id="btn-save" class="small-margins half-width with-padding action-button">Save</button>
                     </div>
                     <!-- body -->
                     <div class="small-vertical-margin">
                         <label for="bodyEditor">Body</label>
-                        <textarea id="bodyEditor" class="bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
+                        <textarea id="bodyEditor" class="data-field bordered-field max-width with-padding height-300 vertically-resizeable"></textarea>
                     </div>
                     <!-- show/hide -->
                     <div id="optional" class="clickable-text highlight">
diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js
index 0091390..aa1dc5a 100644
--- a/target/classes/static/js/datatransfer.js
+++ b/target/classes/static/js/datatransfer.js
@@ -64,18 +64,16 @@ function getDomain(){
 function setDataModified(){
     if(dataModified) return;
     dataModified = true;
-    $('#btn-save').removeClass('btn-inactive');
-    $('#btn-save').addClass('btn-action');
+    $('#btn-save').addClass('active');
     $('#btn-save').click(getUpdate);
 }
 
 //Adding change listener to fields
-$('.field').change(setModified);
+$('.data-field').change(setModified);
 
 function setDataOrigin(){
     dataModified = false;
-    $('#btn-save').addClass('btn-inactive');
-    $('#btn-save').removeClass('btn-action');
+    $('#btn-save').removeClass('active');
     $('#btn-save').off();
 }
 
@@ -306,9 +304,6 @@ function fillMessageList(){
     $('.tile').click(function() {
         console.log(this);
         loadMessage(parseInt($(this).attr('tileid')));
-        // console.log(e.target);
-        // const id = parseInt(e.target.tileid);
-        // loadMessage(id);
     });
     // $('.btn-tile').click(tileRemoval);
 }