Even more work on editor widget