Changes to menu system