fixes #82 (GH): reorder keymap to improve user input collection