Change menu numbering scheme to be more logical for returns to main