Improve keyboard shortcuts.