Rearrange location of Search/Uberbar and cleaning up menu builder

menus on upgrades installs no longer build … grrr