diff --git a/tabs/pid_tuning.css b/tabs/pid_tuning.css
index c5e27520..cba9d9ed 100644
--- a/tabs/pid_tuning.css
+++ b/tabs/pid_tuning.css
@@ -589,8 +589,7 @@
 .tab-pid_tuning .rates_preview_cell {
     position: relative;
     width: 100%;
-    height: 0;
-    padding-bottom: 100%;
+    height: 320px;
 }
 
 .tab-pid_tuning .rates_preview {
@@ -606,5 +605,4 @@
     margin-top: -1px;
     border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
-    height: 260px;
 }
diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index 01f7d03b..7f05515b 100755
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -203,17 +203,16 @@
 				</div>
                             </th>
                         </tr>
-                        <tr class="HORIZON">
-                            <!-- 7 -->
-                            <td class="third" i18n="pidTuningHorizon"></td>
-                            <td class="third"><input type="number" name="p" step="1" min="0" max="255" /></td>
-                            <td class="third"><input type="number" name="i" step="1" min="0" max="255" /></td>
-                        </tr>
                         <tr class="ANGLE">
                             <!-- 7 -->
                             <td class="third" i18n="pidTuningAngle"></td>
+                            <td class="third"><input type="number" name="p" step="1" min="0" max="255" /></td>
+                        </tr>
+                        <tr class="HORIZON">
+                            <!-- 7 -->
+                            <td class="third" i18n="pidTuningHorizon"></td>
+                            <td class="third"><input type="number" name="i" step="1" min="0" max="255" /></td>
                             <td class="third"><input type="number" name="d" step="1" min="0" max="255" /></td>
-			    <td></td>
                         </tr>
                     </table>
                 </div>
diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index e7b35e46..98592932 100755
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -145,18 +145,18 @@ TABS.pid_tuning.initialize = function (callback) {
         });
 
         i = 0;
-        $('.pid_tuning .HORIZON input').each(function () {
+        $('.pid_tuning .ANGLE input').each(function () {
             switch (i) {
                 case 0:
                     $(this).val(PIDs[7][i++]);
                     break;
+            }
+        });
+        $('.pid_tuning .HORIZON input').each(function () {
+            switch (i) {
                 case 1:
                     $(this).val(PIDs[7][i++]);
                     break;
-            }
-        });
-        $('.pid_tuning .ANGLE input').each(function () {
-            switch (i) {
                 case 2:
                     $(this).val(PIDs[7][i++]);
                     break;
@@ -267,10 +267,10 @@ TABS.pid_tuning.initialize = function (callback) {
         });
 
         i = 0;
-        $('table.pid_tuning tr.HORIZON input').each(function () {
+        $('table.pid_tuning tr.ANGLE input').each(function () {
             PIDs[7][i++] = parseFloat($(this).val());
         });
-        $('table.pid_tuning tr.ANGLE input').each(function () {
+        $('table.pid_tuning tr.HORIZON input').each(function () {
             PIDs[7][i++] = parseFloat($(this).val());
         });
 
diff --git a/tabs/receiver.css b/tabs/receiver.css
index 8dea0243..40b62121 100644
--- a/tabs/receiver.css
+++ b/tabs/receiver.css
@@ -436,7 +436,7 @@
 .tab-receiver .model_preview_cell {
     position: relative;
     width: 100%;
-    height: 220px;
+    height: 180px;
 }
 
 .tab-receiver .model_preview {