Some refinements on the Template.html