diff --git a/conf/conf.xml.example b/conf/conf.xml.example
index fb7a9966fc..b7c9fc3197 100644
--- a/conf/conf.xml.example
+++ b/conf/conf.xml.example
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <conf>
-  <!-- arm7 aircrafts -->
 
   <!-- booz2 -->
   <aircraft
@@ -44,7 +43,7 @@
     radio="radios/cockpitMM.xml"
     telemetry="telemetry/default_fixedwing.xml"
     flight_plan="flight_plans/basic.xml"
-    settings="settings/fixedwing_basic.xml settings/estimation/infrared.xml"
+    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
     gui_color="#6293ba"
     />
   <aircraft
@@ -54,7 +53,7 @@
     radio="radios/cockpitSX.xml"
     telemetry="telemetry/default_fixedwing_imu.xml"
     flight_plan="flight_plans/versatile.xml"
-    settings="settings/fixedwing_tuning.xml settings/estimation/ins_neutrals.xml"
+    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
     gui_color="blue"
     />
   <aircraft
@@ -64,7 +63,7 @@
     radio="radios/cockpitMM.xml"
     telemetry="telemetry/default_fixedwing.xml"
     flight_plan="flight_plans/versatile.xml"
-    settings="settings/fixedwing_tuning.xml settings/estimation/infrared.xml"
+    settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
     gui_color="#ba6293"
     />
   <aircraft
@@ -73,8 +72,8 @@
     airframe="airframes/examples/easystar_ets.xml"
     radio="radios/cockpitSX.xml"
     telemetry="telemetry/default_fixedwing.xml"
-    flight_plan="flight_plans/versatile.xml"
-    settings="settings/fixedwing_tuning.xml settings/estimation/infrared.xml"
+    flight_plan="flight_plans/basic.xml"
+    settings="settings/fixedwing_basic.xml settings/estimation/infrared.xml"
     gui_color="red"
     />
 
diff --git a/conf/settings/fixedwing_tuning.xml b/conf/settings/control/ctl_basic.xml
similarity index 73%
rename from conf/settings/fixedwing_tuning.xml
rename to conf/settings/control/ctl_basic.xml
index f827cd4010..470d25704e 100644
--- a/conf/settings/fixedwing_tuning.xml
+++ b/conf/settings/control/ctl_basic.xml
@@ -4,29 +4,6 @@
 
 <settings>
   <dl_settings>
-    <dl_settings NAME="flight params">
-      <dl_setting MAX="1000" MIN="0" STEP="10" VAR="flight_altitude" shortname="altitude"/>
-      <dl_setting MAX="10" MIN="-10" STEP="0.5" VAR="wind_east"/>
-      <dl_setting MAX="10" MIN="-10" STEP="0.5" VAR="wind_north"/>
-    </dl_settings>
-
-    <dl_settings NAME="mode">
-      <dl_setting MAX="2" MIN="0" STEP="1" VAR="pprz_mode" module="autopilot"/>
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="alt_kalman_enabled" shortname="alt_kalman" module="estimator"/>
-      <dl_setting MAX="0" MIN="0" STEP="1" VAR="estimator_flight_time" shortname="flight time"/>
-      <dl_setting MAX="1000" MIN="0" STEP="1" VAR="stage_time"/>
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="launch"/>
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="kill_throttle"/>
-      <dl_setting MAX="2" MIN="0" STEP="1" VAR="gps.reset" module="subsystems/gps" handler="Reset" shortname="GPS reset"/>
-
-      <dl_setting MAX="200" MIN="-200" STEP="10" VAR="nav_radius" module="subsystems/nav" handler="SetNavRadius">
-        <strip_button icon="circle-right.png" name="Circle right" value="1"/>
-        <strip_button icon="circle-left.png" name="Circle left" value="-1"/>
-        <key_press key="greater" value="1"/>
-        <key_press key="less" value="-1"/>
-      </dl_setting>
-    </dl_settings>
-
     <dl_settings NAME="control">
 
       <dl_settings NAME="trim">
@@ -52,15 +29,13 @@
 
       <dl_settings name="auto_throttle">
         <dl_setting MAX="1" MIN="0.0" STEP="0.05" VAR="v_ctl_auto_throttle_cruise_throttle" shortname="cruise throttle" module="guidance/guidance_v" handler="SetCruiseThrottle" param="V_CTL_AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE">
-          <strip_button name="Loiter" value="0.1"/>
-          <strip_button name="Cruise" value="0"/>
-          <strip_button name="Dash" value="1"/>
+          <strip_button name="Loiter" value="0.1" group="dash_loiter"/>
+          <strip_button name="Cruise" value="0" group="dash_loiter"/>
+          <strip_button name="Dash" value="1" group="dash_loiter"/>
         </dl_setting>
         <dl_setting MAX="0.05" MIN="0.00" STEP="0.005" VAR="v_ctl_auto_throttle_pgain" shortname="throttle_pgain" param="V_CTL_AUTO_THROTTLE_PGAIN"/>
         <dl_setting MAX="1" MIN="0.0" STEP="0.05" VAR="v_ctl_auto_throttle_igain" shortname="throttle_igain" param="V_CTL_AUTO_THROTTLE_IGAIN"/>
         <dl_setting MAX="2" MIN="0.0" STEP="0.1" VAR="v_ctl_auto_throttle_dgain" shortname="throttle_dgain"/>
-        <dl_setting MAX="0" MIN="-4000" STEP="100" VAR="v_ctl_auto_throttle_dash_trim" shortname="dash trim"/>
-        <dl_setting MIN="0" MAX="3000" STEP="100" VAR="v_ctl_auto_throttle_loiter_trim" shortname="loiter trim" param="V_CTL_AUTO_THROTTLE_LOITER_TRIM"/>
         <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="v_ctl_auto_throttle_climb_throttle_increment" shortname="throttle_incr" param="V_CTL_AUTO_THROTTLE_CLIMB_THROTTLE_INCREMENT"/>
         <dl_setting MAX="1" MIN="0" STEP="0.01" VAR="v_ctl_auto_throttle_pitch_of_vz_pgain" shortname="pitch_of_vz" param="V_CTL_AUTO_THROTTLE_PITCH_OF_VZ_PGAIN"/>
         <dl_setting MAX="10" MIN="-10" STEP="0.1" VAR="v_ctl_auto_throttle_pitch_of_vz_dgain" shortname="pitch_of_vz (d)"/>
diff --git a/conf/settings/control/ctl_dash_loiter_trim.xml b/conf/settings/control/ctl_dash_loiter_trim.xml
new file mode 100644
index 0000000000..6b2f2d1efb
--- /dev/null
+++ b/conf/settings/control/ctl_dash_loiter_trim.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE settings SYSTEM "settings.dtd">
+
+<!-- Set dash and loiter trim -->
+
+<settings>
+  <dl_settings>
+    <dl_settings NAME="trim">
+      <dl_setting MAX="0" MIN="-4000" STEP="100" VAR="v_ctl_auto_throttle_dash_trim" shortname="dash trim" param="V_CTL_AUTO_THROTTLE_DASH_TRIM" module="stabilization/stabilization_attitude"/>
+      <dl_setting MIN="0" MAX="3000" STEP="100" VAR="v_ctl_auto_throttle_loiter_trim" shortname="loiter trim" param="V_CTL_AUTO_THROTTLE_LOITER_TRIM"/>
+    </dl_settings>
+  </dl_settings>
+</settings>