Enhanced the navigation flow