Fixed various issues with the navigation
Some more improvements