some aesthetic changes
mainly color changes
Merge branch 'master' into gh-pages