fixes on navigation flow