Keep the navigation in order