better navigation and fixed typeahead