update templates
fixes a bug in Entry
updates templates.