Gh 780

Updates to the keyboard shortcuts display.  Ready for merge.