Reorder styles to be more logic
Merge branch 'master' into gh-pages