Minimal reorganization of editor form