Refactored actions and keymap to be separate