1 files changed, 9 insertions, 14 deletions

diff --git a/src/sequencer.c b/src/sequencer.c
index b2a8468..0efd50c 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -370,11 +370,12 @@ handle_right_col_selection(void) {
         if (right_col_selection_loc == R_COL_STOP) {
             right_col_selection_loc = R_COL_PLAY;
         } else {
-            input_handler = handle_trigger_selection;
-            switch (right_col_selection_loc) {
-                case R_COL_BPM: { trig_selection_loc = 15; } break;
-                default:  { trig_selection_loc = 7; } break;
+            if (right_col_selection_loc == R_COL_BPM) {
+                trig_selection_loc = 15;
+            } else {
+                trig_selection_loc = 7;
             }
+            input_handler = handle_trigger_selection;
             redraw_params = true;
         }
     } else if (key_tap(KEY_RIGHT)) {
@@ -382,20 +383,13 @@ handle_right_col_selection(void) {
             right_col_selection_loc = R_COL_STOP;
         } else {
             input_handler = handle_pattern_selection;
-            switch (right_col_selection_loc) {
-                case R_COL_BANK_A: { pattern_selection_loc = 0; } break;
-                case R_COL_BANK_B: { pattern_selection_loc = 1; } break;
-                case R_COL_BANK_C: { pattern_selection_loc = 2; } break;
-                case R_COL_BANK_D: { pattern_selection_loc = 3; } break;
-                case R_COL_STOP:   { pattern_selection_loc = 5; } break;
-                default: { pattern_selection_loc = 6; } break;
-            }
             redraw_trigs = true;
         }
     } else if (key_tap(KEY_UP)) {
         switch (right_col_selection_loc) {
             case R_COL_PLAY:
-            case R_COL_STOP: { right_col_selection_loc = R_COL_BANK_D; } break;
+            case R_COL_STOP: { right_col_selection_loc = R_COL_SETTINGS; } break;
+            case R_COL_SETTINGS: { right_col_selection_loc = R_COL_BANK_D; } break;
             case R_COL_BPM: { right_col_selection_loc = R_COL_PLAY; } break;
             case R_COL_BANK_A: { right_col_selection_loc = R_COL_BPM; } break;
             default: { right_col_selection_loc++; } break;
@@ -405,7 +399,8 @@ handle_right_col_selection(void) {
             case R_COL_PLAY:
             case R_COL_STOP: { right_col_selection_loc = R_COL_BPM; } break;
             case R_COL_BPM: { right_col_selection_loc = R_COL_BANK_A; } break;
-            case R_COL_BANK_D: { right_col_selection_loc = R_COL_PLAY; } break;
+            case R_COL_BANK_D: { right_col_selection_loc = R_COL_SETTINGS; } break;
+            case R_COL_SETTINGS: { right_col_selection_loc = R_COL_PLAY; } break;
             default: { right_col_selection_loc--; } break;
         }
     } else if (key_tap(KEY_L)) {