Updated some components for the gh-page.

Just minor fix ups to make the gh page more representable.
Merge remote-tracking branch 'origin/master' into gh-pages