Updated menu manager