Refactored almost all the menu