Worked more on the Menu Manager