Moved keymapping from logic to UI. This keeps the logic cleaner