color changes and other design edits
Merge branch 'gh-pages'