Editor: options menu & refactoring