Update the menu

This is in response to RT #66534 and various other RT issues.
It should have been done a long time ago.