Refactored ChallengeUI