Added support for arrow key navigation