ChallengeUI tweaks