Update templates

Just update templates
* Add master class name for each template
* Fix some html problems