Reorganized the main menu