Added ability to navigate with keys