Add contact page, refactor unit tests
Merge with master
Merge branch 'static-pages'