implemented new menu structure