tweaked ui
Fixed email names
Merge branch 'master' of https://github.com/amilchling/shufu-website