diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product
index 3a6cfa082a..933e9e2375 100644
--- a/cave/com.raytheon.viz.product.awips/awips.product
+++ b/cave/com.raytheon.viz.product.awips/awips.product
@@ -24,9 +24,9 @@
 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
 -Dqpid.dest_syntax=BURL
--Dlogback.configurationFile=logback-viz-core-developer.xml
+-Dlogback.configurationFile=logback-viz-alertview.xml
 -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
--Dthrift.stream.maxsize=400
+-Dthrift.stream.maxsize=200
 -Dviz.memory.warn.threshold=98
 -Dhttps.certificate.check=true
 -XX:+UnlockExperimentalVMOptions
@@ -87,6 +87,7 @@
       <feature id="com.raytheon.uf.viz.nwsauth.feature"/>
       <feature id="com.raytheon.uf.viz.archive.feature"/>
       <feature id="com.raytheon.uf.viz.gisdatastore.feature"/>
+      <feature id="com.raytheon.uf.viz.useradmin.feature"/>
       <feature id="com.raytheon.viz.dataaccess.feature"/>
       <feature id="com.raytheon.uf.viz.localization.perspective.feature"/>
       <feature id="com.raytheon.uf.viz.core.feature"/>
@@ -108,6 +109,7 @@
       <feature id="com.raytheon.viz.text.feature"/>
       <feature id="com.raytheon.viz.warngen.feature"/>
       <feature id="com.raytheon.viz.gfe.feature"/>
+      <feature id="com.raytheon.uf.viz.dat.feature"/>
       <feature id="com.raytheon.uf.viz.d2d.ui.awips.feature"/>
       <feature id="com.raytheon.uf.viz.d2d.gfe.feature"/>
       <feature id="com.raytheon.uf.viz.ncep.dataplugins.feature"/>
diff --git a/cave/com.raytheon.viz.product.awips/developer.product b/cave/com.raytheon.viz.product.awips/developer.product
index 0a192e5b99..6892778492 100644
--- a/cave/com.raytheon.viz.product.awips/developer.product
+++ b/cave/com.raytheon.viz.product.awips/developer.product
@@ -14,19 +14,18 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-data @user.home/Library/CAVE -user @user.home/Library/CAVE -clean -consoleLog -component thinclient -alertviz
+      <programArgs>-data @user.home/Library/caveData -user @user.home/Library/caveData -clean -consoleLog -component thinclient -alertviz
       </programArgs>
       <vmArgs>-Xmx4536M
 -XX:+UseG1GC
 -XstartOnFirstThread
 -Dosgi.instance.area.readOnly=true
--Djava.library.path=lib/ext
 -Dorg.eclipse.update.reconcile=false
 -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
 -Dqpid.dest_syntax=BURL
--Dlogback.configurationFile=logback-viz-core-developer.xml
+-Dlogback.configurationFile=logback-viz-alertview.xml
 -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
--Dthrift.stream.maxsize=400
+-Dthrift.stream.maxsize=200
 -Dviz.memory.warn.threshold=99
 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 -Dhttps.certificate.check=false
@@ -44,7 +43,7 @@
       </vmArgsWin>
    </launcherArgs>
 
-   <windowImages i16="/com.raytheon.viz.product.awips/icons/cave_16x16.png" i32="/com.raytheon.viz.product.awips/icons/cave_32x32.png" i48="/com.raytheon.viz.product.awips/icons/cave_48x48.png" i64="/com.raytheon.viz.product.awips/icons/cave_64x64.png" i128="/com.raytheon.viz.product.awips/icons/cave_128x128.png"/>
+   <windowImages/>
 
    <splash
       location="com.raytheon.viz.ui.personalities.awips"
@@ -52,17 +51,20 @@
       startupMessageRect="7,252,445,20"
       startupForegroundColor="000000" />
    <launcher name="cave">
+      <macosx icon="/com.raytheon.viz.product.awips/icons/cave-icon.icns"/>
       <solaris/>
       <win useIco="false">
          <bmp/>
       </win>
    </launcher>
 
+
    <vm>
       <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
-      <windows include="true">JavaSE-1.8</windows>
+      <windows include="true">jdk1.7.0</windows>
    </vm>
 
+
    <plugins>
    </plugins>
 
@@ -78,4 +80,11 @@
       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
    </configurations>
 
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
 </product>
diff --git a/cave/com.raytheon.viz.product.awips/icons/awipsLogo.png b/cave/com.raytheon.viz.product.awips/icons/awipsLogo.png
index 60e9e344ef..189dd36e9c 100644
Binary files a/cave/com.raytheon.viz.product.awips/icons/awipsLogo.png and b/cave/com.raytheon.viz.product.awips/icons/awipsLogo.png differ
diff --git a/cave/com.raytheon.viz.product.awips/icons/cave-icon.icns b/cave/com.raytheon.viz.product.awips/icons/cave-icon.icns
new file mode 100644
index 0000000000..2b519a39f8
Binary files /dev/null and b/cave/com.raytheon.viz.product.awips/icons/cave-icon.icns differ
diff --git a/cave/com.raytheon.viz.product.awips/icons/cave_128x128.png b/cave/com.raytheon.viz.product.awips/icons/cave_128x128.png
index c674357a67..b1f1d490fe 100755
Binary files a/cave/com.raytheon.viz.product.awips/icons/cave_128x128.png and b/cave/com.raytheon.viz.product.awips/icons/cave_128x128.png differ
diff --git a/cave/com.raytheon.viz.product.awips/icons/cave_16x16.png b/cave/com.raytheon.viz.product.awips/icons/cave_16x16.png
index 60e9e344ef..f91640e0c4 100755
Binary files a/cave/com.raytheon.viz.product.awips/icons/cave_16x16.png and b/cave/com.raytheon.viz.product.awips/icons/cave_16x16.png differ
diff --git a/cave/com.raytheon.viz.product.awips/icons/cave_32x32.png b/cave/com.raytheon.viz.product.awips/icons/cave_32x32.png
index 14240043f0..0597364375 100755
Binary files a/cave/com.raytheon.viz.product.awips/icons/cave_32x32.png and b/cave/com.raytheon.viz.product.awips/icons/cave_32x32.png differ
diff --git a/cave/com.raytheon.viz.product.awips/icons/cave_48x48.png b/cave/com.raytheon.viz.product.awips/icons/cave_48x48.png
index 08b2f5ffa4..f8d1fa7874 100755
Binary files a/cave/com.raytheon.viz.product.awips/icons/cave_48x48.png and b/cave/com.raytheon.viz.product.awips/icons/cave_48x48.png differ
diff --git a/cave/com.raytheon.viz.product.awips/icons/cave_64x64.png b/cave/com.raytheon.viz.product.awips/icons/cave_64x64.png
index 4429370b7c..17e7c4c284 100755
Binary files a/cave/com.raytheon.viz.product.awips/icons/cave_64x64.png and b/cave/com.raytheon.viz.product.awips/icons/cave_64x64.png differ
diff --git a/cave/com.raytheon.viz.product.awips/nawips.product b/cave/com.raytheon.viz.product.awips/nawips.product
index 7582cb10be..4704fa4508 100644
--- a/cave/com.raytheon.viz.product.awips/nawips.product
+++ b/cave/com.raytheon.viz.product.awips/nawips.product
@@ -95,6 +95,7 @@
       <feature id="com.raytheon.viz.gfe.feature" version="1.0.0.qualifier"/>
       <feature id="com.raytheon.uf.viz.registry.feature" version="1.0.0.qualifier"/>
       <feature id="com.raytheon.uf.viz.aviation.advisory.feature" version="1.14.0.qualifier"/>
+      <feature id="com.raytheon.uf.viz.useradmin.feature" version="1.0.0.qualifier"/>
       <feature id="com.raytheon.uf.viz.ncep.dataplugins.feature" version="1.0.0.qualifier"/>
       <feature id="com.raytheon.uf.viz.dataplugins.feature" version="1.0.0.qualifier"/>
       <feature id="com.raytheon.uf.viz.displays.feature" version="1.0.0.qualifier"/>
diff --git a/cave/com.raytheon.viz.product.awips/plugin.xml b/cave/com.raytheon.viz.product.awips/plugin.xml
index 4d3362eeff..48ca8ad15e 100644
--- a/cave/com.raytheon.viz.product.awips/plugin.xml
+++ b/cave/com.raytheon.viz.product.awips/plugin.xml
@@ -53,10 +53,6 @@
                name="startupForegroundColor"
                value="000000">
          </property>
-         <property
-               name="windowImages"
-               value="icons/cave_16x16.png,icons/cave_32x32.png,icons/cave_48x48.png,icons/cave_64x64.png,icons/cave_128x128.png">
-         </property>
          <property
                name="rendererFactoryUri"
                value="bundleclass://com.raytheon.uf.viz.personalities.cave/com.raytheon.uf.viz.personalities.cave.presentation.VizRendererFactory">
diff --git a/cave/com.raytheon.viz.product.awips/plugin_customization.ini b/cave/com.raytheon.viz.product.awips/plugin_customization.ini
index 676ffff981..7ebc555198 100644
--- a/cave/com.raytheon.viz.product.awips/plugin_customization.ini
+++ b/cave/com.raytheon.viz.product.awips/plugin_customization.ini
@@ -4,4 +4,4 @@ org.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.cave.scheme
 org.eclipse.ui.editors/lineNumberRuler=true
 org.eclipse.core.resources/snapshots.operations=2147483647
 org.eclipse.core.resources/description.snapshotinterval=2147483647
-org.eclipse.ui/SHOW_MEMORY_MONITOR = false
\ No newline at end of file
+org.eclipse.ui/SHOW_MEMORY_MONITOR = true
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.volumebrowser/plugin.xml b/cave/com.raytheon.viz.volumebrowser/plugin.xml
index d4a739dbec..966430c02f 100644
--- a/cave/com.raytheon.viz.volumebrowser/plugin.xml
+++ b/cave/com.raytheon.viz.volumebrowser/plugin.xml
@@ -80,6 +80,7 @@
                   value="PLANVIEW">
             </parameter>
          </command>
+	<!--
          <command
                commandId="com.raytheon.viz.volumebrowser.volumeBrowserRef"
                label="Cross Sections">
@@ -120,6 +121,7 @@
                   value="SOUNDING">
             </parameter>
          </command>
+	-->
          <separator
                name="afterVB"
                visible="false">