Improve navigation logic.