More structural changes in the Editor (more work needed)