More editor prototype refinement