General html updates and cleanup
Merge pull request #9 from fburchdev/format

General html updates and cleanup