Tweaks in challenge template