I 2361

Bunch of changes to the new editor.