Editor in place
Now with ace
Merge branch 'hotfix/ace-editor'