diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb68289f4..5d19981032 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 910f84362c..214175aa23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "info.nightscout.androidaps"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1004
-        versionName "1.0.04"
+        versionCode 1005
+        versionName "1.0.05"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java
index 85a41ac66d..fe4adf2729 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewExtendedBolusDialog.java
@@ -38,7 +38,7 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
                              Bundle savedInstanceState) {
         getDialog().setTitle(getString(R.string.overview_extendedbolus_button));
 
-        View view = inflater.inflate(R.layout.overview_newextendedbolus_fragment, container, false);
+        View view = inflater.inflate(R.layout.overview_newextendedbolus_dialog, container, false);
         okButton = (Button) view.findViewById(R.id.overview_newextendedbolus_okbutton);
         insulinEdit = (EditText) view.findViewById(R.id.overview_newextendedbolus_insulin);
         h05Radio = (RadioButton) view.findViewById(R.id.overview_newextendedbolus_05h);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java
index 8febc6e7b2..4a0cd0c314 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTempBasalDialog.java
@@ -49,7 +49,7 @@ public class NewTempBasalDialog extends DialogFragment implements View.OnClickLi
                              Bundle savedInstanceState) {
         getDialog().setTitle(getString(R.string.overview_tempbasal_button));
 
-        View view = inflater.inflate(R.layout.overview_newtempbasal_fragment, container, false);
+        View view = inflater.inflate(R.layout.overview_newtempbasal_dialog, container, false);
         okButton = (Button) view.findViewById(R.id.overview_newtempbasal_okbutton);
         basalPercentEdit = (EditText) view.findViewById(R.id.overview_newtempbasal_basalpercentinput);
         basalAbsoluteEdit = (EditText) view.findViewById(R.id.overview_newtempbasal_basalabsoluteinput);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index 6ea7c3a92f..98a2f1cb37 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -31,7 +31,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.overview_newtreatment_fragment, null, false);
+        View view = inflater.inflate(R.layout.overview_newtreatment_dialog, null, false);
 
         deliverButton = (Button) view.findViewById(R.id.treatments_newtreatment_deliverbutton);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index 594f88d4ee..2c0c91eec9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -27,6 +27,8 @@ import info.nightscout.androidaps.plugins.OpenAPSMA.IobTotal;
 import info.nightscout.client.data.NSProfile;
 import info.nightscout.utils.*;
 
+// TODO: wizard upload top NS calculation
+// TODO: add carbtime
 public class WizardDialog extends DialogFragment implements OnClickListener {
 
     Button wizardDialogDeliverButton;
@@ -78,7 +80,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.overview_wizard_fragment, null, false);
+        View view = inflater.inflate(R.layout.overview_wizard_dialog, null, false);
 
         wizardDialogDeliverButton = (Button) view.findViewById(R.id.treatments_wizard_deliverButton);
         wizardDialogDeliverButton.setOnClickListener(this);
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index f515ea73dd..a6c12858e9 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -25,13 +25,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_bg_plus"
+            android:id="@+id/careportal_newnstreatment_bg_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
         <EditText
@@ -46,13 +46,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_bg_minus"
+            android:id="@+id/careportal_newnstreatment_bg_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
@@ -120,13 +120,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_carbs_plus"
+            android:id="@+id/careportal_newnstreatment_carbs_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
 
@@ -142,13 +142,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_carbs_minus"
+            android:id="@+id/careportal_newnstreatment_carbs_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
@@ -180,13 +180,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_insulin_plus"
+            android:id="@+id/careportal_newnstreatment_insulin_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
 
@@ -203,13 +203,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_insulin_minus"
+            android:id="@+id/careportal_newnstreatment_insulin_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
@@ -241,13 +241,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_split_plus"
+            android:id="@+id/careportal_newnstreatment_split_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
 
@@ -264,13 +264,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_split_minus"
+            android:id="@+id/careportal_newnstreatment_split_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
@@ -301,13 +301,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_duration_plus"
+            android:id="@+id/careportal_newnstreatment_duration_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
 
@@ -324,13 +324,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_duration_minus"
+            android:id="@+id/careportal_newnstreatment_duration_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
@@ -363,13 +363,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_percent_plus"
+            android:id="@+id/careportal_newnstreatment_percent_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
 
@@ -386,13 +386,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_percent_minus"
+            android:id="@+id/careportal_newnstreatment_percent_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
@@ -423,13 +423,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_absolute_plus"
+            android:id="@+id/careportal_newnstreatment_absolute_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
 
@@ -446,13 +446,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_absolute_minus"
+            android:id="@+id/careportal_newnstreatment_absolute_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
@@ -483,13 +483,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_carbtime_plus"
+            android:id="@+id/careportal_newnstreatment_carbtime_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
 
@@ -506,13 +506,13 @@
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
-            android:id="@+id/careportal_newnstreatment_carbtime_minus"
+            android:id="@+id/careportal_newnstreatment_carbtime_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
diff --git a/app/src/main/res/layout/overview_newextendedbolus_fragment.xml b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/overview_newextendedbolus_fragment.xml
rename to app/src/main/res/layout/overview_newextendedbolus_dialog.xml
index 574cb546a6..a7b0170505 100644
--- a/app/src/main/res/layout/overview_newextendedbolus_fragment.xml
+++ b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
@@ -25,13 +25,13 @@
             android:orientation="horizontal">
 
             <ImageView
-                android:id="@+id/overview_newextendedbolus_insulin_plus"
+                android:id="@+id/overview_newextendedbolus_insulin_minus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/circle"
                 android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_add"
+                android:src="@drawable/ic_action_minus"
                 android:tint="#ffffff" />
 
             <EditText
@@ -47,13 +47,13 @@
                 android:gravity="center_horizontal" />
 
             <ImageView
-                android:id="@+id/overview_newextendedbolus_insulin_minus"
+                android:id="@+id/overview_newextendedbolus_insulin_plus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/circle"
                 android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
+                android:src="@drawable/ic_action_add"
                 android:tint="#ffffff" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/overview_newtempbasal_fragment.xml b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/overview_newtempbasal_fragment.xml
rename to app/src/main/res/layout/overview_newtempbasal_dialog.xml
index 23ccf0b904..81b64f0da9 100644
--- a/app/src/main/res/layout/overview_newtempbasal_fragment.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
@@ -57,13 +57,13 @@
 
 
             <ImageView
-                android:id="@+id/overview_newtempbasal_basalpercent_plus"
+                android:id="@+id/overview_newtempbasal_basalpercent_minus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/circle"
                 android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_add"
+                android:src="@drawable/ic_action_minus"
                 android:tint="#ffffff"
                 android:layout_weight="0.5" />
 
@@ -81,13 +81,13 @@
                 android:gravity="center_horizontal" />
 
             <ImageView
-                android:id="@+id/overview_newtempbasal_basalpercent_minus"
+                android:id="@+id/overview_newtempbasal_basalpercent_plus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/circle"
                 android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
+                android:src="@drawable/ic_action_add"
                 android:tint="#ffffff"
                 android:layout_weight="0.5" />
 
@@ -103,13 +103,13 @@
 
 
             <ImageView
-                android:id="@+id/overview_newtempbasal_basalabsolute_plus"
+                android:id="@+id/overview_newtempbasal_basalabsolute_minus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/circle"
                 android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_add"
+                android:src="@drawable/ic_action_minus"
                 android:tint="#ffffff"
                 android:layout_weight="0.5" />
 
@@ -127,13 +127,13 @@
                 android:gravity="center_horizontal" />
 
             <ImageView
-                android:id="@+id/overview_newtempbasal_basalabsolute_minus"
+                android:id="@+id/overview_newtempbasal_basalabsolute_plus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/circle"
                 android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
+                android:src="@drawable/ic_action_add"
                 android:tint="#ffffff"
                 android:layout_weight="0.5" />
 
diff --git a/app/src/main/res/layout/overview_newtreatment_fragment.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/overview_newtreatment_fragment.xml
rename to app/src/main/res/layout/overview_newtreatment_dialog.xml
index a74ad64cc4..b95b333b74 100644
--- a/app/src/main/res/layout/overview_newtreatment_fragment.xml
+++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml
@@ -21,13 +21,13 @@
         android:orientation="horizontal">
 
         <ImageView
-            android:id="@+id/treatments_newtreatment_insulinamount_plus"
+            android:id="@+id/treatments_newtreatment_insulinamount_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
         <EditText
@@ -43,13 +43,13 @@
             android:gravity="center_horizontal" />
 
         <ImageView
-            android:id="@+id/treatments_newtreatment_insulinamount_minus"
+            android:id="@+id/treatments_newtreatment_insulinamount_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
     </LinearLayout>
 
@@ -68,13 +68,13 @@
         android:layout_gravity="center_horizontal">
 
         <ImageView
-            android:id="@+id/treatments_newtreatment_carbsamount_plus"
+            android:id="@+id/treatments_newtreatment_carbsamount_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_add"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
         <EditText
@@ -90,13 +90,13 @@
             android:gravity="center_horizontal" />
 
         <ImageView
-            android:id="@+id/treatments_newtreatment_carbsamount_minus"
+            android:id="@+id/treatments_newtreatment_carbsamount_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
-            android:src="@drawable/ic_action_minus"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
 
diff --git a/app/src/main/res/layout/overview_wizard_fragment.xml b/app/src/main/res/layout/overview_wizard_dialog.xml
similarity index 77%
rename from app/src/main/res/layout/overview_wizard_fragment.xml
rename to app/src/main/res/layout/overview_wizard_dialog.xml
index c2278357f7..82dc753c24 100644
--- a/app/src/main/res/layout/overview_wizard_fragment.xml
+++ b/app/src/main/res/layout/overview_wizard_dialog.xml
@@ -1,428 +1,425 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="10dp"
-    android:orientation="vertical"
+    android:focusableInTouchMode="true"
     android:minWidth="300dp"
-    android:focusableInTouchMode="true">
+    android:orientation="vertical"
+    android:padding="10dp">
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:width="80dp"
             android:padding="10dp"
             android:text="@string/treatments_wizard_bg_label"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_gravity="center_horizontal"
-            android:width="80dp" />
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
+            android:id="@+id/treatments_wizard_bginput_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/treatments_wizard_bginput_plus"
-            android:src="@drawable/ic_action_add"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
         <EditText
+            android:id="@+id/treatments_wizard_bginput"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:id="@+id/treatments_wizard_bginput"
-            android:padding="10dp"
             android:layout_gravity="center_horizontal"
-            android:inputType="numberDecimal"
+            android:layout_weight="0.5"
             android:gravity="center_horizontal"
-            android:layout_weight="0.5" />
+            android:inputType="numberDecimal"
+            android:padding="10dp"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
+            android:id="@+id/treatments_wizard_bginput_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/treatments_wizard_bginput_minus"
             android:layout_gravity="center"
-            android:src="@drawable/ic_action_minus"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
             android:id="@+id/treatments_wizard_bgunits"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="mg/dl"
             android:layout_gravity="center_vertical"
             android:gravity="left"
+            android:minWidth="40dp"
             android:paddingLeft="5dp"
-            android:minWidth="40dp" />
+            android:text="mg/dl"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:width="80dp"
             android:padding="10dp"
             android:text="@string/treatments_wizard_carbs_label"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_gravity="center_horizontal"
-            android:width="80dp" />
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
+            android:id="@+id/treatments_wizard_carbsinput_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/treatments_wizard_carbsinput_plus"
-            android:src="@drawable/ic_action_add"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
         <EditText
+            android:id="@+id/treatments_wizard_carbsinput"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text=""
-            android:id="@+id/treatments_wizard_carbsinput"
-            android:padding="10dp"
-            android:minWidth="200dp"
             android:layout_gravity="center_horizontal"
-            android:inputType="numberDecimal"
+            android:layout_weight="0.5"
             android:gravity="center_horizontal"
-            android:layout_weight="0.5" />
+            android:inputType="numberDecimal"
+            android:minWidth="200dp"
+            android:padding="10dp"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
+            android:id="@+id/treatments_wizard_carbsinput_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/treatments_wizard_carbsinput_minus"
             android:layout_gravity="center"
-            android:src="@drawable/ic_action_minus"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="g"
             android:layout_gravity="center_vertical"
             android:gravity="left"
+            android:minWidth="40dp"
             android:paddingLeft="5dp"
-            android:minWidth="40dp" />
+            android:text="g"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:width="80dp"
             android:padding="10dp"
             android:text="@string/treatments_wizard_correction_label"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_gravity="center_horizontal"
-            android:width="80dp" />
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
+            android:id="@+id/treatments_wizard_correctioninput_minus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/treatments_wizard_correctioninput_plus"
-            android:src="@drawable/ic_action_add"
             android:layout_gravity="center"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_action_minus"
             android:tint="#ffffff" />
 
         <EditText
+            android:id="@+id/treatments_wizard_correctioninput"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text=""
-            android:id="@+id/treatments_wizard_correctioninput"
-            android:padding="10dp"
-            android:minWidth="200dp"
             android:layout_gravity="center_horizontal"
-            android:inputType="numberSigned|numberDecimal"
+            android:layout_weight="0.5"
             android:gravity="center_horizontal"
-            android:layout_weight="0.5" />
+            android:inputType="numberSigned|numberDecimal"
+            android:minWidth="200dp"
+            android:padding="10dp"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ImageView
+            android:id="@+id/treatments_wizard_correctioninput_plus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/treatments_wizard_correctioninput_minus"
             android:layout_gravity="center"
-            android:src="@drawable/ic_action_minus"
             android:background="@drawable/circle"
             android:backgroundTint="#ffffff"
+            android:src="@drawable/ic_action_add"
             android:tint="#ffffff" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/treatments_wizard_unit_label"
             android:layout_gravity="center_vertical"
             android:gravity="left"
+            android:minWidth="40dp"
             android:paddingLeft="5dp"
-            android:minWidth="40dp" />
+            android:text="@string/treatments_wizard_unit_label"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center">
+        android:layout_gravity="center"
+        android:orientation="horizontal">
 
         <CheckBox
+            android:id="@+id/treatments_wizard_bgcheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="32dp"
+            android:checked="true" />
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="80dp"
+            android:text="@string/treatments_wizard_bg_label"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_bg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="100dp"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_bginsulin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="50dp"
+            android:gravity="end"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="32dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="80dp"
+            android:text="@string/treatments_wizard_carbs_label"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_carbs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="100dp"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_carbsinsulin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="50dp"
+            android:gravity="end"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/treatments_wizard_bolusiobcheckbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:width="32dp"
-            android:id="@+id/treatments_wizard_bgcheckbox"
             android:checked="true" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/treatments_wizard_bg_label"
-            android:width="80dp"
-            android:id="@+id/textView" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:width="100dp"
-            android:id="@+id/treatments_wizard_bg" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:id="@+id/treatments_wizard_bginsulin"
-            android:width="50dp"
-            android:gravity="end" />
-    </LinearLayout>
-
-   <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-       android:layout_gravity="center">
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:width="32dp" />
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/treatments_wizard_carbs_label"
-            android:width="80dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:width="100dp"
-            android:id="@+id/treatments_wizard_carbs" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:id="@+id/treatments_wizard_carbsinsulin"
-            android:width="50dp"
-            android:gravity="end" />
-    </LinearLayout>
-
-   <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-       android:layout_gravity="center">
-
-       <CheckBox
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:width="32dp"
-           android:id="@+id/treatments_wizard_bolusiobcheckbox"
-           android:checked="true" />
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:width="130dp"
             android:text="@string/treatments_wizard_bolusiob_label"
-            android:width="130dp" />
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
+            android:id="@+id/treatments_wizard_bolusiob"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
             android:width="50dp"
-            android:id="@+id/treatments_wizard_bolusiob" />
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
             android:id="@+id/treatments_wizard_bolusiobinsulin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:width="50dp"
-            android:gravity="end" />
+            android:gravity="end"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
     </LinearLayout>
 
-   <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-       android:layout_gravity="center">
-
-       <CheckBox
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:width="32dp"
-           android:id="@+id/treatments_wizard_basaliobcheckbox"
-           android:checked="true" />
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/treatments_wizard_basaliob_label"
-            android:width="130dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:width="50dp"
-            android:id="@+id/treatments_wizard_basaliob" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:id="@+id/treatments_wizard_basaliobinsulin"
-            android:width="50dp"
-            android:gravity="end" />
-    </LinearLayout>
-
-   <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-       android:layout_gravity="center">
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:width="32dp" />
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/treatments_wizard_correction_label"
-            android:width="80dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:width="100dp"
-            android:id="@+id/treatments_wizard_correction" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:id="@+id/treatments_wizard_correctioninsulin"
-            android:width="50dp"
-            android:gravity="end" />
-    </LinearLayout>
-
-   <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-       android:layout_gravity="center">
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:width="32dp" />
-
-       <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"
-            android:text="@string/treatments_wizard_total_label"
-            android:width="80dp"
-           android:height="30dp"
-           android:gravity="center_vertical"
-           android:textColor="@color/accent_material_light" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:width="100dp"
-            android:id="@+id/treatments_wizard_total" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"
-            android:id="@+id/treatments_wizard_totalinsulin"
-            android:width="50dp"
-            android:gravity="center_vertical|end"
-            android:textColor="@color/accent_material_light" />
-    </LinearLayout>
-
-
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:orientation="horizontal"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_gravity="right">
-
-    <Button
-        android:id="@+id/treatments_wizard_deliverButton"
-        style="?android:attr/buttonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="SEND TO PUMP"
-        android:textSize="20sp"
-        android:padding="10dp"
-        android:layout_weight="1"
-        android:textAllCaps="false"
-        />
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/treatments_wizard_basaliobcheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="32dp"
+            android:checked="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="130dp"
+            android:text="@string/treatments_wizard_basaliob_label"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_basaliob"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="50dp"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_basaliobinsulin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="50dp"
+            android:gravity="end"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="32dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="80dp"
+            android:text="@string/treatments_wizard_correction_label"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_correction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="100dp"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_correctioninsulin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="50dp"
+            android:gravity="end"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="32dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="80dp"
+            android:height="30dp"
+            android:gravity="center_vertical"
+            android:text="@string/treatments_wizard_total_label"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/accent_material_light"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_total"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="100dp"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/treatments_wizard_totalinsulin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:width="50dp"
+            android:gravity="center_vertical|end"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/accent_material_light"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <Button
+            android:id="@+id/treatments_wizard_deliverButton"
+            style="?android:attr/buttonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            android:text="SEND TO PUMP"
+            android:textAllCaps="false"
+            android:textSize="20sp" />
 
     </LinearLayout>