* remove deprecated styling, and small fix attempt
Merge branch 'master' into gh-pages