diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5a5ddb79c..aaa245f3bf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,7 +57,7 @@
         <activity
             android:name=".widget.WidgetConfigureActivity"
             android:theme="@android:style/Theme.Material.Dialog.NoActionBar"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 9a5d86db99..e4960d913f 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -296,6 +296,7 @@ class MainActivity : NoSplashAppCompatActivity() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menu.setGroupDividerEnabled(true)
         this.menu = menu
         menuInflater.inflate(R.menu.menu_main, menu)
         pluginPreferencesMenuItem = menu.findItem(R.id.nav_plugin_preferences)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
index 48c17ed348..320ce0f2c8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
@@ -59,7 +59,7 @@ class OpenAPSAMAFragment : DaggerFragment() {
             setColorSchemeColors(rh.gac(context, R.attr.colorPrimaryDark), rh.gac(context, R.attr.colorPrimary), rh.gac(context, R.attr.colorSecondary))
             setOnRefreshListener {
                 binding.lastrun.text = rh.gs(info.nightscout.androidaps.R.string.executing)
-                openAPSAMAPlugin.invoke("OpenAPSAMA swiperefresh", false)
+                Thread { openAPSAMAPlugin.invoke("OpenAPSAMA swiperefresh", false) }.start()
             }
         }
 
@@ -76,7 +76,7 @@ class OpenAPSAMAFragment : DaggerFragment() {
         when (item.itemId) {
             ID_MENU_RUN -> {
                 binding.lastrun.text = rh.gs(R.string.executing)
-                openAPSAMAPlugin.invoke("OpenAPSAMA menu", false)
+                Thread { openAPSAMAPlugin.invoke("OpenAPSAMA menu", false) }.start()
                 true
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
index 348abbc78a..23a61db108 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
@@ -36,6 +36,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var jsonFormatter: JSONFormatter
+    private lateinit var refreshDialog: Runnable
 
     private val ID_MENU_RUN = 1
 
@@ -58,10 +59,9 @@ class OpenAPSSMBFragment : DaggerFragment() {
             setColorSchemeColors(rh.gac(context, R.attr.colorPrimaryDark), rh.gac(context, R.attr.colorPrimary), rh.gac(context, R.attr.colorSecondary))
             setOnRefreshListener {
                 binding.lastrun.text = rh.gs(info.nightscout.androidaps.R.string.executing)
-                activePlugin.activeAPS.invoke("OpenAPSSMB swiperefresh", false)
+                Thread { activePlugin.activeAPS.invoke("OpenAPSSMB swiperefresh", false) }.start()
             }
         }
-
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -75,7 +75,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
         when (item.itemId) {
             ID_MENU_RUN -> {
                 binding.lastrun.text = rh.gs(R.string.executing)
-                activePlugin.activeAPS.invoke("OpenAPSSMB menu", false)
+                Thread { activePlugin.activeAPS.invoke("OpenAPSSMB menu", false) }.start()
                 true
             }
 
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index aff0d78e1b..62e8661ca8 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -22,7 +22,7 @@
             android:layout_marginTop="4dp"
             app:cardCornerRadius="4dp"
             app:contentPadding="2dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             android:layout_gravity="center">
 
@@ -147,7 +147,7 @@
             android:layout_marginTop="4dp"
             app:cardCornerRadius="4dp"
             app:contentPadding="2dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             android:layout_gravity="center">
 
@@ -170,7 +170,7 @@
             android:layout_marginTop="4dp"
             app:cardCornerRadius="4dp"
             app:contentPadding="2dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             android:layout_gravity="center">
 
@@ -323,7 +323,7 @@
             android:layout_marginBottom="4dp"
             app:cardCornerRadius="4dp"
             app:contentPadding="2dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             android:layout_gravity="center">
 
diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml
index e34d749e7b..cbcb970a8b 100644
--- a/app/src/main/res/layout/activity_stats.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -56,7 +56,7 @@
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
             app:cardCornerRadius="4dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             app:contentPadding="2dp">
 
@@ -79,7 +79,7 @@
             android:layout_marginTop="4dp"
             android:layout_marginEnd="4dp"
             app:cardCornerRadius="4dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             app:contentPadding="2dp">
 
@@ -102,7 +102,7 @@
             android:layout_marginTop="4dp"
             android:layout_marginEnd="4dp"
             app:cardCornerRadius="4dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             app:contentPadding="2dp">
 
diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml
index 261b3c0475..463a2a2e35 100644
--- a/app/src/main/res/layout/bgsource_item.xml
+++ b/app/src/main/res/layout/bgsource_item.xml
@@ -11,7 +11,7 @@
     android:layout_marginStart="4dp"
     app:cardCornerRadius="4dp"
     app:contentPadding="2dp"
-    app:cardElevation="4dp"
+    app:cardElevation="2dp"
     android:layout_gravity="center">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/objectives_item.xml b/app/src/main/res/layout/objectives_item.xml
index 9083300a3c..91aa64a3de 100644
--- a/app/src/main/res/layout/objectives_item.xml
+++ b/app/src/main/res/layout/objectives_item.xml
@@ -11,7 +11,7 @@
     android:layout_marginTop="16dp"
     android:layout_marginEnd="16dp"
     app:cardCornerRadius="4dp"
-    app:cardElevation="4dp"
+    app:cardElevation="2dp"
     app:cardUseCompatPadding="true"
     app:contentPadding="16dp"
     android:layout_gravity="center">
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index 25301a3bb6..445f3a3fd9 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -10,7 +10,7 @@
     android:layout_marginStart="4dp"
     app:cardCornerRadius="4dp"
     app:contentPadding="2dp"
-    app:cardElevation="4dp"
+    app:cardElevation="2dp"
     app:cardUseCompatPadding="true"
     android:layout_gravity="center">
 
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 42e55843f0..1cd9f44799 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -44,6 +44,7 @@
         android:orderInCategory="1"
         app:showAsAction="never"
         android:title="@string/nav_profilehelper" />
+    <group android:id="@+id/about_exit">
     <item
         android:id="@+id/nav_about"
         android:orderInCategory="1"
@@ -54,5 +55,5 @@
         android:orderInCategory="1"
         app:showAsAction="never"
         android:title="@string/nav_exit" />
-
+    </group>
 </menu>
diff --git a/core/src/main/res/layout/maintenance_import_list_item.xml b/core/src/main/res/layout/maintenance_import_list_item.xml
index d7e8cd1f18..1b1341d8e2 100644
--- a/core/src/main/res/layout/maintenance_import_list_item.xml
+++ b/core/src/main/res/layout/maintenance_import_list_item.xml
@@ -12,7 +12,7 @@
     android:layout_marginTop="4dp"
     app:cardCornerRadius="4dp"
     app:contentPadding="2dp"
-    app:cardElevation="4dp"
+    app:cardElevation="2dp"
     app:cardUseCompatPadding="false"
     android:layout_gravity="center">
 
diff --git a/dana/src/main/res/layout/danar_history_item.xml b/dana/src/main/res/layout/danar_history_item.xml
index ddae424524..11f4e0594c 100644
--- a/dana/src/main/res/layout/danar_history_item.xml
+++ b/dana/src/main/res/layout/danar_history_item.xml
@@ -10,7 +10,7 @@
     android:layout_marginStart="4dp"
     app:cardCornerRadius="4dp"
     app:contentPadding="2dp"
-    app:cardElevation="4dp"
+    app:cardElevation="2dp"
     app:cardUseCompatPadding="true"
     android:layout_gravity="center">
 
diff --git a/diaconn/src/main/AndroidManifest.xml b/diaconn/src/main/AndroidManifest.xml
index 739266232d..830dfec9f2 100644
--- a/diaconn/src/main/AndroidManifest.xml
+++ b/diaconn/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
             android:theme="@style/AppTheme" />
         <activity
             android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8BLEScanActivity"
-            android:theme="@style/AppTheme">
+            android:theme="@style/AppTheme"
+            android:exported="false">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.PumpDiaconnG8.activities.DiaconnG8BLEScanActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
index a86ac98505..7cb0e6f322 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
@@ -9,7 +9,7 @@
     android:layout_gravity="center"
     android:layout_marginStart="4dp"
     app:cardCornerRadius="4dp"
-    app:cardElevation="4dp"
+    app:cardElevation="2dp"
     app:cardUseCompatPadding="true"
     app:contentPadding="2dp">
 
diff --git a/rileylink/src/main/res/layout/rileylink_status_general.xml b/rileylink/src/main/res/layout/rileylink_status_general.xml
index 3ef25590ff..14a83b5a11 100644
--- a/rileylink/src/main/res/layout/rileylink_status_general.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_general.xml
@@ -21,7 +21,7 @@
             android:layout_marginTop="4dp"
             android:layout_marginEnd="4dp"
             app:cardCornerRadius="4dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             app:contentPadding="2dp">
 
@@ -228,7 +228,7 @@
             android:layout_marginTop="4dp"
             android:layout_marginEnd="4dp"
             app:cardCornerRadius="4dp"
-            app:cardElevation="4dp"
+            app:cardElevation="2dp"
             app:cardUseCompatPadding="false"
             app:contentPadding="2dp">