cleaned up HTML templates
Merge pull request #280 from GinBaby/master

Cleaned up HTML templates