diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0cae9ee2d..dc49f49d 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -69,6 +69,9 @@
     "tabSetup": {
         "message": "Setup"
     },
+    "tabCalibration": {
+        "message": "Calibration"
+    },
     "tabConfiguration": {
         "message": "Configuration"
     },
diff --git a/js/gui.js b/js/gui.js
index 91392ac2..911d16a1 100644
--- a/js/gui.js
+++ b/js/gui.js
@@ -35,6 +35,7 @@ var GUI_control = function () {
         'receiver',
         'sensors',
         'servos',
+        'calibration',
         'setup'
     ];
     this.allowedTabs = this.defaultAllowedTabsWhenDisconnected;
diff --git a/main.css b/main.css
index e9084363..3dfe403a 100644
--- a/main.css
+++ b/main.css
@@ -814,6 +814,18 @@ li.active .ic_transponder {
     background-image: url(images/icons/cf_icon_transponder_white.svg);
 }
 
+.ic_calibration {
+    background-image: url(images/icons/cf_icon_wizard_grey.svg);
+}
+
+.ic_calibration:hover {
+    background-image: url(images/icons/cf_icon_wizard_white.svg);
+}
+
+li.active .ic_calibration {
+    background-image: url(images/icons/cf_icon_wizard_white.svg);
+}
+
 
 /* SPARE Tab-Icons */
 .ic_failsafe {
@@ -1280,7 +1292,7 @@ dialog {
 }
 
 .default_btn a:active {
-    background-color: #4d9324;
+    background-color: #0a3a9d;
     transition: all ease 0.0s;
     box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35);
 }
diff --git a/main.html b/main.html
index 019b86f8..f0f88257 100755
--- a/main.html
+++ b/main.html
@@ -8,6 +8,7 @@
 <link type="text/css" rel="stylesheet" href="./js/libraries/jquery.nouislider.pips.min.css" />
 <link type="text/css" rel="stylesheet" href="./js/libraries/flightindicators.css" />
 <link type="text/css" rel="stylesheet" href="./tabs/landing.css" media="all" />
+<link type="text/css" rel="stylesheet" href="./tabs/calibration.css" media="all" />
 <link type="text/css" rel="stylesheet" href="./tabs/setup.css" media="all" />
 <link type="text/css" rel="stylesheet" href="./tabs/help.css" media="all" />
 <link type="text/css" rel="stylesheet" href="./tabs/ports.css" media="all" />
@@ -62,6 +63,7 @@
 <script type="text/javascript" src="./main.js"></script>
 <script type="text/javascript" src="./tabs/landing.js"></script>
 <script type="text/javascript" src="./tabs/setup.js"></script>
+<script type="text/javascript" src="./tabs/calibration.js"></script>
 <script type="text/javascript" src="./tabs/help.js"></script>
 <script type="text/javascript" src="./tabs/ports.js"></script>
 <script type="text/javascript" src="./tabs/configuration.js"></script>
@@ -194,6 +196,7 @@
                 </ul>
                 <ul class="mode-connected">
                     <li class="tab_setup"><a href="#" i18n="tabSetup" class="tabicon ic_setup" title="Setup"></a></li>
+                    <li class="tab_calibration"><a href="#" i18n="tabCalibration" class="tabicon ic_calibration" title="Calibration"></a></li>
                     <li class="tab_ports"><a href="#" i18n="tabPorts" class="tabicon ic_ports" title="Ports"></a></li>
                     <li class="tab_configuration"><a href="#" i18n="tabConfiguration" class="tabicon ic_config" title="Configuration"></a></li>
                     <li class="tab_failsafe"><a href="#" i18n="tabFailsafe" class="tabicon ic_failsafe" title="Failsafe"></a></li>
diff --git a/main.js b/main.js
index 6c734a94..34e0a6ec 100644
--- a/main.js
+++ b/main.js
@@ -142,6 +142,9 @@ $(document).ready(function () {
                     case 'setup':
                         TABS.setup.initialize(content_ready);
                         break;
+                    case 'calibration':
+                        TABS.calibration.initialize(content_ready);
+                        break;
                     case 'configuration':
                         TABS.configuration.initialize(content_ready);
                         break;
diff --git a/tabs/configuration.js b/tabs/configuration.js
index ccb70766..c961175d 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -271,11 +271,12 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
         ];
 
         var gpsSbas = [
-            'Auto-detect',
+            'Disabled',
             'European EGNOS',
             'North American WAAS',
             'Japanese MSAS',
-            'Indian GAGAN'
+            'Indian GAGAN',
+            'Autodetect'
         ];