diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp
index ee07593..1abf9f7 100644
--- a/firmware/src/main.cpp
+++ b/firmware/src/main.cpp
@@ -382,8 +382,7 @@ void read_io_data(){
             }
 
             // Calculate new Y1 values
-            joystick_y1_hid = map(joystick_y1, AXIS_MIN, AXIS_MAX, HID_AXIS_CENTER, HID_AXIS_MAX);
-            joystick_y1_hid_rev = map(joystick_y1, AXIS_MIN, AXIS_MAX, HID_AXIS_CENTER, HID_AXIS_MIN);
+            joystick_y1_hid = map(joystick_y1, AXIS_MIN, AXIS_MAX, HID_AXIS_MIN, HID_AXIS_MAX);
 
             // Calculate new X2 values after applying exp curve 
             if (joystick_x2 != AXIS_CENTER){
@@ -424,7 +423,7 @@ void read_io_data(){
                 toggle_button_mode = false;
             }
 
-            if (fn_mode == 2){
+            if (fn_mode == 1){
                 if (digitalRead(BUTTON_TRD) != button_arm_previous_value){
                     button_arm_previous_value = digitalRead(BUTTON_TRD);
                     if (digitalRead(BUTTON_TRD) == LOW){
@@ -644,6 +643,9 @@ void loop()
             if (digitalRead(BUTTON_TLD) == LOW){
                 Joystick.button(14, 1);
             }
+            if (digitalRead(BUTTON_TRD) == LOW){
+                Joystick.button(15, 1);
+            }
         }
         else if (fn_mode == 1){
 
@@ -685,29 +687,9 @@ void loop()
         if (digitalRead(BUTTON_FRU) == LOW){
             Joystick.button(3, 1);
         }
-        if (toggle_button_arm){
-            Joystick.button(15, 1);
-        }
-
-        // Check rev mode (reverse stick for Y1 axix)
-        if (joystick_y1 == AXIS_MIN){
-            joystick_y1_hid_rev_mode = 1;
-        }
-        else if ((joystick_y1 > AXIS_MIN) && (fn_mode <= 1) && (joystick_y1_hid_rev_mode == 1)){
-            joystick_y1_hid_rev_mode = 0;
-        }
-        else if ((joystick_y1 > AXIS_MIN) && (fn_mode > 1) && (joystick_y1_hid_rev_mode == 1)){
-            joystick_y1_hid_rev_mode = 2;
-        }
 
         // Set axis values
-        if (joystick_y1_hid_rev_mode == 0){
-            Joystick.Y(joystick_y1_hid);
-        }
-        else if (joystick_y1_hid_rev_mode == 2){
-            Joystick.Y(joystick_y1_hid_rev);
-        } 
-
+        Joystick.Y(joystick_y1_hid);
         Joystick.X(joystick_x1_hid);
         
         if (fn_mode == 2){
@@ -813,10 +795,11 @@ void loop()
             button_led_1_mode = 0; 
             button_led_2_mode = 2; 
         }
-        else if (joystick_y1_hid_rev_mode == 2){
-            button_led_1_mode = 2; 
-            button_led_2_mode = 2; 
-        } 
+        else if ((joystick_x1 != AXIS_CENTER) || (joystick_y1 != AXIS_MIN) || 
+                (joystick_x2 != AXIS_CENTER) || (joystick_y2 != AXIS_CENTER)){
+            button_led_1_mode = 1; 
+            button_led_2_mode = 1; 
+        }
 
         /* Updated button led 1 */
         if (button_led_1_mode == 2 && button_led_1_on == false)