More radical styling changes
Merge remote-tracking branch 'origin/develop' into gh-pages