BK-702 Make current editing templates more modular