BK-1026 Sync edit templates with new design