Use new menu system, fix game over scores