better navigation management