Massive changes to menu system