Fix the navigation