html format updates
Merge branch 'shaneBranch'