Added long short title and long title to templates