changed menu structure