diff --git a/app/src/main/res/layout/overview_calibration_dialog.xml b/app/src/main/res/layout/overview_calibration_dialog.xml
index cff9d0dab1..2118b9b274 100644
--- a/app/src/main/res/layout/overview_calibration_dialog.xml
+++ b/app/src/main/res/layout/overview_calibration_dialog.xml
@@ -1,86 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="10dp">
+    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="10dp">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="10dp"
-            android:text="@string/overview_calibration_bg_label"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="10dp"
-            android:id="@+id/overview_calibration_units"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal">
-
-
-            <ImageView
-                android:id="@+id/overview_calibration_bg_minus"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="0.5"
-                android:background="@drawable/circle"
-                android:backgroundTint="#ffffff"
-                android:src="@drawable/ic_action_minus"
-                android:tint="#ffffff" />
+                android:orientation="vertical">
 
-            <EditText
-                android:id="@+id/overview_calibration_bg"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="0.5"
-                android:gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:minWidth="100dp"
-                android:padding="10dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:padding="10dp"
+                    android:text="@string/overview_calibration_bg_label"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <ImageView
-                android:id="@+id/overview_calibration_bg_plus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="0.5"
-                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:layout_gravity="center_horizontal"
+                    android:padding="10dp"
+                    android:id="@+id/overview_calibration_units"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:orientation="horizontal">
+
+
+                    <ImageView
+                        android:id="@+id/overview_calibration_bg_minus"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="0.5"
+                        android:background="@drawable/circle"
+                        android:backgroundTint="#ffffff"
+                        android:src="@drawable/ic_action_minus"
+                        android:tint="#ffffff" />
+
+                    <EditText
+                        android:id="@+id/overview_calibration_bg"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_weight="0.5"
+                        android:gravity="center_horizontal"
+                        android:inputType="numberDecimal"
+                        android:minWidth="100dp"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                    <ImageView
+                        android:id="@+id/overview_calibration_bg_plus"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="0.5"
+                        android:background="@drawable/circle"
+                        android:backgroundTint="#ffffff"
+                        android:src="@drawable/ic_action_add"
+                        android:tint="#ffffff" />
+
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/overview_calibration_okbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="10dp"
+                    android:text="OK"
+                    android:textSize="20sp"
+                    android:layout_marginTop="30dp" />
+
+            </LinearLayout>
 
         </LinearLayout>
-
-        <Button
-            android:id="@+id/overview_calibration_okbutton"
-            style="?android:attr/buttonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="10dp"
-            android:text="OK"
-            android:textSize="20sp"
-            android:layout_marginTop="30dp" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_newextendedbolus_dialog.xml b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
index 2d4cf8fee0..d004c5a59d 100644
--- a/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
+++ b/app/src/main/res/layout/overview_newextendedbolus_dialog.xml
@@ -1,109 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="10dp">
+    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="10dp">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="10dp"
-            android:text="@string/treatments_newtreatment_insulinamount_label"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:padding="10dp"
+                    android:text="@string/treatments_newtreatment_insulinamount_label"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <ImageView
-                android:id="@+id/overview_newextendedbolus_insulin_minus"
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        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_minus"
+                        android:tint="#ffffff" />
+
+                    <EditText
+                        android:id="@+id/overview_newextendedbolus_insulin"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:inputType="numberDecimal"
+                        android:minWidth="100dp"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:gravity="center_horizontal" />
+
+                    <ImageView
+                        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_add"
+                        android:tint="#ffffff" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <RadioGroup
                 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:tint="#ffffff" />
+                android:layout_gravity="center_horizontal">
 
-            <EditText
-                android:id="@+id/overview_newextendedbolus_insulin"
-                android:layout_width="wrap_content"
+                <RadioButton
+                    android:id="@+id/overview_newextendedbolus_05h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="0.5 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newextendedbolus_1h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newextendedbolus_2h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newextendedbolus_3h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="3 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newextendedbolus_4h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="4 h" />
+            </RadioGroup>
+
+            <Button
+                android:id="@+id/overview_newextendedbolus_okbutton"
+                style="?android:attr/buttonStyle"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:inputType="numberDecimal"
-                android:minWidth="100dp"
                 android:padding="10dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:gravity="center_horizontal" />
+                android:text="OK"
+                android:textSize="20sp" />
+
 
-            <ImageView
-                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_add"
-                android:tint="#ffffff" />
         </LinearLayout>
-
-    </LinearLayout>
-
-    <RadioGroup
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal">
-
-        <RadioButton
-            android:id="@+id/overview_newextendedbolus_05h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="0.5 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newextendedbolus_1h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newextendedbolus_2h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="2 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newextendedbolus_3h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="3 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newextendedbolus_4h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="4 h" />
-    </RadioGroup>
-
-    <Button
-        android:id="@+id/overview_newextendedbolus_okbutton"
-        style="?android:attr/buttonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:text="OK"
-        android:textSize="20sp" />
-
-
-</LinearLayout>
\ No newline at end of file
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_newtempbasal_dialog.xml b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
index 81b64f0da9..57a1fd5649 100644
--- a/app/src/main/res/layout/overview_newtempbasal_dialog.xml
+++ b/app/src/main/res/layout/overview_newtempbasal_dialog.xml
@@ -1,193 +1,207 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="10dp">
+    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:orientation="horizontal">
-
-        <RadioGroup
-            android:id="@+id/overview_newtempbasal_radiogroup"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/overview_newtempbasal_percent_radio"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="20dp"
-                android:checked="true"
-                android:text="@string/overview_newtempbasal_percent_label" />
-
-            <RadioButton
-                android:id="@+id/overview_newtempbasal_absolute_radio"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:text="U/h" />
-        </RadioGroup>
-
-    </LinearLayout>
-
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:padding="10dp"
-            android:text="@string/overview_newtempbasal_basal_label"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="10dp">
 
-        <LinearLayout
-            android:id="@+id/overview_newtempbasal_percent_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center_horizontal">
-
-
-            <ImageView
-                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_minus"
-                android:tint="#ffffff"
-                android:layout_weight="0.5" />
-
-            <EditText
-                android:id="@+id/overview_newtempbasal_basalpercentinput"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_weight="0.5"
-                android:inputType="numberDecimal"
-                android:minWidth="100dp"
-                android:padding="10dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:gravity="center_horizontal" />
+                android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/overview_newtempbasal_basalpercent_plus"
+                <RadioGroup
+                    android:id="@+id/overview_newtempbasal_radiogroup"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/overview_newtempbasal_percent_radio"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="20dp"
+                        android:checked="true"
+                        android:text="@string/overview_newtempbasal_percent_label" />
+
+                    <RadioButton
+                        android:id="@+id/overview_newtempbasal_absolute_radio"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:text="U/h" />
+                </RadioGroup>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:padding="10dp"
+                    android:text="@string/overview_newtempbasal_basal_label"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <LinearLayout
+                    android:id="@+id/overview_newtempbasal_percent_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_gravity="center_horizontal">
+
+
+                    <ImageView
+                        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_minus"
+                        android:tint="#ffffff"
+                        android:layout_weight="0.5" />
+
+                    <EditText
+                        android:id="@+id/overview_newtempbasal_basalpercentinput"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_weight="0.5"
+                        android:inputType="numberDecimal"
+                        android:minWidth="100dp"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:gravity="center_horizontal" />
+
+                    <ImageView
+                        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_add"
+                        android:tint="#ffffff"
+                        android:layout_weight="0.5" />
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/overview_newtempbasal_absolute_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_gravity="center_horizontal">
+
+
+                    <ImageView
+                        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_minus"
+                        android:tint="#ffffff"
+                        android:layout_weight="0.5" />
+
+                    <EditText
+                        android:id="@+id/overview_newtempbasal_basalabsoluteinput"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_weight="0.5"
+                        android:inputType="numberDecimal"
+                        android:minWidth="100dp"
+                        android:padding="10dp"
+                        android:text=""
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:gravity="center_horizontal" />
+
+                    <ImageView
+                        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_add"
+                        android:tint="#ffffff"
+                        android:layout_weight="0.5" />
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+            <RadioGroup
                 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:tint="#ffffff"
-                android:layout_weight="0.5" />
+                android:layout_gravity="center_horizontal">
+
+                <RadioButton
+                    android:id="@+id/overview_newtempbasal_05h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="true"
+                    android:text="0.5 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newtempbasal_1h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="1 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newtempbasal_2h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="2 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newtempbasal_3h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="3 h" />
+
+                <RadioButton
+                    android:id="@+id/overview_newtempbasal_4h"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="4 h" />
+            </RadioGroup>
+
+            <Button
+                android:id="@+id/overview_newtempbasal_okbutton"
+                style="?android:attr/buttonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="10dp"
+                android:text="OK"
+                android:textSize="20sp" />
 
 
         </LinearLayout>
-
-       <LinearLayout
-            android:id="@+id/overview_newtempbasal_absolute_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center_horizontal">
-
-
-            <ImageView
-                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_minus"
-                android:tint="#ffffff"
-                android:layout_weight="0.5" />
-
-            <EditText
-                android:id="@+id/overview_newtempbasal_basalabsoluteinput"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="0.5"
-                android:inputType="numberDecimal"
-                android:minWidth="100dp"
-                android:padding="10dp"
-                android:text=""
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:gravity="center_horizontal" />
-
-            <ImageView
-                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_add"
-                android:tint="#ffffff"
-                android:layout_weight="0.5" />
-
-
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-    <RadioGroup
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal">
-
-        <RadioButton
-            android:id="@+id/overview_newtempbasal_05h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="0.5 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newtempbasal_1h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newtempbasal_2h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="2 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newtempbasal_3h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="3 h" />
-
-        <RadioButton
-            android:id="@+id/overview_newtempbasal_4h"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="4 h" />
-    </RadioGroup>
-
-    <Button
-        android:id="@+id/overview_newtempbasal_okbutton"
-        style="?android:attr/buttonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:text="OK"
-        android:textSize="20sp" />
-
-
-</LinearLayout>
\ No newline at end of file
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/overview_newtreatment_dialog.xml b/app/src/main/res/layout/overview_newtreatment_dialog.xml
index b95b333b74..a601f0f425 100644
--- a/app/src/main/res/layout/overview_newtreatment_dialog.xml
+++ b/app/src/main/res/layout/overview_newtreatment_dialog.xml
@@ -1,126 +1,140 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:focusableInTouchMode="true"
-    android:orientation="vertical"
-    android:padding="10dp">
+    tools:context="info.nightscout.androidaps.plugins.InsulinFastacting.InsulinFastactingFragment">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:padding="10dp"
-        android:text="@string/treatments_newtreatment_insulinamount_label"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:orientation="horizontal">
-
-        <ImageView
-            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_minus"
-            android:tint="#ffffff" />
-
-        <EditText
-            android:id="@+id/treatments_newtreatment_insulinamount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:inputType="numberDecimal"
-            android:minWidth="200dp"
-            android:padding="10dp"
-            android:text=""
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:gravity="center_horizontal" />
-
-        <ImageView
-            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_add"
-            android:tint="#ffffff" />
-    </LinearLayout>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:padding="10dp"
-        android:text="@string/treatments_newtreatment_carbsamount_label"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_gravity="center_horizontal">
-
-        <ImageView
-            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_minus"
-            android:tint="#ffffff" />
-
-        <EditText
-            android:id="@+id/treatments_newtreatment_carbsamount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:inputType="numberDecimal"
-            android:minWidth="200dp"
-            android:padding="10dp"
-            android:text=""
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:gravity="center_horizontal" />
-
-        <ImageView
-            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_add"
-            android:tint="#ffffff" />
-
-
-    </LinearLayout>
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:orientation="horizontal"
-        android:padding="10dp">
+        android:layout_height="match_parent">
 
-        <Button
-            android:id="@+id/treatments_newtreatment_deliverbutton"
-            style="?android:attr/buttonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:padding="10dp"
-            android:text="OK"
-            android:textSize="20sp" />
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical"
+            android:padding="10dp">
 
-    </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:padding="10dp"
+                android:text="@string/treatments_newtreatment_insulinamount_label"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal">
+
+                <ImageView
+                    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_minus"
+                    android:tint="#ffffff" />
+
+                <EditText
+                    android:id="@+id/treatments_newtreatment_insulinamount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:inputType="numberDecimal"
+                    android:minWidth="200dp"
+                    android:padding="10dp"
+                    android:text=""
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:gravity="center_horizontal" />
+
+                <ImageView
+                    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_add"
+                    android:tint="#ffffff" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:padding="10dp"
+                android:text="@string/treatments_newtreatment_carbsamount_label"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_gravity="center_horizontal">
+
+                <ImageView
+                    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_minus"
+                    android:tint="#ffffff" />
+
+                <EditText
+                    android:id="@+id/treatments_newtreatment_carbsamount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:inputType="numberDecimal"
+                    android:minWidth="200dp"
+                    android:padding="10dp"
+                    android:text=""
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:gravity="center_horizontal" />
+
+                <ImageView
+                    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_add"
+                    android:tint="#ffffff" />
 
 
-</LinearLayout>
\ No newline at end of file
+            </LinearLayout>
+
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <Button
+                    android:id="@+id/treatments_newtreatment_deliverbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="10dp"
+                    android:text="OK"
+                    android:textSize="20sp" />
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file