Switching to the new menu format