Improve contest template