navigations improvements