Lots of styling changes
Merge branch 'hotfix/0.0.3.2' into gh-pages