diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9ce494..74bb7de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
         - Added facility to upload data to remote server.
         - Added support for additional GarminSD settings data fields to record the watch app version number etc and
           log that info to the SysLog file.
+        - Made only a subset of settings available by default, unless the user enables 'advanced mode' to make them all visible.
     V3.1.15 - 01mar2020
         - Added German Language support for main and startup app screens.
     V3.1.14 - 27feb2020
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b4ddd6f..52c3c98 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -79,7 +79,29 @@
   <string name="AudibleAlarmsCancelledFor">Akustische Alarme abgeschaltet fuer </string>
   <string name="PressToReEnable"> Drücken um Funktion wieder zu aktivieren</string>
   <string name="CancelAudibleAlarms">Akustische Alarme abschalten (voruebergehend)</string>
-  <string name="AudibleAlarmsOff"> Akustische Alarme AUS</string>
+  <string name="AudibleAlarmsOff">Heart Rate Max Threshold (bpm)</string>
   <string name="Fault">FEHLER</string>
+    <string name="AdvancedModeTitle">Advanced Mode</string>
+  <string name="AdvancedModeSummary">Enable Advanced Settings (exposes a lot more things you can change....)</string>
+    <string name="AutoStartTitle">Auto Start</string>
+  <string name="AutoStartSummary">Auto start OpenSeizureDetector when phone is started</string>
+  <string name="DataSourceSummary">Select whether to use a Garmin Watch, Pebble Watch or network connection as the seizure detector data source.</string>
+  <string name="LogRemoteTitle">Log Data Remotely</string>
+  <string name="UseMobileSummary">Use mobile internet to log remote data</string>
+  <string name="SeizureDetectorSettingsTitle">Seizure Detector Settings</string>
+  <string name="AlarmThreshTitle">Alarm Threshold</string>
+  <string name="AlarmThreshSummary">Alarm Threshold (Default = 100)</string>
+  <string name="AlarmRatioThreshTitle">Alarm Ratio Threshold</string>
+  <string name="AlarmRatioThreshSummary">Alarm Ratio Threshold (Default = 50). Increase to reduce sensitivity.</string>
+  <string name="AlarmFreqMaxTitle">AlarmFreqMax (Hz)</string>
+  <string name="AlarmFreqMaxSummary">Maximum Frequency of ROI (Hz) (Default = 8 Hz)</string>
+  <string name="AlarmFreqMinTitle">AlarmFreqMin (Hz)</string>
+  <string name="AlarmFreqMinSummary">Minimum Frequency of ROI (Hz) (Default = 3 Hz)</string>
+  <string name="HRAlarmEnabledTitle">Heart Rate Alarm Enabled</string>
+  <string name="HRAlarmEnabledSummary" />
+  <string name="HRNullAlarmTitle">Treat a Null heart rate as an alarm condition</string>
+  <string name="HRNullAlarmSummary" />
+  <string name="HRThreshMinTitle">Heart Rate Min Threshold (bpm)</string>
+  <string name="HRThreshMaxTitle" >Heart Rate Min Threshold (bpm)</string>
 </resources>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aec55a8..fd7be75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
         \n    - Added facility to upload data to remote server.
         \n    - Added support for additional GarminSD settings data fields to record the watch app version number etc and
           log that info to the SysLog file.
+        \n    - Made only a subset of settings visible by default unless the user enables Advanced Mode
         \n  V3.1.15 - Added German Language Support to main and start-up screens
         \n  V3.1.14 - Repaired OpenSeizureDetector Web Interface, that was broken by V3.1.13
         \n  V3.1.13 - Fixed ERR-400 display on garmin watch and associated problem with network datasource fault alerting.
@@ -30,6 +31,7 @@
         \n    - Added facility to upload data to remote server.
         \n    - Added support for additional GarminSD settings data fields to record the watch app version number etc and
           log that info to the SysLog file.
+        \n    - Made only a subset of settings visible by default unless the user enables Advanced Mode
         \n  V3.1.15 - Added German Language Support to main and start-up screens
         \n  V3.1.14 - Repaired OpenSeizureDetector Web Interface, that was broken by V3.1.13
         \n  V3.1.13 - Fixed ERR-400 display on garmin watch and associated problem with network datasource fault alerting.
@@ -91,4 +93,32 @@
     <string name="invalid_username">Not a valid username</string>
     <string name="invalid_password">Password must be >5 characters</string>
     <string name="login_failed">"Login failed"</string>
+    <string name="AdvancedModeTitle">Advanced Mode</string>
+    <string name="AdvancedModeSummary">Enable Advanced Settings (exposes a lot more things you can change....)</string>
+    <string name="AutoStartTitle">Auto Start</string>
+    <string name="AutoStartSummary">Auto start OpenSeizureDetector when phone is started</string>
+    <string name="DataSourceTitle">Select Data Source</string>
+    <string name="DataSourceSummary">Select whether to use a Garmin Watch, Pebble Watch or network connection as the seizure detector data source.</string>
+    <string name="LogRemoteTitle">Log Data Remotely</string>
+    <string name="LogRemoteSummary">Log Data to Central OpenSeizureDetector Database</string>
+    <string name="UseMobileTitle">Use Mobile Internet</string>
+    <string name="UseMobileSummary">Use mobile internet to log remote data</string>
+    <string name="SeizureDetectorSettingsTitle">Seizure Detector Settings</string>
+    <string name="AlarmThreshTitle">Alarm Threshold</string>
+    <string name="AlarmThreshSummary">Alarm Threshold (Default = 100)</string>
+    <string name="AlarmRatioThreshTitle">Alarm Ratio Threshold</string>
+    <string name="AlarmRatioThreshSummary">Alarm Ratio Threshold (Default = 50). Increase to reduce sensitivity.</string>
+    <string name="AlarmFreqMaxTitle">AlarmFreqMax (Hz)</string>
+    <string name="AlarmFreqMaxSummary">Maximum Frequency of ROI (Hz) (Default = 8 Hz)</string>
+    <string name="AlarmFreqMinTitle">AlarmFreqMin (Hz)</string>
+    <string name="AlarmFreqMinSummary">Minimum Frequency of ROI (Hz) (Default = 3 Hz)</string>
+    <string name="HRAlarmEnabledTitle">Heart Rate Alarm Enabled</string>
+    <string name="HRAlarmEnabledSummary" />
+    <string name="HRNullAlarmTitle">Treat a Null heart rate as an alarm condition</string>
+    <string name="HRNullAlarmSummary" />
+    <string name="HRThreshMinTitle">Heart Rate Min Threshold (bpm)</string>
+    <string name="HRThreshMinSummary" />
+    <string name="HRThreshMaxTitle">Heart Rate Max Threshold (bpm)</string>
+    <string name="HRThreshMaxSummary" />
+
 </resources>
diff --git a/app/src/main/res/xml/basic_prefs.xml b/app/src/main/res/xml/basic_prefs.xml
index 3dd452f..5b0a360 100644
--- a/app/src/main/res/xml/basic_prefs.xml
+++ b/app/src/main/res/xml/basic_prefs.xml
@@ -4,14 +4,14 @@
         android:defaultValue="false"
         android:enabled="true"
         android:key="advancedMode"
-        android:summary="Enable Advanced Settings (exposes a lot more things you can change....)"
-        android:title="Advanced Mode" />
+        android:summary="@string/AdvancedModeSummary"
+        android:title="@string/AdvancedModeTitle" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:enabled="true"
         android:key="AutoStart"
-        android:summary="Auto Start App on Boot"
-        android:title="Auto Start App on Boot" />
+        android:summary="@string/AutoStartSummary"
+        android:title="@string/AutoStartTitle" />
 
     <ListPreference
         android:defaultValue="Garmin"
@@ -19,69 +19,69 @@
         android:entries="@array/datasource_list"
         android:entryValues="@array/datasource_list_values"
         android:key="DataSource"
-        android:summary="Select whether to use a Garmin Watch, Pebble Watch or network connection as the seizure detector data source."
-        android:title="Select Data Source" />
+        android:summary="@string/DataSourceSummary"
+        android:title="@string/DataSourceTitle" />
 
     <PreferenceCategory android:title="Data Logging Settings">
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="LogDataRemote"
-        android:summary="Log Data to Central OpenSeizureDetector Database"
-        android:title="Log Data Remotely" />
+        android:summary="@string/LogRemoteSummary"
+        android:title="@string/LogRemoteTitle" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="LogDataRemoteMobile"
-        android:summary="Use mobile internet to log remote data"
-        android:title="Use Mobile Internet" />
+        android:summary="@string/UseMobileSummary"
+        android:title="@string/UseMobileTitle" />
     </PreferenceCategory>
 
 
-    <PreferenceCategory android:title="Seizure Detector Settings">
+    <PreferenceCategory android:title="@string/SeizureDetectorSettingsTitle">
 
     <EditTextPreference
         android:defaultValue="100"
         android:key="AlarmThresh"
-        android:summary="Alarm Threshold (Default = 100)"
-        android:title="AlarmThresh" />
+        android:summary="@string/AlarmThreshSummary"
+        android:title="@string/AlarmThreshTitle" />
     <EditTextPreference
         android:defaultValue="50"
         android:key="AlarmRatioThresh"
-        android:summary="Alarm Ratio Threshold (Default = 50).  Increase to reduce sensitivity."
-        android:title="AlarmRatioThresh" />
+        android:summary="@string/AlarmRatioThreshSummary"
+        android:title="@string/AlarmRatioThreshTitle" />
 
     <EditTextPreference
         android:defaultValue="3"
         android:key="AlarmFreqMin"
-        android:summary="Minimum Frequency of ROI (Hz) (Default = 3 Hz)"
-        android:title="AlarmFreqMin (Hz)" />
+        android:summary="@string/AlarmFreqMinSummary"
+        android:title="@string/AlarmFreqMinTitle" />
     <EditTextPreference
         android:defaultValue="8"
         android:key="AlarmFreqMax"
-        android:summary="Maximum Frequency of ROI (Hz) (Default = 8 Hz)"
-        android:title="AlarmFreqMax (Hz)" />
+        android:summary="@string/AlarmFreqMaxSummary"
+        android:title="@string/AlarmFreqMaxTitle" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Heart Rate Alarm Settings">
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="HRAlarmActive"
-            android:summary=""
-            android:title="Heart Rate Alarm Enabled" />
+            android:summary="@string/HRAlarmEnabledSummary"
+            android:title="@string/HRAlarmEnabledTitle" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="HRNullAsAlarm"
-            android:summary=""
-            android:title="Treat a Null heart rate as an alarm condition" />
+            android:summary="@string/HRNullAlarmSummary"
+            android:title="@string/HRNullAlarmTitle" />
         <EditTextPreference
             android:defaultValue="40"
             android:key="HRThreshMin"
-            android:summary=""
-            android:title="Heart Rate Min Threshold (bpm)" />
+            android:summary="@string/HRThreshMinSummary"
+            android:title="@string/HRThreshMinTitle" />
         <EditTextPreference
             android:defaultValue="150"
             android:key="HRThreshMax"
-            android:summary=""
-            android:title="Heart Rate Max Threshold (bpm)" />
+            android:summary="@string/HRThreshMaxSummary"
+            android:title="@string/HRThreshMaxTitle" />
     </PreferenceCategory>