diff --git a/app/src/main/res/layout/insightpump_fragment.xml b/app/src/main/res/layout/insightpump_fragment.xml
index 2ab1a50d2a..a475f3ba09 100644
--- a/app/src/main/res/layout/insightpump_fragment.xml
+++ b/app/src/main/res/layout/insightpump_fragment.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="info.nightscout.androidaps.plugins.PumpInsight.InsightFragment">
+    tools:context="info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_newtempbasal_dialog.xml b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
index 14b95db54e..f0b49cff0b 100644
--- a/app/src/main/res/layout/overview_newtempbasal_dialog.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
@@ -52,12 +52,14 @@
 
                     <RadioButton
                         android:id="@+id/overview_newtempbasal_percent_radio"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:checked="true"
                         android:text="@string/overview_newtempbasal_percent_label" />
 
                     <RadioButton
                         android:id="@+id/overview_newtempbasal_absolute_radio"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="U/h" />
 
diff --git a/app/src/main/res/xml/pref_smscommunicator.xml b/app/src/main/res/xml/pref_smscommunicator.xml
index 06614f81df..202e7348c5 100644
--- a/app/src/main/res/xml/pref_smscommunicator.xml
+++ b/app/src/main/res/xml/pref_smscommunicator.xml
@@ -5,11 +5,9 @@
         android:title="@string/smscommunicator">
 
         <EditTextPreference
-            android:title="@string/smscommunicator_allowednumbers"
-            android:summary="@string/smscommunicator_allowednumbers_summary"
             android:key="@string/key_smscommunicator_allowednumbers"
-            android:defaultValue="">
-        </EditTextPreference>
+            android:summary="@string/smscommunicator_allowednumbers_summary"
+            android:title="@string/smscommunicator_allowednumbers" />
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_smscommunicator_remotecommandsallowed"