Improvements in the template.