re-order menu items for both the main menu and popup menus; remove the
experimental FI control panel