diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java
index 8ef5486ade..a5722af830 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/insulin/InsulinProfileEditor.java
@@ -1,7 +1,6 @@
 package com.eveningoutpost.dexdrip.insulin;
 
 import android.os.Bundle;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -9,7 +8,6 @@
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
-import android.widget.ScrollView;
 
 import com.eveningoutpost.dexdrip.BaseAppCompatActivity;
 import com.eveningoutpost.dexdrip.R;
@@ -36,8 +34,6 @@ public class InsulinProfileEditor extends BaseAppCompatActivity {
     private Spinner basalSpinner, bolusSpinner;
     private HashMap<Insulin, CheckBox> checkboxes;
     private HashMap<String, Insulin> profiles;
-    private ScrollView parentScrollView;
-    private ScrollView childScrollView;
 
     //private Context mContext;
 
@@ -56,19 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
         linearLayout = (LinearLayout) findViewById(R.id.profile_layout_view);
         basalSpinner = (Spinner) findViewById(R.id.basalSpinner);
         bolusSpinner = (Spinner) findViewById(R.id.bolusSpinner);
-        parentScrollView = (ScrollView) findViewById(R.id.parent_scroll_view);
-        childScrollView = (ScrollView) findViewById(R.id.child_scroll_view);
 
-        parentScrollView.setOnTouchListener((v, event) -> {
-            findViewById(R.id.parent_scroll_view).getParent().requestDisallowInterceptTouchEvent(false);
-            return false;
-        });
-
-        childScrollView.setOnTouchListener((v, event) -> {
-            // Disallow the touch request for parent scroll on touch of  child view
-            v.getParent().getParent().requestDisallowInterceptTouchEvent(true);
-            return false;
-        });
         val iprofiles = InsulinManager.getAllProfiles();
         if (iprofiles == null) {
             JoH.static_toast_long("Can't initialize insulin profiles");
diff --git a/app/src/main/res/layout/activity_insulinprofile_editor.xml b/app/src/main/res/layout/activity_insulinprofile_editor.xml
index 093c4b4635..7ec51e416e 100644
--- a/app/src/main/res/layout/activity_insulinprofile_editor.xml
+++ b/app/src/main/res/layout/activity_insulinprofile_editor.xml
@@ -8,7 +8,6 @@
     android:fitsSystemWindows="true">
 
     <ScrollView
-        android:id="@+id/parent_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingBottom="@dimen/activity_vertical_margin"
@@ -21,10 +20,8 @@
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:weightSum="1"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentStart="true">
+            android:layout_height="wrap_content"
+            android:weightSum="1">
 
             <TextView
                 android:id="@+id/Text"
@@ -34,26 +31,20 @@
                 android:text="@string/pref_enable_insulinprofiles"
                 android:textSize="18sp" />
 
-            <ScrollView
-                android:id="@+id/child_scroll_view"
-                android:layout_width="match_parent"
-                android:layout_height="440dp"
-                android:paddingLeft="@dimen/activity_horizontal_margin"
-                android:paddingTop="@dimen/activity_vertical_margin"
-                android:paddingRight="@dimen/activity_horizontal_margin"
-                android:paddingBottom="@dimen/activity_vertical_margin">
-
                 <LinearLayout
                     android:id="@+id/profile_layout_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="440dp"
-                    android:layout_gravity="bottom"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top"
                     android:layout_weight="1"
+                    android:paddingLeft="@dimen/activity_horizontal_margin"
+                    android:paddingTop="@dimen/activity_vertical_margin"
+                    android:paddingRight="@dimen/activity_horizontal_margin"
+                    android:paddingBottom="@dimen/activity_vertical_margin"
                     android:fadeScrollbars="false"
                     android:orientation="vertical"
-                    android:scrollbars="vertical"></LinearLayout>
-
-            </ScrollView>
+                    android:scrollbars="vertical">
+                </LinearLayout>
 
             <TextView
                 android:id="@+id/Text2"
@@ -87,41 +78,42 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="94dp"
+                android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
                 android:layout_weight="1"
+                android:paddingTop="@dimen/activity_vertical_margin"
                 android:gravity="bottom">
 
                 <Button
+                    android:id="@+id/profileCancelbtn"
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
-                    android:layout_height="32dp"
-                    android:text="@string/cancel"
-                    android:id="@+id/profileCancelbtn"
-                    android:onClick="profileCancelButton"
-                    android:layout_alignParentBottom="true"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@+id/profileUndoBtn"
                     android:layout_alignParentStart="true"
-                    android:layout_alignTop="@+id/profileUndoBtn" />
+                    android:layout_alignParentBottom="true"
+                    android:onClick="profileCancelButton"
+                    android:text="@string/cancel" />
 
                 <Button
+                    android:id="@+id/profileSaveBtn"
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/save"
-                    android:id="@+id/profileSaveBtn"
-                    android:layout_alignParentBottom="true"
-                    android:layout_alignParentEnd="true"
                     android:layout_alignTop="@+id/profileUndoBtn"
-                    android:onClick="profileSaveButton" />
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentBottom="true"
+                    android:onClick="profileSaveButton"
+                    android:text="@string/save" />
 
                 <Button
+                    android:id="@+id/profileUndoBtn"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/reset"
-                    android:id="@+id/profileUndoBtn"
                     android:layout_alignParentBottom="true"
                     android:layout_toEndOf="@+id/profileCancelbtn"
-                    android:onClick="profileUndoButton" />
+                    android:onClick="profileUndoButton"
+                    android:text="@string/reset" />
             </RelativeLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/raw/initiallexicon.txt b/app/src/main/res/raw/initiallexicon.json
similarity index 57%
rename from app/src/main/res/raw/initiallexicon.txt
rename to app/src/main/res/raw/initiallexicon.json
index ea0e174a92..8bb98bbd0c 100644
--- a/app/src/main/res/raw/initiallexicon.txt
+++ b/app/src/main/res/raw/initiallexicon.json
@@ -1,6 +1,8 @@
-{"entries":[
-{"lexicon": "stop",
-    "matchWords":[
+{
+  "entries": [
+    {
+      "lexicon": "stop",
+      "matchWords": [
         "stop",
         "cancel",
         "done",
@@ -10,10 +12,11 @@
         "finished",
         "finish",
         "quit"
-    ]},
-
-{"lexicon": "rapid",
-    "matchWords":[
+      ]
+    },
+    {
+      "lexicon": "rapid",
+      "matchWords": [
         "rapid",
         "rapid acting",
         "rapid-acting",
@@ -28,16 +31,18 @@
         "unit",
         "u",
         "you"
-    ]},
-
-{"lexicon": "long",
-    "matchWords":[
+      ]
+    },
+    {
+      "lexicon": "long",
+      "matchWords": [
         "long",
         "long acting"
-    ]},
-
-{"lexicon": "carbs",
-    "matchWords":[
+      ]
+    },
+    {
+      "lexicon": "carbs",
+      "matchWords": [
         "carbs",
         "cards",
         "carbohydrate",
@@ -49,41 +54,43 @@
         "car",
         "g",
         "gee"
-    ]},
-
-{"lexicon": "time",
-    "matchWords":[
+      ]
+    },
+    {
+      "lexicon": "time",
+      "matchWords": [
         "time",
         "times",
         "clock",
-	    "o'clock",
+        "o'clock",
         "oclock",
         "hour",
         "hours",
         "at"
-    ]},
-
-{"lexicon": "ago",
-    "matchWords":[
+      ]
+    },
+    {
+      "lexicon": "ago",
+      "matchWords": [
         "ago"
-    ]},
-
-
-{"lexicon": "blood",
-    "matchWords":[
+      ]
+    },
+    {
+      "lexicon": "blood",
+      "matchWords": [
         "mmol",
         "mmols",
-	    "animal",
+        "animal",
         "miles",
         "mile",
         "memo",
-	    "mobile",
-	    "month",
+        "mobile",
+        "month",
         "mm",
         "mg",
         "bg",
-	    "milligram",
-	    "milligrams",
+        "milligram",
+        "milligrams",
         "normal",
         "mole",
         "moles",
@@ -93,21 +100,25 @@
         "blood sugar",
         "hottest",
         "obsessed"
-    ]},
-
-{"lexicon": "grams",
-    "matchWords":[
-    ]},
-
-{"lexicon": "units",
-    "matchWords":[
-    ]},
-
-{"lexicon": "note",
-    "matchWords":[
+      ]
+    },
+    {
+      "lexicon": "grams",
+      "matchWords": [
+      ]
+    },
+    {
+      "lexicon": "units",
+      "matchWords": [
+      ]
+    },
+    {
+      "lexicon": "note",
+      "matchWords": [
         "note",
         "notes",
         "night"
-    ]}
-
-]}
+      ]
+    }
+  ]
+}
diff --git a/app/src/main/res/raw/insulin_profiles.txt b/app/src/main/res/raw/insulin_profiles.json
similarity index 80%
rename from app/src/main/res/raw/insulin_profiles.txt
rename to app/src/main/res/raw/insulin_profiles.json
index 85db7c9eec..023c387fb2 100644
--- a/app/src/main/res/raw/insulin_profiles.txt
+++ b/app/src/main/res/raw/insulin_profiles.json
@@ -1,19 +1,15 @@
 {
-  "profiles":
-  [
+  "profiles": [
     {
       "name": "FIASP",
       "displayName": "FIASP (ultra fast acting)",
       "concentration": "U100",
-      "PPN":
-      [
+      "PPN": [
         "FIASP-U100"
       ],
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "2",
           "peak": "45",
           "duration": "300"
@@ -24,15 +20,12 @@
       "name": "Afrezza",
       "displayName": "Afrezza (inhaled, ultra-fast acting)",
       "concentration": "U100",
-      "PPN":
-      [
+      "PPN": [
         "Afrezza-U100"
       ],
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "5",
           "peak": "50",
           "duration": "150"
@@ -43,15 +36,12 @@
       "name": "Apidra",
       "displayName": "Apidra (ultra-fast acting)",
       "concentration": "U100",
-      "PPN":
-      [
+      "PPN": [
         "Apidra-U100"
       ],
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "10",
           "peak": "60-180",
           "duration": "300"
@@ -62,15 +52,12 @@
       "name": "Novorapid",
       "displayName": "Novorapid (rapid acting)",
       "concentration": "U100",
-      "PPN":
-      [
+      "PPN": [
         "1100558736"
       ],
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "10",
           "peak": "75",
           "duration": "180"
@@ -81,15 +68,12 @@
       "name": "Humalog",
       "displayName": "Humalog (rapid acting)",
       "concentration": "U100",
-      "PPN":
-      [
+      "PPN": [
         "Humalog-U100"
       ],
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "10",
           "peak": "75",
           "duration": "180"
@@ -100,18 +84,15 @@
       "name": "Lispro",
       "displayName": "Lispro (rapid acting)",
       "concentration": "U100",
-      "PPN":
-      [
+      "PPN": [
         "111291061285",
         "111291059828",
         "111291064107",
         "111291063541"
       ],
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "15",
           "peak": "90",
           "duration": "210"
@@ -122,15 +103,12 @@
       "name": "Actrapid",
       "displayName": "Actrapid (short acting)",
       "concentration": "U100",
-      "PPN":
-      [
+      "PPN": [
         "1102949004"
       ],
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "30",
           "peak": "60-240",
           "duration": "480"
@@ -140,16 +118,13 @@
     {
       "name": "Insulatard",
       "displayName": "Insulatard (NPH)",
-      "PPN":
-      [
+      "PPN": [
         "1105039656"
       ],
       "concentration": "U100",
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "60",
           "peak": "120-720",
           "duration": "1440"
@@ -159,16 +134,13 @@
     {
       "name": "Toujeo",
       "displayName": "Toujeo (long acting)",
-      "PPN":
-      [
+      "PPN": [
         "ToujeoU100"
       ],
       "concentration": "U100",
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "180",
           "peak": "480",
           "duration": "2160"
@@ -178,16 +150,13 @@
     {
       "name": "Lantus",
       "displayName": "Lantus (long acting)",
-      "PPN":
-      [
+      "PPN": [
         "LantusU100"
       ],
       "concentration": "U100",
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "60",
           "peak": "420-1200",
           "duration": "2160"
@@ -197,16 +166,13 @@
     {
       "name": "Levemir",
       "displayName": "Levemir (long acting)",
-      "PPN":
-      [
+      "PPN": [
         "LevemirU100"
       ],
       "concentration": "U100",
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "60",
           "peak": "180-840",
           "duration": "1500"
@@ -216,16 +182,13 @@
     {
       "name": "Basaglar",
       "displayName": "Basaglar (long acting)",
-      "PPN":
-      [
+      "PPN": [
         "BasaglarU100"
       ],
       "concentration": "U100",
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "60",
           "peak": "480-1140",
           "duration": "1440"
@@ -235,16 +198,13 @@
     {
       "name": "Tresiba",
       "displayName": "Tresiba (ultra-long acting)",
-      "PPN":
-      [
+      "PPN": [
         "TresibaU100"
       ],
       "concentration": "U100",
-      "Curve":
-      {
+      "Curve": {
         "type": "linear trapezoid",
-        "data":
-        {
+        "data": {
           "onset": "90",
           "peak": "120-2460",
           "duration": "2520"