Bunch of small fixes
Merge branch 'master' of https://github.com/melodyk/site