Adding modifications as per conversations

Reordered menu.   Using a menu like this is brittle because you have to keep multiple places in sync.  If one is out of sync, you may accidentally execute the wrong action