Fix heading on 404 and 500 pages
Merge branch 'final-polish-front-end' into develop
Merge branch 'develop'