diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 982682e035..fc9190475e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,6 +49,7 @@
             android:theme="@style/Theme.AppCompat.Translucent" />
         <activity android:name=".AgreementActivity" />
         <activity android:name=".plugins.PumpDanaR.activities.DanaRHistoryActivity" />
+        <activity android:name=".plugins.PumpDanaR.activities.DanaRUserOptionsActivity" />
         <activity android:name=".TDDStatsActivity" />
         <activity android:name=".plugins.Overview.activities.QuickWizardListActivity">
             <intent-filter>
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
index eb9cd05d82..ee5e39c4fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
@@ -1,14 +1,82 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.activities;
 
 import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SwitchCompat;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.Spinner;
+import android.widget.Switch;
+import android.widget.TextView;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+
 /**
  * Created by Rumen Georgiev on 5/31/2018.
  */
 
 public class DanaRUserOptionsActivity extends Activity {
     private static Logger log = LoggerFactory.getLogger(DanaRUserOptionsActivity.class);
+
+    private Handler mHandler;
+    private static HandlerThread mHandlerThread;
+    LinearLayoutManager llm;
+    RecyclerView recyclerView;
+
+    Switch timeFormat;
+    Switch buttonScroll;
+    Switch beep;
+    RadioGroup pumpAlarm;
+    RadioButton pumpAlarmSound;
+    RadioButton pumpAlarmVibrate;
+    RadioButton pumpAlarmBoth;
+    EditText screenTimeout;
+    EditText backlightTimeout;
+    EditText shutdown;
+    EditText lowReservoir;
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        MainApp.bus().register(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        MainApp.bus().unregister(this);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.danar_user_options);
+
+        timeFormat = (Switch) findViewById(R.id.danar_timeformat);
+        buttonScroll = (Switch) findViewById(R.id.danar_buttonscroll);
+        beep = (Switch) findViewById(R.id.danar_beep);
+        pumpAlarm = (RadioGroup) findViewById(R.id.danar_pumpalarm);
+        pumpAlarmSound = (RadioButton) findViewById(R.id.danar_pumpalarm_sound);
+        pumpAlarmVibrate = (RadioButton) findViewById(R.id.danar_pumpalarm_vibrate);
+        pumpAlarmBoth = (RadioButton) findViewById(R.id.danar_pumpalarm_both);
+        screenTimeout = (EditText) findViewById(R.id.danar_screentimeout);
+        backlightTimeout = (EditText) findViewById(R.id.danar_backlight);
+        shutdown = (EditText) findViewById(R.id.danar_shutdown);
+        lowReservoir = (EditText) findViewById(R.id.danar_lowreservoir);
+
+
+
+    }
 }
diff --git a/app/src/main/res/layout/danar_user_options.xml b/app/src/main/res/layout/danar_user_options.xml
index 7d84cfa65c..b0affb9082 100644
--- a/app/src/main/res/layout/danar_user_options.xml
+++ b/app/src/main/res/layout/danar_user_options.xml
@@ -10,12 +10,14 @@
         android:layout_height="match_parent">
 
         <ScrollView
+            android:id="@+id/danar_user_options_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/danar_buttons"
             android:fillViewport="true">
 
             <LinearLayout
+                android:id="@+id/danar_user_options_top"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -43,33 +45,21 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/danar_timedisplay"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
                     <Switch
                         android:id="@+id/danar_timeformat"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:showText="true"
+                        android:text="@string/danar_timedisplay"
                         android:textOff="12h"
                         android:textOn="24h" />
 
@@ -88,32 +78,22 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/danar_buttonscroll"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
                     <Switch
                         android:id="@+id/danar_buttonscroll"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_weight="1"
+                        android:text="@string/danar_buttonscroll"
+                        android:textOff="@string/option_off"
+                        android:textOn="@string/option_on" />
 
 
                 </LinearLayout>
@@ -130,32 +110,22 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/danar_beep"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
                     <Switch
                         android:id="@+id/danar_beep"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1" />
+                        android:layout_weight="1"
+                        android:text="@string/danar_beep"
+                        android:textOff="@string/option_off"
+                        android:textOn="@string/option_on" />
 
 
                 </LinearLayout>
@@ -172,13 +142,19 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="end"
+                        android:gravity="left"
                         android:paddingRight="5dp"
                         android:text="@string/danar_pumpalarm"
                         android:textSize="14sp" />
@@ -194,9 +170,11 @@
                         android:textSize="14sp" />
 
                     <RadioGroup
+                        android:id="@+id/danar_pumpalarm"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1">
+                        android:layout_weight="1"
+                        android:checkedButton="@+id/danar_pumpalarm_sound">
 
                         <RadioButton
                             android:id="@+id/danar_pumpalarm_sound"
@@ -234,13 +212,19 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="end"
+                        android:gravity="top"
                         android:paddingRight="5dp"
                         android:text="@string/danar_screentimeout"
                         android:textSize="14sp" />
@@ -277,13 +261,19 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="end"
+                        android:gravity="top"
                         android:paddingRight="5dp"
                         android:text="@string/danar_backlight"
                         android:textSize="14sp" />
@@ -320,33 +310,23 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="end"
-                        android:paddingRight="5dp"
-                        android:text="@string/danar_glucoseunits"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:layout_width="5dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="center_horizontal"
-                        android:paddingEnd="2dp"
-                        android:paddingStart="2dp"
-                        android:text=":"
-                        android:textSize="14sp" />
-
                     <Switch
                         android:id="@+id/danar_units"
-                        android:layout_width="match_parent"
+                        android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:textOff="mg/dl"
+                        android:showText="true"
+                        android:splitTrack="false"
+                        android:text="@string/danar_glucoseunits"
+                        android:textOff="@string/mgdl"
                         android:textOn="@string/mmol" />
 
                 </LinearLayout>
@@ -363,13 +343,19 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="end"
+                        android:gravity="left"
                         android:paddingRight="5dp"
                         android:text="@string/danar_shutdown"
                         android:textSize="14sp" />
@@ -406,13 +392,19 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="20dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="5dp"
                     android:orientation="horizontal">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="end"
+                        android:gravity="left"
                         android:paddingRight="5dp"
                         android:text="@string/danar_lowreservoir"
                         android:textSize="14sp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03e2dd671d..e41e04c964 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1081,7 +1081,7 @@
     <string name="setupwizard_aps_description">Select one from availables algorithms. They are sorted from oldest to newest. Newer algorithm is usualy more powerfull and more aggresive. Thus if you are new looper you may probably start with AMA and not with latest one. Do not forget to read the OpenAPS documentation and configure it before use.</string>
     <string name="startobjective">Start your first objective</string>
     <string name="danar_useroptions">Additional options</string>
-    <string name="danar_timedisplay">Display time in 24h time format( not 12hr )</string>
+    <string name="danar_timedisplay">Display time format( not 12hr )</string>
     <string name="danar_buttonscroll">Button scroll</string>
     <string name="danar_beep">Beep on button press</string>
     <string name="danar_pumpalarm">Alarm</string>
@@ -1094,4 +1094,6 @@
     <string name="danar_shutdown">Shutdown</string>
     <string name="danar_lowreservoir">Low reservoir</string>
     <string name="danar_saveuseroptions">Save options to pump</string>
+    <string name="option_on">On</string>
+    <string name="option_off">Off</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index c2eee2bc62..d5db368eac 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -23,7 +23,6 @@
             android:defaultValue="false"
             android:key="openapsama_useautosens"
             android:title="@string/openapsama_useautosens" />
-
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_use_smb"