nav improvements

mark 3028420941