diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index 61b6435..a0331b6 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -571,79 +571,64 @@ public class MainActivity extends AppCompatActivity {
                         tv.setTextColor(okTextColour);
                     }
 
-                    if (mConnection.mSdServer.mLogData) {
-                        if (mConnection.mSdServer.mLogDataRemote) {
-                            if (mConnection.mSdServer.mLm.mWac.isLoggedIn()) {
-                                if (!mConnection.mSdServer.mLogDataRemoteMobile) {
-                                    Log.v(TAG,"mLogDataRemoteMobile="+mConnection.mSdServer.mLogDataRemoteMobile);
-                                    Log.v(TAG,"mUtil.isMobileDataActive="+mUtil.isMobileDataActive());
-                                    if (mUtil.isNetworkConnected()) {
-                                        if (mUtil.isMobileDataActive()) {
-                                            tv = (TextView) findViewById(R.id.remoteDbTv);
-                                            tv.setText(getString(R.string.data_sharing_status)
-                                                    + ": "
-                                                    + getString(R.string.not_updating_mobile));
-                                            tv.setBackgroundColor(warnColour);
-                                            tv.setTextColor(warnTextColour);
-                                        } else {
-                                            if (mConnection.mSdServer.mLm.mWac.mServerConnectionOk) {
-                                                tv = (TextView) findViewById(R.id.remoteDbTv);
-                                                tv.setText(getString(R.string.data_sharing_status)
-                                                        + ": "
-                                                        + getString(R.string.data_sharing_setup_ok));
-                                                tv.setBackgroundColor(okColour);
-                                                tv.setTextColor(okTextColour);
-                                            } else {
-                                                tv = (TextView) findViewById(R.id.remoteDbTv);
-                                                tv.setText(getString(R.string.data_sharing_status)
-                                                        + ": "
-                                                        + getString(R.string.error_connecting_to_server));
-                                                tv.setBackgroundColor(warnColour);
-                                                tv.setTextColor(warnTextColour);
-                                            }
-                                        }
-                                    } else {
-                                        tv = (TextView) findViewById(R.id.remoteDbTv);
-                                        tv.setText(getString(R.string.data_sharing_status)
-                                                + ": "
-                                                + getString(R.string.not_updating_no_network));
-                                        tv.setBackgroundColor(warnColour);
-                                        tv.setTextColor(warnTextColour);
-                                    }
-                                } else {
-                                    tv = (TextView) findViewById(R.id.remoteDbTv);
-                                    tv.setText(getString(R.string.data_sharing_status)
-                                            + ": "
-                                            + getString(R.string.data_sharing_setup_ok));
-                                    tv.setBackgroundColor(okColour);
-                                    tv.setTextColor(okTextColour);
-                                }
-                            } else {
-                                tv = (TextView) findViewById(R.id.remoteDbTv);
-                                tv.setText(getString(R.string.data_sharing_status)
-                                        +": "
-                                        +getString(R.string.not_logged_in));
-                                tv.setBackgroundColor(warnColour);
-                                tv.setTextColor(warnTextColour);
-                            }
-                        } else {
-                            tv = (TextView) findViewById(R.id.remoteDbTv);
-                            tv.setText(getString(R.string.data_sharing_status)
-                                    +": "
-                                    +getString(R.string.not_sharing_logged_data));
-                            tv.setBackgroundColor(warnColour);
-                            tv.setTextColor(warnTextColour);
-                        }
-                    } else {
+                    ////////////////////////////////////////////////////////////
+                    // Populate the Data Sharing Status Box
+                    // We start off with it set to OK, then check for several different abnormal conditions
+                    // in turn - the last one that is active is the one that is displayed.
+                    tv = (TextView) findViewById(R.id.remoteDbTv);
+                    tv.setText(getString(R.string.data_sharing_status)
+                            + ": "
+                            + getString(R.string.data_sharing_setup_ok));
+                    tv.setBackgroundColor(okColour);
+                    tv.setTextColor(okTextColour);
+
+                    if (!mConnection.mSdServer.mLm.mWac.mServerConnectionOk) {
+                        // Problem connecting to server
                         tv = (TextView) findViewById(R.id.remoteDbTv);
                         tv.setText(getString(R.string.data_sharing_status)
-                                +": "
-                                +getString(R.string.not_logging_data));
+                                + ": "
+                                + getString(R.string.error_connecting_to_server));
                         tv.setBackgroundColor(warnColour);
                         tv.setTextColor(warnTextColour);
                     }
 
+                    if (!mConnection.mSdServer.mLogDataRemoteMobile && mUtil.isMobileDataActive()) {
+                        // We are on mobile internet but we are set to not upload over mobile data.
+                        tv.setText(getString(R.string.data_sharing_status)
+                                + ": "
+                                + getString(R.string.not_updating_mobile));
+                        tv.setBackgroundColor(warnColour);
+                        tv.setTextColor(warnTextColour);
+                    }
 
+                    if (!mUtil.isNetworkConnected()) {
+                        // No network connection
+                        tv.setText(getString(R.string.data_sharing_status)
+                                + ": "
+                                + getString(R.string.not_updating_no_network));
+                        tv.setBackgroundColor(warnColour);
+                        tv.setTextColor(warnTextColour);
+                    }
+
+                    if (!mConnection.mSdServer.mLm.mWac.isLoggedIn()) {
+                        // Not Logged In
+                        tv.setText(getString(R.string.data_sharing_status)
+                                + ": "
+                                + getString(R.string.not_logged_in));
+                        tv.setBackgroundColor(warnColour);
+                        tv.setTextColor(warnTextColour);
+                    }
+
+                    if (!mConnection.mSdServer.mLogData) {
+                        // Not set to share data
+                        tv.setText(getString(R.string.data_sharing_status)
+                                + ": "
+                                + getString(R.string.not_sharing_logged_data));
+                        tv.setBackgroundColor(warnColour);
+                        tv.setTextColor(warnTextColour);
+                    }
+
+                    /////////////////////////////////////////////////////
                     // Set ProgressBars to show margin to alarm.
                     long powerPc;
                     if (mConnection.mSdServer.mSdData.alarmThresh != 0)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e500dbc..14c3ab5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -331,7 +331,7 @@
     <string name="reset_password">Reset Password</string>
     <string name="login_to_osdapi">Log in to Share Data</string>
     <string name="login">Log In</string>
-    <string name="data_sharing_status">Data Sharing Status</string>
+    <string name="data_sharing_status">Data Sharing</string>
     <string name="not_logging_data">Not Logging Data</string>
     <string name="not_sharing_logged_data">Not Sharing Logged Data</string>
     <string name="not_logged_in">Not Logged In</string>
@@ -339,6 +339,6 @@
     <string name="please_confirm_seizure_events">Please Check your Shared Seizure Events</string>
     <string name="data_sharing_log_in">Data Sharing Log-In</string>
     <string name="not_updating_mobile">Not Updating using Mobile Internet</string>
-    <string name="not_updating_no_network">Not Updating - No Network Connection</string>
+    <string name="not_updating_no_network">No Network Connection</string>
     <string name="error_connecting_to_server">Error Connecting to Server</string>
 </resources>