Work in progress: new style for editor