diff --git a/conf/simulator/gazebo/models/bebop/bebop.sdf b/conf/simulator/gazebo/models/bebop/bebop.sdf
index 0d4d0e71f3..a58d495ba6 100644
--- a/conf/simulator/gazebo/models/bebop/bebop.sdf
+++ b/conf/simulator/gazebo/models/bebop/bebop.sdf
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <sdf version='1.4'>
   <model name="bebop">
-    <pose>0 0 .1 0 0 0</pose>
+    <pose>0 0 .1 0 0 1.57</pose>
 
     <link name="chassis">
       <velocity_decay>
diff --git a/conf/userconf/tudelft/control_panel.xml b/conf/userconf/tudelft/control_panel.xml
index 280fcfff4e..6526b90723 100644
--- a/conf/userconf/tudelft/control_panel.xml
+++ b/conf/userconf/tudelft/control_panel.xml
@@ -45,6 +45,7 @@
       <arg flag="--port" constant="/dev/ttyUSB1"/>
       <arg flag="--id" constant="1"/>
     </program>
+    <program name="Gazebo" command="sw/tools/gzclient_launcher.sh"/>
     <program name="BluegigaUsbDongleScanner" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
       <arg flag="/dev/ttyACM2"/>
       <arg flag="scan"/>
@@ -274,5 +275,54 @@
         <arg flag="extreme_3d_pro.xml"/>
       </program>
     </session>
+  <session name="Simulation - Gazebo">
+      <program name="Simulator">
+        <arg flag="-a" constant="@AIRCRAFT"/>
+        <arg flag="-t" constant="nps"/>
+      </program>
+      <program name="Data Link">
+        <arg flag="-udp"/>
+      </program>
+      <program name="Server">
+        <arg flag="-n"/>
+      </program>
+      <program name="GCS">
+        <arg flag="-speech"/>
+        <arg flag="-maximize"/>
+        <arg flag="-center_ac"/>
+        <arg flag="-mercator"/>
+        <arg flag="-maps_no_http"/>
+        <arg flag="-track_size" constant="200"/>
+        <arg flag="-zoom" constant="40."/>
+      </program>
+      <program name="Gazebo"/>
+    </session>
+    <session name="Simulation - Gazebo + Joystick">
+      <program name="Simulator">
+        <arg flag="-a" constant="@AIRCRAFT"/>
+        <arg flag="-t" constant="nps"/>
+      </program>
+      <program name="Data Link">
+        <arg flag="-udp"/>
+      </program>
+      <program name="Server">
+        <arg flag="-n"/>
+      </program>
+      <program name="GCS">
+        <arg flag="-speech"/>
+        <arg flag="-maximize"/>
+        <arg flag="-center_ac"/>
+        <arg flag="-mercator"/>
+        <arg flag="-maps_no_http"/>
+        <arg flag="-track_size" constant="200"/>
+        <arg flag="-zoom" constant="40."/>
+      </program>
+      <program name="Joystick" command="sw/ground_segment/joystick/input2ivy">
+        <arg flag="-ac" constant="@AIRCRAFT"/>
+        <arg flag="hobbyking.xml"/>
+        <arg flag="-d 0"/>
+      </program>
+      <program name="Gazebo"/>
+    </session>
   </section>
-</control_panel>
\ No newline at end of file
+</control_panel>
diff --git a/sw/ext/tudelft_gazebo_models b/sw/ext/tudelft_gazebo_models
index ccb6baa57a..53bb8f82d2 160000
--- a/sw/ext/tudelft_gazebo_models
+++ b/sw/ext/tudelft_gazebo_models
@@ -1 +1 @@
-Subproject commit ccb6baa57a53b98def4c3424ba27a2a8dcfd3d4e
+Subproject commit 53bb8f82d29c1fc5510e51b9faf5bf79ab6c4a66