More work on ShortcutChooser class.
Somehow git marks this file as changed even after a revert.
Shortcut Editor is mostly working now.