working on styling changes
Merge branch 'pages' into gh-pages