Updated for new menu system in UCP