Improve style and structure of editor and modal.