Shortcut changes

This PR has a bunch of small changes to the shortcuts. This work is track in issue #4884