Further improvements in the default template.