diff --git a/app/src/main/ic_copyprev-web.png b/app/src/main/ic_copyprev-web.png
new file mode 100644
index 0000000000..d32f31327c
Binary files /dev/null and b/app/src/main/ic_copyprev-web.png differ
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
index 61830ff70b..963443e0b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
@@ -1,9 +1,13 @@
 package info.nightscout.androidaps.plugins.CircadianPercentageProfile;
 
 
+import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.Html;
 import android.text.TextWatcher;
@@ -14,16 +18,19 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Text;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.FragmentBase;
 import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
 import info.nightscout.androidaps.plugins.Careportal.OptionsToShow;
+import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
 
@@ -51,6 +58,10 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
     Button profileswitchButton;
     ImageView percentageIcon;
     ImageView timeIcon;
+    ImageView basaleditIcon;
+    ImageView iceditIcon;
+    ImageView isfeditIcon;
+
 
 
 
@@ -74,6 +85,12 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
         timeIcon = (ImageView) layout.findViewById(R.id.circadianpercentageprofile_timeicon);
         profileswitchButton = (Button) layout.findViewById(R.id.circadianpercentageprofile_profileswitch);
 
+        basaleditIcon = (ImageView) layout.findViewById(R.id.circadianpercentageprofile_basaledit);
+        iceditIcon = (ImageView) layout.findViewById(R.id.circadianpercentageprofile_icedit);
+        isfeditIcon = (ImageView) layout.findViewById(R.id.circadianpercentageprofile_isfedit);
+
+
+
         mgdlView.setChecked(circadianPercentageProfilePlugin.mgdl);
         mmolView.setChecked(circadianPercentageProfilePlugin.mmol);
         diaView.setText(circadianPercentageProfilePlugin.dia.toString());
@@ -153,6 +170,14 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
             }
         });
 
+        basaleditIcon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                BasalEditDialog basalEditDialog = new BasalEditDialog();
+                basalEditDialog.show(getFragmentManager(), "Edit Basal");
+            }
+        });
+
 
         TextWatcher textWatch = new TextWatcher() {
 
@@ -209,4 +234,36 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
         baseprofileISF.setText(Html.fromHtml("<h4>ISF: </h4>" + circadianPercentageProfilePlugin.baseIsfString()));
     }
 
+    private class BasalEditDialog extends DialogFragment{
+
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                                 Bundle savedInstanceState) {
+            getDialog().setTitle("Edit Base-Basal rates: ");
+            View view = inflater.inflate(R.layout.circadianpercentageprofile_editbasal_dialog, container, false);
+            LinearLayout list = (LinearLayout) view.findViewById(R.id.circadianpp_editbasal_listlayout);
+            for (int i = 0; i < 24; i++) {
+                View childview = inflater.inflate(R.layout.circadianpercentageprofile_listelement, container, false);
+                ((TextView)childview.findViewById(R.id.basal_time_elem)).setText((i<10?"0":"") + i + ":00: ");
+
+                if(i==0){
+                    (childview.findViewById(R.id.basal_copyprev_elem)).setVisibility(View.INVISIBLE);;
+                } else {
+                    //TODO: Add listener
+                }
+
+                //TODO: safe EditTexts in array for prev buttonaction!
+                ((TextView)childview.findViewById(R.id.basal_edittext_elem)).setText(DecimalFormatter.to2Decimal(getPlugin().basebasal[i]));
+
+                list.addView(childview);
+            }
+            getDialog().setCancelable(true);
+            return view;
+        }
+
+
+
+
+
+}
+
 }
diff --git a/app/src/main/res/layout/circadianpercentageprofile_editbasal_dialog.xml b/app/src/main/res/layout/circadianpercentageprofile_editbasal_dialog.xml
new file mode 100644
index 0000000000..48e9f5a52f
--- /dev/null
+++ b/app/src/main/res/layout/circadianpercentageprofile_editbasal_dialog.xml
@@ -0,0 +1,66 @@
+<?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:orientation="vertical"
+    android:padding="10dp">
+
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+        <LinearLayout
+            android:id="@+id/circadianpp_editbasal_listlayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <!-- Insert elements programmatically -->
+
+        </LinearLayout>
+
+
+    </ScrollView>
+
+    <View
+        android:id="@+id/fill_preset_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@android:color/darker_gray"/>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        android:gravity="center_horizontal"
+        android:layout_gravity="center_horizontal">
+
+        <Button
+            android:id="@+id/fill_preset_button2"
+            style="?android:attr/buttonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.3"
+            android:padding="10dp"
+            android:text="CANCEL"
+            android:textSize="20sp" />
+        <Button
+            android:id="@+id/fill_preset_button3"
+            style="?android:attr/buttonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.3"
+            android:padding="10dp"
+            android:text="OK"
+            android:textSize="20sp" />
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml
index d034261c17..9254b6571b 100644
--- a/app/src/main/res/layout/circadianpercentageprofile_fragment.xml
+++ b/app/src/main/res/layout/circadianpercentageprofile_fragment.xml
@@ -124,6 +124,7 @@
                         android:layout_weight="1"/>
 
                     <ImageView
+                        android:id="@+id/circadianpercentageprofile_basaledit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@mipmap/ic_edit"
@@ -151,6 +152,7 @@
                         android:layout_weight="1"/>
 
                     <ImageView
+                        android:id="@+id/circadianpercentageprofile_icedit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@mipmap/ic_edit"
@@ -174,6 +176,7 @@
                         android:layout_weight="1"/>
 
                     <ImageView
+                        android:id="@+id/circadianpercentageprofile_isfedit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@mipmap/ic_edit"
diff --git a/app/src/main/res/layout/circadianpercentageprofile_listelement.xml b/app/src/main/res/layout/circadianpercentageprofile_listelement.xml
new file mode 100644
index 0000000000..7d013e4977
--- /dev/null
+++ b/app/src/main/res/layout/circadianpercentageprofile_listelement.xml
@@ -0,0 +1,31 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/cardColorBackground"
+    android:orientation="horizontal"
+    android:paddingTop="5dp"
+    android:textAppearance="?android:attr/textAppearanceSmall"
+    android:gravity="center_horizontal">
+
+    <TextView
+        android:id="@+id/basal_time_elem"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/cardColorBackground"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <EditText
+        android:id="@+id/basal_edittext_elem"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:inputType="numberDecimal"
+        android:layout_marginLeft="15dp"/>
+
+    <ImageView
+        android:id="@+id/basal_copyprev_elem"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@mipmap/ic_copyprev"
+        android:layout_marginLeft="15dp"/>
+</LinearLayout>
diff --git a/app/src/main/res/mipmap-hdpi/ic_copyprev.png b/app/src/main/res/mipmap-hdpi/ic_copyprev.png
new file mode 100644
index 0000000000..afa55472e9
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_copyprev.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_copyprev.png b/app/src/main/res/mipmap-mdpi/ic_copyprev.png
new file mode 100644
index 0000000000..19378e336e
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_copyprev.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_copyprev.png b/app/src/main/res/mipmap-xhdpi/ic_copyprev.png
new file mode 100644
index 0000000000..2554ff9a40
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_copyprev.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_copyprev.png b/app/src/main/res/mipmap-xxhdpi/ic_copyprev.png
new file mode 100644
index 0000000000..7660f01e6d
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_copyprev.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_copyprev.png b/app/src/main/res/mipmap-xxxhdpi/ic_copyprev.png
new file mode 100644
index 0000000000..f75bf4a662
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_copyprev.png differ