* userspace and keymap changes for rupa * remove layout wrappers and blocker rows from wrappers handle this in keymaps for now