rearranged some of the keymaps