Greatly improved keyboard navigation. Still more to come...