diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
index 0355e055e1..3965ef5326 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
@@ -207,7 +207,7 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
     public double getBaseBasalRate() {
         Profile profile = MainApp.getConfigBuilder().getProfile();
         if (profile != null)
-            return profile.getBasal();
+            return profile.getBasal() != null ? profile.getBasal() : 0d;
         else
             return 0d;
     }
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index 09d8a458a4..b3e29a104e 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -197,6 +197,60 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/careportal_newnstreatment_temptarget_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/reason"
+                        android:width="120dp"
+                        android:padding="10dp"
+                        android:textAppearance="@android:style/TextAppearance.Material.Small"
+                        android:layout_gravity="center_vertical"
+                        android:textStyle="bold" />
+
+                    <Spinner
+                        android:id="@+id/careportal_newnstreatment_temptarget_reason"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/nsprofileview_target_label"
+                        android:width="120dp"
+                        android:padding="10dp"
+                        android:textAppearance="@android:style/TextAppearance.Material.Small"
+                        android:layout_gravity="center_vertical"
+                        android:textStyle="bold" />
+
+                    <info.nightscout.utils.NumberPicker
+                        android:id="@+id/careportal_newnstreatment_temptarget"
+                        android:layout_width="130dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center_vertical" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/careportal_newnstreatment_duration_layout"
                 android:layout_width="match_parent"
@@ -420,50 +474,7 @@
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_temptarget_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:minWidth="120dp"
-                        android:orientation="vertical"
-                        android:padding="10dp">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/target_range"
-                            android:textAppearance="@android:style/TextAppearance.Material.Small"
-                            android:textStyle="bold" />
-
-                        <Spinner
-                            android:id="@+id/careportal_newnstreatment_temptarget_reason"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true" />
-
-                    </LinearLayout>
-
-                    <info.nightscout.utils.NumberPicker
-                        android:id="@+id/careportal_newnstreatment_temptarget"
-                        android:layout_width="130dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center_vertical" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
+           <LinearLayout
                 android:id="@+id/careportal_newnstreatment_notes_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index c5bfe15319..a22d46906d 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -240,108 +240,96 @@
                         android:id="@+id/overview_showprediction_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/predictionshortlabel"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/prediction"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold"/>
 
                     <CheckBox
                         android:id="@+id/overview_showprediction"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/prediction" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/basalshortlabel"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/basal"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showbasals"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/basal" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/iob"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/iob"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showiob"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/iob" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/cob"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/cob"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showcob"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/cob" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/dev"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/deviations"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showdeviations"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/deviations" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/ratio_short"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showratios"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp" />
+                        android:layout_gravity="center" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_fragment_nsclient.xml b/app/src/main/res/layout/overview_fragment_nsclient.xml
index 1a5771c26e..91255ec66f 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient.xml
@@ -478,108 +478,96 @@
                     android:id="@+id/overview_showprediction_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/predictionshortlabel"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/prediction"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold"/>
 
                 <CheckBox
                     android:id="@+id/overview_showprediction"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/prediction" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/basalshortlabel"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/basal"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showbasals"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/basal" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/iob"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/iob"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showiob"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/iob" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/cob"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/cob"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showcob"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/cob" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/dev"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/deviations"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showdeviations"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/deviations" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/ratio_short"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showratios"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp" />
+                    android:layout_gravity="center" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index e7ddd35913..554aefb56c 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -562,108 +562,96 @@
                         android:id="@+id/overview_showprediction_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/predictionshortlabel"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/prediction"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold"/>
 
                     <CheckBox
                         android:id="@+id/overview_showprediction"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/prediction" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/basalshortlabel"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/basal"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showbasals"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/basal" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/iob"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/iob"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showiob"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/iob" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/cob"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/cob"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showcob"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/cob" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/dev"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/deviations"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showdeviations"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp"
+                        android:layout_gravity="center"
                         app:buttonTint="@color/deviations" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
+                        android:layout_gravity="center"
                         android:text="@string/ratio_short"
                         android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textStyle="bold"
-                        android:paddingTop="4dp"/>
+                        android:textStyle="bold" />
 
                     <CheckBox
                         android:id="@+id/overview_showratios"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-5dp" />
+                        android:layout_gravity="center" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_fragment_smallheight.xml b/app/src/main/res/layout/overview_fragment_smallheight.xml
index c45ca863e2..c390935581 100644
--- a/app/src/main/res/layout/overview_fragment_smallheight.xml
+++ b/app/src/main/res/layout/overview_fragment_smallheight.xml
@@ -235,108 +235,96 @@
                     android:id="@+id/overview_showprediction_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/predictionshortlabel"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/prediction"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold"/>
 
                 <CheckBox
                     android:id="@+id/overview_showprediction"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/prediction" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/basalshortlabel"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/basal"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showbasals"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/basal" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/iob"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/iob"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showiob"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/iob" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/cob"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/cob"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showcob"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/cob" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/dev"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/deviations"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showdeviations"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp"
+                    android:layout_gravity="center"
                     app:buttonTint="@color/deviations" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center"
                     android:text="@string/ratio_short"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold"
-                    android:paddingTop="4dp"/>
+                    android:textStyle="bold" />
 
                 <CheckBox
                     android:id="@+id/overview_showratios"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="-5dp"
-                    android:layout_marginTop="-5dp" />
+                    android:layout_gravity="center" />
 
             </LinearLayout>