Main Menu refactored