Bug fix + small CSS changes.
Text edits.
Merge branch 'master' into gh-pages