Added support for arrows key navigation