Re-wired the editor after refactoring