Improved keyboard navigation