Reorganized main menu