diff --git a/main.css b/main.css
index 252901bc..54482b11 100644
--- a/main.css
+++ b/main.css
@@ -495,6 +495,7 @@ input[type="number"]::-webkit-inner-spin-button {
     border: 1px solid silver;
     background-color: white;
 	border-radius:5px;
+	z-index:1;
 }
 #options-window input {
     float: left;
@@ -1487,11 +1488,11 @@ body {
 }
 
 .default_btn {
-	margin-bottom:7px;
+	margin-bottom:10px;
 }
 
 .default_btn a {
- 	font-size:11px;
+ 	font-size:12px;
 }
 	
 #tabs li a {
diff --git a/tabs/setup.css b/tabs/setup.css
index 8f2ae5e8..f5824358 100644
--- a/tabs/setup.css
+++ b/tabs/setup.css
@@ -205,7 +205,7 @@ margin-bottom:10px;
     position: absolute;
 	width: calc(75% - 20px);
 	min-height:356px;
-	height: calc(100% - 198px);
+	height: calc(100% - 218px);
 }
 
 
diff --git a/tabs/setup_old.css b/tabs/setup_old.css
deleted file mode 100755
index 81a7fbfc..00000000
--- a/tabs/setup_old.css
+++ /dev/null
@@ -1,219 +0,0 @@
-.tab-setup .model-and-info {
-    height: calc(100% - 138px);
-}
-.tab-setup {
-    height: 100%;
-}
-.tab-setup .section {
-    clear: both;
-    padding-bottom: 8px;
-}
-.tab-setup .section a {
-    display: block;
-
-    float: left;
-
-    width: 190px;
-    height: 24px;
-    line-height: 24px;
-
-    text-align: center;
-    font-weight: bold;
-
-    border: 1px solid silver;
-    background-color: #ececec;
-
-    white-space: nowrap;
-}
-.tab-setup .section a:hover {
-    background-color: #dedcdc;
-}
-.tab-setup .section  a.calibrating {
-    background-color: #c1c1c1;
-}
-.tab-setup .section a.calibrating:hover {
-    cursor: default;
-    background-color: #c1c1c1;
-}
-.tab-setup .section a.disabled {
-    background-color: #c1c1c1;
-}
-.tab-setup .section a.disabled:hover {
-    cursor: default;
-}
-.tab-setup .section a.backup {
-    width: 90px;
-    margin-right: 8px;
-}
-.tab-setup .section a.restore {
-    width: 90px;
-}
-.tab-setup .section p {
-    margin-left: 200px;
-
-    padding: 0 0 0 5px;
-
-    height: 25px;
-    line-height: 25px;
-
-    border-bottom: 1px solid #e5e5e5;
-}
-.tab-setup #interactive_block {
-    float: left;
-    position: relative;
-
-    height: 100%;
-    width: calc(100% - 199px);
-
-    border: 1px solid silver;
-    background-color: white;
-}
-.tab-setup #interactive_block .attitude {
-    float: right;
-    margin: 10px 10px 0px 0px
-}
-
-.tab-setup #interactive_block .attitude dt {
-    float: left;
-    width: 64px;
-    font-weight: 700;
-    text-align: right
-}
-
-.tab-setup #interactive_block .attitude dd {
-    display: block;
-    margin-left: 64px;
-    width: 64px;
-    text-align: right
-}
-.tab-setup #interactive_block a.reset {
-    position: absolute;
-    display: block;
-
-    bottom: 10px;
-    right: 10px;
-
-    height: 28px;
-    line-height: 28px;
-
-    padding: 0 15px 0 15px;
-
-    text-align: center;
-    font-weight: bold;
-
-    border: 1px solid silver;
-    background-color: #ececec;
-
-    z-index: 100;
-}
-.tab-setup #interactive_block a.reset:hover {
-    background-color: #dedcdc;
-}
-.tab-setup #canvas_wrapper {
-    position: absolute;
-
-    width: 100%;
-    height: 100%;
-
-    top: 0;
-    left: 0;
-}
-.tab-setup .block_wrapper {
-    font-size: 0;
-}
-.tab-setup .block {
-    float: left;
-    display: block;
-
-    margin-left: 10px;
-
-    border: 1px solid silver;
-}
-.tab-setup .block .head {
-    display: block;
-
-    text-align: center;
-    line-height: 20px;
-    font-weight: bold;
-
-    border-bottom: 1px solid silver;
-    background-color: #ececec;
-}
-.tab-setup .block.info {
-    display: inline-block;
-    margin-bottom: 10px;
-
-    vertical-align: top;
-    font-size: 12px;
-
-    border: 1px solid silver;
-}
-.tab-setup .block.info .fields {
-    padding: 5px 5px 3px 5px;
-}
-.tab-setup .block.info dt {
-    float: left;
-
-    width: 99px;
-    height: 20px;
-    line-height: 20px;
-}
-.tab-setup .block.info dd {
-    width: 76px;
-    height: 20px;
-    line-height: 20px;
-
-    margin-left: 99px;
-}
-.tab-setup .block.gps {
-    width: 185px;
-    margin-bottom: 10px;
-}
-.tab-setup .block.gps .fields {
-    padding: 5px 5px 3px 5px;
-}
-.tab-setup .block.gps dt {
-    float: left;
-
-    width: 85px;
-    height: 20px;
-
-    margin-bottom: 2px;
-
-    line-height: 20px;
-}
-.tab-setup .block.gps dd {
-    height: 20px;
-
-    margin-left: 85px;
-    margin-bottom: 2px;
-
-    line-height: 20px;
-}
-.tab-setup .block.instruments {
-    width: 185px;
-}
-.tab-setup .buttons {
-    width: calc(100% - 20px);
-
-    position: absolute;
-    bottom: 10px;
-}
-.tab-setup .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-setup .update:hover {
-    background-color: #dedcdc;
-}
diff --git a/tabs/setup_old.html b/tabs/setup_old.html
deleted file mode 100755
index 837a7859..00000000
--- a/tabs/setup_old.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="tab-setup">
-    <div class="section">
-        <a class="calibrateAccel" href="#" i18n="initialSetupButtonCalibrateAccel"></a>
-        <p i18n="initialSetupCalibrateAccelText">
-        </p>
-    </div>
-    <div class="section">
-        <a class="calibrateMag" href="#" i18n="initialSetupButtonCalibrateMag"></a>
-        <p i18n="initialSetupCalibrateMagText">
-        </p>
-    </div>
-    <div class="section">
-        <a class="resetSettings" href="#" i18n="initialSetupButtonReset"></a>
-        <p i18n="initialSetupResetText">
-        </p>
-    </div>
-    <div class="section">
-        <a class="backup" href="#" i18n="initialSetupButtonBackup"></a>
-        <a class="restore" href="#" i18n="initialSetupButtonRestore"></a>
-        <p i18n="initialSetupBackupRestoreText">
-        </p>
-    </div>
-    <div class="model-and-info">
-        <div id="interactive_block">
-            <div id="canvas_wrapper">
-                <canvas id="canvas"></canvas>
-            </div>
-            <div class="attitude">
-                <dl>
-                    <dt>Heading:</dt><dd class="heading">&nbsp;</dd>
-                    <dt>Pitch:</dt><dd class="pitch">&nbsp;</dd>
-                    <dt>Roll:</dt><dd class="roll">&nbsp;</dd>
-                </dl>
-            </div>
-            <a class="reset" href="#" i18n="initialSetupButtonResetZaxis"></a>
-        </div>
-        <div class="block info">
-            <span class="head" i18n="initialSetupInfoHead"></span>
-            <div class="fields">
-                <dl>
-                    <dt i18n="initialSetupBattery"></dt><dd class="bat-voltage">0 V</dd>
-                    <dt i18n="initialSetupDrawn"></dt><dd class="bat-mah-drawn">0 mAh</dd>
-                    <dt i18n="initialSetupDrawing"></dt><dd class="bat-mah-drawing">0 A</dd>
-                    <dt i18n="initialSetupRSSI"></dt><dd class="rssi">0 %</dd>
-                </dl>
-            </div>
-        </div>
-        <div class="block gps">
-            <span class="head" i18n="initialSetupGPSHead"></span>
-            <div class="fields">
-                <dl>
-                    <dt i18n="gps3dFix"></dt><dd class="gpsFix"></dd>
-                    <dt i18n="gpsSats"></dt><dd class="gpsSats"></dd>
-                    <dt i18n="gpsLat"></dt><dd class="gpsLat"></dd>
-                    <dt i18n="gpsLon"></dt><dd class="gpsLon"></dd>
-                </dl>
-            </div>
-        </div>
-        <div class="block instruments">
-          <span class="head" i18n="initialSetupInstrumentsHead"></span>
-          <span id="attitude"></span>
-          <span id="heading"></span>
-        </div>
-    </div>
-</div>