Cleaning up python merge ugliness and more aesthetic changes to html and css.