diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33ae386..d88a4bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
-    V4.3.0  - added a crude 'flap' detector into OSD Algorithm, added simplified default UI, Improved data sharing data entry.
+    V4.2.11 - added a crude 'flap' detector into OSD Algorithm
     V4.2.10 - fixed (infrequent) crash when opening data sharing page (#195), and crash if log manager fails to start (#196)
     V4.2.9 - fixed crash when using Polish translation.
     V4.2.8 - 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e35b655..14bd92a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,9 +50,6 @@
         <activity
             android:name=".MainActivity2"
             android:exported="false" />
-        <activity
-            android:name=".ActivityMainSimple"
-            android:exported="false" />
         <!--<activity
             android:name=".MlModelManager"
             android:exported="false"
diff --git a/app/src/main/java/uk/org/openseizuredetector/ActivityMainSimple.java b/app/src/main/java/uk/org/openseizuredetector/ActivityMainSimple.java
deleted file mode 100644
index 43adc29..0000000
--- a/app/src/main/java/uk/org/openseizuredetector/ActivityMainSimple.java
+++ /dev/null
@@ -1,1186 +0,0 @@
-/*
-  Pebble_sd - a simple accelerometer based seizure detector that runs on a
-  Pebble smart watch (http://getpebble.com).
-
-  See http://openseizuredetector.org for more information.
-
-  Copyright Graham Jones, 2024
-
-  This file is part of Android_pebble_sd.
-
-  Android_Pebble_sd is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-  
-  Android_Pebble_sd is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-  
-  You should have received a copy of the GNU General Public License
-  along with android_pebble_sd.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-package uk.org.openseizuredetector;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Messenger;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.MenuCompat;
-
-import com.github.mikephil.charting.charts.BarChart;
-import com.github.mikephil.charting.components.XAxis;
-import com.github.mikephil.charting.components.YAxis;
-import com.github.mikephil.charting.data.BarData;
-import com.github.mikephil.charting.data.BarDataSet;
-import com.github.mikephil.charting.data.BarEntry;
-import com.github.mikephil.charting.utils.ValueFormatter;
-import com.rohitss.uceh.UCEHandler;
-
-import java.lang.reflect.Field;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Timer;
-import java.util.TimerTask;
-
-
-public class ActivityMainSimple extends AppCompatActivity {
-    static final String TAG = "ActivityMainSimple";
-    private int okColour = Color.BLUE;
-    private int warnColour = Color.MAGENTA;
-    private int alarmColour = Color.RED;
-    private int okTextColour = Color.WHITE;
-    private int warnTextColour = Color.WHITE;
-    private int alarmTextColour = Color.BLACK;
-    private OsdUtil mUtil;
-    private SdServiceConnection mConnection;
-    private Menu mOptionsMenu;
-
-    private Intent sdServerIntent;
-
-    final Handler serverStatusHandler = new Handler();
-    final Handler mHandler = new Handler();
-    Messenger messenger = new Messenger(new ResponseHandler());
-    Timer mUiTimer;
-    private Context mContext;
-
-    /**
-     * Called when the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "onCreate()");
-
-        // Set our custom uncaught exception handler to report issues.
-        //Thread.setDefaultUncaughtExceptionHandler(new OsdUncaughtExceptionHandler(MainActivity.this));
-        new UCEHandler.Builder(this)
-                .addCommaSeparatedEmailAddresses("crashreports@openseizuredetector.org.uk,")
-                .build();
-
-        mUtil = new OsdUtil(getApplicationContext(), serverStatusHandler);
-        mConnection = new SdServiceConnection(getApplicationContext());
-        mContext = this;
-
-        // Initialise the User Interface
-        setContentView(R.layout.activity_main_simple);
-
-        /* Force display of overflow menu - from stackoverflow
-         * "how to force use of..."
-         */
-        try {
-            Log.v(TAG, "trying menubar fiddle...");
-            ViewConfiguration config = ViewConfiguration.get(this);
-            Field menuKeyField =
-                    ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
-            if (menuKeyField != null) {
-                Log.v(TAG, "menuKeyField is not null - configuring....");
-                menuKeyField.setAccessible(true);
-                menuKeyField.setBoolean(config, false);
-            } else {
-                Log.v(TAG, "menuKeyField is null - doing nothing...");
-            }
-        } catch (Exception e) {
-            Log.v(TAG, "menubar fiddle exception: " + e.toString());
-        }
-
-        // Force the screen to stay on when the app is running
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        // Deal with the 'AcceptAlarm Button'
-        Button button = (Button) findViewById(R.id.acceptAlarmButton);
-        button.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Log.v(TAG, "acceptAlarmButton.onClick()");
-                if (mConnection.mBound) {
-                    if ((mConnection.mSdServer.mSmsTimer != null)
-                            && (mConnection.mSdServer.mSmsTimer.mTimeLeft > 0)) {
-                        Log.i(TAG, "acceptAlarmButton.onClick() - Stopping SMS Timer");
-                        mUtil.showToast(getString(R.string.SMSAlarmCancelledMsg));
-                        mConnection.mSdServer.stopSmsTimer();
-                    } else {
-                        Log.v(TAG, "acceptAlarmButton.onClick() - Accepting Alarm");
-                        mConnection.mSdServer.acceptAlarm();
-                    }
-                }
-            }
-        });
-
-        // Deal with the 'Cancel Audible Button'
-        button = (Button) findViewById(R.id.cancelAudibleButton);
-        button.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Log.v(TAG, "cancelAudibleButton.onClick()");
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.cancelAudible();
-                }
-            }
-        });
-
-        // Deal with the 'Raise Alarm'
-        button = (Button) findViewById(R.id.manualAlarmButton);
-        button.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Log.v(TAG, "manualAlarmButton.onClick()");
-                // Confirmation dialog based on: https://stackoverflow.com/a/12213536/2104584
-                //AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext());
-                //builder.setTitle("Raise Alarm");
-                //builder.setMessage(String.format("Raise a Seizure Detected Alarm NOW?"));
-                //builder.setPositiveButton("YES", new DialogInterface.OnClickListener() {
-                //    @Override
-                //    public void onClick(DialogInterface dialog, int which) {
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.raiseManualAlarm();
-                }
-                //        dialog.dismiss();
-                //    }
-                //});
-                //builder.setNegativeButton("NO", new DialogInterface.OnClickListener() {
-                //    @Override
-                //    public void onClick(DialogInterface dialog, int which) {
-                //        dialog.dismiss();
-                //    }
-                //});
-                //AlertDialog alert = builder.create();
-                //if (!(this).isFinishing()) {
-                //    alert.show();
-                //}
-
-
-            }
-        });
-        // The background service might ask us to show the data sharing dialog if data sharing is not working correctly
-        String actionStr = getIntent().getAction();
-        if (actionStr != null) {
-            Log.i(TAG, "onCreate() - action=" + actionStr);
-            if (actionStr.equals("showDataSharingDialog")) {
-                showDataSharingDialog();
-            }
-        } else {
-            Log.i(TAG, "onCreate - action is null - starting normally");
-        }
-    }
-
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        String actionStr;
-        Log.i(TAG, "onNewIntent");
-        Bundle extras = intent.getExtras();
-        // The background service might ask us to show the data sharing dialog if data sharing is not working correctly
-        actionStr = getIntent().getAction();
-        if (actionStr != null) {
-            Log.i(TAG, "onNewIntent() - action=" + actionStr);
-            if (actionStr.equals("showDataSharingDialog")) {
-                showDataSharingDialog();
-            }
-        } else {
-            if (extras != null) {
-                actionStr = extras.getString("action");
-                if (actionStr.equals("showDataSharingDialog")) {
-                    showDataSharingDialog();
-                }
-                Log.i(TAG, "onNewIntent - extra actionstr is " + actionStr);
-            } else {
-                Log.i(TAG, "onNewIntent - extra actionstr is null - starting normally");
-            }
-        }
-    }
-
-    /**
-     * Create Action Bar
-     */
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        Log.i(TAG, "onCreateOptionsMenu()");
-        getMenuInflater().inflate(R.menu.main_activity_actions, menu);
-        MenuCompat.setGroupDividerEnabled(menu, true);
-        //mOptionsMenu = menu;
-        //if (mConnection.mSdServer.mSdDataSourceName != "Pebble") {
-        //    Log.v(TAG,"Disabling Pebble Specific Menu Items");
-        //    menu.findItem(R.id.action_instal_watch_app).setEnabled(false);
-        //    menu.findItem(R.id.action_launch_pebble_app).setEnabled(false);
-        //}
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        Log.i(TAG, "onOptionsItemSelected() :  " + item.getItemId() + " selected");
-        switch (item.getItemId()) {
-            /*case R.id.action_launch_pebble_app:
-                Log.i(TAG, "action_launch_pebble_app");
-                mConnection.mSdServer.mSdDataSource.startPebbleApp();
-                return true;
-                */
-            case R.id.action_install_watch_app:
-                Log.i(TAG, "action_install_watch_app");
-                mConnection.mSdServer.mSdDataSource.installWatchApp();
-                return true;
-
-            case R.id.action_accept_alarm:
-                Log.i(TAG, "action_accept_alarm");
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.acceptAlarm();
-                }
-                return true;
-            case R.id.action_exit:
-                // Respond to the start/stop server menu item.
-                Log.i(TAG, "action_exit: Stopping Server");
-                mUtil.unbindFromServer(getApplicationContext(), mConnection);
-                stopServer();
-                // We exit this activity as a crude way of forcing the fragments to disconnect from the server
-                // so that the server exits properly - otherwise we end up with multiple threads running.
-                // FIXME - tell the threads to unbind from the serer before calling stopServer as an alternative.
-                finish();
-                return true;
-            case R.id.action_start_stop:
-                Log.i(TAG, "action_start_stop: restarting server");
-                mUtil.showToast("Stopping Background Service....");
-                mUtil.stopServer();
-                // Wait 1 second to give the server chance to shutdown, then re-start it
-                mHandler.postDelayed(new Runnable() {
-                    public void run() {
-                        mUtil.showToast("Re-Starting Background Service...");
-                        mUtil.startServer();
-                    }
-                }, 1000);
-                return true;
-            /* fault beep test does not work with fault timer, so disable test option.
-            case R.id.action_test_fault_beep:
-                Log.i(TAG, "action_test_fault_beep");
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.faultWarningBeep();
-                }
-                return true;
-                */
-            case R.id.action_test_alarm_beep:
-                Log.i(TAG, "action_test_alarm_beep");
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.alarmBeep();
-                }
-                return true;
-            case R.id.action_test_warning_beep:
-                Log.i(TAG, "action_test_warning_beep");
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.warningBeep();
-                }
-                return true;
-            case R.id.action_test_sms_alarm:
-                Log.i(TAG, "action_test_sms_alarm");
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.sendSMSAlarm();
-                }
-                return true;
-
-            /*case R.id.action_test_phone_alarm:
-                Log.i(TAG, "action_test_phone_alarm");
-                if (mConnection.mBound) {
-                    mConnection.mSdServer.sendPhoneAlarm();
-                }
-                return true;
-                */
-
-            case R.id.action_authenticate_api:
-                Log.i(TAG, "action_autheticate_api");
-                try {
-                    Intent i = new Intent(
-                            ActivityMainSimple.this,
-                            AuthenticateActivity.class);
-                    this.startActivity(i);
-                } catch (Exception ex) {
-                    Log.i(TAG, "exception starting export activity " + ex.toString());
-                }
-                return true;
-            case R.id.action_about_datasharing:
-                Log.i(TAG, "action_about_datasharing");
-                showDataSharingDialog();
-                return true;
-            /*
-            case R.id.action_export:
-                Log.i(TAG, "action_export");
-                try {
-                    Intent i = new Intent(
-                            MainActivity.this,
-                            ExportDataActivity.class);
-                    this.startActivity(i);
-                } catch (Exception ex) {
-                    Log.i(TAG, "exception starting export activity " + ex.toString());
-                }
-                return true;
-             */
-            /* case R.id.action_logs:
-                Log.i(TAG, "action_logs");
-                try {
-                    String url = "http://"
-                            + mUtil.getLocalIpAddress()
-                            + ":8080/logfiles.html";
-                    Intent i = new Intent(Intent.ACTION_VIEW);
-                    i.setData(Uri.parse(url));
-                    startActivity(i);
-                    //Intent prefsIntent = new Intent(
-                    //        MainActivity.this,
-                    //        LogManagerActivity.class);
-                    //this.startActivity(prefsIntent);
-                } catch (Exception ex) {
-                    Log.i(TAG, "exception starting log manager activity " + ex.toString());
-                }
-                return true;
-             */
-            case R.id.action_logmanager:
-                Log.i(TAG, "action_logmanager");
-                try {
-                    Intent intent = new Intent(
-                            ActivityMainSimple.this,
-                            LogManagerControlActivity.class);
-                    this.startActivity(intent);
-                } catch (Exception ex) {
-                    Log.i(TAG, "exception starting log manager activity " + ex.toString());
-                }
-                return true;
-            case R.id.action_report_seizure:
-                Log.i(TAG, "action_report_seizure");
-                try {
-                    Intent intent = new Intent(
-                            ActivityMainSimple.this,
-                            ReportSeizureActivity.class);
-                    this.startActivity(intent);
-                } catch (Exception ex) {
-                    Log.i(TAG, "exception starting Report Seizure activity " + ex.toString());
-                }
-                return true;
-            case R.id.action_settings:
-                Log.i(TAG, "action_settings");
-                try {
-                    Intent prefsIntent = new Intent(
-                            ActivityMainSimple.this,
-                            PrefActivity.class);
-                    this.startActivity(prefsIntent);
-                } catch (Exception ex) {
-                    Log.i(TAG, "exception starting settings activity " + ex.toString());
-                }
-                return true;
-            case R.id.action_about:
-                Log.i(TAG, "action_about");
-                showAbout();
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        Log.i(TAG, "onStart()");
-        mUtil.writeToSysLogFile("MainActivity.onStart()");
-        SharedPreferences SP = PreferenceManager
-                .getDefaultSharedPreferences(getBaseContext());
-        boolean audibleAlarm = SP.getBoolean("AudibleAlarm", true);
-        Log.v(TAG, "onStart - auidbleAlarm = " + audibleAlarm);
-
-        TextView tv;
-        tv = (TextView) findViewById(R.id.versionTvSimple);
-        String versionName = mUtil.getAppVersionName();
-        tv.setText(getString(R.string.AppTitleText) + " " + versionName);
-        tv.setBackgroundColor(okColour);
-        tv.setTextColor(okTextColour);
-
-        if (mUtil.isServerRunning()) {
-            mUtil.writeToSysLogFile("MainActivity.onStart - Binding to Server");
-            mUtil.bindToServer(getApplicationContext(), mConnection);
-        } else {
-            Log.i(TAG, "onStart() - Server Not Running");
-            mUtil.writeToSysLogFile("MainActivity.onStart - Server Not Running");
-        }
-        // start timer to refresh user interface every second.
-        mUiTimer = new Timer();
-        mUiTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                updateServerStatus();
-            }
-        }, 0, 1000);
-
-
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        Log.i(TAG, "onStop() - unbinding from server");
-        mUtil.writeToSysLogFile("MainActivity.onStop()");
-        mUtil.unbindFromServer(getApplicationContext(), mConnection);
-        mUiTimer.cancel();
-    }
-
-
-    private void startServer() {
-        mUtil.writeToSysLogFile("MainActivity.startServer()");
-        Log.i(TAG, "startServer(): starting Server...");
-        mUtil.startServer();
-        // Change the action bar icon to show the option to stop the service.
-        if (mOptionsMenu != null) {
-            Log.v(TAG, "Changing menu icons");
-            MenuItem menuItem = mOptionsMenu.findItem(R.id.action_start_stop);
-            menuItem.setIcon(R.drawable.stop_server);
-            menuItem.setTitle(R.string.StopServerTitle);
-        } else {
-            Log.v(TAG, "mOptionsMenu is null - not changing icons!");
-        }
-    }
-
-    private void stopServer() {
-        mUtil.writeToSysLogFile("MainActivity.stopServer()");
-        Log.i(TAG, "stopServer(): stopping Server...");
-        mUtil.stopServer();
-        // Change the action bar icon to show the option to start the service.
-        if (mOptionsMenu != null) {
-            Log.v(TAG, "Changing action bar icons");
-            mOptionsMenu.findItem(R.id.action_start_stop).setIcon(R.drawable.start_server);
-            mOptionsMenu.findItem(R.id.action_start_stop).setTitle(R.string.StartServerTitle);
-        } else {
-            Log.v(TAG, "mOptionsMenu is null, not changing icons!");
-        }
-    }
-
-
-    /*
-     * updateServerStatus - called by the mUiTimer timer periodically.
-     * requests the ui to be updated by calling serverStatusRunnable.
-     */
-    private void updateServerStatus() {
-        serverStatusHandler.post(serverStatusRunnable);
-    }
-
-    /*
-     * serverStatusRunnable - called by serverStatus - updates the
-     * user interface to reflect the current status received from the server.
-     */
-    final Runnable serverStatusRunnable = new Runnable() {
-        public void run() {
-            Log.v(TAG, "serverStatusRunnable()");
-            if (true) return;
-            TextView tv;
-            if (mUtil.isServerRunning()) {
-                LinearLayout ll = (LinearLayout) findViewById(R.id.statusLayoutSimple);
-                ll.setBackgroundColor(okColour);
-                ll = (LinearLayout) findViewById(R.id.watchStatusLl);
-                ll.setBackgroundColor(okColour);
-
-                tv = (TextView) findViewById(R.id.serverStatusTvSimple);
-                if (mConnection.mBound) {
-                    if (mConnection.mSdServer.mSdDataSourceName.equals("Phone")) {
-                        if (mConnection.mSdServer.mLogNDA)
-                            tv.setText(getString(R.string.ServerRunningOK) + "\n" + getString(R.string.DataSource) + " = " + "Phone" + "\n" + "(Demo Mode)" + "\nNDA Logging");
-                        else
-                            tv.setText(getString(R.string.ServerRunningOK) + "\n" + getString(R.string.DataSource) + " = " + "Phone" + "\n" + "(Demo Mode)");
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-                    } else {
-                        if (mConnection.mSdServer.mLogNDA)
-                            tv.setText(getString(R.string.ServerRunningOK) + "\n" + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName + "\nNDA Logging");
-                        else
-                            tv.setText(getString(R.string.ServerRunningOK) + "\n" + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName);
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                    }
-                    tv = (TextView) findViewById(R.id.algsTv);
-                    tv.setText("Algorithms");
-                    tv.setBackgroundColor(okColour);
-                    tv.setTextColor(okTextColour);
-                    tv = (TextView) findViewById(R.id.osdAlgTv);
-                    tv.setText("OSD ");
-                    if (mConnection.mSdServer.mSdData.mOsdAlarmActive) {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-                    } else {
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                    }
-                    tv = (TextView) findViewById(R.id.cnnAlgTv);
-                    tv.setText("CNN ");
-                    if (mConnection.mSdServer.mSdData.mCnnAlarmActive) {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-                    } else {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                    }
-                    tv = (TextView) findViewById(R.id.hrAlgTv);
-                    tv.setText("HR ");
-                    if (mConnection.mSdServer.mSdData.mHRAlarmActive) {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-                    } else {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                    }
-                    tv = (TextView) findViewById(R.id.o2AlgTv);
-                    tv.setText("O2 ");
-                    if (mConnection.mSdServer.mSdData.mO2SatAlarmActive) {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-                    } else {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                    }
-                    /* tv = (TextView) findViewById(R.id.fallAlgTv);
-                    tv.setText("Fall ");
-                    if (mConnection.mSdServer.mSdData.mFallActive) {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-                    } else {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                        tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                    }
-                     */
-                }
-                tv = (TextView) findViewById(R.id.serverIpTv);
-                tv.setText(getString(R.string.AccessServerAt) + " http://"
-                        + mUtil.getLocalIpAddress()
-                        + ":8080");
-                tv.setBackgroundColor(okColour);
-                tv.setTextColor(okTextColour);
-            } else {
-                tv = (TextView) findViewById(R.id.serverStatusTv);
-                tv.setText(R.string.ServerStopped);
-                tv.setBackgroundColor(warnColour);
-                tv.setTextColor(warnTextColour);
-                tv = (TextView) findViewById(R.id.serverIpTv);
-                tv.setText("--");
-                tv.setBackgroundColor(warnColour);
-                tv.setTextColor(warnTextColour);
-            }
-
-
-            try {
-                if (mConnection.mBound) {
-                    tv = (TextView) findViewById(R.id.alarmTv);
-                    if ((mConnection.mSdServer.mSdData.alarmState == 0)
-                            && !mConnection.mSdServer.mSdData.alarmStanding
-                            && !mConnection.mSdServer.mSdData.fallAlarmStanding) {
-                        tv.setText(getString(R.string.okBtnTxt));
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                    }
-                    if ((mConnection.mSdServer.mSdData.alarmState == 1)
-                            && !mConnection.mSdServer.mSdData.alarmStanding
-                            && !mConnection.mSdServer.mSdData.fallAlarmStanding) {
-                        tv.setText(R.string.Warning);
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-                    }
-                    if (mConnection.mSdServer.mSdData.alarmState == 6) {
-                        tv.setText(R.string.Mute);
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-                    }
-                    if (mConnection.mSdServer.mSdData.alarmStanding) {
-                        tv.setText(getString(R.string.Alarm) + "\n" + mConnection.mSdServer.mSdData.alarmCause);
-                        tv.setBackgroundColor(alarmColour);
-                        tv.setTextColor(alarmTextColour);
-                    }
-                    if (mConnection.mSdServer.mSdData.fallAlarmStanding) {
-                        tv.setText(R.string.Fall);
-                        tv.setBackgroundColor(alarmColour);
-                        tv.setTextColor(alarmTextColour);
-                    }
-
-                    tv = (TextView) findViewById(R.id.data_time_tv);
-                    tv.setText(mConnection.mSdServer.mSdData.dataTime.format("%H:%M:%S"));
-                    tv.setBackgroundColor(okColour);
-                    tv.setTextColor(okTextColour);
-
-                    // Pebble Connected Phrase - use for HR if active instead.
-                    tv = (TextView) findViewById(R.id.pebbleTv);
-                    //if (mConnection.mSdServer.mSdData.mHRAlarmActive) {
-                    if (mConnection.mSdServer.mSdData.mO2Sat > 0) {
-                        tv.setText(getString(R.string.HR_Equals) + " " + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n"
-                                + "(av = "
-                                + Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage) + ", "
-                                + Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage) + " bpm)\n"
-                                + getString(R.string.SpO2) + " = " + Math.round(mConnection.mSdServer.mSdData.mO2Sat) + "%");
-                    } else {
-                        tv.setText(getString(R.string.HR_Equals) + " " + Math.round(mConnection.mSdServer.mSdData.mHR) + " bpm\n"
-                                + "(av = "
-                                + Math.round(mConnection.mSdServer.mSdData.mAdaptiveHrAverage) + ", "
-                                + Math.round(mConnection.mSdServer.mSdData.mAverageHrAverage) + " bpm)\n"
-                                + getString(R.string.SpO2) + " = ---%");
-                    }
-                    if (mConnection.mSdServer.mSdData.mHRAlarmStanding
-                            || mConnection.mSdServer.mSdData.mAdaptiveHrAlarmStanding
-                            || mConnection.mSdServer.mSdData.mAverageHrAlarmStanding
-                            || mConnection.mSdServer.mSdData.mO2SatAlarmStanding) {
-                        tv.setBackgroundColor(alarmColour);
-                        tv.setTextColor(alarmTextColour);
-                    } else if (mConnection.mSdServer.mSdData.mHRFaultStanding || mConnection.mSdServer.mSdData.mO2SatFaultStanding) {
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-                    } else {
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                    }
-                    /*} else {
-                        if (mConnection.mSdServer.mSdData.watchConnected) {
-                            tv.setText(R.string.HRAlarmOff);
-                            tv.setBackgroundColor(okColour);
-                            tv.setTextColor(okTextColour);
-
-                        } else {
-                            tv.setText(getString(R.string.WatchNotConnected));
-                            tv.setBackgroundColor(warnColour);
-                            tv.setTextColor(warnTextColour);
-                        }
-                    }
-                    */
-
-                    tv = (TextView) findViewById(R.id.fragment_watch_app_status_tv);
-                    if (mConnection.mSdServer.mSdData.watchAppRunning) {
-                        tv.setText(R.string.WatchAppOK);
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-                    } else {
-                        tv.setText(R.string.WatchAppNotRunning);
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-                    }
-                    tv = (TextView) findViewById(R.id.battTv);
-                    if (mConnection.mSdServer.mSdData.dataSourceName.equals("Phone")) {
-                        tv.setText(getString(R.string.WatchBatteryEquals)
-                                + "---% / "
-                                + String.valueOf(mConnection.mSdServer.mSdData.phoneBatteryPc) + "%");
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-
-                    } else {
-                        tv.setText(getString(R.string.WatchBatteryEquals)
-                                + String.valueOf(mConnection.mSdServer.mSdData.batteryPc) + "% / "
-                                + String.valueOf(mConnection.mSdServer.mSdData.phoneBatteryPc) + "%");
-
-                        if (mConnection.mSdServer.mSdData.batteryPc <= 10) {
-                            tv.setBackgroundColor(alarmColour);
-                            tv.setTextColor(alarmTextColour);
-                        }
-                        if (mConnection.mSdServer.mSdData.batteryPc > 10) {
-                            tv.setBackgroundColor(warnColour);
-                            tv.setTextColor(warnTextColour);
-                        }
-                        if (mConnection.mSdServer.mSdData.batteryPc >= 20) {
-                            tv.setBackgroundColor(okColour);
-                            tv.setTextColor(okTextColour);
-                        }
-                    }
-                    ////////////////////////////////////////////////////////////
-                    // 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);
-                    if (mConnection.mSdServer.mLogNDA)
-                        tv.setText(getString(R.string.data_sharing_status)
-                                + ": "
-                                + getString(R.string.data_sharing_setup_ok)
-                                + ": " + getString(R.string.nda_logging));
-                    else
-                        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.checkServerConnection()) {
-                        // Problem connecting to server
-                        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);
-                    }
-
-                    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)
-                        powerPc = mConnection.mSdServer.mSdData.roiPower * 100 /
-                                mConnection.mSdServer.mSdData.alarmThresh;
-                    else
-                        powerPc = 0;
-
-                    long specPc;
-                    if (mConnection.mSdServer.mSdData.specPower != 0 &&
-                            mConnection.mSdServer.mSdData.alarmRatioThresh != 0)
-                        specPc = 100 * (mConnection.mSdServer.mSdData.roiPower * 10 /
-                                mConnection.mSdServer.mSdData.specPower) /
-                                mConnection.mSdServer.mSdData.alarmRatioThresh;
-                    else
-                        specPc = 0;
-
-                    long specRatio;
-                    if (mConnection.mSdServer.mSdData.specPower != 0) {
-                        specRatio = 10 * mConnection.mSdServer.mSdData.roiPower /
-                                mConnection.mSdServer.mSdData.specPower;
-                    } else
-                        specRatio = 0;
-
-                    long pSeizurePc;
-                    pSeizurePc = (long) (mConnection.mSdServer.mSdData.mPseizure * 100);
-                    Log.d(TAG, "pSeizurePc=" + pSeizurePc + ", mPseizure=" + mConnection.mSdServer.mSdData.mPseizure);
-                    ((TextView) findViewById(R.id.powerTv)).setText(getString(R.string.PowerEquals) + mConnection.mSdServer.mSdData.roiPower +
-                            " (" + getString(R.string.Threshold) + "=" + mConnection.mSdServer.mSdData.alarmThresh + ")");
-                    ((TextView) findViewById(R.id.spectrumTv)).setText(getString(R.string.SpectrumRatioEquals) + specRatio +
-                            " (" + getString(R.string.Threshold) + "=" + mConnection.mSdServer.mSdData.alarmRatioThresh + ")");
-                    ((TextView) findViewById(R.id.pSeizureTv)).setText(getString(R.string.seizure_probability) + " = " + pSeizurePc + "%");
-
-                    ProgressBar pb;
-                    Drawable pbDrawable;
-                    pb = ((ProgressBar) findViewById(R.id.powerProgressBar));
-                    pb.setMax(100);
-                    pb.setProgress((int) powerPc);
-                    pbDrawable = getResources().getDrawable(R.drawable.progress_bar_blue);
-                    if (powerPc > 75)
-                        pbDrawable = getResources().getDrawable(R.drawable.progress_bar_yellow);
-                    if (powerPc > 100)
-                        pbDrawable = getResources().getDrawable(R.drawable.progress_bar_red);
-
-                    //pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
-
-                    pb.setProgressDrawable(pbDrawable);
-
-                    pb = ((ProgressBar) findViewById(R.id.spectrumProgressBar));
-                    pb.setMax(100);
-                    pb.setProgress((int) specPc);
-                    pbDrawable = getResources().getDrawable(R.drawable.progress_bar_blue);
-                    if (specPc > 75)
-                        pbDrawable = getResources().getDrawable(R.drawable.progress_bar_yellow);
-                    if (specPc > 100)
-                        pbDrawable = getResources().getDrawable(R.drawable.progress_bar_red);
-                    //pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
-                    pb.setProgressDrawable(pbDrawable);
-
-                    pb = ((ProgressBar) findViewById(R.id.pSeizureProgressBar));
-                    pb.setMax(100);
-                    pb.setProgress((int) pSeizurePc);
-                    pbDrawable = getResources().getDrawable(R.drawable.progress_bar_blue);
-                    if (pSeizurePc > 30)
-                        pbDrawable = getResources().getDrawable(R.drawable.progress_bar_yellow);
-                    if (pSeizurePc > 50)
-                        pbDrawable = getResources().getDrawable(R.drawable.progress_bar_red);
-                    //pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
-                    pb.setProgressDrawable(pbDrawable);
-
-
-                    // Fault Conditions - We override the values in the UI because we do not know
-                    // if the stored ones are correct or not with a fault present.
-                    if ((mConnection.mSdServer.mSdData.alarmState == 4) ||
-                            (mConnection.mSdServer.mSdData.alarmState == 7) || mConnection.mSdServer.mSdData.mHrFrozenFaultStanding) {
-                        tv = (TextView) findViewById(R.id.alarmTv);
-                        if (mConnection.mSdServer.mSdData.alarmState == 4 || mConnection.mSdServer.mSdData.mHrFrozenFaultStanding) {
-                            tv.setText(R.string.Fault);
-                            tv.setBackgroundColor(warnColour);
-                            tv.setTextColor(warnTextColour);
-                        }
-                        if (mConnection.mSdServer.mSdData.alarmState == 7) {
-                            tv.setText(R.string.NetFault);
-                            tv.setBackgroundColor(warnColour);
-                            tv.setTextColor(warnTextColour);
-                        }
-                        tv = (TextView) findViewById(R.id.data_time_tv);
-                        tv.setText(mConnection.mSdServer.mSdData.dataTime.format("%H:%M:%S"));
-                        tv.setBackgroundColor(okColour);
-                        tv.setTextColor(okTextColour);
-
-                        tv = (TextView) findViewById(R.id.data_time_tv);
-                        tv.setText("--:--:--");
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-
-                        tv = (TextView) findViewById(R.id.pebbleTv);
-                        //tv.setText(getString(R.string.HR_Equals) + " --- bpm\n"+getString(R.string.o2_sat)+" = --- %");
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-
-                        tv = (TextView) findViewById(R.id.fragment_watch_app_status_tv);
-                        tv.setText(getString(R.string.WatchApp) + " ----");
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-
-                        tv = (TextView) findViewById(R.id.battTv);
-                        tv.setText(getString(R.string.WatchBatteryEquals) + " ---%");
-                        tv.setBackgroundColor(warnColour);
-                        tv.setTextColor(warnTextColour);
-                    }
-                } else {   // Not bound to server
-                    tv = (TextView) findViewById(R.id.alarmTv);
-                    tv.setText(R.string.Dashes);
-                    tv.setBackgroundColor(warnColour);
-                    tv.setTextColor(warnTextColour);
-                    tv = (TextView) findViewById(R.id.data_time_tv);
-                    tv.setText(mConnection.mSdServer.mSdData.dataTime.format("%H:%M:%S"));
-                    tv.setBackgroundColor(okColour);
-                    tv.setTextColor(okTextColour);
-
-                    tv = (TextView) findViewById(R.id.data_time_tv);
-                    tv.setText("--:--:--");
-                    tv.setBackgroundColor(warnColour);
-                    tv.setTextColor(warnTextColour);
-
-                    tv = (TextView) findViewById(R.id.pebbleTv);
-                    tv.setText(getString(R.string.HR_Equals) + "---");
-                    tv.setBackgroundColor(warnColour);
-                    tv.setTextColor(warnTextColour);
-
-                    tv = (TextView) findViewById(R.id.fragment_watch_app_status_tv);
-                    tv.setText(getString(R.string.WatchApp) + " -----");
-                    tv.setBackgroundColor(warnColour);
-                    tv.setTextColor(warnTextColour);
-
-                    tv = (TextView) findViewById(R.id.battTv);
-                    tv.setText(getString(R.string.WatchBatteryEquals) + " ---%");
-                    tv.setBackgroundColor(warnColour);
-                    tv.setTextColor(warnTextColour);
-
-                    tv = (TextView) findViewById(R.id.remoteDbTv);
-                    tv.setText("---");
-                    tv.setBackgroundColor(warnColour);
-                    tv.setTextColor(warnTextColour);
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "ServerStatusRunnable: Exception - ");
-                e.printStackTrace();
-            }
-
-            // deal with latch alarms button
-            Button acceptAlarmButton = (Button) findViewById(R.id.acceptAlarmButton);
-
-            if (mConnection.mBound) {
-                if ((mConnection.mSdServer.mSmsTimer != null)
-                        && (mConnection.mSdServer.mSmsTimer.mTimeLeft > 0)) {
-                    acceptAlarmButton.setText(getString(R.string.SMSWillBeSentIn) + " " +
-                            mConnection.mSdServer.mSmsTimer.mTimeLeft / 1000 +
-                            " s - " + getString(R.string.Cancel));
-                    acceptAlarmButton.setBackgroundColor(alarmColour);
-                    acceptAlarmButton.setEnabled(true);
-                } else {
-                    acceptAlarmButton.setText(R.string.AcceptAlarm);
-                    acceptAlarmButton.setBackgroundColor(Color.GRAY);
-                    if (mConnection.mBound)
-                        if ((mConnection.mSdServer.isLatchAlarms())
-                                || mConnection.mSdServer.mSdData.mFallActive) {
-                            acceptAlarmButton.setEnabled(true);
-                        } else {
-                            acceptAlarmButton.setEnabled(false);
-                        }
-                }
-            } else {
-                acceptAlarmButton.setText(getString(R.string.AcceptAlarm));
-                acceptAlarmButton.setBackgroundColor(Color.DKGRAY);
-                acceptAlarmButton.setEnabled(false);
-            }
-
-            // Deal with Cancel Audible button
-            Button cancelAudibleButton =
-                    (Button) findViewById(R.id.cancelAudibleButton);
-            if (mConnection.mBound)
-                if (mConnection.mSdServer.isAudibleCancelled()) {
-                    cancelAudibleButton.setText(getString(R.string.AudibleAlarmsCancelledFor)
-                            + " " + mConnection.mSdServer.
-                            cancelAudibleTimeRemaining()
-                            + " sec");
-                    cancelAudibleButton.setEnabled(true);
-                } else {
-                    if (mConnection.mSdServer.mAudibleAlarm) {
-                        cancelAudibleButton.setText(R.string.CancelAudibleAlarms);
-                        cancelAudibleButton.setEnabled(true);
-                    } else {
-                        cancelAudibleButton.setText(R.string.AudibleAlarmsOff);
-                        cancelAudibleButton.setEnabled(false);
-                    }
-                }
-
-            ////////////////////////////////////////////////////////////
-            // Produce graph
-            BarChart mChart = (BarChart) findViewById(R.id.chart1);
-            mChart.setDrawBarShadow(false);
-            mChart.setNoDataTextDescription("You need to provide data for the chart.");
-            mChart.setDescription("");
-
-            // X and Y Values
-            ArrayList<String> xVals = new ArrayList<String>();
-            ArrayList<BarEntry> yBarVals = new ArrayList<BarEntry>();
-            for (int i = 0; i < 10; i++) {
-                xVals.add(i + "-" + (i + 1) + " Hz");
-                if (mConnection.mSdServer != null) {
-                    yBarVals.add(new BarEntry(mConnection.mSdServer.mSdData.simpleSpec[i], i));
-                } else {
-                    yBarVals.add(new BarEntry(i, i));
-                }
-            }
-
-            // create a dataset and give it a type
-            BarDataSet barDataSet = new BarDataSet(yBarVals, "Spectrum");
-            try {
-                int[] barColours = new int[10];
-                for (int i = 0; i < 10; i++) {
-                    if ((i < mConnection.mSdServer.mSdData.alarmFreqMin) ||
-                            (i > mConnection.mSdServer.mSdData.alarmFreqMax)) {
-                        barColours[i] = Color.GRAY;
-                    } else {
-                        barColours[i] = Color.RED;
-                    }
-                }
-                barDataSet.setColors(barColours);
-            } catch (NullPointerException e) {
-                Log.e(TAG, "Null pointer exception setting bar colours");
-            }
-            barDataSet.setBarSpacePercent(20f);
-            barDataSet.setBarShadowColor(Color.WHITE);
-            BarData barData = new BarData(xVals, barDataSet);
-            barData.setValueFormatter(new ValueFormatter() {
-                @Override
-                public String getFormattedValue(float v) {
-                    DecimalFormat format = new DecimalFormat("####");
-                    return format.format(v);
-                }
-            });
-            mChart.setData(barData);
-
-            // format the axes
-            XAxis xAxis = mChart.getXAxis();
-            xAxis.setPosition(XAxis.XAxisPosition.BOTTOM);
-            xAxis.setTextSize(10f);
-            xAxis.setDrawAxisLine(true);
-            xAxis.setDrawLabels(true);
-            // Note:  the default text colour is BLACK, so does not show up on black background!!!
-            //  This took a lot of finding....
-            xAxis.setTextColor(Color.WHITE);
-            xAxis.setDrawGridLines(false);
-
-            YAxis yAxis = mChart.getAxisLeft();
-            yAxis.setAxisMinValue(0f);
-            yAxis.setAxisMaxValue(3000f);
-            yAxis.setDrawGridLines(true);
-            yAxis.setDrawLabels(true);
-            yAxis.setTextColor(Color.WHITE);
-            yAxis.setValueFormatter(new ValueFormatter() {
-                @Override
-                public String getFormattedValue(float v) {
-                    DecimalFormat format = new DecimalFormat("#####");
-                    return format.format(v);
-                }
-            });
-
-            YAxis yAxis2 = mChart.getAxisRight();
-            yAxis2.setDrawGridLines(false);
-
-            try {
-                mChart.getLegend().setEnabled(false);
-            } catch (NullPointerException e) {
-                Log.e(TAG, "Null Pointer Exception setting legend");
-            }
-
-            mChart.invalidate();
-        }
-    };
-
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        Log.i(TAG, "onPause()");
-        mUtil.writeToSysLogFile("MainActivity.onPause()");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Log.i(TAG, "onResume()");
-        mUtil.writeToSysLogFile("MainActivity.onResume()");
-
-        // Check to see if the user has asked for the new user interface to be used instead of this one
-        // and start that if necessary.
-        try {
-            SharedPreferences SP = PreferenceManager
-                    .getDefaultSharedPreferences(getBaseContext());
-            boolean useNewUi = SP.getBoolean("UseNewUi", false);
-            if (useNewUi) {
-                Log.i(TAG,"onResume() - launching new User Interface");
-                Intent intent = new Intent(
-                        getApplicationContext(),
-                        MainActivity2.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-                startActivity(intent);
-                finish();
-            }
-        } catch (Exception ex) {
-            Log.e(TAG, "exception starting main activity " + ex.toString());
-        }
-    }
-
-
-    private void showAbout() {
-        mUtil.writeToSysLogFile("MainActivity.showAbout()");
-        View aboutView = getLayoutInflater().inflate(R.layout.about_layout, null, false);
-        String versionName = mUtil.getAppVersionName();
-        Log.i(TAG, "showAbout() - version name = " + versionName);
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setIcon(R.drawable.icon_24x24);
-        builder.setTitle("OpenSeizureDetector V" + versionName);
-        builder.setNeutralButton(getString(R.string.closeBtnTxt), new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                dialog.cancel();
-            }
-        });
-        builder.setPositiveButton(R.string.privacy_policy_button_title, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                dialog.cancel();
-                String url = OsdUtil.PRIVACY_POLICY_URL;
-                Intent i = new Intent(Intent.ACTION_VIEW);
-                i.setData(Uri.parse(url));
-                startActivity(i);
-                dialog.cancel();
-            }
-        });
-        builder.setNegativeButton(R.string.data_sharing_button_title, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                dialog.cancel();
-                String url = OsdUtil.DATA_SHARING_URL;
-                Intent i = new Intent(Intent.ACTION_VIEW);
-                i.setData(Uri.parse(url));
-                startActivity(i);
-                dialog.cancel();
-            }
-        });
-        builder.setView(aboutView);
-        builder.create();
-        builder.show();
-    }
-
-    private void showDataSharingDialog() {
-        mUtil.writeToSysLogFile("MainActivity.showDataSharingDialog()");
-        View aboutView = getLayoutInflater().inflate(R.layout.data_sharing_dialog_layout, null, false);
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setIcon(R.drawable.datasharing_fault_24x24);
-        builder.setTitle(R.string.data_sharing_dialog_title);
-        builder.setNegativeButton(getString(R.string.cancel), null);
-        builder.setPositiveButton(getString(R.string.login), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                Log.i(TAG, "dataSharingDialog.positiveButton.onClick()");
-                try {
-                    Intent i = new Intent(
-                            ActivityMainSimple.this,
-                            AuthenticateActivity.class);
-                    mContext.startActivity(i);
-                } catch (Exception ex) {
-                    Log.i(TAG, "exception starting activity " + ex.toString());
-                }
-
-            }
-        });
-        builder.setView(aboutView);
-        builder.create();
-        builder.show();
-    }
-
-
-    static class ResponseHandler extends Handler {
-        @Override
-        public void handleMessage(Message message) {
-            Log.i(TAG, "Message=" + message.toString());
-        }
-    }
-
-}
diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
index fb4873c..4ee024e 100644
--- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
@@ -512,7 +512,7 @@ public class StartupActivity extends AppCompatActivity {
                             } else {
                                 intent = new Intent(
                                         getApplicationContext(),
-                                        ActivityMainSimple.class);
+                                        MainActivity.class);
                             }
                             intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
                             startActivity(intent);
diff --git a/app/src/main/res/layout/activity_main_simple.xml b/app/src/main/res/layout/activity_main_simple.xml
index f7178cc..a00ae34 100644
--- a/app/src/main/res/layout/activity_main_simple.xml
+++ b/app/src/main/res/layout/activity_main_simple.xml
@@ -6,136 +6,21 @@
     android:layout_height="fill_parent"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/statusLayoutSimple"
+    <TextView
+        android:id="@+id/versionTv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
-        <TextView
-            android:id="@+id/versionTvSimple"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name" />
-        <TextView
-            android:id="@+id/serverStatusTvSimple"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/app_name" />
+        android:text="@string/app_name" />
 
-    </LinearLayout>
 
-    <LinearLayout
+    <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/fragment_common_container_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="100">
-        <TextView
-            android:id="@+id/alg1NameTv"
-            android:layout_weight="70"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="OSD" />
-        <TextView
-            android:id="@+id/alg1StatusTv"
-            android:layout_weight="70"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="alg1StatusTv" />
-    </LinearLayout>
+        android:layout_height="wrap_content" />
 
-    <LinearLayout
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/fragment_pager"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="100">
-        <TextView
-            android:id="@+id/alg2NameTv"
-            android:layout_weight="70"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="Flap" />
-        <TextView
-            android:id="@+id/alg2StatusTv"
-            android:layout_width="0dp"
-            android:layout_weight="70"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="alg2StatusTv" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="100">
-        <TextView
-            android:id="@+id/alg3NameTv"
-            android:layout_weight="70"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="CNN" />
-        <TextView
-            android:id="@+id/alg3StatusTv"
-            android:layout_width="0dp"
-            android:layout_weight="70"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="alg3StatusTv longer text" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="100">
-        <TextView
-            android:id="@+id/alg4NameTv"
-            android:layout_weight="70"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="HR" />
-        <TextView
-            android:id="@+id/alg4StatusTv"
-            android:layout_width="0dp"
-            android:layout_weight="70"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="alg3StatusTv longer text" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false">
-
-        <Button
-            android:id="@+id/acceptAlarmButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/AcceptAlarmBtnTxt" />
-
-        <Button
-            android:id="@+id/cancelAudibleButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/CancelAudibleButtonTxt" />
-
-        <Button
-            android:id="@+id/manualAlarmButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:backgroundTint="#ff0000"
-            android:text="@string/ManualAlarmBtnTxt" />
-    </LinearLayout>
-
-
+        android:layout_height="match_parent" />
 </LinearLayout>
\ No newline at end of file