Restructuring so ToolBar does not depend on editor