Some cosmetic changes to templates.