Keyboard shortcuts improvements (#70)