Further improvements to keyboard navigation