Minor changes to menu system for multisession