Made fixes to menu system.