Refactor MainMenu