diff --git a/data_resources.qrc b/data_resources.qrc
index cb73ede..474a6ff 100644
--- a/data_resources.qrc
+++ b/data_resources.qrc
@@ -6,18 +6,23 @@
         <file>html/css/beneoverlay.css</file>
         <file>html/js/beneoverlay.js</file>
         <file>html/js/jquery.min.js</file>
-        <file>html/js/landing.js</file>
-        <file>html/js/progress.js</file>
+        <file>html/js/landing/title.js</file>
+        <file>html/js/landing/rate.js</file>
+        <file>html/js/landing/speed.js</file>
+        <file>html/js/landing/attitude.js</file>
+        <file>html/js/landing/landing.js</file>
+        <file>html/js//progress/progress.js</file>
         <file>html/js/qwebchannel.js</file>
         <file>html/landing.html</file>
         <file>html/progress.html</file>
-        <file>html/js/altitude.js</file>
-        <file>html/js/callsign.js</file>
-        <file>html/js/heading.js</file>
-        <file>html/js/network.js</file>
-        <file>html/js/performance.js</file>
-        <file>html/js/speed.js</file>
-        <file>html/js/wind.js</file>
+        <file>html/js/widgets/altitude.js</file>
+        <file>html/js/widgets/callsign.js</file>
+        <file>html/js/widgets/heading.js</file>
+        <file>html/js/widgets/network.js</file>
+        <file>html/js/widgets/performance.js</file>
+        <file>html/js/widgets/speed.js</file>
+        <file>html/js/widgets/wind.js</file>
+        <file>html/js/widgets/widgets.js</file>
         <file>html/altitude.html</file>
         <file>html/callsign.html</file>
         <file>html/heading.html</file>
@@ -27,6 +32,6 @@
         <file>html/wind.html</file>
         <file>html/widgets.html</file>
         <file>html/temperature.html</file>
-        <file>html/js/temperature.js</file>
+        <file>html/js/widgets/temperature.js</file>
     </qresource>
 </RCC>
diff --git a/html/altitude.html b/html/altitude.html
index 90aeab5..439c8f9 100755
--- a/html/altitude.html
+++ b/html/altitude.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/altitude.js"></script>
+        <script type="text/javascript" src="js/widgets/altitude.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/callsign.html b/html/callsign.html
index 2d28e93..52c5908 100755
--- a/html/callsign.html
+++ b/html/callsign.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/callsign.js"></script>
+        <script type="text/javascript" src="js/widgets/callsign.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/heading.html b/html/heading.html
index de31c64..7e6d2fe 100755
--- a/html/heading.html
+++ b/html/heading.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/heading.js"></script>
+        <script type="text/javascript" src="js/widgets/heading.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/js/landing/attitude.js b/html/js/landing/attitude.js
new file mode 100644
index 0000000..3977f4f
--- /dev/null
+++ b/html/js/landing/attitude.js
@@ -0,0 +1,35 @@
+/* Copyright (C) 2017 Benjamin Isbarn.
+
+   This file is part of BeneOverlay.
+
+   BeneOverlay is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   BeneOverlay is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+function setupAttitude(data_refs) {
+    setupCustomStyle(
+        $("#attitude"),
+        {
+            "custom_style": data_refs["landing/attitude/custom_style"],
+            "icon_enabled": data_refs["landing/attitude/icon_enabled"],
+            "icon_size": data_refs["landing/attitude/icon_size"],
+            "primary_color": data_refs["landing/attitude/primary_color"],
+            "secondary_color": data_refs["landing/attitude/secondary_color"],
+            "primary_font": data_refs["landing/attitude/primary_font"],
+            "secondary_font": data_refs["landing/attitude/secondary_font"]
+        },
+        data_refs
+    );
+
+    attachToToggle($("#bank-row"), data_refs["landing/attitude/bank_enabled"]);
+}
diff --git a/html/js/landing.js b/html/js/landing/landing.js
similarity index 75%
rename from html/js/landing.js
rename to html/js/landing/landing.js
index d5096f1..7704646 100644
--- a/html/js/landing.js
+++ b/html/js/landing/landing.js
@@ -17,19 +17,16 @@
 */
 
 function setupLanding(data_refs) {
-    setupCustomStyle(
-        $("#landing"),
-        {
-            "custom_style": data_refs["landing/custom_style"],
-            "icon_enabled": data_refs["landing/icon_enabled"],
-            "icon_size": data_refs["landing/icon_size"],
-            "primary_color": data_refs["landing/primary_color"],
-            "secondary_color": data_refs["landing/secondary_color"],
-            "primary_font": data_refs["landing/primary_font"],
-            "secondary_font": data_refs["landing/secondary_font"]
-        },
-        data_refs
-    );
+    setupTitle(data_refs);
+    setupRate(data_refs);
+    setupSpeed(data_refs);
+    setupAttitude(data_refs);
+
+    attachToToggle($("#title"), data_refs["landing/title/enabled"]);
+    attachToToggle($("#rate"), data_refs["landing/rate/enabled"]);
+    attachToToggle($("#speed"), data_refs["landing/speed/enabled"]);
+    attachToToggle($("#attitude"), data_refs["landing/attitude/enabled"]);
+
 
     function updateBackgroundImage() {
         if (data_refs["landing/background_image_enabled"].data) {
@@ -43,13 +40,13 @@ function setupLanding(data_refs) {
     attachToFun(updateBackgroundImage, data_refs["landing/background_image_enabled"]);
 
     function setVisible(val) {
-      if (val) {
-        $("#landing").fadeIn("fast");
-        $("#background").fadeIn("fast");
-      } else {
-        $("#landing").fadeOut("slow");
-        $("#background").fadeOut("slow");
-      }
+        if (val) {
+            $("#landing").fadeIn("fast");
+            $("#background").fadeIn("fast");
+        } else {
+            $("#landing").fadeOut("slow");
+            $("#background").fadeOut("slow");
+        }
     }
 
     attachToFun(setVisible, data_refs["landing/settings_mode"]);
@@ -82,5 +79,4 @@ function setupLanding(data_refs) {
 
         }
     });
-
 }
diff --git a/html/js/landing/rate.js b/html/js/landing/rate.js
new file mode 100644
index 0000000..ac05e5b
--- /dev/null
+++ b/html/js/landing/rate.js
@@ -0,0 +1,36 @@
+/* Copyright (C) 2017 Benjamin Isbarn.
+
+   This file is part of BeneOverlay.
+
+   BeneOverlay is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   BeneOverlay is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+function setupRate(data_refs) {
+    setupCustomStyle(
+        $("#rate"),
+        {
+            "custom_style": data_refs["landing/rate/custom_style"],
+            "icon_enabled": data_refs["landing/rate/icon_enabled"],
+            "icon_size": data_refs["landing/rate/icon_size"],
+            "primary_color": data_refs["landing/rate/primary_color"],
+            "secondary_color": data_refs["landing/rate/secondary_color"],
+            "primary_font": data_refs["landing/rate/primary_font"],
+            "secondary_font": data_refs["landing/rate/secondary_font"]
+        },
+        data_refs
+    );
+
+    attachToToggle($("#vs-row"), data_refs["landing/rate/vs_enabled"]);
+    attachToToggle($("#pitch-row"), data_refs["landing/rate/pitch_enabled"]);
+}
diff --git a/html/js/landing/speed.js b/html/js/landing/speed.js
new file mode 100644
index 0000000..1e0be94
--- /dev/null
+++ b/html/js/landing/speed.js
@@ -0,0 +1,36 @@
+/* Copyright (C) 2017 Benjamin Isbarn.
+
+   This file is part of BeneOverlay.
+
+   BeneOverlay is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   BeneOverlay is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+function setupSpeed(data_refs) {
+    setupCustomStyle(
+        $("#speed"),
+        {
+            "custom_style": data_refs["landing/speed/custom_style"],
+            "icon_enabled": data_refs["landing/speed/icon_enabled"],
+            "icon_size": data_refs["landing/speed/icon_size"],
+            "primary_color": data_refs["landing/speed/primary_color"],
+            "secondary_color": data_refs["landing/speed/secondary_color"],
+            "primary_font": data_refs["landing/speed/primary_font"],
+            "secondary_font": data_refs["landing/speed/secondary_font"]
+        },
+        data_refs
+    );
+
+    attachToToggle($("#ias-row"), data_refs["landing/speed/ias_enabled"]);
+    attachToToggle($("#gs-row"), data_refs["landing/speed/gs_enabled"]);
+}
diff --git a/html/js/landing/title.js b/html/js/landing/title.js
new file mode 100644
index 0000000..2c5d358
--- /dev/null
+++ b/html/js/landing/title.js
@@ -0,0 +1,33 @@
+/* Copyright (C) 2017 Benjamin Isbarn.
+
+   This file is part of BeneOverlay.
+
+   BeneOverlay is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   BeneOverlay is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+function setupTitle(data_refs) {
+    setupCustomStyle(
+        $("#title"),
+        {
+            "custom_style": data_refs["landing/title/custom_style"],
+            "icon_enabled": data_refs["landing/title/icon_enabled"],
+            "icon_size": data_refs["landing/title/icon_size"],
+            "primary_color": data_refs["landing/title/primary_color"],
+            "secondary_color": data_refs["landing/title/secondary_color"],
+            "primary_font": data_refs["landing/title/primary_font"],
+            "secondary_font": data_refs["landing/title/secondary_font"]
+        },
+        data_refs
+    );
+}
diff --git a/html/js/progress.js b/html/js/progress/progress.js
similarity index 98%
rename from html/js/progress.js
rename to html/js/progress/progress.js
index 0ebf6d9..f66f1fc 100644
--- a/html/js/progress.js
+++ b/html/js/progress/progress.js
@@ -43,6 +43,7 @@ function setupProgress(data_refs) {
     attachToToggle($("#dtg-row"), data_refs["progress/dtg_enabled"]);
     attachToToggle($("#eta-row"), data_refs["progress/eta_enabled"]);
     attachToToggle($("#ete-row"), data_refs["progress/ete_enabled"]);
+    attachToToggle($("#route"), data_refs["progress/route_enabled"]);
 
     function setProgressBarViewBox() {
         let width = $("#progress_bar").width();
diff --git a/html/js/altitude.js b/html/js/widgets/altitude.js
similarity index 97%
rename from html/js/altitude.js
rename to html/js/widgets/altitude.js
index ac1b145..adb9ccd 100644
--- a/html/js/altitude.js
+++ b/html/js/widgets/altitude.js
@@ -31,7 +31,6 @@ function setupAltitude(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#altitude"), data_refs["widget/altitude/enabled"]);
     attachToToggle($("#alt-row"), data_refs["widget/altitude/alt_enabled"]);
     attachToToggle($("#vs-row"), data_refs["widget/altitude/vs_enabled"]);
 
diff --git a/html/js/callsign.js b/html/js/widgets/callsign.js
similarity index 95%
rename from html/js/callsign.js
rename to html/js/widgets/callsign.js
index 0493280..dde805d 100644
--- a/html/js/callsign.js
+++ b/html/js/widgets/callsign.js
@@ -31,7 +31,6 @@ function setupCallsign(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#callsign"), data_refs["widget/callsign/enabled"]);
     attachToToggle($("#callsign-row"), data_refs["widget/callsign/callsign_enabled"]);
     attachToToggle($("#airline-row"), data_refs["widget/callsign/airline_enabled"]);
 
diff --git a/html/js/heading.js b/html/js/widgets/heading.js
similarity index 96%
rename from html/js/heading.js
rename to html/js/widgets/heading.js
index d2c24d4..4676680 100644
--- a/html/js/heading.js
+++ b/html/js/widgets/heading.js
@@ -31,7 +31,6 @@ function setupHeading(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#heading"), data_refs["widget/heading/enabled"]);
     attachToToggle($("#hdg-row"), data_refs["widget/heading/hdg_enabled"]);
     attachToToggle($("#trk-row"), data_refs["widget/heading/trk_enabled"]);
 
diff --git a/html/js/network.js b/html/js/widgets/network.js
similarity index 95%
rename from html/js/network.js
rename to html/js/widgets/network.js
index fa1dddc..de872f5 100644
--- a/html/js/network.js
+++ b/html/js/widgets/network.js
@@ -31,7 +31,6 @@ function setupNetwork(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#network"), data_refs["widget/network/enabled"]);
     attachToToggle($("#network-row"), data_refs["widget/network/network_enabled"]);
     attachToToggle($("#aircraft-row"), data_refs["widget/network/aircraft_enabled"]);
 
diff --git a/html/js/performance.js b/html/js/widgets/performance.js
similarity index 95%
rename from html/js/performance.js
rename to html/js/widgets/performance.js
index b18aaac..5b9c4ec 100644
--- a/html/js/performance.js
+++ b/html/js/widgets/performance.js
@@ -31,7 +31,6 @@ function setupPerformance(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#performance"), data_refs["widget/performance/enabled"]);
     attachToToggle($("#fps-row"), data_refs["widget/performance/fps_enabled"]);
     attachToToggle($("#vas-row"), data_refs["widget/performance/vas_enabled"]);
 
diff --git a/html/js/speed.js b/html/js/widgets/speed.js
similarity index 97%
rename from html/js/speed.js
rename to html/js/widgets/speed.js
index 6ba8b0a..666e828 100644
--- a/html/js/speed.js
+++ b/html/js/widgets/speed.js
@@ -31,7 +31,6 @@ function setupSpeed(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#speed"), data_refs["widget/speed/enabled"]);
     attachToToggle($("#ias-row"), data_refs["widget/speed/ias_enabled"]);
     attachToToggle($("#tas-row"), data_refs["widget/speed/tas_enabled"]);
     attachToToggle($("#gs-row"), data_refs["widget/speed/gs_enabled"]);
diff --git a/html/js/temperature.js b/html/js/widgets/temperature.js
similarity index 95%
rename from html/js/temperature.js
rename to html/js/widgets/temperature.js
index 346a8a9..b487447 100644
--- a/html/js/temperature.js
+++ b/html/js/widgets/temperature.js
@@ -31,7 +31,6 @@ function setupTemperature(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#temperature"), data_refs["widget/temperature/enabled"]);
     attachToToggle($("#tat-row"), data_refs["widget/temperature/tat_enabled"]);
     attachToToggle($("#oat-row"), data_refs["widget/temperature/oat_enabled"]);
 
diff --git a/html/js/widgets/widgets.js b/html/js/widgets/widgets.js
new file mode 100644
index 0000000..3481194
--- /dev/null
+++ b/html/js/widgets/widgets.js
@@ -0,0 +1,19 @@
+function setupWidgets(data_refs) {
+    setupCallsign(data_refs);
+    setupNetwork(data_refs);
+    setupSpeed(data_refs);
+    setupHeading(data_refs);
+    setupAltitude(data_refs);
+    setupWind(data_refs);
+    setupTemperature(data_refs);
+    setupPerformance(data_refs);
+
+    attachToToggle($("#callsign"), data_refs["widget/callsign/enabled"]);
+    attachToToggle($("#network"), data_refs["widget/network/enabled"]);
+    attachToToggle($("#speed"), data_refs["widget/speed/enabled"]);
+    attachToToggle($("#heading"), data_refs["widget/heading/enabled"]);
+    attachToToggle($("#altitude"), data_refs["widget/altitude/enabled"]);
+    attachToToggle($("#wind"), data_refs["widget/wind/enabled"]);
+    attachToToggle($("#temperature"), data_refs["widget/temperature/enabled"]);
+    attachToToggle($("#performance"), data_refs["widget/performance/enabled"]);
+}
diff --git a/html/js/wind.js b/html/js/widgets/wind.js
similarity index 96%
rename from html/js/wind.js
rename to html/js/widgets/wind.js
index c7fa9d5..070249b 100644
--- a/html/js/wind.js
+++ b/html/js/widgets/wind.js
@@ -31,7 +31,6 @@ function setupWind(data_refs) {
         data_refs
     );
 
-    attachToToggle($("#wind"), data_refs["widget/wind/enabled"]);
     attachToToggle($("#dir-row"), data_refs["widget/wind/dir_enabled"]);
     attachToToggle($("#mag-row"), data_refs["widget/wind/mag_enabled"]);
 
diff --git a/html/landing.html b/html/landing.html
index c955b27..16004ad 100755
--- a/html/landing.html
+++ b/html/landing.html
@@ -25,7 +25,11 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/landing.js"></script>
+        <script type="text/javascript" src="js/landing/title.js"></script>
+        <script type="text/javascript" src="js/landing/rate.js"></script>
+        <script type="text/javascript" src="js/landing/speed.js"></script>
+        <script type="text/javascript" src="js/landing/attitude.js"></script>
+        <script type="text/javascript" src="js/landing/landing.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
@@ -37,8 +41,8 @@
     <body>
         <img id="background" style="display: none">
         <div id="landing" style="display: none">
-            <span class="secondary-font secondary-color">Touchdown!</span>
-            <div class="tabs" style="padding-top: 10px; padding-bottom: 20px;">
+            <div id="title" style="padding-bottom: 10px;"><span class="secondary-font secondary-color">Touchdown!<span></div>
+            <div id="rate" class="tabs" style="padding-bottom: 20px;">
                 <svg class="icon" viewBox="0 0 80 100">
                     <line x1="0" x2="80" y1="95" y2="95" stroke-width="5" class="secondary-stroke" />
                     <g transform="translate(0,-8) rotate(0,40,89)" id="airplane">
@@ -50,12 +54,12 @@
                     </g>
                 </svg>
                 <table>
-                    <tr>
+                    <tr id="vs-row">
                         <td class="secondary-font secondary-color">V/S:&nbsp;</td>
                         <td id="vs" class="primary-font primary-color right">-100</td>
                         <td class="primary-font primary-color">ft/min</td>
                     </tr>
-                    <tr>
+                    <tr id="pitch-row">
                         <td class="secondary-font secondary-color">Pitch:&nbsp;</td>
                         <td id="pitch" class="primary-font primary-color right">3</td>
                         <td class="primary-font primary-color">&#176;</td>
@@ -63,7 +67,7 @@
                 </table>
             </div>
             <div class="tabs">
-                <div class="tabs">
+                <div id="speed" class="tabs">
                     <svg class="icon" viewBox="0 0 100 100">
                         <defs>
                             <marker id='head' orient="auto"
@@ -98,19 +102,19 @@
                         </g>
                     </svg>
                     <table>
-                        <tr>
+                        <tr id="ias-row">
                             <td class="secondary-font secondary-color">IAS:&nbsp;</td>
                             <td id="ias" class="primary-font primary-color right">10</td>
                             <td class="primary-font primary-color">kt</td>
                         </tr>
-                        <tr>
+                        <tr id="gs-row">
                             <td class="secondary-font secondary-color">GS:&nbsp;</td>
                             <td id="gs" class="primary-font primary-color right">15</td>
                             <td class="primary-font primary-color">kt</td>
                         </tr>
                     </table>
                 </div>
-                <div class="tabs">
+                <div id="attitude" class="tabs">
                     <svg class="icon" viewBox="0 0 100 100">
                         <g id="bank_angle">
                             <path d="M50,56 L0,50 L50,44 M45,50 L50,15 L55,50 M50,44 L100,50 L50,56" class="primary-fill" />
@@ -118,7 +122,7 @@
                         </g>
                     </svg>
                     <table>
-                        <tr>
+                        <tr id="bank-row">
                             <td class="secondary-font secondary-color">Bank:&nbsp;</td>
                             <td id="bank" class="primary-font primary-color right">3</td>
                             <td class="primary-font primary-color">&#176;</td>
diff --git a/html/network.html b/html/network.html
index cf9bbd8..46f78d4 100755
--- a/html/network.html
+++ b/html/network.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/network.js"></script>
+        <script type="text/javascript" src="js/widgets/network.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/performance.html b/html/performance.html
index 7a59664..bc12ee3 100755
--- a/html/performance.html
+++ b/html/performance.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/performance.js"></script>
+        <script type="text/javascript" src="js/widgets/performance.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/progress.html b/html/progress.html
index e59872a..f9ff5f5 100755
--- a/html/progress.html
+++ b/html/progress.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/progress.js"></script>
+        <script type="text/javascript" src="js/progress/progress.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/speed.html b/html/speed.html
index 6387b8d..1bced4f 100755
--- a/html/speed.html
+++ b/html/speed.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/speed.js"></script>
+        <script type="text/javascript" src="js/widgets/speed.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/temperature.html b/html/temperature.html
index a08b790..8aead92 100755
--- a/html/temperature.html
+++ b/html/temperature.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/temperature.js"></script>
+        <script type="text/javascript" src="js/widgets/temperature.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/html/widgets.html b/html/widgets.html
index be9f320..d9bddb6 100755
--- a/html/widgets.html
+++ b/html/widgets.html
@@ -5,25 +5,19 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/callsign.js"></script>
-        <script type="text/javascript" src="js/network.js"></script>
-        <script type="text/javascript" src="js/speed.js"></script>
-        <script type="text/javascript" src="js/heading.js"></script>
-        <script type="text/javascript" src="js/altitude.js"></script>
-        <script type="text/javascript" src="js/wind.js"></script>
-        <script type="text/javascript" src="js/temperature.js"></script>
-        <script type="text/javascript" src="js/performance.js"></script>
+        <script type="text/javascript" src="js/widgets/callsign.js"></script>
+        <script type="text/javascript" src="js/widgets/network.js"></script>
+        <script type="text/javascript" src="js/widgets/speed.js"></script>
+        <script type="text/javascript" src="js/widgets/heading.js"></script>
+        <script type="text/javascript" src="js/widgets/altitude.js"></script>
+        <script type="text/javascript" src="js/widgets/wind.js"></script>
+        <script type="text/javascript" src="js/widgets/temperature.js"></script>
+        <script type="text/javascript" src="js/widgets/performance.js"></script>
+        <script type="text/javascript" src="js/widgets/widgets.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
-                 setupCallsign(data_refs);
-                 setupNetwork(data_refs);
-                 setupSpeed(data_refs);
-                 setupHeading(data_refs);
-                 setupAltitude(data_refs);
-                 setupWind(data_refs);
-                 setupTemperature(data_refs);
-                 setupPerformance(data_refs);
+                 setupWidgets(data_refs);
              });
          });
         </script>
diff --git a/html/wind.html b/html/wind.html
index 796f63b..7bc6ce4 100755
--- a/html/wind.html
+++ b/html/wind.html
@@ -5,7 +5,7 @@
         <script type="text/javascript" src="js/qwebchannel.js"></script>
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/beneoverlay.js"></script>
-        <script type="text/javascript" src="js/wind.js"></script>
+        <script type="text/javascript" src="js/widgets/wind.js"></script>
         <script type="text/javascript">
          $(function () {
              connect(function (data_refs) {
diff --git a/qml/BOColorSelector.qml b/qml/BOColorSelector.qml
index eabeba3..1e85702 100644
--- a/qml/BOColorSelector.qml
+++ b/qml/BOColorSelector.qml
@@ -18,67 +18,63 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.1
 import Qt.labs.platform 1.0
 
 BOItem {
     id: root
 
-    implicitWidth: Math.max(label_text.implicitWidth, indicator_rectangle.implicitWidth + indicator_rectangle.anchors.leftMargin)
-    implicitHeight: label_text.implicitHeight + indicator_rectangle.implicitHeight + indicator_rectangle.anchors.topMargin
-
     Text {
         id: label_text
 
-        anchors {top: parent.top; left: parent.left; right: parent.right}
         text: root.label
+        wrapMode: Text.WordWrap
+
+        Layout.fillWidth: true
     }
 
     Item {
-        anchors {left: parent.left; top: label_text.bottom; right: parent.right; bottom: parent.bottom}
+
+        implicitWidth: indicator_rectangle.implicitWidth
+        implicitHeight: indicator_rectangle.implicitHeight
 
         Rectangle {
             id: indicator_rectangle
 
-            anchors {left: parent.left; verticalCenter: parent.verticalCenter; leftMargin: 10; topMargin: 8}
+            anchors.centerIn: parent
             implicitWidth: 30
             implicitHeight: 30
             radius: 3
             border.color: Material.accent
             border.width: 2
-            visible: mouse_area.containsMouse
-        }
+            opacity: mouse_area.containsMouse
 
-        Rectangle {
-            id: value_rectangle
-
-            anchors {fill: indicator_rectangle; margins: 3}
-            radius: 3
-            color: data_ref.data
+            MouseArea {
+                id: mouse_area
 
-            Binding {
-                target: data_ref
-                property: "data"
-                value: value_rectangle.color
+                anchors.fill: parent
+                hoverEnabled: true
+                onClicked: value_color_dialog.open()
             }
-        }
 
-        MouseArea {
-            id: mouse_area
+            ColorDialog {
+                id: value_color_dialog
 
-            anchors.fill: indicator_rectangle
-            hoverEnabled: true
-            onClicked: color_dialog.open()
+                color: value_rectangle.color
+                currentColor: value_rectangle.color
+                onColorChanged: {
+                    root.data_ref.data = value_color_dialog.color;
+                }
+            }
         }
 
-        ColorDialog {
-            id: color_dialog
+        Rectangle {
+            id: value_rectangle
 
-            color: value_rectangle.color
-            currentColor: value_rectangle.color
-            onColorChanged: {
-                value_rectangle.color = color_dialog.color;
-            }
+            anchors {fill: indicator_rectangle; margins: 3}
+            radius: 3
+            color: root.data_ref.data
         }
     }
 }
diff --git a/qml/BOFontSelector.qml b/qml/BOFontSelector.qml
index 3b5a0ef..51c0efb 100644
--- a/qml/BOFontSelector.qml
+++ b/qml/BOFontSelector.qml
@@ -18,58 +18,57 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.1
 import Qt.labs.platform 1.0
 
 BOItem {
     id: root
 
-    implicitWidth: Math.max(label_text.implicitWidth, value_text.implicitWidth + value_text.anchors.leftMargin)
-    implicitHeight: label_text.implicitHeight + value_text.implicitHeight + value_text.anchors.topMargin + indicator_rectangle.implicitHeight
-
     Text {
         id: label_text
 
-        anchors {top: parent.top; left: parent.left; right: parent.right}
         text: root.label
+        wrapMode: Text.WordWrap
+
+        Layout.fillWidth: true
     }
 
     Text {
         id: value_text
 
-        anchors {top: label_text.bottom; left: parent.left; right: parent.right; leftMargin: 10; topMargin: 8}
-
-        text: data_ref.data.family + ", " + data_ref.data.pointSize
-        font.family: data_ref.data.family
+        text: root.data_ref.data.family + ", " + root.data_ref.data.pointSize
+        font.family: root.data_ref.data.family
         font.pointSize: 11
-    }
 
-    Rectangle {
-        id: indicator_rectangle
+        MouseArea {
+            id: mouse_area
 
-        anchors {left: value_text.left; top: value_text.bottom; right: value_text.right; bottom: parent.bottom}
-        implicitHeight: 2
-        color: Material.accentColor
-        visible: mouse_area.containsMouse
-    }
+            anchors.fill: parent
+            hoverEnabled: true
+            onClicked: font_dialog.open()
+        }
 
-    MouseArea {
-        id: mouse_area
+        FontDialog {
+            id: font_dialog
 
-        anchors.fill: value_text
-        hoverEnabled: true
-        onClicked: font_dialog.open()
-    }
+            font: root.data_ref.data
 
-    FontDialog {
-        id: font_dialog
+            onFontChanged: {
+                console.log("Font changed to " + font_dialog.font);
+                root.data_ref.data = font_dialog.font;
 
-        font: data_ref.data
+            }
+        }
+    }
 
-        onFontChanged: {
-            console.log("Font changed to " + font_dialog.font);
-            data_ref.data = font_dialog.font;
+    Rectangle {
+        id: indicator_rectangle
 
-        }
+        implicitHeight: 2
+        implicitWidth: value_text.implicitWidth
+        color: Material.accentColor
+        opacity: mouse_area.containsMouse
     }
+
 }
diff --git a/qml/BOGroupBox.qml b/qml/BOGroupBox.qml
index 9464280..97013cf 100644
--- a/qml/BOGroupBox.qml
+++ b/qml/BOGroupBox.qml
@@ -18,45 +18,53 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.1
 
-Item {
+ColumnLayout {
     id: root
 
     property string label
     default property alias contents: content.data
 
-    implicitWidth: Math.max(label_text.implicitWidth, content.implicitWidth)
-    implicitHeight: label_text.implicitHeight + content.implicitHeight
+    spacing: 0
 
     Text {
         id: label_text
 
-        anchors {left: parent.left; top: parent.top; right: parent.right}
         text: root.label
         font.pointSize: 12
         color: Material.hintTextColor
+
+        Layout.fillWidth: true
+        Layout.leftMargin: 20
+        Layout.rightMargin: 20
+        Layout.topMargin: 20
     }
 
     Flickable {
         id: content_flickable
 
-        anchors {left: parent.left; top: label_text.bottom; right: parent.right; bottom: parent.bottom}
-        contentHeight: content.height + content.anchors.topMargin
+        contentHeight: content.height
         clip: true
+
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        Layout.leftMargin: 30
+        Layout.topMargin: 20
+        Layout.rightMargin: 20
+        Layout.bottomMargin: 20
+
         ScrollBar.vertical: ScrollBar {
             id: vertical_scroll_bar
 
             policy: content_flickable.contentHeight > content_flickable.height? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
         }
 
-        Item {
+        GridLayout {
             id: content
 
-            implicitWidth: children[0].implicitWidth
-            implicitHeight: children[0].implicitHeight
-
-            anchors {left: parent.left; top: parent.top; right: parent.right; leftMargin: 8; topMargin: 16; rightMargin: vertical_scroll_bar.visible? vertical_scroll_bar.width + 8 : 8}
+            anchors {left: parent.left; top: parent.top; right: parent.right; rightMargin: 10}
         }
     }
 }
diff --git a/qml/BOImageSelector.qml b/qml/BOImageSelector.qml
index 49c3e64..3b4cd4d 100644
--- a/qml/BOImageSelector.qml
+++ b/qml/BOImageSelector.qml
@@ -18,62 +18,61 @@
 
 import QtQuick 2.0
 import QtQuick.Controls.Material 2.1
+import QtQuick.Layouts 1.3
 import Qt.labs.platform 1.0
 
 BOItem {
     id: root
 
-    implicitWidth: Math.max(label_text.implicitWidth, indicator_rectangle.implicitWidth + indicator_rectangle.anchors.leftMargin)
-    implicitHeight: label_text.implicitHeight + indicator_rectangle.implicitHeight + indicator_rectangle.anchors.topMargin
-
     Text {
         id: label_text
 
-        anchors {top: parent.top; left: parent.left; right: parent.right}
         text: root.label
-        color: enabled? Material.foreground : Material.hintTextColor
+        wrapMode: Text.WordWrap
+
+        Layout.fillWidth: true
     }
 
-    Rectangle {
-        id: indicator_rectangle
+    Item {
 
-        anchors {left: parent.left; top: label_text.bottom; right: parent.right; bottom: parent.bottom; leftMargin: 10; topMargin: 8}
+        implicitWidth: indicator_rectangle.implicitWidth
+        implicitHeight: indicator_rectangle.implicitHeight
 
-        implicitWidth: implicitHeight
-        implicitHeight: 100
-        radius: 3
-        border {color: Material.accent; width: 2}
-        visible: mouse_area.containsMouse
-    }
+        Rectangle {
+            id: indicator_rectangle
 
-    Image {
-        id: value_image
+            anchors.centerIn: parent
+            implicitWidth: 100
+            implicitHeight: 100
+            radius: 3
+            border.color: Material.accent
+            border.width: 2
+            opacity: mouse_area.containsMouse
 
-        source: data_ref.data
-        anchors {fill: indicator_rectangle; margins: 3}
-        fillMode: Image.PreserveAspectCrop
+            MouseArea {
+                id: mouse_area
 
-        Binding {
-            target: data_ref
-            property: "data"
-            value: value_image.source
-        }
-    }
+                anchors.fill: parent
+                hoverEnabled: true
+                onClicked: value_file_dialog.open()
+            }
 
-    MouseArea {
-        id: mouse_area
+            FileDialog {
+                id: value_file_dialog
 
-        anchors.fill: indicator_rectangle
-        hoverEnabled: true
-        onClicked: value_file_dialog.open()
-    }
+                nameFilters: ["Image files (*.bmp *.png *.jpg *.jpeg *.gif *.svg)"]
+                onFileChanged: {
+                    root.data_ref.data = value_file_dialog.file
+                }
+            }
+        }
 
-    FileDialog {
-        id: value_file_dialog
+        Image {
+            id: value_image
 
-        nameFilters: ["Image files (*.bmp *.png *.jpg *.jpeg *.gif *.svg)"]
-        onFileChanged: {
-            value_image.source = value_file_dialog.file
+            source: root.data_ref.data
+            anchors {fill: indicator_rectangle; margins: 3}
+            fillMode: Image.PreserveAspectCrop
         }
     }
 }
diff --git a/qml/BOItem.qml b/qml/BOItem.qml
index b52ba7d..b69109b 100644
--- a/qml/BOItem.qml
+++ b/qml/BOItem.qml
@@ -18,11 +18,14 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.3
 
-Item {
+GridLayout {
     id: root
 
     property var data_ref
     property string label
     property string description
+
+    columns: 1
 }
diff --git a/qml/BOLanding.qml b/qml/BOLanding.qml
deleted file mode 100644
index 56600a4..0000000
--- a/qml/BOLanding.qml
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  property var data_ref_settings_mode: data_ref_manager.getDataRef("landing/settings_mode")
-  property var data_ref_background_image_enabled: data_ref_manager.getDataRef("landing/background_image_enabled")
-  property var data_ref_background_image: data_ref_manager.getDataRef("landing/background_image")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("landing/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("landing/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("landing/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("landing/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("landing/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("landing/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("landing/secondary_font")
-
-  name: "Landing Settings"
-
-  BOSwitch {
-    id: settings_mode_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Settings Mode"
-    description: "Set landing monitor to always visible"
-    data_ref: root.data_ref_settings_mode
-  }
-
-  Button {
-      id: test_event_button
-
-      anchors.top: settings_mode_switch.bottom
-      anchors.left: parent.left
-
-      anchors.topMargin: 20
-      anchors.leftMargin: 20
-
-      text: "Test Event"
-
-      visible: !settings_mode_switch.checked
-
-      onClicked: {
-          data_ref_manager.getDataRef("sim/on_ground").setData(false);
-          data_ref_manager.getDataRef("sim/on_ground").setData(true);
-      }
-  }
-
-  BOSpinBox {
-    id: popup_duration_spin_box
-
-    anchors.top: test_event_button.visible ? test_event_button.bottom : settings_mode_switch.bottom
-    anchors.left: parent.left
-
-    name: "Popup Duration"
-    data_ref: data_ref_manager.getDataRef("landing/popup_duration");
-    from: 1
-  }
-
-  BOSwitch {
-    id: background_image_enabled_switch
-
-    anchors.top: popup_duration_spin_box.bottom
-    anchors.left: parent.left
-
-    name: "Background Image"
-    description: "Enable background image"
-    data_ref: root.data_ref_background_image_enabled
-  }
-
-  BOImageSelector {
-
-    id: background_image_image_selector
-
-    anchors.top: background_image_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Background Image"
-    data_ref: root.data_ref_background_image
-
-    visible: background_image_enabled_switch.checked
-
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: background_image_image_selector.visible? background_image_image_selector.bottom : background_image_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOMenuItem.qml b/qml/BOMenuItem.qml
index acf9dbe..557f748 100644
--- a/qml/BOMenuItem.qml
+++ b/qml/BOMenuItem.qml
@@ -21,39 +21,26 @@ import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 
 RadioButton {
-
-  id: root
-
-  anchors.leftMargin: 10
-
-  checked: false
-
-  hoverEnabled: true
-
-  property string label
-
-  indicator: Rectangle {
-    implicitWidth: 10
-
-    anchors.right: parent.right
-    anchors.top: parent.top
-    anchors.bottom: parent.bottom
-
-    //color: control.checked? "#7289da" : "#616367"
-    color: root.checked? Material.accentColor : Material.background
-    visible: root.hovered | root.checked ? true : false
-
-  }
-
-  contentItem: Text {
-    text: root.label
-
-    //color: control.hovered | control.checked? "#FFFFFF" : "#616367"
-    color: root.hovered | root.checked? "#edf0f2" : "#61747e"
-    font.pointSize: 10
-    //horizontalAlignment: Text.AlignLeft
-    //verticalAlignment: Text.AlignVCenter
-
-  }
-
+    id: root
+
+    property string label
+
+    checked: false
+    hoverEnabled: true
+    implicitHeight: 35
+
+    indicator: Rectangle {
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        implicitWidth: 10
+        color: root.checked? Material.accentColor : Material.background
+        visible: root.hovered | root.checked ? true : false
+    }
+
+    contentItem: Text {
+        text: root.label
+        color: root.hovered | root.checked? "#edf0f2" : "#61747e"
+        font.pointSize: 10
+    }
 }
diff --git a/qml/BOProgress.qml b/qml/BOProgress.qml
deleted file mode 100644
index eed4c33..0000000
--- a/qml/BOProgress.qml
+++ /dev/null
@@ -1,181 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-    id: root
-
-    property var data_ref_custom_style
-    property var data_ref_icon_enabled
-    property var data_ref_icon_size
-    property var data_ref_primary_color
-    property var data_ref_secondary_color
-    property var data_ref_primary_font
-    property var data_ref_secondary_font
-
-    BOSwitch {
-        id: dep_enabled_switch
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-
-        name: "Show DEP"
-        description: "Enable DEP readout."
-        data_ref: data_ref_manager.getDataRef("progress/dep_enabled")
-    }
-    BOSwitch {
-        id: arr_enabled_switch
-
-        anchors.top: dep_enabled_switch.bottom
-        anchors.left: parent.left
-
-        name: "Show ARR"
-        description: "Enable ARR readout."
-        data_ref: data_ref_manager.getDataRef("progress/arr_enabled")
-    }
-    BOSwitch {
-        id: dtg_enabled_switch
-
-        anchors.top: arr_enabled_switch.bottom
-        anchors.left: parent.left
-
-        name: "Show DTG"
-        description: "Enable DTG readout."
-        data_ref: data_ref_manager.getDataRef("progress/dtg_enabled")
-    }
-    BOSwitch {
-        id: eta_enabled_switch
-
-        anchors.top: dtg_enabled_switch.bottom
-        anchors.left: parent.left
-
-        name: "Show ETA"
-        description: "Enable ETA readout."
-        data_ref: data_ref_manager.getDataRef("progress/eta_enabled")
-    }
-    BOSwitch {
-        id: ete_enabled_switch
-
-        anchors.top: eta_enabled_switch.bottom
-        anchors.left: parent.left
-
-        name: "Show ETE"
-        description: "Enable ETE readout."
-        data_ref: data_ref_manager.getDataRef("progress/ete_enabled")
-    }
-
-    BOSwitch {
-        id: custom_style_switch
-
-        anchors.top: ete_enabled_switch.bottom
-        anchors.left: parent.left
-
-        name: "Custom Style"
-        description: "Enable custom styling for this widget"
-        data_ref: root.data_ref_custom_style
-    }
-
-    BOSwitch {
-        id: icon_enabled_switch
-
-        anchors.top: custom_style_switch.bottom
-        anchors.left: parent.left
-
-        name: "Icon Enabled"
-        description: "Enable the icon for this widget"
-        data_ref: root.data_ref_icon_enabled
-
-        visible: custom_style_switch.checked && custom_style_switch.visible
-    }
-
-    BOSpinBox {
-        id: icon_size_spin_box
-
-        anchors.top: icon_enabled_switch.bottom
-        anchors.left: parent.left
-
-        name: "Icon Size"
-        data_ref: root.data_ref_icon_size
-        from: 0
-
-        visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-    }
-
-    BOColorSelector {
-
-        id: primary_color_color_selector
-
-        anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-        anchors.left: parent.left
-
-        name: "Primary Color"
-        data_ref: data_ref_primary_color
-
-        visible: custom_style_switch.checked && custom_style_switch.visible
-
-    }
-
-    BOColorSelector {
-
-        id: secondary_color_color_selector
-
-        anchors.left: primary_color_color_selector.right
-        anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-        name: "Secondary Color"
-        data_ref: data_ref_secondary_color
-
-        visible: custom_style_switch.checked && custom_style_switch.visible
-
-    }
-
-    BOFontSelector {
-
-        id: primary_font_font_selector
-
-        anchors.top: secondary_color_color_selector.bottom
-        anchors.left: parent.left
-
-        name: "Primary Font"
-
-        data_ref: root.data_ref_primary_font
-
-        visible: custom_style_switch.checked && custom_style_switch.visible
-    }
-
-    BOFontSelector {
-        id: secondary_font_font_selector
-
-        anchors.left: primary_font_font_selector.right
-        anchors.top: secondary_color_color_selector.bottom
-
-        name: "Secondary Font"
-
-        data_ref: root.data_ref_secondary_font
-
-        visible: custom_style_switch.checked && custom_style_switch.visible
-    }
-
-
-}
-
diff --git a/qml/BOSpinBox.qml b/qml/BOSpinBox.qml
index 1dc91e8..90e36f5 100644
--- a/qml/BOSpinBox.qml
+++ b/qml/BOSpinBox.qml
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.3
 
 BOItem {
     id: root
@@ -25,19 +26,18 @@ BOItem {
     property alias from: value_spin_box.from
     property alias to: value_spin_box.to
 
-    implicitWidth: Math.max(label_text.implicitWidth, value_spin_box.implicitWidth + value_spin_box.anchors.leftMargin)
-    implicitHeight: label_text.implicitHeight + value_spin_box.implicitHeight
-
     Text {
         id: label_text
-        anchors {top: parent.top; left: parent.left; right: parent.right}
+
         text: root.label
+        wrapMode: Text.WordWrap
+
+        Layout.fillWidth: true
     }
 
     SpinBox {
         id: value_spin_box
 
-        anchors {top: label_text.bottom; left: parent.left; right: parent.right; bottom: parent.bottom; leftMargin: 10}
         value: data_ref.data
         editable: true
 
diff --git a/qml/BOSwitch.qml b/qml/BOSwitch.qml
index a234302..7a9c356 100644
--- a/qml/BOSwitch.qml
+++ b/qml/BOSwitch.qml
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.1
 
 BOItem {
@@ -25,16 +26,16 @@ BOItem {
 
     property alias checked: value_checkbox.checked
 
-    implicitWidth: value_checkbox.implicitWidth + Math.max(label_text.implicitWidth + label_text.anchors.leftMargin, description_text.implicitWidth + description_text.anchors.leftMargin)
-    implicitHeight: Math.max(value_checkbox.implicitHeight, label_text.implicitHeight + description_text.implicitHeight)
-
     Switch {
         id: value_checkbox
 
-        anchors {left: parent.left; top: parent.top; bottom: parent.bottom}
         padding: 0
         checked: root.data_ref.data
 
+        Layout.rowSpan: 2
+        Layout.column: 0
+        Layout.row: 0
+
         Binding {
             target: root.data_ref
             property: "data"
@@ -45,19 +46,24 @@ BOItem {
     Text {
         id: label_text
 
-        anchors {left: value_checkbox.right; top: parent.top; right: parent.right; bottom: value_checkbox.verticalCenter; leftMargin: 8; bottomMargin: 2}
         text: root.label
         font.pointSize: 11
         wrapMode: Text.WordWrap
-        verticalAlignment: Text.AlignBottom
+
+        Layout.row: 0
+        Layout.column: 1
+        Layout.fillWidth: true
     }
 
     Text {
         id: description_text
 
-        anchors {left: value_checkbox.right; top: value_checkbox.verticalCenter; right: parent.right; bottom: parent.bottom; leftMargin: 8; topMargin: 2}
         text: root.description
         color: Material.hintTextColor
         wrapMode: Text.WordWrap
+
+        Layout.row: 1
+        Layout.column: 1
+        Layout.fillWidth: true
     }
 }
diff --git a/qml/BOTextField.qml b/qml/BOTextField.qml
index 7480847..3d33d6b 100644
--- a/qml/BOTextField.qml
+++ b/qml/BOTextField.qml
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 2.1
+import QtQuick.Layouts 1.3
 
 BOItem {
     id: root
@@ -25,27 +26,26 @@ BOItem {
     property alias placeholderText: value_text_field.placeholderText
     property alias validator: value_text_field.validator
 
-    implicitWidth: Math.max(label_text.implicitWidth, value_text_field.implicitWidth + value_text_field.anchors.leftMargin)
-    implicitHeight: label_text.implicitHeight + value_text_field.implicitHeight
-
     Text {
         id: label_text
 
-        anchors {top: parent.top; left: parent.left; right: parent.right}
         text: root.label
+        wrapMode: Text.WordWrap
+
+        Layout.fillWidth: true
     }
 
     TextField {
         id: value_text_field
 
+        text: data_ref.data
         onActiveFocusChanged: {
             if (activeFocus) {
                 selectAll();
             }
         }
 
-        anchors {top: label_text.bottom; left: parent.left; right: parent.right; bottom: parent.bottom; leftMargin: 8}
-        text: data_ref.data
+        Layout.fillWidth: true
 
         Binding {
             target: data_ref
@@ -53,4 +53,5 @@ BOItem {
             value: value_text_field.text
         }
     }
+
 }
diff --git a/qml/BOWidgetAltitude.qml b/qml/BOWidgetAltitude.qml
deleted file mode 100644
index acf78cd..0000000
--- a/qml/BOWidgetAltitude.qml
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Altitude Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/altitude/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/altitude/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/altitude/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/altitude/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/altitude/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/altitude/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/altitude/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/altitude/secondary_font")
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: alt_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show ALT"
-      description: "Enable ALT readout."
-      data_ref: data_ref_manager.getDataRef("widget/altitude/alt_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: vs_enabled_switch
-
-      anchors.top: alt_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show V/S"
-      description: "Enable V/S readout."
-      data_ref: data_ref_manager.getDataRef("widget/altitude/vs_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: vs_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOWidgetCallsign.qml b/qml/BOWidgetCallsign.qml
deleted file mode 100644
index 9546914..0000000
--- a/qml/BOWidgetCallsign.qml
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Callsign Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/callsign/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/callsign/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/callsign/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/callsign/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/callsign/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/callsign/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/callsign/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/callsign/secondary_font")
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: callsign_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show Callsign"
-      description: "Enable Callsign readout."
-      data_ref: data_ref_manager.getDataRef("widget/callsign/callsign_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: airline_enabled_switch
-
-      anchors.top: callsign_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show Airline"
-      description: "Enable Airline readout."
-      data_ref: data_ref_manager.getDataRef("widget/callsign/airline_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: airline_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOWidgetHeading.qml b/qml/BOWidgetHeading.qml
deleted file mode 100644
index 599cb69..0000000
--- a/qml/BOWidgetHeading.qml
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Heading Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/heading/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/heading/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/heading/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/heading/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/heading/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/heading/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/heading/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/heading/secondary_font")
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: hdg_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show HDG"
-      description: "Enable HDG readout."
-      data_ref: data_ref_manager.getDataRef("widget/heading/hdg_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: trk_enabled_switch
-
-      anchors.top: hdg_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show TRK"
-      description: "Enable TRK readout."
-      data_ref: data_ref_manager.getDataRef("widget/heading/trk_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: prepend_zeros_switch
-
-    anchors.top: trk_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Prepend Zeros"
-    description: "Prepend zeros if heading is less than 100°"
-    data_ref: data_ref_manager.getDataRef("widget/heading/prepend_zeros")
-
-    visible: (hdg_enabled_switch.checked || trk_enabled_switch.checked) && enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: prepend_zeros_switch.visible? prepend_zeros_switch.bottom : trk_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOWidgetNetwork.qml b/qml/BOWidgetNetwork.qml
deleted file mode 100644
index 086496e..0000000
--- a/qml/BOWidgetNetwork.qml
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Network Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/network/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/network/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/network/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/network/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/network/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/network/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/network/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/network/secondary_font")
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: network_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show Network"
-      description: "Enable Network readout."
-      data_ref: data_ref_manager.getDataRef("widget/network/network_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: aircraft_enabled_switch
-
-      anchors.top: network_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show Aircraft"
-      description: "Enable Aircraft readout."
-      data_ref: data_ref_manager.getDataRef("widget/network/aircraft_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: aircraft_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOWidgetPerformance.qml b/qml/BOWidgetPerformance.qml
deleted file mode 100644
index b6c2135..0000000
--- a/qml/BOWidgetPerformance.qml
+++ /dev/null
@@ -1,187 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Performance Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/performance/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/performance/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/performance/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/performance/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/performance/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/performance/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/performance/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/performance/secondary_font")
-  property var data_ref_fps_buffer_size: data_ref_manager.getDataRef("widget/performance/fps_buffer_size")
-
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: fps_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show FPS"
-      description: "Enable FPS readout."
-      data_ref: data_ref_manager.getDataRef("widget/performance/fps_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: vas_enabled_switch
-
-      anchors.top: fps_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show VAS"
-      description: "Enable VAS readout."
-      data_ref: data_ref_manager.getDataRef("widget/performance/vas_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSpinBox {
-    id: fps_buffer_size_spin_box
-
-    anchors.top: vas_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "FPS Buffer Size"
-    data_ref: root.data_ref_fps_buffer_size
-    from: 1
-
-    visible: fps_enabled_switch.checked && fps_enabled_switch.visible
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: fps_buffer_size_spin_box.visible? fps_buffer_size_spin_box.bottom : vas_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOWidgetSettings.qml b/qml/BOWidgetSettings.qml
index 343d0d3..f49036b 100644
--- a/qml/BOWidgetSettings.qml
+++ b/qml/BOWidgetSettings.qml
@@ -22,7 +22,6 @@ import QtQuick.Layouts 1.3
 BOGroupBox {
     id: root
 
-    property var data_ref_enabled
     property var data_ref_custom_style
     property var data_ref_icon_enabled
     property var data_ref_icon_size
@@ -39,20 +38,12 @@ BOGroupBox {
         columnSpacing: 16
         rowSpacing: 16
 
-        BOSwitch {
-            id: enabled_switch
-
-            label: "Enabled"
-            description: "Enable this widget"
-            data_ref: root.data_ref_enabled
-            Layout.columnSpan: 2
-        }
-
         ColumnLayout {
             id: content
 
             spacing: 16
-            visible: enabled_switch.checked
+
+            Layout.columnSpan: 2
         }
 
         BOSwitch {
@@ -61,44 +52,60 @@ BOGroupBox {
             label: "Custom Style"
             description: "Enable custom styling for this widget"
             data_ref: root.data_ref_custom_style
+
             Layout.columnSpan: 2
-            visible: enabled_switch.checked
+        }
 
-            onHeightChanged: {
-                console.log(height);
-            }
+        BOSwitch {
+            id: icon_enabled_switch
+
+            label: "Icon Enabled"
+            description: "Enable icon for this widget"
+            data_ref: root.data_ref_icon_enabled
+            visible: custom_style_switch.checked
+
+            Layout.columnSpan: 2
         }
 
         BOSpinBox {
             label: "Icon Size"
             data_ref: root.data_ref_icon_size
             from: 0
+            visible: custom_style_switch.checked && icon_enabled_switch.checked
+
             Layout.columnSpan: 2
-            visible: custom_style_switch.checked && custom_style_switch.visible
         }
 
         BOColorSelector {
             label: "Primary Color"
             data_ref: data_ref_primary_color
-            visible: custom_style_switch.checked && custom_style_switch.visible
+            visible: custom_style_switch.checked
+
+            Layout.fillWidth: false
         }
 
         BOColorSelector {
             label: "Secondary Color"
             data_ref: data_ref_secondary_color
-            visible: custom_style_switch.checked && custom_style_switch.visible
+            visible: custom_style_switch.checked
+
+            Layout.fillWidth: true
         }
 
         BOFontSelector {
             label: "Primary Font"
             data_ref: root.data_ref_primary_font
-            visible: custom_style_switch.checked && custom_style_switch.visible
+            visible: custom_style_switch.checked
+
+            Layout.fillWidth: false
         }
 
         BOFontSelector {
             label: "Secondary Font"
             data_ref: root.data_ref_secondary_font
-            visible: custom_style_switch.checked && custom_style_switch.visible
+            visible: custom_style_switch.checked
+
+            Layout.fillWidth: true
         }
     }
 }
diff --git a/qml/BOWidgetSpeed.qml b/qml/BOWidgetSpeed.qml
deleted file mode 100644
index fa99b7a..0000000
--- a/qml/BOWidgetSpeed.qml
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Speed Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/speed/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/speed/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/speed/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/speed/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/speed/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/speed/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/speed/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/speed/secondary_font")
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: ias_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show IAS"
-      description: "Enable IAS readout."
-      data_ref: data_ref_manager.getDataRef("widget/speed/ias_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: tas_enabled_switch
-
-      anchors.top: ias_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show TAS"
-      description: "Enable TAS readout."
-      data_ref: data_ref_manager.getDataRef("widget/speed/tas_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: gs_enabled_switch
-
-      anchors.top: tas_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show GS"
-      description: "Enable GS readout."
-      data_ref: data_ref_manager.getDataRef("widget/speed/gs_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: mach_enabled_switch
-
-      anchors.top: gs_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show Mach"
-      description: "Enable Mach readout."
-      data_ref: data_ref_manager.getDataRef("widget/speed/mach_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: mach_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOWidgetTemperature.qml b/qml/BOWidgetTemperature.qml
deleted file mode 100644
index 7784d20..0000000
--- a/qml/BOWidgetTemperature.qml
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Temperature Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/temperature/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/temperature/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/temperature/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/temperature/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/temperature/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/temperature/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/temperature/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/temperature/secondary_font")
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: oat_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show OAT"
-      description: "Enable OAT readout."
-      data_ref: data_ref_manager.getDataRef("widget/temperature/oat_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: tat_enabled_switch
-
-      anchors.top: oat_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show TAT"
-      description: "Enable TAT readout. TAT is bugged in X-Plane."
-      data_ref: data_ref_manager.getDataRef("widget/temperature/tat_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: tat_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/BOWidgetWind.qml b/qml/BOWidgetWind.qml
deleted file mode 100644
index 7938cc5..0000000
--- a/qml/BOWidgetWind.qml
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright (C) 2017 Benjamin Isbarn.
-
-   This file is part of BeneOverlay.
-
-   BeneOverlay is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   BeneOverlay is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with BeneOverlay.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.2
-
-
-
-BOGroupBox {
-  id: root
-
-  name: "Wind Settings"
-
-  property var data_ref_enabled: data_ref_manager.getDataRef("widget/wind/enabled")
-  property var data_ref_custom_style: data_ref_manager.getDataRef("widget/wind/custom_style")
-  property var data_ref_icon_enabled: data_ref_manager.getDataRef("widget/wind/icon_enabled")
-  property var data_ref_icon_size: data_ref_manager.getDataRef("widget/wind/icon_size")
-  property var data_ref_primary_color: data_ref_manager.getDataRef("widget/wind/primary_color")
-  property var data_ref_secondary_color: data_ref_manager.getDataRef("widget/wind/secondary_color")
-  property var data_ref_primary_font: data_ref_manager.getDataRef("widget/wind/primary_font")
-  property var data_ref_secondary_font: data_ref_manager.getDataRef("widget/wind/secondary_font")
-
-  BOSwitch {
-    id: enabled_switch
-
-    anchors.top: parent.top
-    anchors.left: parent.left
-
-    name: "Enabled"
-    description: "Enable this widget"
-    data_ref: root.data_ref_enabled
-  }
-
-  BOSwitch {
-      id: dir_enabled_switch
-
-      anchors.top: enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show DIR"
-      description: "Enable DIR readout."
-      data_ref: data_ref_manager.getDataRef("widget/wind/dir_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-      id: mag_enabled_switch
-
-      anchors.top: dir_enabled_switch.bottom
-      anchors.left: parent.left
-
-      name: "Show MAG"
-      description: "Enable MAG readout."
-      data_ref: data_ref_manager.getDataRef("widget/wind/mag_enabled")
-
-      visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: prepend_zeros_switch
-
-    anchors.top: mag_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Prepend Zeros"
-    description: "Prepend zeros if wind direction is less than 100°"
-    data_ref: data_ref_manager.getDataRef("widget/wind/prepend_zeros")
-
-    visible: dir_enabled_switch.checked && dir_enabled_switch.visible
-  }
-
-  BOSwitch {
-    id: custom_style_switch
-
-    anchors.top: prepend_zeros_switch.visible? prepend_zeros_switch.bottom : mag_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Custom Style"
-    description: "Enable custom styling for this widget"
-    data_ref: root.data_ref_custom_style
-
-    visible: enabled_switch.checked
-  }
-
-  BOSwitch {
-    id: icon_enabled_switch
-
-    anchors.top: custom_style_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Enabled"
-    description: "Enable the icon for this widget"
-    data_ref: root.data_ref_icon_enabled
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOSpinBox {
-    id: icon_size_spin_box
-
-    anchors.top: icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Icon Size"
-    data_ref: root.data_ref_icon_size
-    from: 0
-
-    visible: icon_enabled_switch.checked && icon_enabled_switch.visible
-  }
-
-  BOColorSelector {
-
-    id: primary_color_color_selector
-
-    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-    anchors.left: parent.left
-
-    name: "Primary Color"
-    data_ref: data_ref_primary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOColorSelector {
-
-    id: secondary_color_color_selector
-
-    anchors.left: primary_color_color_selector.right
-    anchors.verticalCenter: primary_color_color_selector.verticalCenter
-
-    name: "Secondary Color"
-    data_ref: data_ref_secondary_color
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-
-  }
-
-  BOFontSelector {
-
-    id: primary_font_font_selector
-
-    anchors.top: secondary_color_color_selector.bottom
-    anchors.left: parent.left
-
-    name: "Primary Font"
-
-    data_ref: root.data_ref_primary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-  BOFontSelector {
-    id: secondary_font_font_selector
-
-    anchors.left: primary_font_font_selector.right
-    anchors.top: secondary_color_color_selector.bottom
-
-    name: "Secondary Font"
-
-    data_ref: root.data_ref_secondary_font
-
-    visible: custom_style_switch.checked && custom_style_switch.visible
-  }
-
-
-}
-
diff --git a/qml/main.qml b/qml/main.qml
index 66d0480..9a11fcf 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -30,29 +30,31 @@ ApplicationWindow {
     id: root
     visible: true
     width: 600
+    minimumWidth: main_grid_layout.Layout.minimumWidth
     height: 750
+    minimumHeight: main_grid_layout.Layout.minimumHeight
     title: "BeneOverlay v" + VERSION_STRING
 
     Dialog {
+        id: dialog
 
         property alias text: dialog_message.text
         property string download_url
 
-        id: dialog
-
         width: 400
         height: 400
-
         standardButtons: Dialog.Open
-
         modal: true
+        x: (parent.width - dialog.width)/2
+        y: (parent.height - dialog.height)/2
+
+        onAccepted: Qt.openUrlExternally(download_url)
 
         Flickable {
             id: dialog_flickable
-            anchors.fill: parent
 
+            anchors.fill: parent
             contentHeight: dialog_message.height
-
             clip: true
 
             ScrollBar.vertical: ScrollBar {
@@ -69,809 +71,873 @@ ApplicationWindow {
                 anchors.rightMargin: scroll_bar.width
 
                 wrapMode: Text.WordWrap
-
                 textFormat: Text.RichText
-
                 onLinkActivated: Qt.openUrlExternally(link)
-
             }
-
         }
-
-
-        x: (parent.width - dialog.width)/2
-        y: (parent.height - dialog.height)/2
-
-        onAccepted: Qt.openUrlExternally(download_url)
-
     }
 
     UpdateManager {
-
         id: update_manager
 
         user: "benesim"
         repo: "beneoverlay"
 
-        Component.onCompleted: update_manager.checkForUpdate()
-
         onUpdateAvailable: {
             dialog.title = "Version " + version_string + " available!";
             dialog.text = "<style>a { color: " + Material.accent + "; }</style>" + new Showdown.showdown.Converter().makeHtml(body);
             dialog.download_url = download_url;
-            console.log(dialog.text);
             dialog.open();
         }
-
+        Component.onCompleted: update_manager.checkForUpdate()
     }
 
-    Rectangle {
-        id: menu
+    GridLayout {
+        id: main_grid_layout
 
-        property int index: 0
+        anchors.fill: parent
+        columnSpacing: 0
+        rowSpacing: 0
+        columns: 2
+        rows: 2
 
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
+        Rectangle {
+            id: menu
 
-        width: 180
+            property int index: 0
 
-        color: "#263238"
+            width: 180
+            color: "#263238"
 
-        Image {
-            id: logo_image
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.leftMargin: 10
-            anchors.topMargin: 10
-            source: "qrc:/images/beneoverlay.png"
-        }
+            Layout.rowSpan: 2
+            Layout.fillHeight: true
+            Layout.minimumHeight: menu_column_layout.Layout.minimumHeight
 
-        BOMenuItem {
-            id: flight_menu_item
-
-            anchors.top: logo_image.bottom
-            anchors.topMargin: 20
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            label: "Flight"
-
-            checked: true
-
-            onCheckedChanged: if (checked) menu.index = 0
-        }
-
-        BOMenuItem {
-            id: general_menu_item
-
-            anchors.top: flight_menu_item.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            label: "General"
-
-            onCheckedChanged: if (checked) menu.index = 1
-        }
-
-        Text {
-            id: widgets_text
-            text: "Widgets"
-
-            height: general_menu_item.height
-            verticalAlignment: Text.AlignVCenter
-
-            anchors.top: general_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 18
+            ButtonGroup {
+                id: menu_button_group
+            }
 
-            color: "#61747e"
-            font.pointSize: 10
-        }
+            ColumnLayout {
+                id: menu_column_layout
 
-        BOMenuItem {
-            id: callsign_menu_item
+                anchors {left: parent.left; top: parent.top; right: parent.right; leftMargin: 10; topMargin: 10}
+                spacing: 0
 
-            anchors.top: widgets_text.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                Image {
+                    source: "qrc:/images/beneoverlay.png"
+                    Layout.bottomMargin: 10
+                }
 
-            label: "Callsign"
+                BOMenuItem {
+                    label: "Flight"
+                    checked: true
+                    onCheckedChanged: if (checked) menu.index = 0
 
-            onCheckedChanged: if (checked) menu.index = 2
-        }
+                    ButtonGroup.group: menu_button_group
+                    Layout.fillWidth: true
+                }
 
-        BOMenuItem {
-            id: network_menu_item
+                BOMenuItem {
+                    label: "General"
+                    onCheckedChanged: if (checked) menu.index = 1
 
-            anchors.top: callsign_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                    ButtonGroup.group: menu_button_group
+                    Layout.fillWidth: true
+                }
 
-            label: "Network"
+                BOMenuItem {
+                    label: "Widgets"
+                    onCheckedChanged: if (checked) menu.index = 2
 
-            onCheckedChanged: if (checked) menu.index = 3
-        }
+                    ButtonGroup.group: menu_button_group
+                    Layout.fillWidth: true
+                }
 
-        BOMenuItem {
-            id: speed_menu_item
+                ColumnLayout {
 
-            anchors.top: network_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                    Layout.leftMargin: 10
+                    spacing: 0
 
-            label: "Speed"
+                    BOMenuItem {
+                        label: "Callsign"
+                        onCheckedChanged: if (checked) menu.index = 3
 
-            onCheckedChanged: if (checked) menu.index = 4
-        }
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-        BOMenuItem {
-            id: heading_menu_item
+                    BOMenuItem {
+                        label: "Network"
+                        onCheckedChanged: if (checked) menu.index = 4
 
-            anchors.top: speed_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-            label: "Heading"
+                    BOMenuItem {
+                        label: "Speed"
+                        onCheckedChanged: if (checked) menu.index = 5
 
-            onCheckedChanged: if (checked) menu.index = 5
-        }
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-        BOMenuItem {
-            id: altitude_menu_item
+                    BOMenuItem {
+                        label: "Heading"
+                        onCheckedChanged: if (checked) menu.index = 6
 
-            anchors.top: heading_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-            label: "Altitude"
+                    BOMenuItem {
+                        label: "Altitude"
+                        onCheckedChanged: if (checked) menu.index = 7
 
-            onCheckedChanged: if (checked) menu.index = 6
-        }
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-        BOMenuItem {
-            id: wind_menu_item
+                    BOMenuItem {
+                        label: "Wind"
+                        onCheckedChanged: if (checked) menu.index = 8
 
-            anchors.top: altitude_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-            label: "Wind"
+                    BOMenuItem {
+                        label: "Temperature"
+                        onCheckedChanged: if (checked) menu.index = 9
 
-            onCheckedChanged: if (checked) menu.index = 7
-        }
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-        BOMenuItem {
-            id: temperature_menu_item
+                    BOMenuItem {
+                        label: "Performance"
+                        onCheckedChanged: if (checked) menu.index = 10
 
-            anchors.top: wind_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
+                }
 
-            label: "Temperature"
+                BOMenuItem {
+                    label: "Progress"
+                    onCheckedChanged: if (checked) menu.index = 11
 
-            onCheckedChanged: if (checked) menu.index = 8
-        }
+                    ButtonGroup.group: menu_button_group
+                    Layout.fillWidth: true
+                }
 
-        BOMenuItem {
-            id: performance_menu_item
+                BOMenuItem {
+                    label: "Landing"
+                    onCheckedChanged: if (checked) menu.index = 12
 
-            anchors.top: temperature_menu_item.bottom
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            anchors.right: parent.right
+                    ButtonGroup.group: menu_button_group
+                    Layout.fillWidth: true
+                }
 
-            label: "Performance"
+                ColumnLayout {
 
-            onCheckedChanged: if (checked) menu.index = 9
-        }
+                    Layout.leftMargin: 10
+                    spacing: 0
 
-        BOMenuItem {
-            id: progress_menu_item
+                    BOMenuItem {
+                        label: "Title"
+                        onCheckedChanged: if (checked) menu.index = 13
 
-            anchors.top: performance_menu_item.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-            label: "Progress"
+                    BOMenuItem {
+                        label: "Rate"
+                        onCheckedChanged: if (checked) menu.index = 14
 
-            onCheckedChanged: if (checked) menu.index = 10
-        }
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-        BOMenuItem {
-            id: landing_monitor_menu_item
+                    BOMenuItem {
+                        label: "Speed"
+                        onCheckedChanged: if (checked) menu.index = 15
 
-            anchors.top: progress_menu_item.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
 
-            label: "Landing"
+                    BOMenuItem {
+                        label: "Attitude"
+                        onCheckedChanged: if (checked) menu.index = 16
 
-            onCheckedChanged: if (checked) menu.index = 11
+                        ButtonGroup.group: menu_button_group
+                        Layout.fillWidth: true
+                    }
+                }
+            }
         }
-    }
-
-    StackLayout {
-
-        anchors.left: menu.right
-        anchors.top: parent.top
-        anchors.bottom: notification_rectangle.visible? notification_rectangle.top : parent.bottom
-        anchors.right: parent.right
 
-        currentIndex: menu.index
+        StackLayout {
+            currentIndex: menu.index
 
-        anchors {topMargin: 20; leftMargin: 20}
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            Layout.rowSpan: notification_rectangle.visible? 1 : 2
 
-        BOGroupBox {
-            label: "Flight Settings"
-            //anchors.fill: parent
+            BOGroupBox {
+                label: "Flight Settings"
 
-            GridLayout {
-                anchors {left: parent.left; top: parent.top; right: parent.right}
-                columns: 2
+                GridLayout {
+                    anchors {left: parent.left; top: parent.top; right: parent.right}
+                    columns: 2
 
-                columnSpacing: 32
-                rowSpacing: 32
+                    columnSpacing: 32
+                    rowSpacing: 32
 
-                BOTextField {
-                    label: "Departure ICAO"
-                    placeholderText: "EDDT"
-                    data_ref: data_ref_manager.getDataRef("flight/departure_icao")
-                    Layout.fillWidth: true
-                }
+                    BOTextField {
+                        label: "Departure ICAO"
+                        placeholderText: "EDDT"
+                        data_ref: data_ref_manager.getDataRef("flight/departure_icao")
+                        Layout.fillWidth: true
+                    }
 
-                BOTextField {
-                    label: "Arrival ICAO"
-                    placeholderText: "LSZH"
-                    data_ref: data_ref_manager.getDataRef("flight/arrival_icao")
-                    Layout.fillWidth: true
-                }
+                    BOTextField {
+                        label: "Arrival ICAO"
+                        placeholderText: "LSZH"
+                        data_ref: data_ref_manager.getDataRef("flight/arrival_icao")
+                        Layout.fillWidth: true
+                    }
 
-                BOTextField {
-                    label: "Route"
-                    placeholderText: "BRANE Q201 BUREL UM736 TABAT UL87 ANELA UN869 TEDGO T724 RILAX"
-                    data_ref: data_ref_manager.getDataRef("flight/route")
-                    Layout.columnSpan: 2
-                    Layout.fillWidth: true
-                }
+                    BOTextField {
+                        label: "Route"
+                        placeholderText: "BRANE Q201 BUREL UM736 TABAT UL87 ANELA UN869 TEDGO T724 RILAX"
+                        data_ref: data_ref_manager.getDataRef("flight/route")
+                        Layout.columnSpan: 2
+                        Layout.fillWidth: true
+                    }
 
-                BOTextField {
-                    label: "Airline"
-                    placeholderText: "Global Wings"
-                    data_ref: data_ref_manager.getDataRef("flight/airline")
-                    Layout.fillWidth: true
-                }
+                    BOTextField {
+                        label: "Airline"
+                        placeholderText: "Global Wings"
+                        data_ref: data_ref_manager.getDataRef("flight/airline")
+                        Layout.fillWidth: true
+                    }
 
-                BOTextField {
-                    label: "Airline ICAO"
-                    placeholderText: "GLW"
-                    data_ref: data_ref_manager.getDataRef("flight/airline_icao")
-                    Layout.fillWidth: true
-                }
+                    BOTextField {
+                        label: "Airline ICAO"
+                        placeholderText: "GLW"
+                        data_ref: data_ref_manager.getDataRef("flight/airline_icao")
+                        Layout.fillWidth: true
+                    }
 
-                BOTextField {
-                    label: "Flight Number"
-                    placeholderText: "568A"
-                    data_ref: data_ref_manager.getDataRef("flight/flight_number")
-                    Layout.fillWidth: true
-                }
+                    BOTextField {
+                        label: "Flight Number"
+                        placeholderText: "568A"
+                        data_ref: data_ref_manager.getDataRef("flight/flight_number")
+                        Layout.fillWidth: true
+                    }
 
-                BOTextField {
-                    label: "Network"
-                    placeholderText: "IVAO"
-                    data_ref: data_ref_manager.getDataRef("flight/network")
-                    Layout.fillWidth: true
-                }
+                    BOTextField {
+                        label: "Network"
+                        placeholderText: "IVAO"
+                        data_ref: data_ref_manager.getDataRef("flight/network")
+                        Layout.fillWidth: true
+                    }
 
-                BOTextField {
-                    label: "Cruise Altitude"
-                    placeholderText: "12000"
-                    data_ref: data_ref_manager.getDataRef("flight/cruise_altitude")
-                    Layout.fillWidth: true
-                    validator: IntValidator {
-                        bottom: 0
+                    BOTextField {
+                        label: "Cruise Altitude"
+                        placeholderText: "12000"
+                        data_ref: data_ref_manager.getDataRef("flight/cruise_altitude")
+                        Layout.fillWidth: true
+                        validator: IntValidator {
+                            bottom: 0
+                        }
                     }
-                }
 
-                BOTextField {
-                    label: "Max IAS"
-                    placeholderText: "300"
-                    data_ref: data_ref_manager.getDataRef("flight/max_ias")
-                    Layout.fillWidth: true
-                    validator: IntValidator {
-                        bottom: 0
+                    BOTextField {
+                        label: "Max IAS"
+                        placeholderText: "300"
+                        data_ref: data_ref_manager.getDataRef("flight/max_ias")
+                        Layout.fillWidth: true
+                        validator: IntValidator {
+                            bottom: 0
+                        }
                     }
-                }
 
-                BOTextField {
-                    label: "Transition Altitude"
-                    placeholderText: "5000"
-                    data_ref: data_ref_manager.getDataRef("flight/transition_altitude")
-                    Layout.fillWidth: true
-                    validator: IntValidator {
-                        bottom: 0
+                    BOTextField {
+                        label: "Transition Altitude"
+                        placeholderText: "5000"
+                        data_ref: data_ref_manager.getDataRef("flight/transition_altitude")
+                        Layout.fillWidth: true
+                        validator: IntValidator {
+                            bottom: 0
+                        }
                     }
-                }
 
-                BOTextField {
-                    label: "Aircraft ICAO"
-                    placeholderText: "B738"
-                    data_ref: data_ref_manager.getDataRef("flight/aircraft_icao")
-                    Layout.fillWidth: true
+                    BOTextField {
+                        label: "Aircraft ICAO"
+                        placeholderText: "B738"
+                        data_ref: data_ref_manager.getDataRef("flight/aircraft_icao")
+                        Layout.fillWidth: true
+                    }
                 }
             }
-        }
-
-        BOGroupBox {
-            anchors.fill: parent
-            label: "General Settings"
-
-            //BOSpinBox {
-            //    id: data_rate_spin_box
-
-            //    anchors.top: parent.top
-            //    anchors.left: parent.left
-
-            //    name: "Data Rate"
-            //    from: 1
-            //    to: 60
-            //    data_ref: data_ref_manager.getDataRef("global/data_rate")
-            //}
 
-            //BOSwitch {
-            //    id: icon_enabled_switch
+            BOGroupBox {
+                anchors.fill: parent
+                label: "General Settings"
 
-            //    anchors.top: data_rate_spin_box.bottom
-            //    anchors.left: parent.left
+                GridLayout {
+                    anchors {left: parent.left; top: parent.top; right: parent.right}
+                    columns: 2
+                    columnSpacing: 16
+                    rowSpacing: 16
 
-            //    name: "Icons Enabled"
-            //    description: "Enable icons for the widgets"
-            //    data_ref: data_ref_manager.getDataRef("global/icon_enabled")
-            //}
+                    BOSpinBox {
+                        label: "Data Rate"
+                        from: 1
+                        to: 60
+                        data_ref: data_ref_manager.getDataRef("global/data_rate")
 
-            //BOSpinBox {
-            //    id: icon_size_spin_box
-
-            //    anchors.top: icon_enabled_switch.bottom
-            //    anchors.left: parent.left
+                        Layout.columnSpan: 2
+                    }
 
-            //    name: "Icon Size"
-            //    data_ref: data_ref_manager.getDataRef("global/icon_size")
-            //    from: 0
+                    BOSwitch {
+                        label: "Icons Enabled"
+                        description: "Enable icons for the widgets"
+                        data_ref: data_ref_manager.getDataRef("global/icon_enabled")
 
-            //    visible: icon_enabled_switch.checked
-            //}
+                        Layout.columnSpan: 2
+                    }
 
-            //BOColorSelector {
+                    BOSpinBox {
+                        label: "Icon Size"
+                        data_ref: data_ref_manager.getDataRef("global/icon_size")
+                        from: 0
 
-            //    id: primary_color_color_selector
+                        Layout.columnSpan: 2
+                    }
 
-            //    anchors.top: icon_size_spin_box.visible? icon_size_spin_box.bottom : icon_enabled_switch.bottom
-            //    anchors.left: parent.left
+                    BOColorSelector {
+                        label: "Primary Color"
+                        data_ref: data_ref_manager.getDataRef("global/primary_color")
 
-            //    name: "Primary Color"
-            //    data_ref: data_ref_manager.getDataRef("global/primary_color")
+                        Layout.fillWidth: false
+                    }
 
-            //}
+                    BOColorSelector {
+                        label: "Secondary Color"
+                        data_ref: data_ref_manager.getDataRef("global/secondary_color")
 
-            //BOColorSelector {
+                        Layout.fillWidth: true
+                    }
 
-            //    id: secondary_color_color_selector
+                    BOFontSelector {
+                        label: "Primary Font"
+                        data_ref: data_ref_manager.getDataRef("global/primary_font")
 
-            //    anchors.left: primary_color_color_selector.right
-            //    anchors.verticalCenter: primary_color_color_selector.verticalCenter
+                        Layout.fillWidth: false
+                    }
 
-            //    name: "Secondary Color"
-            //    data_ref: data_ref_manager.getDataRef("global/secondary_color")
+                    BOFontSelector {
+                        label: "Secondary Font"
+                        data_ref: data_ref_manager.getDataRef("global/secondary_font")
 
-            //}
+                        Layout.fillWidth: true
+                    }
+                }
+            }
 
-            //BOFontSelector {
+            BOGroupBox {
+                label: "Widgets Settings"
 
-            //    id: primary_font_font_selector
+                ColumnLayout {
+                    anchors {left: parent.left; top: parent.top; right: parent.right}
+                    spacing: 16
 
-            //    anchors.top: secondary_color_color_selector.bottom
-            //    anchors.left: parent.left
+                    BOSwitch {
+                        label: "Callsign Enabled"
+                        description: "Enable Callsign widget"
+                        data_ref: data_ref_manager.getDataRef("widget/callsign/enabled")
+                    }
 
-            //    name: "Primary Font"
+                    BOSwitch {
+                        label: "Network Enabled"
+                        description: "Enable Network widget"
+                        data_ref: data_ref_manager.getDataRef("widget/network/enabled")
+                    }
 
-            //    data_ref: data_ref_manager.getDataRef("global/primary_font")
-            //}
+                    BOSwitch {
+                        label: "Speed Enabled"
+                        description: "Enable Speed widget"
+                        data_ref: data_ref_manager.getDataRef("widget/speed/enabled")
+                    }
 
-            //BOFontSelector {
-            //    id: secondary_font_font_selector
+                    BOSwitch {
+                        label: "Heading Enabled"
+                        description: "Enable Heading widget"
+                        data_ref: data_ref_manager.getDataRef("widget/heading/enabled")
+                    }
 
-            //    anchors.left: primary_font_font_selector.right
-            //    anchors.top: secondary_color_color_selector.bottom
+                    BOSwitch {
+                        label: "Altitude Enabled"
+                        description: "Enable Altitude widget"
+                        data_ref: data_ref_manager.getDataRef("widget/altitude/enabled")
+                    }
 
-            //    name: "Secondary Font"
+                    BOSwitch {
+                        label: "Wind Enabled"
+                        description: "Enable Wind widget"
+                        data_ref: data_ref_manager.getDataRef("widget/wind/enabled")
+                    }
 
-            //    data_ref: data_ref_manager.getDataRef("global/secondary_font")
-            //}
-        }
+                    BOSwitch {
+                        label: "Temperature Enabled"
+                        description: "Enable Temperature widget"
+                        data_ref: data_ref_manager.getDataRef("widget/temperature/enabled")
+                    }
 
-        BOWidgetSettings {
-            anchors.fill: parent
-            label: "Callsign Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/callsign/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/callsign/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/callsign/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/callsign/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/callsign/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/callsign/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/callsign/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/callsign/secondary_font")
-
-            BOSwitch {
-                label: "Show Callsign"
-                description: "Enable Callsign readout"
-                data_ref: data_ref_manager.getDataRef("widget/callsign/callsign_enabled")
-            }
-            BOSwitch {
-                label: "Show Airline"
-                description: "Enable Airline readout"
-                data_ref: data_ref_manager.getDataRef("widget/callsign/airline_enabled")
+                    BOSwitch {
+                        label: "Performance Enabled"
+                        description: "Enable Performance widget"
+                        data_ref: data_ref_manager.getDataRef("widget/performance/enabled")
+                    }
+                }
             }
-        }
 
-        BOWidgetSettings {
-            anchors.fill: parent
-            label: "Network Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/network/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/network/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/network/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/network/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/network/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/network/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/network/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/network/secondary_font")
-
-            BOSwitch {
-                label: "Show Network"
-                description: "Enable Network readout"
-                data_ref: data_ref_manager.getDataRef("widget/network/network_enabled")
-            }
-            BOSwitch {
-                label: "Show Aircraft"
-                description: "Enable Aircraft readout"
-                data_ref: data_ref_manager.getDataRef("widget/network/aircraft_enabled")
+            BOWidgetSettings {
+                label: "Callsign Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/callsign/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/callsign/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/callsign/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/callsign/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/callsign/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/callsign/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/callsign/secondary_font")
+
+                BOSwitch {
+                    label: "Show Callsign"
+                    description: "Enable Callsign readout"
+                    data_ref: data_ref_manager.getDataRef("widget/callsign/callsign_enabled")
+                }
+                BOSwitch {
+                    label: "Show Airline"
+                    description: "Enable Airline readout"
+                    data_ref: data_ref_manager.getDataRef("widget/callsign/airline_enabled")
+                }
             }
-        }
 
-        BOWidgetSettings {
-            //anchors.fill: parent
-            label: "Speed Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/speed/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/speed/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/speed/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/speed/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/speed/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/speed/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/speed/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/speed/secondary_font")
-
-            BOSwitch {
-                label: "Show IAS"
-                description: "Enable IAS readout"
-                data_ref: data_ref_manager.getDataRef("widget/speed/ias_enabled")
-            }
-            BOSwitch {
-                label: "Show TAS"
-                description: "Enable TAS readout"
-                data_ref: data_ref_manager.getDataRef("widget/speed/tas_enabled")
-            }
-            BOSwitch {
-                label: "Show GS"
-                description: "Enable GS readout"
-                data_ref: data_ref_manager.getDataRef("widget/speed/gs_enabled")
-            }
-            BOSwitch {
-                label: "Show Mach"
-                description: "Enable Mach readout"
-                data_ref: data_ref_manager.getDataRef("widget/speed/mach_enabled")
+            BOWidgetSettings {
+                label: "Network Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/network/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/network/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/network/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/network/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/network/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/network/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/network/secondary_font")
+
+                BOSwitch {
+                    label: "Show Network"
+                    description: "Enable Network readout"
+                    data_ref: data_ref_manager.getDataRef("widget/network/network_enabled")
+                }
+                BOSwitch {
+                    label: "Show Aircraft"
+                    description: "Enable Aircraft readout"
+                    data_ref: data_ref_manager.getDataRef("widget/network/aircraft_enabled")
+                }
             }
-        }
 
-        BOWidgetSettings {
-            //anchors.fill: parent
-            label: "Heading Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/heading/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/heading/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/heading/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/heading/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/heading/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/heading/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/heading/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/heading/secondary_font")
-
-            BOSwitch {
-                label: "Show HDG"
-                description: "Enable HDG readout"
-                data_ref: data_ref_manager.getDataRef("widget/heading/hdg_enabled")
+            BOWidgetSettings {
+                label: "Speed Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/speed/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/speed/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/speed/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/speed/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/speed/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/speed/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/speed/secondary_font")
+
+                BOSwitch {
+                    label: "Show IAS"
+                    description: "Enable IAS readout"
+                    data_ref: data_ref_manager.getDataRef("widget/speed/ias_enabled")
+                }
+                BOSwitch {
+                    label: "Show TAS"
+                    description: "Enable TAS readout"
+                    data_ref: data_ref_manager.getDataRef("widget/speed/tas_enabled")
+                }
+                BOSwitch {
+                    label: "Show GS"
+                    description: "Enable GS readout"
+                    data_ref: data_ref_manager.getDataRef("widget/speed/gs_enabled")
+                }
+                BOSwitch {
+                    label: "Show Mach"
+                    description: "Enable Mach readout"
+                    data_ref: data_ref_manager.getDataRef("widget/speed/mach_enabled")
+                }
             }
 
-            BOSwitch {
-                label: "Show TRK"
-                description: "Enable TRK readout"
-                data_ref: data_ref_manager.getDataRef("widget/heading/trk_enabled")
-            }
-        }
+            BOWidgetSettings {
+                label: "Heading Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/heading/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/heading/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/heading/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/heading/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/heading/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/heading/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/heading/secondary_font")
 
-        BOWidgetSettings {
-            //anchors.fill: parent
-            label: "Altitude Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/altitude/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/altitude/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/altitude/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/altitude/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/altitude/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/altitude/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/altitude/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/altitude/secondary_font")
-
-            BOSwitch {
-                label: "Show ALT"
-                description: "Enable ALT readout"
-                data_ref: data_ref_manager.getDataRef("widget/altitude/alt_enabled")
-            }
+                BOSwitch {
+                    id: hdg_switch
 
-            BOSwitch {
-                label: "Show VS"
-                description: "Enable VS readout"
-                data_ref: data_ref_manager.getDataRef("widget/altitude/vs_enabled")
-            }
-        }
+                    label: "Show HDG"
+                    description: "Enable HDG readout"
+                    data_ref: data_ref_manager.getDataRef("widget/heading/hdg_enabled")
+                }
 
-        BOWidgetSettings {
-            //anchors.fill: parent
-            label: "Wind Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/wind/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/wind/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/wind/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/wind/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/wind/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/wind/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/wind/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/wind/secondary_font")
-
-            BOSwitch {
-                label: "Show DIR"
-                description: "Enable DIR readout"
-                data_ref: data_ref_manager.getDataRef("widget/wind/dir_enabled")
-            }
+                BOSwitch {
+                    id: trk_switch
 
-            BOSwitch {
-                label: "Show MAG"
-                description: "Enable MAG readout"
-                data_ref: data_ref_manager.getDataRef("widget/wind/mag_enabled")
-            }
-        }
+                    label: "Show TRK"
+                    description: "Enable TRK readout"
+                    data_ref: data_ref_manager.getDataRef("widget/heading/trk_enabled")
+                }
 
-        BOWidgetSettings {
-            //anchors.fill: parent
-            label: "Temperature Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/temperature/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/temperature/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/temperature/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/temperature/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/temperature/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/temperature/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/temperature/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/temperature/secondary_font")
-
-            BOSwitch {
-                label: "Show OAT"
-                description: "Enable OAT readout"
-                data_ref: data_ref_manager.getDataRef("widget/temperature/oat_enabled")
+                BOSwitch {
+                    label: "Prepend Zeros"
+                    description: "Prepend zeros if HDG or TRK < 100°"
+                    data_ref: data_ref_manager.getDataRef("widget/heading/prepend_zeros")
+                    visible: hdg_switch.checked || trk_switch.checked
+                }
             }
 
-            BOSwitch {
-                label: "Show TAT"
-                description: "Enable TAT readout"
-                data_ref: data_ref_manager.getDataRef("widget/temperature/tat_enabled")
-            }
-        }
+            BOWidgetSettings {
+                label: "Altitude Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/altitude/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/altitude/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/altitude/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/altitude/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/altitude/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/altitude/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/altitude/secondary_font")
+
+                BOSwitch {
+                    label: "Show ALT"
+                    description: "Enable ALT readout"
+                    data_ref: data_ref_manager.getDataRef("widget/altitude/alt_enabled")
+                }
 
-        BOWidgetSettings {
-            //anchors.fill: parent
-            label: "Performance Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("widget/performance/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("widget/performance/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("widget/performance/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("widget/performance/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("widget/performance/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("widget/performance/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("widget/performance/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("widget/performance/secondary_font")
-
-            BOSwitch {
-                id: fps_switch
-
-                label: "Show FPS"
-                description: "Enable FPS readout"
-                data_ref: data_ref_manager.getDataRef("widget/performance/fps_enabled")
+                BOSwitch {
+                    label: "Show VS"
+                    description: "Enable VS readout"
+                    data_ref: data_ref_manager.getDataRef("widget/altitude/vs_enabled")
+                }
             }
 
-            BOSpinBox {
-                label: "FPS Buffer Size"
-                data_ref: data_ref_manager.getDataRef("widget/performance/fps_buffer_size")
-                from: 1
-                visible: fps_switch.checked
-            }
+            BOWidgetSettings {
+                label: "Wind Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/wind/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/wind/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/wind/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/wind/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/wind/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/wind/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/wind/secondary_font")
 
-            BOSwitch {
-                label: "Show VAS"
-                description: "Enable VAS readout"
-                data_ref: data_ref_manager.getDataRef("widget/performance/vas_enabled")
-            }
-        }
+                BOSwitch {
+                    id: dir_switch
 
-        BOWidgetSettings {
-            label: "Progress Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("progress/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("progress/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("progress/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("progress/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("progress/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("progress/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("progress/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("progress/secondary_font")
-
-            BOSwitch {
-                label: "Show DEP"
-                description: "Enable DEP readout"
-                data_ref: data_ref_manager.getDataRef("progress/dep_enabled")
-            }
+                    label: "Show DIR"
+                    description: "Enable DIR readout"
+                    data_ref: data_ref_manager.getDataRef("widget/wind/dir_enabled")
+                }
 
-            BOSwitch {
-                label: "Show ARR"
-                description: "Enable ARR readout"
-                data_ref: data_ref_manager.getDataRef("progress/arr_enabled")
-            }
+                BOSwitch {
+                    label: "Prepend Zeros"
+                    description: "Prepend zeros if DIR < 100°"
+                    data_ref: data_ref_manager.getDataRef("widget/wind/prepend_zeros")
+                    visible: dir_switch.checked
+                }
 
-            BOSwitch {
-                label: "Show DTG"
-                description: "Enable DTG readout"
-                data_ref: data_ref_manager.getDataRef("progress/dtg_enabled")
+                BOSwitch {
+                    label: "Show MAG"
+                    description: "Enable MAG readout"
+                    data_ref: data_ref_manager.getDataRef("widget/wind/mag_enabled")
+                }
             }
 
-            BOSwitch {
-                label: "Show ETA"
-                description: "Enable ETA readout"
-                data_ref: data_ref_manager.getDataRef("progress/eta_enabled")
-            }
+            BOWidgetSettings {
+                label: "Temperature Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/temperature/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/temperature/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/temperature/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/temperature/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/temperature/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/temperature/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/temperature/secondary_font")
+
+                BOSwitch {
+                    label: "Show OAT"
+                    description: "Enable OAT readout"
+                    data_ref: data_ref_manager.getDataRef("widget/temperature/oat_enabled")
+                }
 
-            BOSwitch {
-                label: "Show ETE"
-                description: "Enable ETE readout"
-                data_ref: data_ref_manager.getDataRef("progress/ete_enabled")
+                BOSwitch {
+                    label: "Show TAT"
+                    description: "Enable TAT readout"
+                    data_ref: data_ref_manager.getDataRef("widget/temperature/tat_enabled")
+                }
             }
-        }
 
-        BOWidgetSettings {
-            label: "Landing Settings"
-            data_ref_enabled: data_ref_manager.getDataRef("landing/enabled")
-            data_ref_custom_style: data_ref_manager.getDataRef("landing/custom_style")
-            data_ref_icon_enabled: data_ref_manager.getDataRef("landing/icon_enabled")
-            data_ref_icon_size: data_ref_manager.getDataRef("landing/icon_size")
-            data_ref_primary_color: data_ref_manager.getDataRef("landing/primary_color")
-            data_ref_secondary_color: data_ref_manager.getDataRef("landing/secondary_color")
-            data_ref_primary_font: data_ref_manager.getDataRef("landing/primary_font")
-            data_ref_secondary_font: data_ref_manager.getDataRef("landing/secondary_font")
-
-            BOSwitch {
-                id: settings_mode_switch
-
-                label: "Settings Mode"
-                description: "Set landing monitor to always visible"
-                data_ref: data_ref_manager.getDataRef("landing/settings_mode_enabled")
-            }
+            BOWidgetSettings {
+                label: "Performance Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("widget/performance/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("widget/performance/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("widget/performance/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("widget/performance/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("widget/performance/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("widget/performance/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("widget/performance/secondary_font")
+
+                BOSwitch {
+                    id: fps_switch
 
-            Button {
-                text: "Test Event"
-                visible: !settings_mode_switch.checked
-                onClicked: {
-                    data_ref_manager.getDataRef("sim/on_ground").setData(false);
-                    data_ref_manager.getDataRef("sim/on_ground").setData(true);
+                    label: "Show FPS"
+                    description: "Enable FPS readout"
+                    data_ref: data_ref_manager.getDataRef("widget/performance/fps_enabled")
+                }
+
+                BOSpinBox {
+                    label: "FPS Buffer Size"
+                    data_ref: data_ref_manager.getDataRef("widget/performance/fps_buffer_size")
+                    from: 1
+                    visible: fps_switch.checked
                 }
-            }
 
-            BOSpinBox {
-                label: "Popup Duration"
-                data_ref: data_ref_manager.getDataRef("landing/popup_duration")
-                from: 1
+                BOSwitch {
+                    label: "Show VAS"
+                    description: "Enable VAS readout"
+                    data_ref: data_ref_manager.getDataRef("widget/performance/vas_enabled")
+                }
             }
 
-            BOSwitch {
-                id: background_image_enabled_switch
+            BOWidgetSettings {
+                label: "Progress Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("progress/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("progress/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("progress/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("progress/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("progress/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("progress/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("progress/secondary_font")
+
+                BOSwitch {
+                    label: "Show DEP"
+                    description: "Enable DEP readout"
+                    data_ref: data_ref_manager.getDataRef("progress/dep_enabled")
+                }
 
-                label: "Background Image"
-                description: "Enable background image"
-                data_ref: data_ref_manager.getDataRef("landing/background_image_enabled")
-            }
+                BOSwitch {
+                    label: "Show ARR"
+                    description: "Enable ARR readout"
+                    data_ref: data_ref_manager.getDataRef("progress/arr_enabled")
+                }
 
-            BOImageSelector {
-                label: "Background Image"
-                data_ref: data_ref_manager.getDataRef("landing/background_image")
-                visible: background_image_enabled_switch.checked
-            }
+                BOSwitch {
+                    label: "Show DTG"
+                    description: "Enable DTG readout"
+                    data_ref: data_ref_manager.getDataRef("progress/dtg_enabled")
+                }
 
-            BOSwitch {
-                id: ete_switch
+                BOSwitch {
+                    label: "Show ETA"
+                    description: "Enable ETA readout"
+                    data_ref: data_ref_manager.getDataRef("progress/eta_enabled")
+                }
 
-                label: "Show ETE"
-                description: "Enable ETE readout"
-                data_ref: data_ref_manager.getDataRef("landing/ete_enabled")
+                BOSwitch {
+                    label: "Show ETE"
+                    description: "Enable ETE readout"
+                    data_ref: data_ref_manager.getDataRef("progress/ete_enabled")
+                }
+
+                BOSwitch {
+                    label: "Show Route"
+                    description: "Enable Route readout"
+                    data_ref: data_ref_manager.getDataRef("progress/route_enabled")
+                }
             }
 
-        }
+            BOGroupBox {
+                label: "Landing Settings"
 
-        //BOWidgetPerformance {
-        //    anchors.fill: parent
+                ColumnLayout {
+                    anchors {left: parent.left; top: parent.top; right: parent.right}
+                    spacing: 16
 
-        //}
+                    BOSwitch {
+                        id: settings_mode_switch
 
-        //BOProgress {
+                        label: "Settings Mode"
+                        description: "Set landing monitor to always visible"
+                        data_ref: data_ref_manager.getDataRef("landing/settings_mode")
+                    }
 
-        //    anchors.fill: parent
-        //    name: "Progress Settings"
-        //    data_ref_custom_style: data_ref_manager.getDataRef("progress/custom_style")
-        //    data_ref_icon_enabled: data_ref_manager.getDataRef("progress/icon_enabled")
-        //    data_ref_icon_size: data_ref_manager.getDataRef("progress/icon_size")
-        //    data_ref_primary_color: data_ref_manager.getDataRef("progress/primary_color")
-        //    data_ref_secondary_color: data_ref_manager.getDataRef("progress/secondary_color")
-        //    data_ref_primary_font: data_ref_manager.getDataRef("progress/primary_font")
-        //    data_ref_secondary_font: data_ref_manager.getDataRef("progress/secondary_font")
+                    Button {
+                        text: "Test Event"
+                        visible: !settings_mode_switch.checked
+                        onClicked: {
+                            data_ref_manager.getDataRef("sim/on_ground").setData(false);
+                            data_ref_manager.getDataRef("sim/on_ground").setData(true);
+                        }
+                    }
 
-        //}
+                    BOSpinBox {
+                        label: "Popup Duration"
+                        data_ref: data_ref_manager.getDataRef("landing/popup_duration")
+                        from: 1
+                    }
 
-        //BOLanding {
+                    BOSwitch {
+                        id: background_image_enabled_switch
 
-        //    anchors.fill: parent
-        //}
+                        label: "Background Image"
+                        description: "Enable background image"
+                        data_ref: data_ref_manager.getDataRef("landing/background_image_enabled")
+                    }
 
-    }
+                    BOImageSelector {
+                        label: "Background Image"
+                        data_ref: data_ref_manager.getDataRef("landing/background_image")
+                        visible: background_image_enabled_switch.checked
+                    }
+
+                    BOSwitch {
+                        label: "Title Enabled"
+                        description: "Enable Title widget"
+                        data_ref: data_ref_manager.getDataRef("landing/title/enabled")
+                    }
 
-    Rectangle {
-        id: notification_rectangle
+                    BOSwitch {
+                        label: "Network Rate"
+                        description: "Enable Rate widget"
+                        data_ref: data_ref_manager.getDataRef("landing/rate/enabled")
+                    }
 
-        anchors.left: menu.right
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
+                    BOSwitch {
+                        label: "Speed Enabled"
+                        description: "Enable Speed widget"
+                        data_ref: data_ref_manager.getDataRef("landing/speed/enabled")
+                    }
 
-        height: 50
+                    BOSwitch {
+                        label: "Attitude Enabled"
+                        description: "Enable Attitude widget"
+                        data_ref: data_ref_manager.getDataRef("landing/attitude/enabled")
+                    }
+                }
+            }
 
-        color: "#263238"
+            BOWidgetSettings {
+                label: "Title Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("landing/title/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("landing/title/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("landing/title/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("landing/title/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("landing/title/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("landing/title/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("landing/title/secondary_font")
+            }
+
+            BOWidgetSettings {
+                label: "Rate Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("landing/rate/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("landing/rate/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("landing/rate/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("landing/rate/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("landing/rate/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("landing/rate/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("landing/rate/secondary_font")
+
+                BOSwitch {
+                    label: "Show V/S"
+                    description: "Enable V/S readout"
+                    data_ref: data_ref_manager.getDataRef("landing/rate/vs_enabled")
+                }
 
-        Text {
-            id: notification_text
-            anchors.centerIn: parent
+                BOSwitch {
+                    label: "Show Pitch"
+                    description: "Enable Pitch readout"
+                    data_ref: data_ref_manager.getDataRef("landing/rate/pitch_enabled")
+                }
+            }
 
-            color: "#edf0f2"
-            font.pointSize: 10
+            BOWidgetSettings {
+                label: "Speed Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("landing/speed/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("landing/speed/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("landing/speed/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("landing/speed/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("landing/speed/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("landing/speed/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("landing/speed/secondary_font")
+
+                BOSwitch {
+                    label: "Show IAS"
+                    description: "Enable IAS readout"
+                    data_ref: data_ref_manager.getDataRef("landing/speed/ias_enabled")
+                }
 
-            text: "Waiting for Flight Sim"
+                BOSwitch {
+                    label: "Show GS"
+                    description: "Enable GS readout"
+                    data_ref: data_ref_manager.getDataRef("landing/speed/gs_enabled")
+                }
+            }
 
+            BOWidgetSettings {
+                label: "Attitude Settings"
+                data_ref_custom_style: data_ref_manager.getDataRef("landing/attitude/custom_style")
+                data_ref_icon_enabled: data_ref_manager.getDataRef("landing/attitude/icon_enabled")
+                data_ref_icon_size: data_ref_manager.getDataRef("landing/attitude/icon_size")
+                data_ref_primary_color: data_ref_manager.getDataRef("landing/attitude/primary_color")
+                data_ref_secondary_color: data_ref_manager.getDataRef("landing/attitude/secondary_color")
+                data_ref_primary_font: data_ref_manager.getDataRef("landing/attitude/primary_font")
+                data_ref_secondary_font: data_ref_manager.getDataRef("landing/attitude/secondary_font")
+
+                BOSwitch {
+                    label: "Show Bank"
+                    description: "Enable Bank readout"
+                    data_ref: data_ref_manager.getDataRef("landing/attitude/bank_enabled")
+                }
+            }
         }
 
-        //BusyIndicator {
-        //  anchors.left: notification_text.right
-        //  anchors.verticalCenter: notification_text.verticalCenter
+        Rectangle {
+            id: notification_rectangle
 
-        //  height: 30
-        //  width: 30
-        //}
+            height: 50
+            color: "#263238"
+            visible: !data_ref_manager.getDataRef("sim/connected").data
 
-        visible: !data_ref_manager.getDataRef("sim/connected").data
-
-    }
+            Layout.fillWidth: true
 
+            Text {
+                anchors.fill: parent
 
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                color: "#edf0f2"
+                font.pointSize: 10
+                text: "Waiting for Flight Sim"
+                wrapMode: Text.WordWrap
+            }
+        }
+    }
 }
diff --git a/qml/main2.qml b/qml/main2.qml
deleted file mode 100644
index 3e8a006..0000000
--- a/qml/main2.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.7
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.3
-
-ApplicationWindow {
-    id: root
-    visible: true
-    width: 600
-    height: 750
-    title: "BeneOverlay v" + VERSION_STRING
-
-    BOWidgetSettings {
-        anchors.fill: parent
-        label: "Hallo"
-
-        Repeater {
-            model: 10
-            delegate: BOSwitch {
-                label: "Hallo " + index
-            }
-        }
-    }
-
-}
diff --git a/qml/qml_resources.qrc b/qml/qml_resources.qrc
index 09c5fb4..b3e6c11 100644
--- a/qml/qml_resources.qrc
+++ b/qml/qml_resources.qrc
@@ -1,30 +1,19 @@
 <RCC>
     <qresource prefix="/">
         <file>BOColorSelector.qml</file>
+        <file>BOErrorDialog.qml</file>
         <file>BOFontSelector.qml</file>
         <file>BOGroupBox.qml</file>
         <file>BOImageSelector.qml</file>
         <file>BOItem.qml</file>
-        <file>BOLanding.qml</file>
         <file>BOMenuItem.qml</file>
-        <file>BOProgress.qml</file>
         <file>BOSpinBox.qml</file>
         <file>BOSwitch.qml</file>
         <file>BOTextField.qml</file>
         <file>BOWidget.qml</file>
+        <file>BOWidgetSettings.qml</file>
+        <file>js/showdown.js</file>
         <file>main.qml</file>
         <file>qtquickcontrols2.conf</file>
-        <file>BOWidgetPerformance.qml</file>
-        <file>BOErrorDialog.qml</file>
-        <file>BOWidgetHeading.qml</file>
-        <file>BOWidgetWind.qml</file>
-        <file>js/showdown.js</file>
-        <file>BOWidgetTemperature.qml</file>
-        <file>BOWidgetCallsign.qml</file>
-        <file>BOWidgetNetwork.qml</file>
-        <file>BOWidgetSpeed.qml</file>
-        <file>BOWidgetAltitude.qml</file>
-        <file>main2.qml</file>
-        <file>BOWidgetSettings.qml</file>
     </qresource>
 </RCC>
diff --git a/src/datarefmanager.cpp b/src/datarefmanager.cpp
index 5f2075c..4de21f5 100644
--- a/src/datarefmanager.cpp
+++ b/src/datarefmanager.cpp
@@ -189,7 +189,6 @@ DataRefManager::DataRefManager(QObject *parent) : QObject(parent)
     data_ref_map_["widget/temperature/oat_enabled"] = new DataRef(true, true, this);
     data_ref_map_["widget/temperature/tat_enabled"] = new DataRef(true, true, this);
 
-    data_ref_map_["progress/enabled"] = new DataRef(true, true, this);
     data_ref_map_["progress/custom_style"] = new DataRef(false, true, this);
     data_ref_map_["progress/icon_enabled"] = new DataRef(true, true, this);
     data_ref_map_["progress/icon_size"] = new DataRef(70, true, this);
@@ -202,19 +201,53 @@ DataRefManager::DataRefManager(QObject *parent) : QObject(parent)
     data_ref_map_["progress/dtg_enabled"] = new DataRef(true, true, this);
     data_ref_map_["progress/eta_enabled"] = new DataRef(true, true, this);
     data_ref_map_["progress/ete_enabled"] = new DataRef(false, true, this);
+    data_ref_map_["progress/route_enabled"] = new DataRef(true, true, this);
 
-    data_ref_map_["landing/enabled"] = new DataRef(true, true, this);
     data_ref_map_["landing/settings_mode"] = new DataRef(false, true, this);
     data_ref_map_["landing/background_image_enabled"] = new DataRef(true, true, this);
     data_ref_map_["landing/background_image"] = new DataRef("file:///" + QDir::current().absoluteFilePath("html/images/event-background.png"), true, this);
     data_ref_map_["landing/popup_duration"] = new DataRef(8, true, this);
-    data_ref_map_["landing/custom_style"] = new DataRef(false, true, this);
-    data_ref_map_["landing/icon_enabled"] = new DataRef(true, true, this);
-    data_ref_map_["landing/icon_size"] = new DataRef(70, true, this);
-    data_ref_map_["landing/primary_color"] = new DataRef(QColor("#ffffff"), true, this);
-    data_ref_map_["landing/secondary_color"] = new DataRef(QColor("#f44336"), true, this);
-    data_ref_map_["landing/primary_font"] = new DataRef(QFont(), true, this);
-    data_ref_map_["landing/secondary_font"] = new DataRef(QFont(), true, this);
+
+    data_ref_map_["landing/title/enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/title/custom_style"] = new DataRef(false, true, this);
+    data_ref_map_["landing/title/icon_enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/title/icon_size"] = new DataRef(70, true, this);
+    data_ref_map_["landing/title/primary_color"] = new DataRef(QColor("#ffffff"), true, this);
+    data_ref_map_["landing/title/secondary_color"] = new DataRef(QColor("#f44336"), true, this);
+    data_ref_map_["landing/title/primary_font"] = new DataRef(QFont(), true, this);
+    data_ref_map_["landing/title/secondary_font"] = new DataRef(QFont(), true, this);
+
+    data_ref_map_["landing/rate/enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/rate/custom_style"] = new DataRef(false, true, this);
+    data_ref_map_["landing/rate/icon_enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/rate/icon_size"] = new DataRef(70, true, this);
+    data_ref_map_["landing/rate/primary_color"] = new DataRef(QColor("#ffffff"), true, this);
+    data_ref_map_["landing/rate/secondary_color"] = new DataRef(QColor("#f44336"), true, this);
+    data_ref_map_["landing/rate/primary_font"] = new DataRef(QFont(), true, this);
+    data_ref_map_["landing/rate/secondary_font"] = new DataRef(QFont(), true, this);
+    data_ref_map_["landing/rate/vs_enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/rate/pitch_enabled"] = new DataRef(true, true, this);
+
+    data_ref_map_["landing/speed/enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/speed/custom_style"] = new DataRef(false, true, this);
+    data_ref_map_["landing/speed/icon_enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/speed/icon_size"] = new DataRef(70, true, this);
+    data_ref_map_["landing/speed/primary_color"] = new DataRef(QColor("#ffffff"), true, this);
+    data_ref_map_["landing/speed/secondary_color"] = new DataRef(QColor("#f44336"), true, this);
+    data_ref_map_["landing/speed/primary_font"] = new DataRef(QFont(), true, this);
+    data_ref_map_["landing/speed/secondary_font"] = new DataRef(QFont(), true, this);
+    data_ref_map_["landing/speed/ias_enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/speed/gs_enabled"] = new DataRef(true, true, this);
+
+    data_ref_map_["landing/attitude/enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/attitude/custom_style"] = new DataRef(false, true, this);
+    data_ref_map_["landing/attitude/icon_enabled"] = new DataRef(true, true, this);
+    data_ref_map_["landing/attitude/icon_size"] = new DataRef(70, true, this);
+    data_ref_map_["landing/attitude/primary_color"] = new DataRef(QColor("#ffffff"), true, this);
+    data_ref_map_["landing/attitude/secondary_color"] = new DataRef(QColor("#f44336"), true, this);
+    data_ref_map_["landing/attitude/primary_font"] = new DataRef(QFont(), true, this);
+    data_ref_map_["landing/attitude/secondary_font"] = new DataRef(QFont(), true, this);
+    data_ref_map_["landing/attitude/bank_enabled"] = new DataRef(true, true, this);
 
     // Load airport data
     QFile file(":data/airports.csv");