[Adam] redesign of editor
[Adam] redesign with history