More work on editor widget