diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f51a7c..5451c73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
     android:versionCode="92"
-    android:versionName="4.0.0d">
+    android:versionName="4.0.0e">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index 5ac2ac8..6de47ce 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -36,6 +36,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.preference.PreferenceManager;
+import android.support.v4.view.MenuCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
@@ -200,6 +201,7 @@ public class MainActivity extends AppCompatActivity {
     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");
@@ -279,7 +281,7 @@ public class MainActivity extends AppCompatActivity {
                 return true;
                 */
 
-/*            case R.id.action_authenticate_api:
+           case R.id.action_authenticate_api:
                 Log.i(TAG, "action_autheticate_api");
                 try {
                     Intent i = new Intent(
@@ -290,7 +292,7 @@ public class MainActivity extends AppCompatActivity {
                     Log.i(TAG, "exception starting export activity " + ex.toString());
                 }
                 return true;
-                */
+
             /*
             case R.id.action_export:
                 Log.i(TAG, "action_export");
diff --git a/app/src/main/res/menu/main_activity_actions.xml b/app/src/main/res/menu/main_activity_actions.xml
index 8b01d35..3c972cc 100644
--- a/app/src/main/res/menu/main_activity_actions.xml
+++ b/app/src/main/res/menu/main_activity_actions.xml
@@ -1,108 +1,96 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_accept_alarm"
-        android:showAsAction="never|withText"
-        android:title="@string/accept_alarm" />
+    <group android:id="@+id/grp1">
+        <item
+            android:id="@+id/action_accept_alarm"
+            android:showAsAction="never|withText"
+            android:title="@string/accept_alarm" />
+    </group>
+
+    <group android:id="@+id/grp2">
+        <item
+            android:id="@+id/action_start_stop"
+            android:icon="@drawable/stop_server"
+            android:showAsAction="never|withText"
+            android:title="@string/start_stop_server" />
+    </group>
+    <group android:id="@+id/grp3">
+        <item
+            android:id="@+id/action_report_seizure"
+            android:enabled="true"
+            android:icon="@drawable/ic_action_settings"
+            android:showAsAction="never|withText"
+            android:title="@string/report_seizure" />
+
+        <item
+            android:id="@+id/action_logmanager"
+            android:enabled="true"
+            android:icon="@drawable/ic_action_settings"
+            android:showAsAction="never|withText"
+            android:title="@string/data_log_manager" />
+
+        <item
+            android:id="@+id/action_authenticate_api"
+            android:enabled="true"
+            android:icon="@drawable/ic_action_settings"
+            android:showAsAction="never|withText"
+            android:title="@string/data_sharing_log_in" />
+
+    </group>
+    <group android:id="@+id/grp4">
+        <item
+            android:id="@+id/action_install_watch_app"
+            android:showAsAction="never|withText"
+            android:title="@string/install_watch_app" />
+
+        <item
+            android:id="@+id/action_test_alarm_beep"
+            android:icon="@drawable/stop_server"
+            android:showAsAction="never|withText"
+            android:title="@string/test_alarm_beep" />
+
+        <item
+            android:id="@+id/action_test_warning_beep"
+            android:icon="@drawable/stop_server"
+            android:showAsAction="never|withText"
+            android:title="@string/test_warning_beep" />
+
+        <item
+            android:id="@+id/action_test_sms_alarm"
+            android:icon="@drawable/stop_server"
+            android:showAsAction="never|withText"
+            android:title="@string/test_sms_alarm_notification" />
+    </group>
+    <group android:id="@+id/grp5">
+        <item
+            android:id="@+id/action_logs"
+            android:enabled="true"
+            android:icon="@drawable/ic_action_settings"
+            android:showAsAction="never|withText"
+            android:title="@string/view_log_entries" />
+        <!--
+            <item
+                android:enabled="false"
+                android:id="@+id/action_export"
+                android:icon="@drawable/ic_action_settings"
+                android:showAsAction="never|withText"
+                android:title="@string/export_data"
+                />
+        -->
+        <item
+            android:id="@+id/action_settings"
+            android:icon="@drawable/ic_action_settings"
+            android:showAsAction="never|withText"
+            android:title="@string/settings" />
+
+    </group>
+
+    <group android:id="@+id/grp6">
+
+        <item
+            android:id="@+id/action_about"
+            android:showAsAction="never|withText"
+            android:title="@string/about" />
+    </group>
 
 
-    <item
-        android:id="@+id/action_start_stop"
-        android:icon="@drawable/stop_server"
-        android:showAsAction="never|withText"
-        android:title="@string/start_stop_server" />
-
-  <!-- fault beep test does not work because of fault timer so don't show menu option
-    <item
-        android:id="@+id/action_test_fault_beep"
-        android:icon="@drawable/stop_server"
-        android:showAsAction="never|withText"
-        android:title="Test Fault Beep" />
--->
-<!--    <item
-        android:id="@+id/action_launch_pebble_app"
-        android:showAsAction="never|withText"
-        android:title="Launch Pebble App" />
--->
-    <item
-        android:id="@+id/action_install_watch_app"
-        android:showAsAction="never|withText"
-        android:title="@string/install_watch_app" />
-
-    <item
-        android:id="@+id/action_test_alarm_beep"
-        android:icon="@drawable/stop_server"
-        android:showAsAction="never|withText"
-        android:title="@string/test_alarm_beep" />
-
-    <item
-        android:id="@+id/action_test_warning_beep"
-        android:icon="@drawable/stop_server"
-        android:showAsAction="never|withText"
-        android:title="@string/test_warning_beep" />
-
-    <item
-        android:id="@+id/action_test_sms_alarm"
-        android:icon="@drawable/stop_server"
-        android:showAsAction="never|withText"
-        android:title="@string/test_sms_alarm_notification" />
-
-    <!--<item
-        android:enabled="false"
-        android:id="@+id/action_test_phone_alarm"
-        android:icon="@drawable/stop_server"
-        android:showAsAction="never|withText"
-        android:title="@string/test_phone_alarm_notification" />
--->
-    <item
-        android:enabled="true"
-        android:id="@+id/action_report_seizure"
-        android:icon="@drawable/ic_action_settings"
-        android:showAsAction="never|withText"
-        android:title="@string/report_seizure"
-        />
-
-    <item
-        android:enabled="true"
-        android:id="@+id/action_logmanager"
-        android:icon="@drawable/ic_action_settings"
-        android:showAsAction="never|withText"
-        android:title="@string/data_log_manager"
-        />
-
-<!--    <item
-        android:enabled="true"
-        android:id="@+id/action_authenticate_api"
-        android:icon="@drawable/ic_action_settings"
-        android:showAsAction="never|withText"
-        android:title="@string/authenticate"
-    />
--->
-    <item
-        android:id="@+id/action_logs"
-        android:icon="@drawable/ic_action_settings"
-        android:showAsAction="never|withText"
-        android:title="@string/view_log_entries"
-        android:enabled="true"
-        />
-<!--
-    <item
-        android:enabled="false"
-        android:id="@+id/action_export"
-        android:icon="@drawable/ic_action_settings"
-        android:showAsAction="never|withText"
-        android:title="@string/export_data"
-        />
--->
-    <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_action_settings"
-        android:showAsAction="never|withText"
-        android:title="@string/settings"
-        />
-
-    <item
-        android:id="@+id/action_about"
-        android:showAsAction="never|withText"
-        android:title="@string/about" />
-
- </menu>
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 856fa00..23e5a38 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -337,4 +337,5 @@
     <string name="not_logged_in">Not Logged In</string>
     <string name="data_sharing_setup_ok">Data Sharing Setup OK</string>
     <string name="please_confirm_seizure_events">Please Check your Shared Seizure Events</string>
+    <string name="data_sharing_log_in">Data Sharing Log-In</string>
 </resources>