BK-1102 Fix references to new editor screen