Removed dependency on menu_editor