From a1d9c25720edc99c9763a0d2c1803bc2886a8ba7 Mon Sep 17 00:00:00 2001
From: Tiffany Meyer <tiffanym@ucar.edu>
Date: Tue, 8 Feb 2022 12:54:24 -0500
Subject: [PATCH 1/3] Added HDS to the feedtype for National Blended Models
 dataset

---
 rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf  | 2 +-
 rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
index 99ef750351..d92c11407a 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
@@ -1070,5 +1070,5 @@ NGRID	^OUTA98 KWNB (......)[^!]*!grib2
 #
 # National Blend of Models
 #
-NGRID	^(Y.A...) (KWE[AB]) (..)(..)(..)
+NGRID|HDS	^(Y.A...) (KWE[AB]) (..)(..)(..)
 	FILE	-close	/awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_\3\4\5-concat-%Y%m%d_%H%M.grib2
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids
index 8804b6d29e..7ab8c28e51 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.grids
@@ -750,5 +750,5 @@ NGRID	^OUTA98 KWNB (......)[^!]*!grib2
 #
 # National Blend of Models
 #
-NGRID	^(Y.A...) (KWE[AB]) (..)(..)(..)
+NGRID|HDS	^(Y.A...) (KWE[AB]) (..)(..)(..)
 	FILE	-close	/awips2/data_store/grid/(\3:yyyy)(\3:mm)\3/\4/NationalBlend/staging/NationalBlend_\3\4\5-concat-%Y%m%d_%H%M.grib2

From 29d827a362dcd7213eb5dceac86ef81f3577258e Mon Sep 17 00:00:00 2001
From: Tiffany Meyer <tiffanym@ucar.edu>
Date: Fri, 11 Feb 2022 15:26:57 -0500
Subject: [PATCH 2/3] Updated Models Menu *Restructured index.xml to point to
 gridIndex.xml so we could add xml seperators and titles *Removed
 Precipitation Accumulation from most models (except GFS) *Re-ordered models,
 moved models that we aren't ingesting to the bottom *Labeled the Digital
 Forecasts and Mesoscale Analysis models *Updated the HeightComparison.xml to
 include model names that we are using   -GFS-->GFS20   -NAM12 --> NAM40  
 -Uncommented HRRR   -Still exiting but we dont have data: NAVGEM,
 UKMET-Global, ECMF-Global *For NBM, RTMA, URMA   -Created new PrecipAccum.xml
 bundle file where you can pass in the level variable   -Updated the TP value
 to reflect which precip accumulations were used   -Increased the frame count
 from 2 to 10 *Updated

---
 .../base/bundles/grid/HeightComparison.xml    |   8 +-
 .../base/bundles/grid/PrecipAccum.xml         |  54 ++++
 .../base/menus/grid/WaveWatch.xml             |  40 ++-
 .../base/menus/grid/allFamilies-GFS.xml       | 303 +++++++++--------
 .../base/menus/grid/allFamilies.xml           | 304 ++++++++---------
 .../menus/grid/baseComparisonFamilies.xml     |  42 +--
 .../base/menus/grid/cmcFamilies.xml           | 306 +++++++++---------
 .../base/menus/grid/gridIndex.xml             | 180 +++++++++++
 .../base/menus/grid/hrrrSmokeProducts.xml     |  50 ++-
 .../common_static/base/menus/grid/index.xml   | 160 +--------
 .../base/menus/grid/lampFamilies.xml          |  60 ++--
 .../base/menus/grid/mesoFamilies.xml          |  26 +-
 .../base/menus/grid/oceanFamilies.xml         |  24 +-
 .../common_static/base/menus/grid/ww3.xml     |  32 +-
 14 files changed, 821 insertions(+), 768 deletions(-)
 create mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/PrecipAccum.xml
 create mode 100644 edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/gridIndex.xml

diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/HeightComparison.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/HeightComparison.xml
index 7b6f58cd63..5256d5a749 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/HeightComparison.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/HeightComparison.xml
@@ -57,13 +57,13 @@
 								<constraint constraintValue="${level}" constraintType="EQUALS" />
 							</mapping>
 							<mapping key="info.datasetId">
-								<constraint constraintValue="GFS" constraintType="EQUALS" />
+								<constraint constraintValue="GFS20" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
 						<alertParser xsi:type="dataCubeAlertMessageParser" />
 					</resourceData>
 				</resource>
-				<!--
+				
 				<resource>
 					<loadProperties xsi:type="gridLoadProperties"
 						displayType="CONTOUR" loadWithoutData="false">
@@ -105,7 +105,7 @@
 						<alertParser xsi:type="dataCubeAlertMessageParser" />
 					</resourceData>
 				</resource>
-				-->
+				
 				<resource>
 					<loadProperties xsi:type="gridLoadProperties"
 						displayType="CONTOUR" loadWithoutData="false">
@@ -140,7 +140,7 @@
 								<constraint constraintValue="${level}" constraintType="IN" />
 							</mapping>
 							<mapping key="info.datasetId">
-								<constraint constraintValue="NAM12" constraintType="EQUALS" />
+								<constraint constraintValue="NAM40" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
 						<alertParser xsi:type="dataCubeAlertMessageParser" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/PrecipAccum.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/PrecipAccum.xml
new file mode 100644
index 0000000000..50d980e4f9
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/bundles/grid/PrecipAccum.xml
@@ -0,0 +1,54 @@
+<bundle xmlns:ns2="group">
+    <displayList>
+        <displays xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="d2DMapRenderableDisplay" scale="CONUS" density="1.0" magnification="1.0" zoomLevel="1.0" mapCenter="-79.09835514095181 33.915979250804455 0.0">
+            <descriptor xsi:type="mapDescriptor">
+                <resource>
+                    <loadProperties xsi:type="gridLoadProperties" displayType="IMAGE" loadWithoutData="false">
+                        <capabilities>
+                            <capability xsi:type="imagingCapability" contrast="1.0" brightness="0.8" interpolationState="true" alpha="1.0"/>
+                            <capability xsi:type="colorMapCapability">
+                                <colorMapParameters colorMapName="Radar/OSF/Storm Total Precip">
+                                    <persisted>
+                                        <colorMapMin>0.127</colorMapMin>
+                                        <colorMapMax>304.8</colorMapMax>
+                                    </persisted>
+                                </colorMapParameters>
+                            </capability>
+                            <capability xsi:type="colorableCapability" colorAsString="coral"/>
+                            <capability xsi:type="densityCapability" density="1.0"/>
+                            <capability xsi:type="magnificationCapability" magnification="1.0"/>
+                            <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="SOLID"/>
+                            <capability xsi:type="displayTypeCapability" displayType="IMAGE"/>
+                        </capabilities>
+                        <resourceType>PLAN_VIEW</resourceType>
+                    </loadProperties>
+                    <properties isSystemResource="false" isBlinking="false" isMapLayer="false" isHoverOn="false" isVisible="true">
+                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0"/>
+                    </properties>
+                    <resourceData xsi:type="gridResourceData" retrieveData="true" isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
+                        <metadataMap>
+                            <mapping key="info.parameter.abbreviation">
+                                <constraint constraintValue="${TP}" constraintType="EQUALS"/>
+                            </mapping>
+                            <mapping key="info.datasetId">
+                                <constraint constraintValue="${modelName}" constraintType="EQUALS"/>
+                            </mapping>
+                            <mapping key="pluginName">
+                                <constraint constraintValue="grid" constraintType="EQUALS"/>
+                            </mapping>
+                            <mapping key="info.level.masterLevel.name">
+                                <constraint constraintValue="${level}" constraintType="EQUALS"/>
+                            </mapping>
+                            <mapping key="info.level.levelonevalue">
+                                <constraint constraintValue="0.0" constraintType="EQUALS"/>
+                            </mapping>
+                        </metadataMap>
+                        <alertParser xsi:type="dataCubeAlertMessageParser"/>
+                    </resourceData>
+                </resource>
+                <timeMatcher xsi:type="d2DTimeMatcher" deltaFilter="0" forecastFilter="0"/>
+                <numberOfFrames>${frameCount}</numberOfFrames>
+            </descriptor>
+        </displays>
+    </displayList>
+</bundle>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/WaveWatch.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/WaveWatch.xml
index 3e8a571cce..2019e32c56 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/WaveWatch.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/WaveWatch.xml
@@ -19,26 +19,24 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/WW3-TSWH.xml"
-			    menuText="Significant Wave Height" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-SfcWind.xml"
-			    menuText="Sfc Wave Wind" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-PrimaryPeriod.xml"
-			    menuText="Primary Wave Period" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-SecondaryPeriod.xml"
-			    menuText="Secondary Wave Period" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-VorticityWind.xml"
-			    menuText="Sfc Vorticity and Wind" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WW3-TSWH.xml"
+			menuText="Significant Wave Height" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-SfcWind.xml"
+			menuText="Sfc Wave Wind" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-PrimaryPeriod.xml"
+			menuText="Primary Wave Period" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-SecondaryPeriod.xml"
+			menuText="Secondary Wave Period" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WaveWatch-VorticityWind.xml"
+			menuText="Sfc Vorticity and Wind" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
 	</contribute>
 </menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml
index 41b5c5b46d..5caa9ef7b3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies-GFS.xml
@@ -19,172 +19,171 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/PrecipMSLP.xml"
-			    menuText="MSLP and Precipitation" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Precip-GFS.xml"
-			    menuText="Precip Accumulation" id="" useReferenceTime="true">
-		</contribute>
+	<!-- <contribute xsi:type="subMenu" menuText="${menuName}"> -->
+	<contribute xsi:type="bundleItem" file="bundles/grid/PrecipMSLP.xml"
+			menuText="MSLP and Precipitation" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Precip-GFS.xml"
+			menuText="Precip Accumulation" id="" useReferenceTime="true">
+	</contribute>
 <!-- Tiffany Meyer commented out Snow Accum since it's not populated #20210507
-		<contribute xsi:type="bundleItem" file="bundles/grid/Snow.xml"
-			    menuText="Snow Accumulation" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Snow.xml"
+			menuText="Snow Accumulation" id="" useReferenceTime="true">
+	</contribute>
 -->
-		<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
-			    menuText="Sfc Temperature and Wind" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
-			    menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
-			    menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/30mbMeanDewpoint.xml"
-			    menuText="30mb Mean Dewpoint" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/PrecipitableWater.xml"
-			    menuText="Precipitable Water" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
+			menuText="Sfc Temperature and Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
+			menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
+			menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/30mbMeanDewpoint.xml"
+			menuText="30mb Mean Dewpoint" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PrecipitableWater.xml"
+			menuText="Precipitable Water" id="" useReferenceTime="true">
+	</contribute>
 <!-- Tiffany Meyer commented out since it's not populated #20210507
-		<contribute xsi:type="bundleItem" file="bundles/grid/SimulatedREFC.xml"
-			    menuText="Simulated Reflectivity (REFC)" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/LightningThreat.xml"
-			    menuText="Lightning Threat" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SimulatedREFC.xml"
+			menuText="Simulated Reflectivity (REFC)" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/LightningThreat.xml"
+			menuText="Lightning Threat" id="" useReferenceTime="true">
+	</contribute>
 -->
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyD.xml"
-			    menuText="Precip Type / Moisture Transport" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Vorticity.xml"
-			    menuText="500MB Vorticity" id="" useReferenceTime="true">
-			    	<substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity-GFS.xml"
-			    menuText="500MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity-GFS.xml"
-			    menuText="700MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="700.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity-GFS.xml"
-			    menuText="850MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="850.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Trenberth.xml"
-			    menuText="Thickness / Vorticity Advection (Trenberth)" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="850MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="850.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="700MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="700.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="500MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="300MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="300.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="250MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="250.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/PotentialVorticity.xml"
-			    menuText="250MB Potential Vorticity" id="" useReferenceTime="true">
-			    	<substitute key="level" value="250.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyHelicity.xml"
-				    menuText="Helicity / Storm-Relative Flow" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Hail.xml"
-			    menuText="Hail Parameters" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/MCS.xml"
-			    menuText="MCS Parameters" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyD.xml"
+			menuText="Precip Type / Moisture Transport" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Vorticity.xml"
+			menuText="500MB Vorticity" id="" useReferenceTime="true">
+				<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity-GFS.xml"
+			menuText="500MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity-GFS.xml"
+			menuText="700MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="700.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity-GFS.xml"
+			menuText="850MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="850.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Trenberth.xml"
+			menuText="Thickness / Vorticity Advection (Trenberth)" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="850MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="850.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="700MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="700.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="500MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="300MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="300.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="250MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="250.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PotentialVorticity.xml"
+			menuText="250MB Potential Vorticity" id="" useReferenceTime="true">
+				<substitute key="level" value="250.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyHelicity.xml"
+				menuText="Helicity / Storm-Relative Flow" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Hail.xml"
+			menuText="Hail Parameters" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/MCS.xml"
+			menuText="MCS Parameters" id="" useReferenceTime="true">
+	</contribute>
 
-		<contribute xsi:type="subMenu" menuText="Isentropic">
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-		    menuText="270K RH Wind Pressure" id="" useReferenceTime="true">
-		    	<substitute key="level" value="270.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-		    menuText="280K RH Wind Pressure" id="" useReferenceTime="true">
-		    	<substitute key="level" value="280.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="290K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="290.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="300K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="300.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="310K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="310.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="320K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="320.0" />
-			</contribute>
+	<contribute xsi:type="subMenu" menuText="Isentropic">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+		menuText="270K RH Wind Pressure" id="" useReferenceTime="true">
+			<substitute key="level" value="270.0" />
 		</contribute>
-		
-		<!--
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyB.xml"
-			    menuText="Storm Initiation / CAPE" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+		menuText="280K RH Wind Pressure" id="" useReferenceTime="true">
+			<substitute key="level" value="280.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/MidLevelDivergence.xml"
-			    menuText="Mid-Level Divergence / Vorticity" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="290K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="290.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Buoyancy.xml"
-			    menuText="Surface Wind / Pressure / Buoyancy" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="300K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="300.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyA.xml"
-			    menuText="Nonsupercell Tornado Threat / Wind" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="310K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="310.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyYY.xml"
-			    menuText="CAPE / CIN / Helicity" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="320K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="320.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyH.xml"
-			    menuText="Lapse Rate / Buoyancy / Wind" id="" useReferenceTime="true">
+	</contribute>
+	
+	<!--
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyB.xml"
+			menuText="Storm Initiation / CAPE" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/MidLevelDivergence.xml"
+			menuText="Mid-Level Divergence / Vorticity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Buoyancy.xml"
+			menuText="Surface Wind / Pressure / Buoyancy" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyA.xml"
+			menuText="Nonsupercell Tornado Threat / Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyYY.xml"
+			menuText="CAPE / CIN / Helicity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyH.xml"
+			menuText="Lapse Rate / Buoyancy / Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyM.xml"
+				menuText="4-Panel Slantwise Instability" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
+				menuText="Surface Buoyancy" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="subMenu" menuText="4-Panel">
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyE.xml"
+				menuText="Nonsupercell Tornado Threat" id="" useReferenceTime="true">
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyM.xml"
-				    menuText="4-Panel Slantwise Instability" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyF.xml"
+				menuText="Nonsupercell / Isentropic" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyI.xml"
+				menuText="Instability / Divergence" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyL.xml"
+				menuText="Moisture / Precipiation" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyV.xml"
+				menuText="Bulk Shear / Buoyancy" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyW.xml"
+				menuText="Supercell Parameters" id="" useReferenceTime="true">
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
-				    menuText="Surface Buoyancy" id="" useReferenceTime="true">
+				menuText="Helicity / Shear / Buoyancy" id="" useReferenceTime="true">
 		</contribute>
-		<contribute xsi:type="subMenu" menuText="4-Panel">
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyE.xml"
-				    menuText="Nonsupercell Tornado Threat" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyF.xml"
-				    menuText="Nonsupercell / Isentropic" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyI.xml"
-				    menuText="Instability / Divergence" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyL.xml"
-				    menuText="Moisture / Precipiation" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyV.xml"
-				    menuText="Bulk Shear / Buoyancy" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyW.xml"
-				    menuText="Supercell Parameters" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
-				    menuText="Helicity / Shear / Buoyancy" id="" useReferenceTime="true">
-			</contribute>
-		</contribute>
-		-->
 	</contribute>
+	-->
 </menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml
index 35c6174682..f676f7477d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/allFamilies.xml
@@ -19,173 +19,173 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/PrecipMSLP.xml"
-			    menuText="MSLP and Precipitation" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Precip.xml"
-			    menuText="Precip Accumulation" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PrecipMSLP.xml"
+			menuText="MSLP and Precipitation" id="" useReferenceTime="true">
+	</contribute>
+<!-- Tiffany Meyer commented out Snow Accum since it's not populated #20220211
+	<contribute xsi:type="bundleItem" file="bundles/grid/Precip.xml"
+			menuText="Precip Accumulation" id="" useReferenceTime="true">
+	</contribute>
+-->
 <!-- Tiffany Meyer commented out Snow Accum since it's not populated #20210507
 
-		<contribute xsi:type="bundleItem" file="bundles/grid/Snow.xml"
-			    menuText="Snow Accumulation" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Snow.xml"
+			menuText="Snow Accumulation" id="" useReferenceTime="true">
+	</contribute>
 -->
-		<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
-			    menuText="Sfc Temperature and Wind" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
-			    menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
-			    menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/30mbMeanDewpoint.xml"
-			    menuText="30mb Mean Dewpoint" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/PrecipitableWater.xml"
-			    menuText="Precipitable Water" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
+			menuText="Sfc Temperature and Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
+			menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
+			menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/30mbMeanDewpoint.xml"
+			menuText="30mb Mean Dewpoint" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PrecipitableWater.xml"
+			menuText="Precipitable Water" id="" useReferenceTime="true">
+	</contribute>
 <!-- Tiffany Meyer commented out since it's not populated #20210507
-		<contribute xsi:type="bundleItem" file="bundles/grid/SimulatedREFC.xml"
-			    menuText="Simulated Reflectivity (REFC)" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/LightningThreat.xml"
-			    menuText="Lightning Threat" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SimulatedREFC.xml"
+			menuText="Simulated Reflectivity (REFC)" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/LightningThreat.xml"
+			menuText="Lightning Threat" id="" useReferenceTime="true">
+	</contribute>
 -->
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyD.xml"
-			    menuText="Precip Type / Moisture Transport" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Vorticity.xml"
-			    menuText="500MB Vorticity" id="" useReferenceTime="true">
-			    	<substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
-			    menuText="500MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
-			    menuText="700MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="700.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
-			    menuText="850MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="850.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Trenberth.xml"
-			    menuText="Thickness / Vorticity Advection (Trenberth)" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="850MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="850.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="700MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="700.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="500MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="300MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="300.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="250MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="250.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/PotentialVorticity.xml"
-			    menuText="250MB Potential Vorticity" id="" useReferenceTime="true">
-			    	<substitute key="level" value="250.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyHelicity.xml"
-				    menuText="Helicity / Storm-Relative Flow" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Hail.xml"
-			    menuText="Hail Parameters" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/MCS.xml"
-			    menuText="MCS Parameters" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyD.xml"
+			menuText="Precip Type / Moisture Transport" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Vorticity.xml"
+			menuText="500MB Vorticity" id="" useReferenceTime="true">
+				<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
+			menuText="500MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
+			menuText="700MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="700.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
+			menuText="850MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="850.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Trenberth.xml"
+			menuText="Thickness / Vorticity Advection (Trenberth)" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="850MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="850.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="700MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="700.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="500MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="300MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="300.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="250MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="250.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PotentialVorticity.xml"
+			menuText="250MB Potential Vorticity" id="" useReferenceTime="true">
+				<substitute key="level" value="250.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyHelicity.xml"
+				menuText="Helicity / Storm-Relative Flow" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Hail.xml"
+			menuText="Hail Parameters" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/MCS.xml"
+			menuText="MCS Parameters" id="" useReferenceTime="true">
+	</contribute>
 
-		<contribute xsi:type="subMenu" menuText="Isentropic">
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-		    menuText="270K RH Wind Pressure" id="" useReferenceTime="true">
-		    	<substitute key="level" value="270.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-		    menuText="280K RH Wind Pressure" id="" useReferenceTime="true">
-		    	<substitute key="level" value="280.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="290K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="290.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="300K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="300.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="310K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="310.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="320K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="320.0" />
-			</contribute>
+	<contribute xsi:type="subMenu" menuText="Isentropic">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+		menuText="270K RH Wind Pressure" id="" useReferenceTime="true">
+			<substitute key="level" value="270.0" />
 		</contribute>
-		
-		<!--
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyB.xml"
-			    menuText="Storm Initiation / CAPE" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+		menuText="280K RH Wind Pressure" id="" useReferenceTime="true">
+			<substitute key="level" value="280.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/MidLevelDivergence.xml"
-			    menuText="Mid-Level Divergence / Vorticity" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="290K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="290.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Buoyancy.xml"
-			    menuText="Surface Wind / Pressure / Buoyancy" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="300K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="300.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyA.xml"
-			    menuText="Nonsupercell Tornado Threat / Wind" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="310K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="310.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyYY.xml"
-			    menuText="CAPE / CIN / Helicity" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="320K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="320.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyH.xml"
-			    menuText="Lapse Rate / Buoyancy / Wind" id="" useReferenceTime="true">
+	</contribute>
+	
+	<!--
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyB.xml"
+			menuText="Storm Initiation / CAPE" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/MidLevelDivergence.xml"
+			menuText="Mid-Level Divergence / Vorticity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Buoyancy.xml"
+			menuText="Surface Wind / Pressure / Buoyancy" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyA.xml"
+			menuText="Nonsupercell Tornado Threat / Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyYY.xml"
+			menuText="CAPE / CIN / Helicity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyH.xml"
+			menuText="Lapse Rate / Buoyancy / Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyM.xml"
+				menuText="4-Panel Slantwise Instability" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
+				menuText="Surface Buoyancy" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="subMenu" menuText="4-Panel">
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyE.xml"
+				menuText="Nonsupercell Tornado Threat" id="" useReferenceTime="true">
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyM.xml"
-				    menuText="4-Panel Slantwise Instability" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyF.xml"
+				menuText="Nonsupercell / Isentropic" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyI.xml"
+				menuText="Instability / Divergence" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyL.xml"
+				menuText="Moisture / Precipiation" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyV.xml"
+				menuText="Bulk Shear / Buoyancy" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyW.xml"
+				menuText="Supercell Parameters" id="" useReferenceTime="true">
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
-				    menuText="Surface Buoyancy" id="" useReferenceTime="true">
+				menuText="Helicity / Shear / Buoyancy" id="" useReferenceTime="true">
 		</contribute>
-		<contribute xsi:type="subMenu" menuText="4-Panel">
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyE.xml"
-				    menuText="Nonsupercell Tornado Threat" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyF.xml"
-				    menuText="Nonsupercell / Isentropic" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyI.xml"
-				    menuText="Instability / Divergence" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyL.xml"
-				    menuText="Moisture / Precipiation" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyV.xml"
-				    menuText="Bulk Shear / Buoyancy" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyW.xml"
-				    menuText="Supercell Parameters" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
-				    menuText="Helicity / Shear / Buoyancy" id="" useReferenceTime="true">
-			</contribute>
-		</contribute>
-		-->
 	</contribute>
+	-->
 </menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/baseComparisonFamilies.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/baseComparisonFamilies.xml
index a4948f570d..1c5d42d40d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/baseComparisonFamilies.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/baseComparisonFamilies.xml
@@ -19,31 +19,23 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="subMenu" 
-	menuText="Comparison Families" id="ComparisonFamiliesLine">
-		<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
-			menuText="850MB Height" id="850hgt" useReferenceTime="true">
-				<substitute key="level" value="850.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
-			menuText="700MB Height" id="700hgt" useReferenceTime="true">
-				<substitute key="level" value="700.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
-			menuText="500MB Height" id="500hgt" useReferenceTime="true">
-				<substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
-			menuText="250MB Height" id="250hgt" useReferenceTime="true">
-				<substitute key="level" value="250.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/MSLPComparison.xml"
-			menuText="MSLP" id="mslPress" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
+		menuText="850MB Height" id="850hgt" useReferenceTime="true">
+			<substitute key="level" value="850.0" />
 	</contribute>
-	<contribute xsi:type="titleItem" titleText="------ Ocean Products ------"
-		id="OceanModelsLine" />
-	<contribute xsi:type="bundleItem" file="bundles/grid/HFR.xml"
-		menuText="High Frequency Radar (HFR) Ocean Sfc Wind" id="hfr" useReferenceTime="true">
+	<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
+		menuText="700MB Height" id="700hgt" useReferenceTime="true">
+			<substitute key="level" value="700.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
+		menuText="500MB Height" id="500hgt" useReferenceTime="true">
+			<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/HeightComparison.xml"
+		menuText="250MB Height" id="250hgt" useReferenceTime="true">
+			<substitute key="level" value="250.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/MSLPComparison.xml"
+		menuText="MSLP" id="mslPress" useReferenceTime="true">
 	</contribute>
 </menuTemplate>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/cmcFamilies.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/cmcFamilies.xml
index f5d2be4fac..dba8a10111 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/cmcFamilies.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/cmcFamilies.xml
@@ -19,169 +19,167 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/PrecipMSLP.xml"
-			    menuText="MSLP and Precipitation" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Precip.xml"
-			    menuText="Precip Accumulation" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Snow.xml"
-			    menuText="Snow Accumulation" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
-			    menuText="Sfc Temperature and Wind" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
-			    menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
-			    menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/30mbMeanDewpoint.xml"
-			    menuText="30mb Mean Dewpoint" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/PrecipitableWater.xml"
-			    menuText="Precipitable Water" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SimulatedREFC.xml"
-			    menuText="Simulated Reflectivity (REFC)" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/LightningThreat.xml"
-			    menuText="Lightning Threat" id="" useReferenceTime="true">
-		</contribute>
-		
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyD.xml"
-			    menuText="Precip Type / Moisture Transport" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Vorticity.xml"
-			    menuText="500MB Vorticity" id="" useReferenceTime="true">
-			    	<substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
-			    menuText="500MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
-			    menuText="700MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="700.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
-			    menuText="850MB Vertical Velocity" id="" useReferenceTime="true">
-			    <substitute key="level" value="850.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Trenberth.xml"
-			    menuText="Thickness / Vorticity Advection (Trenberth)" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="850MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="850.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="700MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="700.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="500MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="500.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="300MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="300.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
-			    menuText="250MB Wind / Height" id="" useReferenceTime="true">
-			    	<substitute key="level" value="250.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/PotentialVorticity.xml"
-			    menuText="250MB Potential Vorticity" id="" useReferenceTime="true">
-			    	<substitute key="level" value="250.0" />
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyYY.xml"
-			    menuText="CAPE / CIN / Helicity" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/CMCHelicity.xml"
-				    menuText="Helicity" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Hail.xml"
-			    menuText="Hail Parameters" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/MCS.xml"
-			    menuText="MCS Parameters" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PrecipMSLP.xml"
+			menuText="MSLP and Precipitation" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Precip.xml"
+			menuText="Precip Accumulation" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Snow.xml"
+			menuText="Snow Accumulation" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
+			menuText="Sfc Temperature and Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
+			menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
+			menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/30mbMeanDewpoint.xml"
+			menuText="30mb Mean Dewpoint" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PrecipitableWater.xml"
+			menuText="Precipitable Water" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SimulatedREFC.xml"
+			menuText="Simulated Reflectivity (REFC)" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/LightningThreat.xml"
+			menuText="Lightning Threat" id="" useReferenceTime="true">
+	</contribute>
+	
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyD.xml"
+			menuText="Precip Type / Moisture Transport" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Vorticity.xml"
+			menuText="500MB Vorticity" id="" useReferenceTime="true">
+				<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
+			menuText="500MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
+			menuText="700MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="700.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/VerticalVelocity.xml"
+			menuText="850MB Vertical Velocity" id="" useReferenceTime="true">
+			<substitute key="level" value="850.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Trenberth.xml"
+			menuText="Thickness / Vorticity Advection (Trenberth)" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="850MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="850.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="700MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="700.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="500MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="500.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="300MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="300.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WindHeight.xml"
+			menuText="250MB Wind / Height" id="" useReferenceTime="true">
+				<substitute key="level" value="250.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/PotentialVorticity.xml"
+			menuText="250MB Potential Vorticity" id="" useReferenceTime="true">
+				<substitute key="level" value="250.0" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyYY.xml"
+			menuText="CAPE / CIN / Helicity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/CMCHelicity.xml"
+				menuText="Helicity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Hail.xml"
+			menuText="Hail Parameters" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/MCS.xml"
+			menuText="MCS Parameters" id="" useReferenceTime="true">
+	</contribute>
 
-		<contribute xsi:type="subMenu" menuText="Isentropic">
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-		    menuText="270K RH Wind Pressure" id="" useReferenceTime="true">
-		    	<substitute key="level" value="270.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-		    menuText="280K RH Wind Pressure" id="" useReferenceTime="true">
-		    	<substitute key="level" value="280.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="290K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="290.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="300K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="300.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="310K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="310.0" />
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
-				    menuText="320K RH Wind Pressure" id="" useReferenceTime="true">
-				    	<substitute key="level" value="320.0" />
-			</contribute>
+	<contribute xsi:type="subMenu" menuText="Isentropic">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+		menuText="270K RH Wind Pressure" id="" useReferenceTime="true">
+			<substitute key="level" value="270.0" />
 		</contribute>
-		
-		<!--
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyB.xml"
-			    menuText="Storm Initiation / CAPE" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+		menuText="280K RH Wind Pressure" id="" useReferenceTime="true">
+			<substitute key="level" value="280.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/MidLevelDivergence.xml"
-			    menuText="Mid-Level Divergence / Vorticity" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="290K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="290.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Buoyancy.xml"
-			    menuText="Surface Wind / Pressure / Buoyancy" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="300K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="300.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyA.xml"
-			    menuText="Nonsupercell Tornado Threat / Wind" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="310K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="310.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyH.xml"
-			    menuText="Lapse Rate / Buoyancy / Wind" id="" useReferenceTime="true">
+		<contribute xsi:type="bundleItem" file="bundles/grid/Isentropic.xml"
+				menuText="320K RH Wind Pressure" id="" useReferenceTime="true">
+					<substitute key="level" value="320.0" />
 		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyM.xml"
-				    menuText="4-Panel Slantwise Instability" id="" useReferenceTime="true">
+	</contribute>
+	
+	<!--
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyB.xml"
+			menuText="Storm Initiation / CAPE" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/MidLevelDivergence.xml"
+			menuText="Mid-Level Divergence / Vorticity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/Buoyancy.xml"
+			menuText="Surface Wind / Pressure / Buoyancy" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyA.xml"
+			menuText="Nonsupercell Tornado Threat / Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyH.xml"
+			menuText="Lapse Rate / Buoyancy / Wind" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyM.xml"
+				menuText="4-Panel Slantwise Instability" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
+				menuText="Surface Buoyancy" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="subMenu" menuText="4-Panel">
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyE.xml"
+				menuText="Nonsupercell Tornado Threat" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyF.xml"
+				menuText="Nonsupercell / Isentropic" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyI.xml"
+				menuText="Instability / Divergence" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyL.xml"
+				menuText="Moisture / Precipiation" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyV.xml"
+				menuText="Bulk Shear / Buoyancy" id="" useReferenceTime="true">
+		</contribute>
+		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyW.xml"
+				menuText="Supercell Parameters" id="" useReferenceTime="true">
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
-				    menuText="Surface Buoyancy" id="" useReferenceTime="true">
+				menuText="Helicity / Shear / Buoyancy" id="" useReferenceTime="true">
 		</contribute>
-		<contribute xsi:type="subMenu" menuText="4-Panel">
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyE.xml"
-				    menuText="Nonsupercell Tornado Threat" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyF.xml"
-				    menuText="Nonsupercell / Isentropic" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyI.xml"
-				    menuText="Instability / Divergence" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyL.xml"
-				    menuText="Moisture / Precipiation" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyV.xml"
-				    menuText="Bulk Shear / Buoyancy" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyW.xml"
-				    menuText="Supercell Parameters" id="" useReferenceTime="true">
-			</contribute>
-			<contribute xsi:type="bundleItem" file="bundles/grid/ModelFamilyY.xml"
-				    menuText="Helicity / Shear / Buoyancy" id="" useReferenceTime="true">
-			</contribute>
-		</contribute>
-		-->
 	</contribute>
+	-->
 </menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/gridIndex.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/gridIndex.xml
new file mode 100644
index 0000000000..7059fac93e
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/gridIndex.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <contribute xsi:type="titleItem" titleText= "------ Default Models ------" id="defaultModel"/> 
+
+    <contribute xsi:type="subinclude" subMenu = "GFS 1.00° Global" fileName="menus/grid/allFamilies-GFS.xml">
+             <substitute key="modelName" value="GFS1p0" />
+             <substitute key="frameCount" value="180" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "GFS 20km" 
+             fileName="menus/grid/allFamilies-GFS.xml">
+             <substitute key="modelName" value="GFS20" />
+             <substitute key="menuName" value="GFS 20km" />
+             <substitute key="frameCount" value="41" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "GFS-LAMP" 
+             fileName="menus/grid/lampFamilies.xml">
+             <substitute key="modelName" value="LAMP2p5" />
+             <substitute key="menuName" value="GFS-LAMP" />
+             <substitute key="frameCount" value="41" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "HRRR" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="HRRR" />
+             <substitute key="menuName" value="HRRR" />
+             <substitute key="frameCount" value="19" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+        <contribute xsi:type="subinclude" subMenu = "HRRR Smoke" 
+             fileName="menus/grid/hrrrSmokeProducts.xml">
+             <substitute key="modelName" value="HRRR-Smoke" />
+             <substitute key="menuName" value="HRRR Smoke" />
+             <substitute key="frameCount" value="19" />
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "NAM 12km" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="NAM12" />
+             <substitute key="menuName" value="NAM 12km" />
+             <substitute key="frameCount" value="41" />
+             <substitute key="TP" value="TP3hr"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "NAM 40km" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="NAM40" />
+             <substitute key="menuName" value="NAM 40km" />
+             <substitute key="frameCount" value="41" />
+             <substitute key="TP" value="TP3hr"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "RAP 13km" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="RAP13" />
+             <substitute key="menuName" value="RAP 13km" />
+             <substitute key="frameCount" value="19" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+<!-- Tiffany Meyer commented out because we aren't ignesting these models #20210507
+	<contribute xsi:type="subinclude" subMenu = "RAP 20km" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="RAP20" />
+             <substitute key="menuName" value="RAP 20km" />
+             <substitute key="frameCount" value="19" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+    <contribute xsi:type="subinclude" subMenu = "RAp 40km" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="RAP40" />
+             <substitute key="menuName" value="RAP 40km" />
+             <substitute key="frameCount" value="19" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+-->
+    <contribute xsi:type="subinclude" subMenu = "Comparison Families" 
+             fileName="menus/grid/baseComparisonFamilies.xml">
+    </contribute>
+
+    <contribute xsi:type="separator" id="MySeparatorId"/>
+
+   <contribute xsi:type="titleItem" titleText="------ Digital Forecasts and Mesoscale Analysis ------" id="forecasts"/>
+	<contribute xsi:type="subinclude" subMenu = "National Blend" 
+             fileName="menus/grid/mesoFamilies.xml">
+             <substitute key="modelName" value="NationalBlend" />
+             <substitute key="menuName" value="National Blend" />
+             <substitute key="frameCount" value="75" />
+             <substitute key="TP" value="TP1hr"/>
+             <substitute key="level" value="SFC"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "RTMA" 
+             fileName="menus/grid/mesoFamilies.xml">
+             <substitute key="modelName" value="RTMA" />
+             <substitute key="menuName" value="RTMA" />
+             <substitute key="frameCount" value="10" />
+             <substitute key="TP" value="TP1hr"/>
+             <substitute key="level" value="FH"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "URMA" 
+             fileName="menus/grid/mesoFamilies.xml">
+             <substitute key="modelName" value="URMA25" />
+             <substitute key="menuName" value="URMA" />
+             <substitute key="frameCount" value="10" />
+             <substitute key="TP" value="TP6hr"/>
+             <substitute key="level" value="SFC"/>
+    </contribute>
+
+
+    <contribute xsi:type="separator" id="MySeparatorId"/>
+
+	<contribute xsi:type="titleItem" titleText="------ Ocean Products ------" id="OceanModelsLine" />
+	<contribute xsi:type="bundleItem" file="bundles/grid/HFR.xml"
+		menuText="High Frequency Radar (HFR) Ocean Sfc Wind" id="hfr" useReferenceTime="true">
+	</contribute>
+
+    <contribute xsi:type="subinclude" subMenu = "FNMOC WW3" 
+             fileName="menus/grid/ww3.xml">
+             <substitute key="modelName" value="FNMOC-WW3" />
+             <substitute key="menuName" value="FNMOC WW3" />
+             <substitute key="frameCount" value="39" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+    <contribute xsi:type="subinclude" subMenu = "NOAA WW3" 
+             fileName="menus/grid/WaveWatch.xml">
+             <substitute key="modelName" value="WaveWatch" />
+             <substitute key="menuName" value="NOAA WW3" />
+             <substitute key="frameCount" value="32" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "NCEP WW3 Global" 
+             fileName="menus/grid/WaveWatch.xml">
+             <substitute key="modelName" value="GlobalWave" />
+             <substitute key="menuName" value="NCEP WW3 Global" />
+             <substitute key="frameCount" value="32" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+   	<contribute xsi:type="subinclude" subMenu = "ESTOFS" 
+             fileName="menus/grid/oceanFamilies.xml">
+             <substitute key="modelName" value="ESTOFS" />
+             <substitute key="menuName" value="ESTOFS" />
+             <substitute key="frameCount" value="41" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "ETSS Storm Surge" 
+             fileName="menus/grid/oceanFamilies.xml">
+             <substitute key="modelName" value="ETSS" />
+             <substitute key="menuName" value="ETSS Storm Surge" />
+             <substitute key="frameCount" value="41" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+        <contribute xsi:type="separator" id="MySeparatorId"/>
+
+    <contribute xsi:type="titleItem" titleText="------ Optional Models ------" id="optionalModels"/>
+	<contribute xsi:type="subinclude" subMenu = "CMC" 
+             fileName="menus/grid/cmcFamilies.xml">
+             <substitute key="modelName" value="CMC" />
+             <substitute key="menuName" value="CMC" />
+             <substitute key="frameCount" value="19" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+    <contribute xsi:type="subinclude" subMenu = "NAVGEM" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="NAVGEM" />
+             <substitute key="menuName" value="NAVGEM" />
+             <substitute key="frameCount" value="63" />
+             <substitute key="TP" value="TP3hr"/>
+    </contribute>
+	<contribute xsi:type="subinclude" subMenu = "NamDNG" 
+             fileName="menus/grid/allFamilies.xml">
+             <substitute key="modelName" value="NamDNG" />
+             <substitute key="menuName" value="NamDNG 2.5km" />
+             <substitute key="frameCount" value="41" />
+             <substitute key="TP" value="TP3hr"/>
+    </contribute>
+    <contribute xsi:type="subinclude" subMenu = "NDFD" 
+             fileName="menus/grid/mesoFamilies.xml">
+             <substitute key="modelName" value="NDFD" />
+             <substitute key="menuName" value="NDFD" />
+             <substitute key="frameCount" value="2" />
+             <substitute key="TP" value="TP"/>
+    </contribute>
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/hrrrSmokeProducts.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/hrrrSmokeProducts.xml
index 5a633df98d..ec560d0c0e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/hrrrSmokeProducts.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/hrrrSmokeProducts.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <!-- Set the initial top level menu -->
-    <contribute xsi:type="subMenu" menuText="HRRR-Smoke">
-       <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
-           menuText="Fire Radiative Power Mean" id="FRPMean">
-           <substitute key="levelID" value="SFC" />
-           <substitute key="parameterID" value="FRPMean" />
-           <substitute key="levelOneValue" value="0.0" />
-       </contribute>
-       <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
-           menuText="Near-Surface Smoke" id="NEARSFCSMOKE">
-           <substitute key="levelID" value="FHAG" />
-           <substitute key="parameterID" value="NEARSFCSMOKE" />
-           <substitute key="levelOneValue" value="8.0" />
-       </contribute>
-       <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
-           menuText="Vertically-Integrated Smoke" id="VERTINTSMOKE">
-           <substitute key="levelID" value="EA" />
-           <substitute key="parameterID" value="VERTINTSMOKE" />
-           <substitute key="levelOneValue" value="0.0" />
-       </contribute>
-       <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
-           menuText="Aerosol Optical Depth" id="AEROSOLOPTICALDEPTH">
-           <substitute key="levelID" value="EA" />
-           <substitute key="parameterID" value="AEROSOLOPTICALDEPTH" />
-           <substitute key="levelOneValue" value="0.0" />
-       </contribute>
-       </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
+        menuText="Fire Radiative Power Mean" id="FRPMean">
+        <substitute key="levelID" value="SFC" />
+        <substitute key="parameterID" value="FRPMean" />
+        <substitute key="levelOneValue" value="0.0" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
+        menuText="Near-Surface Smoke" id="NEARSFCSMOKE">
+        <substitute key="levelID" value="FHAG" />
+        <substitute key="parameterID" value="NEARSFCSMOKE" />
+        <substitute key="levelOneValue" value="8.0" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
+        menuText="Vertically-Integrated Smoke" id="VERTINTSMOKE">
+        <substitute key="levelID" value="EA" />
+        <substitute key="parameterID" value="VERTINTSMOKE" />
+        <substitute key="levelOneValue" value="0.0" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/hrrrSmokeDisplay.xml"
+        menuText="Aerosol Optical Depth" id="AEROSOLOPTICALDEPTH">
+        <substitute key="levelID" value="EA" />
+        <substitute key="parameterID" value="AEROSOLOPTICALDEPTH" />
+        <substitute key="levelOneValue" value="0.0" />
+    </contribute>
 </menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml
index 3c5e2bd08e..bab385f9d5 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/index.xml
@@ -1,163 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuContributionFile>
-	<include installTo="menu:models" 
-             fileName="menus/grid/cmcFamilies.xml">
-             <substitute key="modelName" value="CMC" />
-             <substitute key="menuName" value="CMC" />
-             <substitute key="frameCount" value="19" />
-             <substitute key="TP" value="TP"/>
-    </include>
     <include installTo="menu:models" 
-             fileName="menus/grid/allFamilies-GFS.xml">
-             <substitute key="modelName" value="GFS1p0" />
-             <substitute key="menuName" value="GFS 1.00° Global" />
-             <substitute key="frameCount" value="180" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies-GFS.xml">
-             <substitute key="modelName" value="GFS20" />
-             <substitute key="menuName" value="GFS 20km" />
-             <substitute key="frameCount" value="41" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/lampFamilies.xml">
-             <substitute key="modelName" value="LAMP2p5" />
-             <substitute key="menuName" value="GFS-LAMP" />
-             <substitute key="frameCount" value="41" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="HRRR" />
-             <substitute key="menuName" value="HRRR" />
-             <substitute key="frameCount" value="19" />
-             <substitute key="TP" value="TP"/>
-    </include>
-        <include installTo="menu:models" 
-             fileName="menus/grid/hrrrSmokeProducts.xml">
-             <substitute key="modelName" value="HRRR-Smoke" />
-             <substitute key="menuName" value="HRRR Smoke" />
-             <substitute key="frameCount" value="19" />
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="NAM12" />
-             <substitute key="menuName" value="NAM 12km" />
-             <substitute key="frameCount" value="41" />
-             <substitute key="TP" value="TP3hr"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="NAM40" />
-             <substitute key="menuName" value="NAM 40km" />
-             <substitute key="frameCount" value="41" />
-             <substitute key="TP" value="TP3hr"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="NamDNG" />
-             <substitute key="menuName" value="NamDNG 2.5km" />
-             <substitute key="frameCount" value="41" />
-             <substitute key="TP" value="TP3hr"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="NationalBlend" />
-             <substitute key="menuName" value="National Blend" />
-             <substitute key="frameCount" value="75" />
-             <substitute key="TP" value="TP3hr"/>
-    </include>
-    <include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="NAVGEM" />
-             <substitute key="menuName" value="NAVGEM" />
-             <substitute key="frameCount" value="63" />
-             <substitute key="TP" value="TP3hr"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="RAP13" />
-             <substitute key="menuName" value="RAP 13km" />
-             <substitute key="frameCount" value="19" />
-             <substitute key="TP" value="TP"/>
-    </include>
-<!-- Tiffany Meyer commented out because we aren't ignesting these models #20210507
-	<include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="RAP20" />
-             <substitute key="menuName" value="RAP 20km" />
-             <substitute key="frameCount" value="19" />
-             <substitute key="TP" value="TP"/>
-    </include>
-    <include installTo="menu:models" 
-             fileName="menus/grid/allFamilies.xml">
-             <substitute key="modelName" value="RAP40" />
-             <substitute key="menuName" value="RAP 40km" />
-             <substitute key="frameCount" value="19" />
-             <substitute key="TP" value="TP"/>
-    </include>
--->
-	<include installTo="menu:models" 
-             fileName="menus/grid/mesoFamilies.xml">
-             <substitute key="modelName" value="NDFD" />
-             <substitute key="menuName" value="NDFD" />
-             <substitute key="frameCount" value="2" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/mesoFamilies.xml">
-             <substitute key="modelName" value="RTMA" />
-             <substitute key="menuName" value="RTMA" />
-             <substitute key="frameCount" value="2" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/mesoFamilies.xml">
-             <substitute key="modelName" value="URMA25" />
-             <substitute key="menuName" value="URMA" />
-             <substitute key="frameCount" value="2" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/baseComparisonFamilies.xml">
-    </include>
-
-    <include installTo="menu:models" 
-             fileName="menus/grid/ww3.xml">
-             <substitute key="modelName" value="FNMOC-WW3" />
-             <substitute key="menuName" value="FNMOC WW3" />
-             <substitute key="frameCount" value="39" />
-             <substitute key="TP" value="TP"/>
-    </include>
-    <include installTo="menu:models" 
-             fileName="menus/grid/WaveWatch.xml">
-             <substitute key="modelName" value="WaveWatch" />
-             <substitute key="menuName" value="NOAA WW3" />
-             <substitute key="frameCount" value="32" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/WaveWatch.xml">
-             <substitute key="modelName" value="GlobalWave" />
-             <substitute key="menuName" value="NCEP WW3 Global" />
-             <substitute key="frameCount" value="32" />
-             <substitute key="TP" value="TP"/>
-    </include>
-   	<include installTo="menu:models" 
-             fileName="menus/grid/oceanFamilies.xml">
-             <substitute key="modelName" value="ESTOFS" />
-             <substitute key="menuName" value="ESTOFS" />
-             <substitute key="frameCount" value="41" />
-             <substitute key="TP" value="TP"/>
-    </include>
-	<include installTo="menu:models" 
-             fileName="menus/grid/oceanFamilies.xml">
-             <substitute key="modelName" value="ETSS" />
-             <substitute key="menuName" value="ETSS Storm Surge" />
-             <substitute key="frameCount" value="41" />
-             <substitute key="TP" value="TP"/>
-    </include>
-
+             fileName="menus/grid/gridIndex.xml"/>
 </menuContributionFile>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/lampFamilies.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/lampFamilies.xml
index beadb57387..70d6592ccd 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/lampFamilies.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/lampFamilies.xml
@@ -19,36 +19,34 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
-			    menuText="Sfc Temperature" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempError.xml"
-			    menuText="Sfc Temperature Error" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
-			    menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTempError.xml"
-			    menuText="Sfc Dewpoint Temperature Error" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
-			    menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/CeilingHeight.xml"
-			    menuText="Ceiling Height" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/LightningPotential.xml"
-			    menuText="2hr Lightning Potential" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/LightningProbability.xml"
-			    menuText="2hr Lightning Probability" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ConvectionPotential.xml"
-			    menuText="2hr Convection Potential" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ConvectionProbability.xml"
-			    menuText="2hr Convection Probability" id="" useReferenceTime="true">
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempWind.xml"
+			menuText="Sfc Temperature" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SurfaceTempError.xml"
+			menuText="Sfc Temperature Error" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
+			menuText="Sfc Dewpoint Temperature" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTempError.xml"
+			menuText="Sfc Dewpoint Temperature Error" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
+			menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/CeilingHeight.xml"
+			menuText="Ceiling Height" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/LightningPotential.xml"
+			menuText="2hr Lightning Potential" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/LightningProbability.xml"
+			menuText="2hr Lightning Probability" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ConvectionPotential.xml"
+			menuText="2hr Convection Potential" id="" useReferenceTime="true">
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ConvectionProbability.xml"
+			menuText="2hr Convection Probability" id="" useReferenceTime="true">
 	</contribute>
 </menuTemplate>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/mesoFamilies.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/mesoFamilies.xml
index 200c63edc9..8fdc215f49 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/mesoFamilies.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/mesoFamilies.xml
@@ -19,18 +19,16 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/2mTemperature.xml"
-			    menuText="2m Temperature and 10m Wind" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
-			    menuText="2m Dewpoint Temperature" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
-			    menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/Precip.xml"
-			    menuText="1 Hr Precip Accumulation" id="" useReferenceTime="true">
-		</contribute>
-	</contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/2mTemperature.xml"
+            menuText="2m Temperature and 10m Wind" id="" useReferenceTime="true">
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/DewpointTemp.xml"
+            menuText="2m Dewpoint Temperature" id="" useReferenceTime="true">
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/SfcRH.xml"
+            menuText="Sfc Relative Humidity" id="" useReferenceTime="true">
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/grid/PrecipAccum.xml"
+            menuText="1 Hr Precip Accumulation" id="" useReferenceTime="true">
+    </contribute>
 </menuTemplate>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/oceanFamilies.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/oceanFamilies.xml
index 9bd1253558..8df3a42c1b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/oceanFamilies.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/oceanFamilies.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/ETSRG.xml"
-			    menuText="Extra Tropical Storm Surge" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ETCWL.xml"
-			    menuText="Extra Tropical Comb. Storm Surge and Tide" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/ELEV.xml"
-			    menuText="Ocean Surface Elevation" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ETSRG.xml"
+			menuText="Extra Tropical Storm Surge" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ETCWL.xml"
+			menuText="Extra Tropical Comb. Storm Surge and Tide" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/ELEV.xml"
+			menuText="Ocean Surface Elevation" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
 	</contribute>
 </menuTemplate>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/ww3.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/ww3.xml
index d1f668704b..7780ebaaf5 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/ww3.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/menus/grid/ww3.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="${menuName}">
-		<contribute xsi:type="bundleItem" file="bundles/grid/WW3-TSWH.xml"
-			    menuText="Significant Wave Height" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WW3-WVHGT.xml"
-			    menuText="Wind Wave Height" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WW3-SwellHeightDirection.xml"
-			    menuText="Swell Height and Direction" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
-		<contribute xsi:type="bundleItem" file="bundles/grid/WW3-PeakWavePeriod.xml"
-			    menuText="Peak Wave Period" id="" useReferenceTime="true">
-			<substitute key="frameCount" value="${frameCount}"/>
-		</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WW3-TSWH.xml"
+			menuText="Significant Wave Height" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WW3-WVHGT.xml"
+			menuText="Wind Wave Height" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WW3-SwellHeightDirection.xml"
+			menuText="Swell Height and Direction" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/grid/WW3-PeakWavePeriod.xml"
+			menuText="Peak Wave Period" id="" useReferenceTime="true">
+		<substitute key="frameCount" value="${frameCount}"/>
 	</contribute>
 </menuTemplate>

From 74a1de90b398e086a648a5d6db5bf17de9727846 Mon Sep 17 00:00:00 2001
From: Tiffany Meyer <tiffanym@ucar.edu>
Date: Fri, 11 Feb 2022 15:38:03 -0500
Subject: [PATCH 3/3] Added NationalBlend model to the volume browser sources
 *NOTE: this is a CAVE side change

---
 .../localization/volumebrowser/VbSources/sfcGrid.xml             | 1 +
 .../localization/volumebrowser/VbSources/volume.xml              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
index 659edb6a86..4152b5784a 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
@@ -43,6 +43,7 @@
     <vbSource key="NamDNG" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="NAM5" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="NAM12" category="SfcGrid" views="PLANVIEW TIMESERIES" />
+    <vbSource key="NationalBlend" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="NAM40" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RFCqpf" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="RTGSST" category="SfcGrid" views="PLANVIEW TIMESERIES" />
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
index d4cadb48f4..2049823786 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/volume.xml
@@ -37,6 +37,7 @@
     <vbSource key="NamDNG" category="Volume" />
     <vbSource key="NAVGEM" category="Volume" />
     <vbSource key="NDFD" category="Volume" />
+    <vbSource key="NationalBlend" category="Volume" />
     <vbSource key="RTMA" category="Volume" />
     <vbSource key="URMA25" category="Volume" />    
     <vbSource key="RAP13" category="Volume" />