fixing nav
minor changes
Merge branch 'master' of https://github.com/beahuang/website