Added Display + Editor templates