Refactored some methods and MenuManager class name