improve editor concept