Fixing some errors in the navigation