diff --git a/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java b/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java
index d4248a29500d148f792956c2d6de974a9cf9f57f..f9f3fba8d82fa0b0182bc9296d420dd1d1d41002 100644
--- a/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java
+++ b/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java
@@ -567,6 +567,8 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
      */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        boolean isDeviceSelected = (mSenseManager != null && mSenseManager.getDevice() != null);
+        boolean isDeviceConnected = isDeviceSelected && mSenseManager.isConnectedAndAvailable();
         switch (item.getItemId()) {
             case R.id.action_connectdisconnect:
                 mConnectDisconnectPending = true;
@@ -576,8 +578,13 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
             case R.id.action_pick:
                 launchDevicePicker();
                 return true;
-            case R.id.update_fw:
-                checkForFirmwareUpdate();
+            case R.id.data_dump:
+                if (isDeviceConnected){
+                    Toast.makeText(this,R.string.disconnect_message, Toast.LENGTH_SHORT).show();
+                }else {
+                    DataDump();
+                }
+
                 return true;
             case R.id.get_fw_info:
                 getFirmwareInfo();
@@ -591,6 +598,7 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
         return false;
     }
 
+
     /**
      * Callback invoked when the user finishes with the license agreement dialog
      */
@@ -1116,5 +1124,7 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
         mDatabase.insert(WicedDBSchema.ThermoTable.NAME, null, values);
     }
 
-
+    public void DataDump(){
+        Log.d(JEFF_TAG, "Place data dump in ExitConfirmFragment.java");
+    }
 }
diff --git a/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java b/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java
index fe032341212d938e4d3177aac17828b56fd8e31c..9dcf58586de21094550f783b2e70349771b2eff0 100644
--- a/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java
+++ b/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java
@@ -76,7 +76,6 @@ public class ExitConfirmFragment extends DialogFragment implements
         if (mCallback != null) {
             try {
                 if (which == AlertDialog.BUTTON_POSITIVE) {
-                    databaseDump();
                     mCallback.onExit();
                 } else if (which == AlertDialog.BUTTON_NEGATIVE) {
                     mCallback.onExitCancelled();
@@ -86,8 +85,6 @@ public class ExitConfirmFragment extends DialogFragment implements
             }
         }
     }
-    public void databaseDump (){
-        Log.d(JEFF_TAG, "Place data dump in ExitConfirmFragment.java");
-    }
+
 
 }
diff --git a/WicedSense/app/src/main/res/layout/database_output.xml b/WicedSense/app/src/main/res/layout/database_output.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb3d8a258054c81b274252adffcf37b375659a36
--- /dev/null
+++ b/WicedSense/app/src/main/res/layout/database_output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/WicedSense/app/src/main/res/menu/main.xml b/WicedSense/app/src/main/res/menu/main.xml
index 1ec6444001f679d4a44ae658f0947318b4a075cd..221cefc3b72a11e300cb55f4e6ee984b2984408b 100644
--- a/WicedSense/app/src/main/res/menu/main.xml
+++ b/WicedSense/app/src/main/res/menu/main.xml
@@ -33,7 +33,7 @@
     <item
         android:id="@+id/data_dump"
         android:orderInCategory="200"
-        android:title="@string/update_fw"/>
+        android:title="@string/data_dump"/>
     <item
         android:id="@+id/get_fw_info"
         android:orderInCategory="200"
diff --git a/WicedSense/app/src/main/res/values/strings.xml b/WicedSense/app/src/main/res/values/strings.xml
index d229dda32664bcf6936572dd7c8f77940e88beec..07439bd616f9f0c771581d706437c9600fb303b5 100644
--- a/WicedSense/app/src/main/res/values/strings.xml
+++ b/WicedSense/app/src/main/res/values/strings.xml
@@ -43,6 +43,8 @@
     <string name="setting_title_gyro">Gyro</string>
     <string name="setting_title_ecompass">eCompass</string>
     <string name="setting_title_accelerometer">Accelerometer</string>
+    <string name="data_dump">Data Dump</string>
+    <string name="disconnect_message">Disconnect from Wiced first.</string>
    
     <string-array name="temperature_scale_type_names">
         <item>Fahrenheit</item>