New and Edit template improved