Refactored editing templates