Working on Edit Templates