Changed the way titles are displayed in templates