Restructured main menu