Fixed keyboard navigation
Refactored keyboard navigation