More usable configuration for now

Layer switching currently produces unwanted key presses.
Remap to avoid conflicts with next cycle till can figure out how to fix