Editor dialog

changelog is long because contains changes from the preview branch