Reworked design for keyboard shortcuts