Improved design in templates.