#149: re-structured the challenge.html template