More fixes for menu ordering.  Refs #2296

Change-Id: Icbc51925ea9aa2d03729286bfb4514d2e0d71a19