table2, menu_editor fixes