More minor fixes
'v1.0.7'
Merge branch 'master' of https://github.com/cshc/cshc_website