diff --git a/main.css b/main.css
index 28536d78..4f1a3f6b 100644
--- a/main.css
+++ b/main.css
@@ -1006,6 +1006,7 @@ dialog {
 	border-bottom:1px solid #59aa29;
 	font-size:20px;
 	line-height:24px;
+	height: 30px;
 	font-family: 'open_sanslight', Arial;
 	margin-bottom:15px;
 	}
@@ -1041,42 +1042,64 @@ dialog {
     for testing: */
   padding: 20px;
   position: relative;
+  float: left;
+  width:calc(100% - 40px);
 }
 
 .content_toolbar {
   /*  content toolbar panel */
-  width: 100%;
-  height: 30px;
-  background: silver;
-  padding: 10px 0;
-  overflow: hidden;
+  	width: 100%;
+  	height: 30px;
+	background-color:#EFEFEF;
+	box-shadow:rgba(0,0,0,0.10) 0 -3px 8px ;  padding: 10px 0;
+  	overflow: hidden;
+  	border-top: 1px solid #F9F9F9;
 }
 
 .content_toolbar .btn a {
   /*  common styles for content toolbar buttons */
-  display: block;
-  float: right;
-  margin-right: 10px;
-  height: 28px;
-  line-height: 28px;
-  padding: 0 15px 0 15px;
-  text-align: center;
-  font-weight: bold;
-  border: 1px solid silver;
-  border-radius: 3px;
-  background-color: #ececec;
+	margin-top: 0px;
+	margin-bottom: 0px;
+	margin-right:20px;
+	background-color:#59aa29;
+	border-radius:3px;
+	border: 1px solid #4c8829;
+	color:#fff;
+	float:right;
+	font-family: 'open_sansbold', Arial;
+	font-size:12px;
+	text-shadow:0px 1px rgba(0, 0, 0, 0.25);
+	display:block;
+	cursor:pointer;
+	transition: all ease 0.2s;
+	padding:0px;
+	padding-left:9px;
+	padding-right:9px;
+	line-height:28px;
 }
 
 .content_toolbar .btn a:hover {
-  background-color: #fff;
-  border-color: #999;
+	background-color:#6ac435;
+	transition: all ease 0.2s;
 }
 
 .content_toolbar .btn a:active {
-  background-color: #999;
-  color: #fff !important;
+	background-color:#4d9324;
+	transition: all ease 0.0s;
+	box-shadow:inset 0px 1px 5px rgba(0, 0, 0, 0.35);
 }
 
+.content_toolbar .btn a.disabled {
+    cursor: default;
+    color: #fff;
+    background-color:#AFAFAF;
+    border: none;
+    pointer-events: none;
+    text-shadow: none;
+    opacity: 0.5;
+}
+
+
 .toolbar_scroll_bottom .content_wrapper {
   /*  content wrapper in view with toolbar in scroll bottom
       leave 50px space for the toolbar
@@ -1552,6 +1575,8 @@ dialog {
 
 .content_wrapper {
   padding: 15px;
+    width:calc(100% - 30px);
+
 }
 
 .tab_title {
@@ -1559,6 +1584,7 @@ dialog {
 	line-height:18px;
 	font-family: 'open_sanslight', Arial;
 	margin-bottom:10px;
+	height: 22px;
 	}
 
 .cf_doc_version_bt a {
@@ -1653,6 +1679,8 @@ input {
 }
 
 
-
+.content_toolbar .btn a {
+margin-right:15px;
+}
 
 	}
diff --git a/modes.css b/modes.css
deleted file mode 100644
index ba9d414a..00000000
--- a/modes.css
+++ /dev/null
@@ -1,64 +0,0 @@
-.tab-modes .boxes {
-    width: 100%;
-    border-collapse: collapse;
-}
-.tab-modes .boxes th, .tab-modes .boxes td {
-    line-height: 22px;
-    text-align: center;
-
-    border: 1px solid #8b8b8b;
-}
-.tab-modes .boxes .heads {
-    background-color: #ececec;
-}
-.tab-modes .boxes .main {
-    background-color: #ececec;
-}
-.tab-modes .boxes .name {
-    text-align: center;
-}
-.tab-modes .boxes .on {
-    color: white;
-    background-color: #0d8b13;
-}
-.tab-modes .boxes .off {
-    color: white;
-    background-color: #be2222;
-}
-.tab-modes .boxes td input {
-    position: absolute;
-
-    margin-top: -6px;
-    margin-left: -6px;
-}
-.tab-modes .boxes .switches:nth-child(odd) {
-    background-color: #ececec;
-}
-.tab-modes .boxes .heads th:first-child {
-    border: 0;
-    background-color: white;
-}
-.tab-modes .buttons {
-    width: calc(100% - 20px);
-
-    position: absolute;
-    bottom: 10px;
-}
-.tab-modes .update {
-    display: block;
-    float: right;
-
-    height: 28px;
-    line-height: 28px;
-
-    padding: 0 15px 0 15px;
-
-    text-align: center;
-    font-weight: bold;
-
-    border: 1px solid silver;
-    background-color: #ececec;
-}
-.tab-modes .update:hover {
-    background-color: #dedcdc;
-}
\ No newline at end of file
diff --git a/tabs/configuration.css b/tabs/configuration.css
index 4ec6eac5..c682feb8 100644
--- a/tabs/configuration.css
+++ b/tabs/configuration.css
@@ -277,6 +277,7 @@
 .tab-configuration .other .gui_box {
 	min-height:355px;
 	float:left;
+	margin-bottom:0px;
 }
 
 .tab-configuration .current .gui_box {
diff --git a/tabs/dataflash.js b/tabs/dataflash.js
index abca46d2..39a162ed 100644
--- a/tabs/dataflash.js
+++ b/tabs/dataflash.js
@@ -78,7 +78,7 @@ TABS.dataflash.initialize = function (callback) {
             });
         }
         
-        $(".save_btn a.erase-flash, .save_btn a.save-flash").toggleClass("disabled", DATAFLASH.usedSize == 0);
+        $(".btn a.erase-flash, .btn a.save-flash").toggleClass("disabled", DATAFLASH.usedSize == 0);
     }
     
     function create_html() {
diff --git a/tabs/gps.html b/tabs/gps.html
index d4d8ef88..8f11c86a 100644
--- a/tabs/gps.html
+++ b/tabs/gps.html
@@ -49,7 +49,7 @@
   </div>
  <div class="cf_column fourth">
    <div class="spacer_right">
-      <div class="gui_box grey">
+      <div class="gui_box grey" style="margin-bottom: -5px;">
         <div class="gui_box_titlebar">
           <div class="spacer_box_title" i18n="gpsSignalStrHead"></div>
         </div>
diff --git a/tabs/logging.css b/tabs/logging.css
index 2504932b..fe3d5a6f 100755
--- a/tabs/logging.css
+++ b/tabs/logging.css
@@ -55,6 +55,9 @@
     display: none;
 }
 
+.tab-logging .back_btn {
+display:none;
+}
 
 @media only screen and (max-width: 1055px), only screen and (max-device-width: 1055px) {
 
diff --git a/tabs/pid_tuning.css b/tabs/pid_tuning.css
index fb123480..aca17356 100644
--- a/tabs/pid_tuning.css
+++ b/tabs/pid_tuning.css
@@ -28,7 +28,7 @@
 	}
 
 .tab-pid_tuning .gui_box {
- 	margin-bottom:65px !important;
+ 	margin-bottom:0px !important;
  }
 
 .tab-pid_tuning table,
diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index 9027c1eb..784fbb06 100755
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -1,3 +1,4 @@
+<div id="content-watermark"></div>
 <div class="tab-pid_tuning toolbar_fixed_bottom">
 <div class="content_wrapper">
    <div class="tab_title" i18n="tabPidTuning"></div>
diff --git a/tabs/setup.css b/tabs/setup.css
index 21c9ab8b..995b7279 100644
--- a/tabs/setup.css
+++ b/tabs/setup.css
@@ -162,11 +162,13 @@ margin-bottom:10px;
 	padding-top:7px;
 	}
 
-
+	
+	
 @media only screen and (max-width: 1055px), only screen and (max-device-width: 1055px) {
 
 
 
+
 .block.instrument .attitude {
 width:50px !important;
 height:50px !important;
diff --git a/tabs/setup.html b/tabs/setup.html
index 83282d56..54fe32e6 100644
--- a/tabs/setup.html
+++ b/tabs/setup.html
@@ -1,5 +1,5 @@
 <div class="tab-setup">
-<div class="content_wrapper">
+<div class="content_wrapper" style="position:initial;">
   <!-- should be the first DIV on each tab -->
   <div class="cf_column full" style="margin-bottom:10px;">
     <div class="tab_title" i18n="tabSetup">Setup</div>
@@ -12,7 +12,7 @@
         <div class="default_btn"><a class="calibrateMag" href="#" i18n="initialSetupButtonCalibrateMag" ></a></div>
         <div class="default_btn"><a class="resetSettings" href="#" i18n="initialSetupButtonReset"></a></div>
         <div class="half">
-          <div class="spacer_right">
+          <div class="spacer_right" style="width: calc(100% - 10px);">
             <div class="default_btn half"><a class="backup" href="#" i18n="initialSetupButtonBackup"></a></div>
           </div>
         </div>
@@ -111,7 +111,7 @@
       </div>
     </div>
     <div class="spacer_left">
-      <div class="gui_box grey" align="center">
+      <div class="gui_box grey" align="center" style="margin-bottom:0px;">
         <div class="gui_box_titlebar" align="left">
           <div class="spacer_box_title" i18n="initialSetupInstrumentsHead"></div>
         </div>