Re-order menu items to fix #9