Refactored the keys menu.
Minor language tweak.
Merge pull request #826 from Bo98/keys-menu-refactor

Refactored the keys menu