Changes to menu and matchmenu classes