changed menu grouping