Fixeup menu order a little

Change-Id: Ibd7cc61c03f85d624d7640ef64d1021b36bc469c