Fix for new menu layout