Refactor editor to use World