Improved keyboard shortcut display UI in popup and options page

This PR addresses both #208 and #201.

The overlapping solution still feels a little hacky for me but, with a complete overhaul of all pages on the cards, I feel it'll do for now.