some last design changes
Merge branch 'master' of https://github.com/Project-Phoenix/Website
merge