New functionality and a setting added to always show shortcuts keys... closes #480