#92: Overall work on the menus.