Refined the challenge selection dialog