diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
index 3a3d12664e4571d3c62d7039f323dda6388e57c8..46e74dfe80b11c6e64e844310a9c8d8f9e7b0388 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
@@ -289,6 +289,7 @@ void MainWindow::controllerUsedChangedCallback(const std_msgs::Int32& msg)
             break;
         case REMOTE_CONTROLLER:
             highlightRemoteControllerTab();
+            break;
         case TUNING_CONTROLLER:
             highlightTuningControllerTab();
             break;
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui
index 6181841c71a0a022295a027cb2250b32276585a6..6cddf41e97cf9af53ac998a520578cf3ce61a962 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.ui
@@ -369,7 +369,7 @@
            </font>
           </property>
           <property name="currentIndex">
-           <number>5</number>
+           <number>0</number>
           </property>
           <property name="usesScrollButtons">
            <bool>true</bool>
diff --git a/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py b/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py
index e68a72fda7576913aec72c09de6d38dd7426128d..8562b558a21c7446598ecffaaa02bea001f802de 100755
--- a/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py
+++ b/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py
@@ -87,11 +87,16 @@ CMD_RECONNECT = 0
 CMD_DISCONNECT = 1
 
 # Commands for PPSClient
-CMD_USE_SAFE_CONTROLLER =   1
-CMD_USE_CUSTOM_CONTROLLER = 2
-CMD_CRAZYFLY_TAKE_OFF =     3
-CMD_CRAZYFLY_LAND =         4
-CMD_CRAZYFLY_MOTORS_OFF =   5
+#CMD_USE_SAFE_CONTROLLER =       1
+#CMD_USE_DEMO_CONTROLLER =       2
+#CMD_USE_STUDENT_CONTROLLER =    3
+#CMD_USE_MPC_CONTROLLER =        4
+#CMD_USE_REMOTE_CONTROLLER =     5
+#CMD_USE_TUNING_CONTROLLER =     6
+
+CMD_CRAZYFLY_TAKE_OFF =     11
+CMD_CRAZYFLY_LAND =         12
+CMD_CRAZYFLY_MOTORS_OFF =   13
 
 rp = RosPack()
 record_file = rp.get_path('d_fall_pps') + '/LoggingOnboard.bag'