Changed menu structure