Add MenuManager, some clean up