Html cleanup and minor revisions