Adding support for keyboard navigation