Improving the navigation