Majorer refactor of the editor.
Merge remote-tracking branch 'origin/master' into Design