Slight re-arrangement to keyboard shortcuts