Cosmetic fixes to templates mainly titles and such