Additional dialog functionality, editor work