diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
index 62da94d3ff..02e46e5c17 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
@@ -62,7 +62,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
 
     override fun submit(): Boolean {
         val insulin = SafeParse.stringToDouble(actions_extendedbolus_insulin.text)
-        val durationInMinutes = SafeParse.stringToInt(actions_extendedbolus_duration.text)
+        val durationInMinutes = actions_extendedbolus_duration.value.toInt()
         val actions: LinkedList<String> = LinkedList()
         val insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
         actions.add(resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraint))
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index 14f0897cc5..7ab5850f87 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -83,7 +83,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
     override fun submit(): Boolean {
         var percent = 0
         var absolute = 0.0
-        val durationInMinutes = SafeParse.stringToInt(actions_tempbasal_duration.text)
+        val durationInMinutes = actions_tempbasal_duration.value.toInt()
         val profile = profileFunction.getProfile() ?: return false
         val actions: LinkedList<String> = LinkedList()
         if (isPercentPump) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
index f81ef07bb8..24b48e0fb7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 import javax.inject.Inject
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
index e7624a98c7..46b696eaec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
@@ -9,7 +9,7 @@ import android.widget.Spinner
 import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.text.DecimalFormat
 import java.util.*
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
index 7824b51960..566315b9eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputDouble(injector: HasAndroidInjector) : Element(injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
index cab16d2502..08647735cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
@@ -3,7 +3,8 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.MinutesNumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputDuration(injector: HasAndroidInjector) : Element(injector) {
@@ -20,11 +21,14 @@ class InputDuration(injector: HasAndroidInjector) : Element(injector) {
     var value: Int = 0
 
     override fun addToLayout(root: LinearLayout) {
-        val numberPicker = NumberPicker(root.context, null)
-        if (unit == TimeUnit.MINUTES)
+        val numberPicker : NumberPicker
+        if (unit == TimeUnit.MINUTES) {
+            numberPicker = MinutesNumberPicker(root.context, null)
             numberPicker.setParams(0.0, 0.0, 24 * 60.0, 10.0, DecimalFormat("0"), false, root.findViewById(R.id.ok))
-        else
+        } else {
+            numberPicker = NumberPicker(root.context, null)
             numberPicker.setParams(0.0, 0.0, 24.0, 1.0, DecimalFormat("0"), false, root.findViewById(R.id.ok))
+        }
         numberPicker.value = value.toDouble()
         numberPicker.setOnValueChangedListener { value: Double -> this.value = value.toInt() }
         root.addView(numberPicker)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
index f822a971f4..0903824a94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputInsulin(injector: HasAndroidInjector) : Element(injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
index 7b1f739ed7..05524abc40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputPercent(injector: HasAndroidInjector) : Element(injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
index 8208e7e687..4f58be8167 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 import javax.inject.Inject
 
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
index 978455a4ae..2d49eb3a97 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.setupwizard.SWNumberValidator
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import info.nightscout.androidaps.utils.SafeParse
 import java.text.DecimalFormat
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
index f09f562d25..5244c5c4ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
@@ -1,30 +1,11 @@
 package info.nightscout.androidaps.utils;
 
 import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.AttributeSet;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.NumberFormat;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.utils.ui.NumberPicker;
 
 /**
  * Created by mike on 28.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index 7010a82c12..1440a65c21 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -13,24 +13,20 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.core.widget.TextViewCompat;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.utils.ui.NumberPicker;
 
 /**
  * Created by mike on 29.12.2016.
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index effa56b112..310a4c566d 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -94,7 +94,7 @@
                         android:text="@string/age"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_age"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
@@ -115,7 +115,7 @@
                         android:text="@string/tdd_total"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_tdd"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
@@ -136,7 +136,7 @@
                         android:text="@string/weight_label"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_weight"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
@@ -157,7 +157,7 @@
                         android:text="@string/basalpctfromtdd_label"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_basalpctfromtdd"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
deleted file mode 100644
index a501e70a77..0000000000
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
-    android:padding="10dp">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/careportal_newnstreatment_eventtype"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:paddingBottom="10dp"
-                android:text="Temp target"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_bg_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/treatments_wizard_bg_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_bginput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:id="@+id/careportal_newnstreatment_bgunits"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="mg/dl"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_bgsource_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <RadioGroup
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginRight="20dp"
-                    android:orientation="horizontal">
-
-                    <RadioButton
-                        android:id="@+id/careportal_newnstreatment_meter"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:checked="false"
-                        android:text="@string/careportal_newnstreatment_meter" />
-
-                    <RadioButton
-                        android:id="@+id/careportal_newnstreatment_sensor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:checked="true"
-                        android:text="@string/careportal_newnstreatment_sensor" />
-
-                    <RadioButton
-                        android:id="@+id/careportal_newnstreatment_other"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/careportal_newnstreatment_other" />
-                </RadioGroup>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_carbs_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/treatments_wizard_carbs_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_carbsinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="g"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_insulin_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_insulin_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_insulininput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="U"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_split_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_split_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_splitinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="%"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </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/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.androidaps.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"
-                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="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_duration_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_durationinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="min"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_percent_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_percent_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_percentinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="%"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_absolute_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_absolute_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_absoluteinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="U/h"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_carbtime_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_carbtime_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_carbtimeinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="min"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_profile_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_profile_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <Spinner
-                    android:id="@+id/careportal_newnstreatment_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="center_vertical" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_reuse_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text=""
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <Button
-                    android:id="@+id/careportal_newnstreatment_reusebutton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/reuse"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text=" "
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_percentage_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_percentage_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_percentage"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="%"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-           <LinearLayout
-                android:id="@+id/careportal_newnstreatment_timeshift_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_timeshift_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_timeshift"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="h"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_notes_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <EditText
-                    android:id="@+id/careportal_newnstreatment_notes"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:width="180dp"
-                    android:inputType="text" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_eventtime_layout"
-                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:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/event_time_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/careportal_newnstreatment_eventdate"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:padding="10dp"
-                    android:text="2017/05/05" />
-
-                <TextView
-                    android:id="@+id/careportal_newnstreatment_eventtime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:padding="10dp"
-                    android:text="08:20pm" />
-
-            </LinearLayout>
-
-            <include layout="@layout/okcancel" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 5cf87640eb..5b298a0db5 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -66,7 +66,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_calibration_bg"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 1a4d722517..3274cc08b7 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -89,7 +89,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/overview_carbs_time"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -122,7 +122,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_carbs_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -155,7 +155,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_carbs_carbs"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index c4c5ad59ca..d6987d6922 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -94,7 +94,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_care_bg"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -129,7 +129,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/actions_care_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 4fde69c44b..2d80b4ab32 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -61,7 +61,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_extendedbolus_insulin"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -94,7 +94,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/actions_extendedbolus_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index 48f60b7a1c..9cd88f525a 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -82,7 +82,7 @@
                 android:text="@string/overview_insulin_label"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/fill_insulinamount"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index 93ec2d96d3..cfcf957761 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -84,7 +84,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_insulin_time"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -117,7 +117,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_insulin_amount"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index ab8efe79cd..01de170277 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -62,7 +62,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/overview_profileswitch_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -154,7 +154,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_profileswitch_percentage"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -187,7 +187,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_profileswitch_timeshift"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index 26b8e08487..cf0dc627fd 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -62,7 +62,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_tempbasal_basalpercentinput"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -96,7 +96,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_tempbasal_basalabsoluteinput"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -129,7 +129,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/actions_tempbasal_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 9eb1ef968c..30912b4a1d 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -85,7 +85,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_temptarget_temptarget"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
@@ -120,7 +120,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/overview_temptarget_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index 418edb5623..662df3e91f 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -76,7 +76,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_treatment_insulin"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -109,7 +109,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_treatment_carbs"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index e23cf759de..7a6e70e066 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -65,7 +65,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_bg_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -95,7 +95,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_carbs_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
@@ -126,7 +126,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_correction_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
@@ -156,7 +156,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_carb_time_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 008af1e032..2bba675168 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -198,7 +198,7 @@
                     android:text="@string/dia"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/localprofile_dia"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/layout/timelistedit_element.xml b/app/src/main/res/layout/timelistedit_element.xml
index 07c64a5ea4..9d852aefa6 100644
--- a/app/src/main/res/layout/timelistedit_element.xml
+++ b/app/src/main/res/layout/timelistedit_element.xml
@@ -19,13 +19,13 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <info.nightscout.androidaps.utils.NumberPicker
+        <info.nightscout.androidaps.utils.ui.NumberPicker
             android:id="@+id/timelistedit_edit1"
             android:layout_width="130dp"
             android:layout_height="40dp"
             android:layout_marginRight="5dp" />
 
-        <info.nightscout.androidaps.utils.NumberPicker
+        <info.nightscout.androidaps.utils.ui.NumberPicker
             android:id="@+id/timelistedit_edit2"
             android:layout_width="130dp"
             android:layout_height="40dp" />
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java b/core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java
similarity index 99%
rename from core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java
rename to core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java
index a84ccd61a2..6a3189c287 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils;
+package info.nightscout.androidaps.utils.ui;
 
 import android.text.InputType;
 import android.text.SpannableStringBuilder;
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt b/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt
new file mode 100644
index 0000000000..d00a91104a
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.utils.ui
+
+import android.content.Context
+import android.text.TextWatcher
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View.OnFocusChangeListener
+import android.widget.Button
+import info.nightscout.androidaps.core.R
+import java.text.DecimalFormat
+
+class MinutesNumberPicker constructor(context: Context, attrs: AttributeSet? = null) : NumberPicker(context, attrs) {
+
+    fun setParams(initValue: Double, minValue: Double, maxValue: Double, step: Double, allowZero: Boolean, okButton: Button? = null, textWatcher: TextWatcher? = null) {
+        super.setParams(initValue, minValue, maxValue, step, null, allowZero, okButton)
+    }
+
+    override fun updateEditText() {
+        if (value == 0.0 && !allowZero) editText.setText("")
+        else {
+            if (focused) editText.setText(DecimalFormat("0").format(value))
+            else {
+                val hours = (value / 60).toInt()
+                val minutes = (value - hours * 60).toInt()
+                val formatted =
+                    if (hours != 0) String.format(context.getString(R.string.format_hour_minute), hours, minutes)
+                    else DecimalFormat("0").format(value)
+                editText.setText(formatted)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java b/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.java
similarity index 90%
rename from core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
rename to core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.java
index c9973579ed..da5bf0ab92 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.java
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.utils;
+package info.nightscout.androidaps.utils.ui;
 
+import android.app.Service;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
@@ -10,6 +11,7 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -20,6 +22,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import info.nightscout.androidaps.core.R;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by mike on 28.06.2016.
@@ -39,12 +43,14 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
     Double minValue = 0d;
     Double maxValue = 1d;
     Double step = 1d;
-    NumberFormat formater;
+    NumberFormat formatter;
     boolean allowZero = false;
     TextWatcher textWatcher = null;
 
     Button okButton = null;
 
+    protected Boolean focused = false;
+
     private Handler mHandler;
     private ScheduledExecutorService mUpdater;
     private OnValueChangedListener mOnValueChangedListener;
@@ -93,7 +99,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         LayoutInflater.from(context).inflate(R.layout.number_picker_layout, this, true);
     }
 
-    private void initialize(Context context) {
+    protected void initialize(Context context) {
         // set layout view
         inflate(context);
 
@@ -136,7 +142,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
 
             @Override
             public void afterTextChanged(Editable s) {
-                value = SafeParse.stringToDouble(editText.getText().toString());
+                if (focused) value = SafeParse.stringToDouble(editText.getText().toString());
                 callValueChangedListener();
                 if (okButton != null) {
                     if (value > maxValue || value < minValue)
@@ -146,6 +152,13 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
                 }
             }
         });
+
+        editText.setOnFocusChangeListener(new OnFocusChangeListener() {
+            @Override public void onFocusChange(View v, boolean hasFocus) {
+                focused = hasFocus;
+                updateEditText();
+            }
+        });
     }
 
     @Override
@@ -196,7 +209,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         this.minValue = minValue;
         this.maxValue = maxValue;
         this.step = step;
-        this.formater = formater;
+        this.formatter = formater;
         this.allowZero = allowZero;
         callValueChangedListener();
         this.okButton = okButton;
@@ -254,11 +267,11 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         updateEditText();
     }
 
-    private void updateEditText() {
+    protected void updateEditText() {
         if (value == 0d && !allowZero)
             editText.setText("");
         else
-            editText.setText(formater.format(value));
+            editText.setText(formatter.format(value));
     }
 
     private void callValueChangedListener() {
@@ -286,6 +299,9 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
     @Override
     public void onClick(View v) {
         if (mUpdater == null) {
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Service.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+            editText.clearFocus();
             if (v == plusButton) {
                 inc(1);
             } else {
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 8933eefc3d..f07d0d2129 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -220,5 +220,6 @@
 
     <!--    Ntp-->
     <string name="timedetection">Time detection</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
 
 </resources>
\ No newline at end of file
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index 9996fa93d0..94f23c5f96 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -175,7 +175,7 @@
                 android:text="@string/danar_screentimeout"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_screentimeout"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
@@ -212,7 +212,7 @@
                 android:text="@string/danar_backlight"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_backlight"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
@@ -268,7 +268,7 @@
                 android:text="@string/danar_shutdown"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_shutdown"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
@@ -305,7 +305,7 @@
                 android:text="@string/danar_lowreservoir"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_lowreservoir"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"