Fix menu management.