refactor display elements for easier adding of new elements
Merge branch 'master' of https://github.com/motherjones/newsquiz