Cleaned up navigation flow