Edit / Delete templates working, fixed new template