Updated main menu structure