Code re-iteration/updates

Updated code.  Fixed a few glitches and updated images and styles.
Merge branch 'master' into gh-pages