update template models/templates, improved template consistency