VE-635: Stashing keyboard shortcut components in more logical places