diff --git a/app/src/main/java/info/nightscout/androidaps/Constants.java b/app/src/main/java/info/nightscout/androidaps/Constants.java
index 27e650edbe..77c8e2b9a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/Constants.java
+++ b/app/src/main/java/info/nightscout/androidaps/Constants.java
@@ -53,7 +53,7 @@ public class Constants {
     // Very Hard Limits Ranges
     // First value is the Lowest and second value is the Highest a Limit can define
     public static final int[] VERY_HARD_LIMIT_MIN_BG = {72,180};
-    public static final int[] VERY_HARD_LIMIT_MAX_BG = {99,270};
+    public static final int[] VERY_HARD_LIMIT_MAX_BG = {90,270};
     public static final int[] VERY_HARD_LIMIT_TARGET_BG = {80,200};
 
     // Very Hard Limits Ranges for Temp Targets
diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
index 92965a466f..858d7fde6e 100644
--- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
@@ -104,6 +104,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
             if (Config.SMSCOMMUNICATORENABLED)
                 addPreferencesFromResource(R.xml.pref_smscommunicator);
             addPreferencesFromResource(R.xml.pref_others);
+            addPreferencesFromResource(R.xml.pref_advanced);
             initSummary(getPreferenceScreen());
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java b/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
index c88d17ca38..113b3dc25c 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
@@ -112,7 +112,7 @@ public class GlucoseStatus {
 
         status.short_avgdelta = average(short_deltas);
 
-        if(prefs.getBoolean("always_use_shortavg",false) || (last_deltas.isEmpty() && prefs.getBoolean("default_to_shortavg",false))){
+        if(prefs.getBoolean("always_use_shortavg",false) || last_deltas.isEmpty()){
             status.delta = status.short_avgdelta;
         } else {
             status.delta = average(last_deltas);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0045693f75..8d469bf73c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -449,8 +449,7 @@
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Shorten tab titles</string>
     <string name="prefs_delta_title">Delta Settings</string>
-    <string name="default_to_shortavg">Default to short average delta</string>
-    <string name="default_to_shortavg_summary">Use short average delta when simple delta cannot be computed.</string>
     <string name="always_use_shortavg">Always use short average delta instead of simple delta</string>
     <string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
+    <string name="advancedsettings_title">Advanced Settings</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
new file mode 100644
index 0000000000..61552cb3be
--- /dev/null
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:key="advanced"
+        android:title="@string/advancedsettings_title">
+        <PreferenceScreen
+            android:title="@string/advancedsettings_title">
+            <PreferenceCategory
+                android:title="@string/nightscout">
+                <SwitchPreference
+                    android:defaultValue="false"
+                    android:key="ns_upload_only"
+                    android:title="@string/ns_upload_only"
+                    android:summary="@string/ns_upload_only_summary"/>
+                <SwitchPreference
+                    android:defaultValue="false"
+                    android:key="ns_sync_use_absolute"
+                    android:title="@string/ns_sync_use_absolute_title" />
+            </PreferenceCategory>
+            <PreferenceCategory
+                android:title="@string/openapsma">
+                <SwitchPreference
+                    android:defaultValue="false"
+                    android:key="always_use_shortavg"
+                    android:title="@string/always_use_shortavg"
+                    android:summary="@string/always_use_shortavg_summary"/>
+            </PreferenceCategory>
+        </PreferenceScreen>
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_nightscout.xml b/app/src/main/res/xml/pref_nightscout.xml
index 937ba32aa5..6bdf24f309 100644
--- a/app/src/main/res/xml/pref_nightscout.xml
+++ b/app/src/main/res/xml/pref_nightscout.xml
@@ -8,16 +8,6 @@
             android:defaultValue="false"
             android:key="syncprofiletopump"
             android:title="@string/syncprofiletopump_title" />
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="ns_upload_only"
-            android:title="@string/ns_upload_only"
-            android:summary="@string/ns_upload_only_summary"/>
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="ns_sync_use_absolute"
-            android:title="@string/ns_sync_use_absolute_title" />
-
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_openapsma.xml b/app/src/main/res/xml/pref_openapsma.xml
index cddb62531b..2cb9d3164b 100644
--- a/app/src/main/res/xml/pref_openapsma.xml
+++ b/app/src/main/res/xml/pref_openapsma.xml
@@ -30,18 +30,5 @@
             android:key="openapsma_max_iob"
             android:numeric="decimal"
             android:title="@string/openapsma_maxiob_summary" />
-        <PreferenceScreen
-            android:title="@string/prefs_delta_title">
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="default_to_shortavg"
-                android:title="@string/default_to_shortavg"
-                android:summary="@string/default_to_shortavg_summary"/>
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="always_use_shortavg"
-                android:title="@string/always_use_shortavg"
-                android:summary="@string/always_use_shortavg_summary"/>
-        </PreferenceScreen>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file