Initial rework on the Editor