diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml
index 48a25f1e..60b561ca 100644
--- a/AircraftConfig/groundservices.xml
+++ b/AircraftConfig/groundservices.xml
@@ -8,7 +8,7 @@
 
     <name>ground-services</name>
     <layout>vbox</layout>
-    
+
     <group>
         <layout>hbox</layout>
         <text>
@@ -26,12 +26,360 @@
             </binding>
         </button>
     </group>
-        
+
     <hrule/>
-    
+
     <group>
         <layout>vbox</layout>
 
+        <group>
+            <layout>hbox</layout>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+            <text>
+                <label>Landing Gear</label>
+            </text>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+        </group>
+
+        <group>
+            <layout>vbox</layout>
+            <checkbox>
+                <label>Enable Gear Chocks</label>
+                <halign>left</halign>
+                <enable>
+                    <and>
+                        <property>/gear/gear[0]/wow</property>
+                        <property>/gear/gear[1]/wow</property>
+                        <property>/gear/gear[2]/wow</property>
+                    </and>
+                </enable>
+                <property>/services/chocks/nose</property>
+                <binding>
+                    <command>property-toggle</command>
+                    <property>/services/chocks/left</property>
+                </binding>
+                <binding>
+                    <command>property-toggle</command>
+                    <property>/services/chocks/right</property>
+                </binding>
+                <binding>
+                    <command>property-toggle</command>
+                    <property>/services/chocks/nose</property>
+                </binding>
+                <live>true</live>
+            </checkbox>
+        </group>
+    </group>
+
+    <group>
+        <layout>vbox</layout>
+
+        <group>
+            <layout>hbox</layout>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+            <text>
+                <label>APU / EPU / AIR / HYD</label>
+            </text>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+        </group>
+
+        <text>
+            <label>APU Oil Level</label>
+        </text>
+
+        <group>
+            <layout>hbox</layout>
+            <slider>
+                <enable>
+                    <property>/systems/apu/oil/allow-oil-consumption</property>
+                </enable>
+                <x>10</x>
+                <y>50</y>
+                <width>200</width>
+                <property>/systems/apu/oil/level-l</property>
+                <min>3.9</min>
+                <max>5.4</max>
+                <live>true</live>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+            </slider>
+
+            <text>
+                <x>10</x>
+                <y>200</y>
+                <label>8.8 litres</label><!-- placeholder for width -->
+                <format>%.1f litres</format>
+                <property>/systems/apu/oil/level-l</property>
+                <live>true</live>
+            </text>
+        </group>
+
+        <checkbox>
+            <label>Enable External Power Box</label>
+            <halign>left</halign>
+            <property>/controls/electrical/ground-cart</property>
+            <binding>
+                <command>property-assign</command>
+                <property>/controls/electrical/switches/ext-pwr</property>
+                <value>0</value>
+            </binding>
+            <enable>
+                <and>
+                    <or>
+                        <property>/controls/gear/brake-parking</property>
+                        <property>/services/chocks/nose</property>
+                        <property>/services/chocks/left</property>
+                        <property>/services/chocks/right</property>
+                    </or>
+                    <less-than>
+                        <property>/velocities/groundspeed-kt</property>
+                        <value>2</value>
+                    </less-than>
+                </and>
+            </enable>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+
+        <checkbox>
+            <label>Enable External Air</label>
+            <halign>left</halign>
+            <property>/controls/pneumatics/switches/groundair</property>
+            <binding>
+                <command>property-toggle</command>
+                <property>/controls/pneumatics/switches/groundair</property>
+            </binding>
+            <enable>
+                <and>
+                    <or>
+                        <property>/controls/gear/brake-parking</property>
+                        <property>/services/chocks/nose</property>
+                        <property>/services/chocks/left</property>
+                        <property>/services/chocks/right</property>
+                    </or>
+                    <less-than>
+                        <property>/velocities/groundspeed-kt</property>
+                        <value>2</value>
+                    </less-than>
+                </and>
+            </enable>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+
+        <checkbox>
+            <label>Yellow HYD Hand Pump</label>
+            <halign>left</halign>
+            <property>/controls/hydraulic/hand-pump-yellow</property>
+            <binding>
+                <command>property-toggle</command>
+                <property>/controls/hydraulic/hand-pump-yellow</property>
+            </binding>
+            <enable>
+                <and>
+                    <or>
+                        <property>/controls/gear/brake-parking</property>
+                        <property>/services/chocks/nose</property>
+                        <property>/services/chocks/left</property>
+                        <property>/services/chocks/right</property>
+                    </or>
+                    <less-than>
+                        <property>/velocities/groundspeed-kt</property>
+                        <value>2</value>
+                    </less-than>
+                    <less-than>
+                        <property>/systems/electrical/bus/ac-2</property>
+                        <value>115</value>
+                    </less-than>
+                    <equals>
+                        <property>/controls/electrical/switches/ext-pwr</property>
+                        <value>0</value>
+                    </equals>
+                </and>
+            </enable>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+    </group>
+
+    <group>
+        <layout>vbox</layout>
+
+        <group>
+            <layout>hbox</layout>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+            <text>
+                <label>Stairways</label>
+            </text>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+        </group>
+
+        <checkbox>
+            <label>Front Left</label>
+            <halign>left</halign>
+            <property>/services/stairs/l1</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+
+        <checkbox>
+            <label>Rear Left</label>
+            <halign>left</halign>
+            <property>/services/stairs/l4</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+
+        <checkbox>
+            <label>Stairway Cover</label>
+            <halign>left</halign>
+            <property>/services/stairs/cover</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+
+        <group>
+            <layout>hbox</layout>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+            <text>
+                <label>Baggage</label>
+            </text>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+        </group>
+
+        <checkbox>
+            <label>Enable Baggage Ramp</label>
+            <halign>left</halign>
+            <property>/services/baggage/enable</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+
+        <group>
+            <layout>hbox</layout>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+            <text>
+                <label>Catering</label>
+            </text>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+        </group>
+
+        <checkbox>
+            <label>Enable Catering Truck</label>
+            <halign>left</halign>
+            <property>/services/catering/enable</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <live>true</live>
+        </checkbox>
+
+        <button>
+            <legend>Toggle Catering</legend>
+            <halign>center</halign>
+            <padding>5</padding>
+            <enable>
+                <property>/services/catering/enable</property>
+            </enable>
+            <binding>
+                <condition>
+                    <less-than>
+                        <property>/services/catering/position-norm</property>
+                        <value>0.1</value>
+                    </less-than>
+                </condition>
+                <command>property-interpolate</command>
+                <property>/services/catering/position-norm</property>
+                <value>0.68</value>
+                <time>5</time>
+            </binding>
+            <binding>
+                <condition>
+                    <greater-than-equals>
+                        <property>/services/catering/position-norm</property>
+                        <value>0.1</value>
+                    </greater-than-equals>
+                </condition>
+                <command>property-interpolate</command>
+                <property>/services/catering/position-norm</property>
+                <value>0.0</value>
+                <time>5</time>
+            </binding>
+        </button>
+
+        <group>
+            <layout>hbox</layout>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+            <text>
+                <label>Fuel</label>
+            </text>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+        </group>
+
+        <button>
+            <legend>Fuel Truck</legend>
+            <halign>center</halign>
+            <padding>5</padding>
+            <binding>
+                <command>nasal</command>
+                <script>
+                    acconfig.fuel_dlg.open();
+                </script>
+            </binding>
+        </button>
+
+        <group>
+            <layout>hbox</layout>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+            <text>
+                <label>De-icing</label>
+            </text>
+            <hrule>
+                <stretch type="bool">true</stretch>
+            </hrule>
+        </group>
+
         <checkbox>
             <label>Enable De-icing Truck</label>
             <halign>left</halign>
@@ -55,159 +403,6 @@
                 <value>1</value>
             </binding>
         </button>
-        
-        <hrule />
-        
-        <button>
-            <legend>Fuel Truck</legend>
-            <halign>center</halign>
-            <padding>5</padding>
-            <binding>
-                <command>nasal</command>
-                <script>
-                acconfig.fuel_dlg.open();
-                </script>
-            </binding>
-        </button>
-        
-        <hrule />
-        
-        <checkbox>
-            <label>Enable Catering Truck</label>
-            <halign>left</halign>
-            <property>/services/catering/enable</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-            <live>true</live>
-        </checkbox>
-
-        <button>
-            <legend>Toggle Catering</legend>
-            <halign>center</halign>
-            <padding>5</padding>
-            <enable>
-                <property>/services/catering/enable</property>
-            </enable>
-            <binding>
-                <condition>
-                    <less-than>
-                        <property>/services/catering/position-norm</property>
-                        <value>0.1</value>
-                    </less-than>
-                </condition><command>property-interpolate</command>
-                <property>/services/catering/position-norm</property>
-                <value>0.68</value>
-                <time>5</time>
-            </binding>
-            <binding>
-                <condition>
-                    <greater-than-equals>
-                        <property>/services/catering/position-norm</property>
-                        <value>0.1</value>
-                    </greater-than-equals>
-                </condition><command>property-interpolate</command>
-                <property>/services/catering/position-norm</property>
-                <value>0.0</value>
-                <time>5</time>
-            </binding>
-        </button>
-        
-        <checkbox>
-            <label>Enable Baggage Ramp</label>
-            <halign>left</halign>
-            <property>/services/baggage/enable</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-            <live>true</live>
-        </checkbox>
-        
-        <group>
-            <layout>hbox</layout>
-
-            <hrule>
-                <stretch type="bool">true</stretch>
-            </hrule>
-            <text>
-                <label>Stairways</label>
-            </text>
-            <hrule>
-                <stretch type="bool">true</stretch>
-            </hrule>
-        </group>
-        
-        <checkbox>
-            <label>Front Left</label>
-            <halign>left</halign>
-            <property>/services/stairs/l1</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-            <live>true</live>
-        </checkbox>
-        
-        <checkbox>
-            <label>Rear Left</label>
-            <halign>left</halign>
-            <property>/services/stairs/l4</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-            <live>true</live>
-        </checkbox>
-        
-        <checkbox>
-            <label>Stairway Cover</label>
-            <halign>left</halign>
-            <property>/services/stairs/cover</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-            <live>true</live>
-        </checkbox>
-    
-        <group>
-            <layout>hbox</layout>
-
-            <hrule>
-                <stretch type="bool">true</stretch>
-            </hrule>
-            <text>
-                <label>APU Oil Level</label>
-            </text>
-            <hrule>
-                <stretch type="bool">true</stretch>
-            </hrule>
-        </group>
-        
-        <group>
-			<layout>hbox</layout>
-            <slider>
-                <enable>
-                    <property>/systems/apu/oil/allow-oil-consumption</property>
-                </enable>
-                <x>10</x>
-                <y>50</y>
-                <width>200</width>
-                <property>/systems/apu/oil/level-l</property>
-                <min>3.9</min>
-                <max>5.4</max>
-				<live>true</live>
-				<binding>
-                    <command>dialog-apply</command>
-                </binding>
-            </slider>
-            
-            <text>
-                <x>10</x>
-                <y>200</y>
-                <label>8.8 litres</label> <!-- placeholder for width -->
-                <format>%.1f litres</format>
-                <property>/systems/apu/oil/level-l</property>
-				<live>true</live>
-            </text>
-        </group>
     </group>
-    
+
 </PropertyList>
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index 0c230669..d7edd304 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -219,151 +219,7 @@
 					</script>
 				</binding>
 			</button>
-			
-			<checkbox>
-				<label>Nose Gear Chock</label>
-				<halign>left</halign>
-				<enable>
-					<and>
-						<property>/gear/gear[0]/wow</property>
-						<property>/gear/gear[1]/wow</property>
-						<property>/gear/gear[2]/wow</property>
-					</and>
-				</enable>
-				<property>/services/chocks/nose</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Main Left Gear Chock</label>
-				<halign>left</halign>
-				<enable>
-					<and>
-						<property>/gear/gear[0]/wow</property>
-						<property>/gear/gear[1]/wow</property>
-						<property>/gear/gear[2]/wow</property>
-					</and>
-				</enable>
-				<property>/services/chocks/left</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Main Right Gear Chock</label>
-				<halign>left</halign>
-				<enable>
-					<and>
-						<property>/gear/gear[0]/wow</property>
-						<property>/gear/gear[1]/wow</property>
-						<property>/gear/gear[2]/wow</property>
-					</and>
-				</enable>
-				<property>/services/chocks/right</property>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Enable External Power Box</label>
-				<halign>left</halign>
-				<property>/controls/electrical/ground-cart</property>
-				<binding>
-					<command>property-assign</command>
-					<property>/controls/electrical/switches/ext-pwr</property>
-					<value>0</value>
-				</binding>
-				<enable>
-					<and>
-						<or>
-							<property>/controls/gear/brake-parking</property>
-							<property>/services/chocks/nose</property>
-							<property>/services/chocks/left</property>
-							<property>/services/chocks/right</property>
-						</or>
-						<less-than>
-							<property>/velocities/groundspeed-kt</property>
-							<value>2</value>
-						</less-than>
-					</and>
-				</enable>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Enable External Air</label>
-				<halign>left</halign>
-				<property>/controls/pneumatics/switches/groundair</property>
-				<binding>
-					<command>property-toggle</command>
-					<property>/controls/pneumatics/switches/groundair</property>
-				</binding>
-				<enable>
-					<and>
-						<or>
-							<property>/controls/gear/brake-parking</property>
-							<property>/services/chocks/nose</property>
-							<property>/services/chocks/left</property>
-							<property>/services/chocks/right</property>
-						</or>
-						<less-than>
-							<property>/velocities/groundspeed-kt</property>
-							<value>2</value>
-						</less-than>
-					</and>
-				</enable>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
-			<checkbox>
-				<label>Yellow HYD Hand Pump</label>
-				<halign>left</halign>
-				<property>/controls/hydraulic/hand-pump-yellow</property>
-				<binding>
-					<command>property-toggle</command>
-					<property>/controls/hydraulic/hand-pump-yellow</property>
-				</binding>
-				<enable>
-					<and>
-						<or>
-							<property>/controls/gear/brake-parking</property>
-							<property>/services/chocks/nose</property>
-							<property>/services/chocks/left</property>
-							<property>/services/chocks/right</property>
-						</or>
-						<less-than>
-							<property>/velocities/groundspeed-kt</property>
-							<value>2</value>
-						</less-than>
-						<less-than>
-							<property>/systems/electrical/bus/ac-2</property>
-							<value>115</value>
-						</less-than>
-						<equals>
-							<property>/controls/electrical/switches/ext-pwr</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</enable>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
+
 			<hrule/>
 			
 			<checkbox>
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index c13c5110..c4ed32b5 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -268,9 +268,9 @@ var systemsLoop = maketimer(0.1, func {
 	systems.APUController.loop();
 	systems.HFLoop();
 	
-	if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/electrical/ground-cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or (getprop("/controls/gear/brake-parking") == 0 and getprop("/services/chocks/nose") == 0 and getprop("/services/chocks/left") == 0 and getprop("/services/chocks/right") == 0))) {
+	if ((getprop("/controls/pneumatics/switches/groundair") or getprop("/controls/electrical/ground-cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or (getprop("/controls/gear/brake-parking") == 0 and getprop("/services/chocks/nose") == 0 and getprop("/services/chocks/left") == 0 and getprop("/services/chocks/right") == 0))) {
 		setprop("/controls/electrical/ground-cart", 0);
-		setprop("/controls/pneumatic/switches/groundair", 0);
+		setprop("/controls/pneumatics/switches/groundair", 0);
 	}
 	
 	if (getprop("/velocities/groundspeed-kt") > 15) {