Improve template.html