Updated main menu structure and links