Implemented correct navigation with keyboard