Improvements in the navigation