Improve navigation flow