More MenuManager work!