Slight updates to templates