diff --git a/layouts/layout.yaml b/layouts/layout.yaml
index fd02211..13100f1 100755
--- a/layouts/layout.yaml
+++ b/layouts/layout.yaml
@@ -2,33 +2,33 @@ Windows:
     1:
         uiwindow:
             Dims:
-                X0: 74
-                Y0: 413
-                Width: 57
-                Height: 57
+                X0: 470
+                Y0: 132
+                Width: 169
+                Height: 50
             Decor:
                 BGColour: 4161
                 FGColour: 65535
                 TitleColour: 65535
                 BorderColour: 63488
                 TitleSize: 2
-                TextSize: 4
+                TextSize: 3
                 HasBorder: 1
                 Padding: 0
             Opts:
                 ShowID: 0
                 WinType: 2
-                PreviewValue: "12"
-            Title: TC
+                PreviewValue: "123.4"
+            Title: Fuel Level
         uidata:
             WID: 1
-            TelemetryField: TC Control
+            TelemetryField: Fuel Level
     2:
         uiwindow:
             Dims:
-                X0: 354
-                Y0: 71
-                Width: 74
+                X0: 321
+                Y0: 73
+                Width: 134
                 Height: 111
             Decor:
                 BGColour: 4161
@@ -72,150 +72,6 @@ Windows:
             WID: 3
             TelemetryField: Throttle Control
     4:
-        uiwindow:
-            Dims:
-                X0: 359
-                Y0: 355
-                Width: 120
-                Height: 49
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 3
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: YELLOW
-            Title: RPMColour
-        uidata:
-            WID: 4
-            TelemetryField: RPM State Colour
-    5:
-        uiwindow:
-            Dims:
-                X0: 60
-                Y0: 155
-                Width: 226
-                Height: 57
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 4
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: "06:45.123"
-            Title: Last Lap
-        uidata:
-            WID: 5
-            TelemetryField: Last Lap Time
-    6:
-        uiwindow:
-            Dims:
-                X0: 470
-                Y0: 188
-                Width: 168
-                Height: 50
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 3
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: 12.3 L
-            Title: Fuel Last Lap
-        uidata:
-            WID: 6
-            TelemetryField: Fuel Last Lap
-    7:
-        uiwindow:
-            Dims:
-                X0: 142
-                Y0: 19
-                Width: 500
-                Height: 20
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 1
-                TextSize: 2
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 1
-                PreviewValue: "5678"
-            Title: TACHO
-        uidata:
-            WID: 7
-            TelemetryField: RPM
-    8:
-        uiwindow:
-            Dims:
-                X0: 694
-                Y0: 423
-                Width: 100
-                Height: 50
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 3
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: "4.56"
-            Title: Oil P
-        uidata:
-            WID: 8
-            TelemetryField: Oil Pressure
-    9:
-        uiwindow:
-            Dims:
-                X0: 331
-                Y0: 190
-                Width: 116
-                Height: 70
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 6
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: "234"
-            Title: SPEEDO
-        uidata:
-            WID: 9
-            TelemetryField: Speed
-    10:
         uiwindow:
             Dims:
                 X0: 694
@@ -237,33 +93,9 @@ Windows:
                 PreviewValue: "101.4"
             Title: Oil T
         uidata:
-            WID: 10
+            WID: 4
             TelemetryField: Oil Temperature
-    11:
-        uiwindow:
-            Dims:
-                X0: 590
-                Y0: 367
-                Width: 100
-                Height: 50
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 3
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: "101.5"
-            Title: Water T
-        uidata:
-            WID: 11
-            TelemetryField: Water Temperature
-    12:
+    5:
         uiwindow:
             Dims:
                 X0: 642
@@ -285,14 +117,14 @@ Windows:
                 PreviewValue: "2.7"
             Title: Fuel Cur Lap
         uidata:
-            WID: 12
+            WID: 5
             TelemetryField: Fuel Current Lap
-    13:
+    6:
         uiwindow:
             Dims:
-                X0: 436
+                X0: 470
                 Y0: 71
-                Width: 206
+                Width: 322
                 Height: 57
             Decor:
                 BGColour: 4161
@@ -309,33 +141,9 @@ Windows:
                 PreviewValue: "9999"
             Title: Dig Tacho
         uidata:
-            WID: 13
+            WID: 6
             TelemetryField: RPM
-    14:
-        uiwindow:
-            Dims:
-                X0: 710
-                Y0: 8
-                Width: 84
-                Height: 57
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 4
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: PIT
-            Title: Pit Sp
-        uidata:
-            WID: 14
-            TelemetryField: Pit Speed Limiter
-    15:
+    7:
         uiwindow:
             Dims:
                 X0: 207
@@ -357,81 +165,9 @@ Windows:
                 PreviewValue: "61.4"
             Title: BBias
         uidata:
-            WID: 15
+            WID: 7
             TelemetryField: BrakeBias
-    16:
-        uiwindow:
-            Dims:
-                X0: 470
-                Y0: 132
-                Width: 169
-                Height: 50
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 3
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: "123.4"
-            Title: Fuel Level
-        uidata:
-            WID: 16
-            TelemetryField: Fuel Level
-    17:
-        uiwindow:
-            Dims:
-                X0: 60
-                Y0: 91
-                Width: 85
-                Height: 57
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 4
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: "123"
-            Title: Lap
-        uidata:
-            WID: 17
-            TelemetryField: Lap Number
-    18:
-        uiwindow:
-            Dims:
-                X0: 9
-                Y0: 413
-                Width: 57
-                Height: 57
-            Decor:
-                BGColour: 4161
-                FGColour: 65535
-                TitleColour: 65535
-                BorderColour: 63488
-                TitleSize: 2
-                TextSize: 4
-                HasBorder: 1
-                Padding: 0
-            Opts:
-                ShowID: 0
-                WinType: 2
-                PreviewValue: "12"
-            Title: ABS
-        uidata:
-            WID: 18
-            TelemetryField: ABS Control
-    19:
+    8:
         uiwindow:
             Dims:
                 X0: 643
@@ -453,9 +189,177 @@ Windows:
                 PreviewValue: "10.54"
             Title: Fuel Av.
         uidata:
-            WID: 19
+            WID: 8
             TelemetryField: Fuel Average Usage
-    20:
+    9:
+        uiwindow:
+            Dims:
+                X0: 9
+                Y0: 413
+                Width: 57
+                Height: 57
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 4
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: "12"
+            Title: ABS
+        uidata:
+            WID: 9
+            TelemetryField: ABS Control
+    10:
+        uiwindow:
+            Dims:
+                X0: 359
+                Y0: 355
+                Width: 120
+                Height: 49
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 3
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: YELLOW
+            Title: RPMColour
+        uidata:
+            WID: 10
+            TelemetryField: RPM State Colour
+    11:
+        uiwindow:
+            Dims:
+                X0: 60
+                Y0: 155
+                Width: 226
+                Height: 57
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 4
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: "06:45.123"
+            Title: Last Lap
+        uidata:
+            WID: 11
+            TelemetryField: Last Lap Time
+    12:
+        uiwindow:
+            Dims:
+                X0: 470
+                Y0: 188
+                Width: 168
+                Height: 50
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 3
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: 12.3 L
+            Title: Fuel Last Lap
+        uidata:
+            WID: 12
+            TelemetryField: Fuel Last Lap
+    13:
+        uiwindow:
+            Dims:
+                X0: 142
+                Y0: 19
+                Width: 500
+                Height: 20
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 1
+                TextSize: 2
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 1
+                PreviewValue: "5678"
+            Title: TACHO
+        uidata:
+            WID: 13
+            TelemetryField: RPM
+    14:
+        uiwindow:
+            Dims:
+                X0: 321
+                Y0: 195
+                Width: 134
+                Height: 80
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 7
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: "234"
+            Title: SPEEDO
+        uidata:
+            WID: 14
+            TelemetryField: Speed
+    15:
+        uiwindow:
+            Dims:
+                X0: 60
+                Y0: 91
+                Width: 85
+                Height: 57
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 4
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: "123"
+            Title: Lap
+        uidata:
+            WID: 15
+            TelemetryField: Lap Number
+    16:
         uiwindow:
             Dims:
                 X0: 470
@@ -477,5 +381,101 @@ Windows:
                 PreviewValue: "41.2"
             Title: Fuel Rem.
         uidata:
-            WID: 20
+            WID: 16
             TelemetryField: Fuel Expected Laps
+    17:
+        uiwindow:
+            Dims:
+                X0: 74
+                Y0: 413
+                Width: 57
+                Height: 57
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 4
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: "12"
+            Title: TC
+        uidata:
+            WID: 17
+            TelemetryField: TC Control
+    18:
+        uiwindow:
+            Dims:
+                X0: 694
+                Y0: 423
+                Width: 100
+                Height: 50
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 3
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: "4.56"
+            Title: Oil P
+        uidata:
+            WID: 18
+            TelemetryField: Oil Pressure
+    19:
+        uiwindow:
+            Dims:
+                X0: 590
+                Y0: 367
+                Width: 100
+                Height: 50
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 3
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: "101.5"
+            Title: Water T
+        uidata:
+            WID: 19
+            TelemetryField: Water Temperature
+    20:
+        uiwindow:
+            Dims:
+                X0: 710
+                Y0: 8
+                Width: 84
+                Height: 57
+            Decor:
+                BGColour: 4161
+                FGColour: 65535
+                TitleColour: 65535
+                BorderColour: 63488
+                TitleSize: 2
+                TextSize: 4
+                HasBorder: 1
+                Padding: 0
+            Opts:
+                ShowID: 0
+                WinType: 2
+                PreviewValue: PIT
+            Title: Pit Sp
+        uidata:
+            WID: 20
+            TelemetryField: Pit Speed Limiter