Refactored html2.tpl, refs #120
Merge pull request #130 from cmfcmf/html-tpls

Refactored html2.tpl, refs #120