Merge pull request #12426 from moxiegirl/new-registry-menu

In with the old menu layout