diff --git a/users/sjb/sjb.h b/users/sjb/sjb.h
index 56728ed3e4c1..128b699584a3 100644
--- a/users/sjb/sjb.h
+++ b/users/sjb/sjb.h
@@ -105,7 +105,7 @@ enum custom_keycodes {
 #define TRANS_ROW _______, _______, _______, _______, _______
 #define BLANK_ROW KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
 
-#define LEFT_HOME_ROW  OSM_ALT  , OSM_GUI, OSM_CTL, OSM_SFT, KC_APP
+#define LEFT_HOME_ROW  OSM_ALT  , OSM_GUI, OSM_CTL, OSM_SFT, CW_TOGG
 #define RIGHT_HOME_ROW CW_TOGG, OSM_SFT, OSM_CTL, OSM_GUI, OSM_ALT
 
 #define LEFT_HOME_ROW_A   _______, HR_J   , _______, _______, _______
@@ -156,20 +156,20 @@ enum custom_keycodes {
 //#define LEFT_MOUSE_ROW_2 KC_ACL0, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U
 //#define LEFT_MOUSE_ROW_3 KC_ACL1, KC_WH_L, KC_BTN3, KC_WH_R, KC_WH_D
 
-#define LEFT_SYS_ROW_1 OSM_RALT, CW_TOGG, KC_APP     , KC_LBRC, KC_RBRC
+#define LEFT_SYS_ROW_1 OSM_RALT, KC_APP , KC_TAB     , KC_LBRC, KC_RBRC
 #define LEFT_SYS_ROW_2 OSM_ALT , OSM_GUI, OSM_CTL    , KC_LPRN, KC_RPRN
 #define LEFT_SYS_ROW_3 OSM_MEH , QK_LOCK, G(KC_MUTE) , KC_LCBR, KC_RCBR
 
-#define RIGHT_SYS_ROW_1 KC_LBRC, KC_RBRC, KC_APP    , CW_TOGG, OSM_RALT
+#define RIGHT_SYS_ROW_1 KC_LBRC, KC_RBRC, KC_TAB    , KC_APP , OSM_RALT
 #define RIGHT_SYS_ROW_2 KC_LPRN, KC_RPRN, OSM_CTL   , OSM_GUI, OSM_ALT
 #define RIGHT_SYS_ROW_3 KC_LCBR, KC_RCBR, G(KC_SPC) , QK_LOCK, OSM_MEH
 
 #define LEFT_NAV_ROW_1 KC_MPRV , KC_VOLU , KC_UP   , KC_PGUP , KC_HOME
-#define LEFT_NAV_ROW_2 KC_MNXT , KC_LEFT , KC_DOWN , KC_RIGHT, KC_TAB
+#define LEFT_NAV_ROW_2 KC_MNXT , KC_LEFT , KC_DOWN , KC_RIGHT, CW_TOGG
 #define LEFT_NAV_ROW_3 KC_MPLY , KC_VOLD , KC_MUTE , KC_PGDN , KC_END
 
 #define RIGHT_NAV_ROW_1 KC_HOME , KC_PGUP, KC_UP  , KC_VOLU , KC_MPRV
-#define RIGHT_NAV_ROW_2 CW_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MNXT
+#define RIGHT_NAV_ROW_2 CW_TOGG , KC_LEFT, KC_DOWN, KC_RIGHT, KC_MNXT
 #define RIGHT_NAV_ROW_3 KC_END  , KC_PGDN, KC_MUTE, KC_VOLD , KC_MPLY
 
 #define TRANSPARENT_THUMB_CLUSTER _______, _______, _______