Fix the navigation!