Menu architecture design changed