Editor bugfix + refactor