More edits to templates