expand and improve key navigation