fixed the keymap and layout