Merged changes to the menu system.