diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index 184a494da2..5a685ffea9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -398,7 +398,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
             // check enough insulin left for bolus
             if (Math.round(detailedBolusInfo.insulin + 0.5) > reservoirBolusResult.reservoirLevel) {
                 return new PumpEnactResult().success(false).enacted(false)
-                        .comment(MainApp.sResources.getString(R.string.combo_reservoir_level_insufficant_for_bolus));
+                        .comment(MainApp.sResources.getString(R.string.combo_reservoir_level_insufficient_for_bolus));
             }
 
             // verify we're update to date and know the most recent bolus
diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml
index 1616d06500..2e10ea1dcf 100644
--- a/app/src/main/res/layout/combopump_fragment.xml
+++ b/app/src/main/res/layout/combopump_fragment.xml
@@ -74,7 +74,7 @@
                     android:layout_weight="1.5"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/combo_pump_activity"
+                    android:text="@string/combo_pump_activity_label"
                     android:textSize="14sp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/danar_fragment.xml b/app/src/main/res/layout/danar_fragment.xml
index 94a9acb9ee..badef63778 100644
--- a/app/src/main/res/layout/danar_fragment.xml
+++ b/app/src/main/res/layout/danar_fragment.xml
@@ -97,7 +97,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_bluetooth_status"
+                        android:text="@string/danar_bluetooth_status"
                         android:textSize="14sp" />
 
                     <TextView
@@ -711,7 +711,7 @@
                     android:drawableTop="@drawable/icon_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/pump_history" />
+                    android:text="@string/danar_history" />
 
                 <Button
                     android:id="@+id/danar_stats"
diff --git a/app/src/main/res/layout/objectives_fragment.xml b/app/src/main/res/layout/objectives_fragment.xml
index a752a57740..45d0578531 100644
--- a/app/src/main/res/layout/objectives_fragment.xml
+++ b/app/src/main/res/layout/objectives_fragment.xml
@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/objectives_fake_layout"
-            android:visibility="visible">
+            android:visibility="gone">
 
             <CheckBox
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index c55a7246ff..74556e461e 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -258,7 +258,7 @@
     <string name="danarprofile_dia">DIA (Време на действие на инсулина) ч.:</string>
     <string name="danarprofile_dia_summary">Време на действие на инсулина</string>
     <string name="failedupdatebasalprofile">Неуспешно обноввяване на базалния профил</string>
-    <string name="pump_history">История</string>
+    <string name="danar_history">История</string>
     <string name="danar_historyreload">Презареди</string>
     <string name="uploading">Качване</string>
     <string name="danar_ebolus">E болус</string>
@@ -546,7 +546,7 @@
     <string name="basalshortlabel">BAS</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="pump_lastconnection_label">Последно свързване</string>
-    <string name="pump_bluetooth_status">Bluetooh статус</string>
+    <string name="danar_bluetooth_status">Bluetooh статус</string>
     <string name="nav_about">За приложението</string>
     <string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
     <string name="dev">DEV</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 380cec9881..0afc5f72ad 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -239,7 +239,7 @@
     <string name="danar_ebolus">E bolus</string>
     <string name="danar_error">chyba</string>
     <string name="danar_glucose">glykémie</string>
-    <string name="pump_history">Historie</string>
+    <string name="danar_history">Historie</string>
     <string name="danar_history_alarm">Alarmy</string>
     <string name="danar_history_basalhours">Hodinové bazály</string>
     <string name="danar_history_bolus">Bolusy</string>
@@ -610,7 +610,7 @@
     <string name="sensitivityweightedaverage">Sensitivita vážený průměr</string>
     <string name="openaps">OpenAPS</string>
     <string name="openaps_short">OAPS</string>
-    <string name="pump_bluetooth_status">Bluetooth status</string>
+    <string name="danar_bluetooth_status">Bluetooth status</string>
     <string name="careportal_activity_label">AKTIVITA &amp; ZPĚTNÁ VAZBA</string>
     <string name="basalmissing">Chybějící bazál v profilu. Použita výchozí hodnota</string>
     <string name="basal_step">Krok bazálu</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 638e633fa9..d18e0785f1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -242,7 +242,7 @@
     <string name="danar_carbohydrate">Kohlenhydrate</string>
     <string name="danar_error">Fehler</string>
     <string name="danar_glucose">Glucose</string>
-    <string name="pump_history">Historie</string>
+    <string name="danar_history">Historie</string>
     <string name="danar_history_alarm">Alarme</string>
     <string name="danar_history_bolus">Bolus</string>
     <string name="danar_history_carbohydrates">Kohlenhydrate</string>
@@ -334,7 +334,7 @@
     <string name="clearlog">Logs leeren</string>
     <string name="copied_to_clipboard">In den Zwischenspeicher kopiert</string>
     <string name="copy_to_clipboard">In den Zwischenspeicher kopieren</string>
-    <string name="pump_bluetooth_status">Bluetooth-Status</string>
+    <string name="danar_bluetooth_status">Bluetooth-Status</string>
     <string name="danar_stats_cumulative_tdd">Kumulative TDD</string>
     <string name="danar_stats_date">Datum</string>
     <string name="danar_stats_expweight">Exponentiell Gewichtete TDD</string>
@@ -674,7 +674,7 @@
     <string name="nsclientinternal_title">Interner NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="combo_refresh">Aktualisieren</string>
-    <string name="combo_pump_activity">Aktivität</string>
+    <string name="combo_pump_activity_label">Aktivität</string>
     <string name="combo_tbr_remaining">%d%% (%d verbleibend)</string>
     <string name="combopump_settings">Accu-Chek Combo settings Einstellungen</string>
     <string name="combo_connect_attempt_failed">Verbindungsaufbau fehlgeschlagen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index cb0355ad9a..0c31fd8d77 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -243,7 +243,7 @@
     <string name="danarprofile">Configuración perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="failedupdatebasalprofile">No se pudo actualizar el perfil basal</string>
-    <string name="pump_history">Historial</string>
+    <string name="danar_history">Historial</string>
     <string name="danar_historyreload">Recargar</string>
     <string name="uploading">Subiendo</string>
     <string name="danar_ebolus">E bolo</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 29dd7c4a02..0b784c8c79 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -91,7 +91,7 @@
     <string name="constraints_violation">Vincolo Violato</string>
     <string name="danar_alarm">Allarme</string>
     <string name="danar_basalhour">Basale Oraria</string>
-    <string name="pump_bluetooth_status">Stato Bluetooh</string>
+    <string name="danar_bluetooth_status">Stato Bluetooh</string>
     <string name="danar_bt_name_title">Dispositivo Bluetooh DanaR</string>
     <string name="danar_carbohydrate">Carboidrati</string>
     <string name="danar_dailyunits">Unita\' giornaliera</string>
@@ -101,7 +101,7 @@
     <string name="danar_enableextendedbolus">Bolo esteso abilitato</string>
     <string name="danar_error">Errore</string>
     <string name="danar_glucose">Glucosio</string>
-    <string name="pump_history">Storia</string>
+    <string name="danar_history">Storia</string>
     <string name="danar_history_alarm">Allarmi</string>
     <string name="danar_history_basalhours">Basale oraria</string>
     <string name="danar_history_bolus">Boli</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b755028e8d..2be54289b2 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -259,7 +259,7 @@
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
     <string name="failedupdatebasalprofile">기초주입 프로파일 갱신 실패</string>
-    <string name="pump_history">과거기록</string>
+    <string name="danar_history">과거기록</string>
     <string name="danar_historyreload">새로고침</string>
     <string name="uploading">업로드중</string>
     <string name="danar_ebolus">E bolus</string>
@@ -556,7 +556,7 @@
     <string name="basalshortlabel">BAS</string>
     <string name="virtualpump_firmware_label">펌웨어</string>
     <string name="pump_lastconnection_label">최근 연결</string>
-    <string name="pump_bluetooth_status">블루투스 상태</string>
+    <string name="danar_bluetooth_status">블루투스 상태</string>
     <string name="nav_about">버전정보</string>
     <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
     <string name="dev">DEV</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 71960023f9..81e8e4246c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -168,7 +168,7 @@
     <string name="cs_lang">Čeština</string>
     <string name="danar_alarm">Alarm</string>
     <string name="danar_basalhour">Basaal uur</string>
-    <string name="pump_bluetooth_status">Bluetooh status</string>
+    <string name="danar_bluetooth_status">Bluetooh status</string>
     <string name="danar_bt_name_title">DanaR Bluetooth toestel</string>
     <string name="danar_carbohydrate">Koolhydraten</string>
     <string name="danar_dailyunits">Dag totaal</string>
@@ -176,7 +176,7 @@
     <string name="danar_enableextendedbolus">Activeer vertraagde bolussen op de pomp</string>
     <string name="danar_error">Storing</string>
     <string name="danar_glucose">glucose</string>
-    <string name="pump_history">Geschiedenis</string>
+    <string name="danar_history">Geschiedenis</string>
     <string name="danar_history_alarm">Alarm</string>
     <string name="restart">Herstart</string>
     <string name="result">Resultaat</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 90cbfb95ec..095339b216 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -111,7 +111,7 @@
     <string name="cs_lang">чешский</string>
     <string name="danar_alarm">внимание!</string>
     <string name="danar_basalhour">почасовой базал</string>
-    <string name="pump_bluetooth_status">статус блутус</string>
+    <string name="danar_bluetooth_status">статус блутус</string>
     <string name="danar_bt_name_title">устройство блутус danaR</string>
     <string name="danar_carbohydrate">углеводы</string>
     <string name="danar_dailyunits">суточные единицы</string>
@@ -122,7 +122,7 @@
     <string name="danar_enableextendedbolus">активировать увеличенные болюсы на помпе</string>
     <string name="danar_error">ошибка</string>
     <string name="danar_glucose">гликемия</string>
-    <string name="pump_history">история</string>
+    <string name="danar_history">история</string>
     <string name="danar_history_alarm">оповещения об опасности</string>
     <string name="danar_history_basalhours">почасовые базалы</string>
     <string name="danar_history_bolus">болюсы</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 2d6de300e5..bf6b2589df 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -112,7 +112,7 @@
     <string name="cs_lang">CZ</string>
     <string name="danar_alarm">Alarm</string>
     <string name="danar_basalhour">basal tim</string>
-    <string name="pump_bluetooth_status">Bluetooth Status</string>
+    <string name="danar_bluetooth_status">Bluetooth Status</string>
     <string name="danar_bt_name_title">DanaR Bluetooth Pump</string>
     <string name="danar_carbohydrate">kolhydrat</string>
     <string name="danar_dailyunits">Enheter/Dag</string>
@@ -120,7 +120,7 @@
     <string name="danar_enableextendedbolus">Aktivera förlängd bolus i pump</string>
     <string name="danar_error">Fel</string>
     <string name="danar_glucose">Glukos</string>
-    <string name="pump_history">Historia</string>
+    <string name="danar_history">Historia</string>
     <string name="danar_history_alarm">Larm</string>
     <string name="danar_history_basalhours">Basal Timmar</string>
     <string name="danar_history_bolus">Bolusar</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8f982ccd4f..29b45b3684 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -593,7 +593,7 @@
     <string name="basalshortlabel">BAS</string>
     <string name="virtualpump_firmware_label">Firmware</string>
     <string name="pump_lastconnection_label">Last connection</string>
-    <string name="pump_bluetooth_status">Bluetooh status</string>
+    <string name="danar_bluetooth_status">Bluetooh status</string>
     <string name="nav_about">About</string>
     <string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
     <string name="dev">DEV</string>
@@ -762,14 +762,12 @@
     <string name="startingbolus">Starting bolus delivery</string>
     <string name="bolusstopping">Stopping bolus delivery</string>
     <string name="bolusstopped">Bolus delivery stopped</string>
-
     <string name="combo_programming_bolus">Programming pump for bolusing</string>
     <string name="combo_refresh">Refresh</string>
     <string name="combo_stats">Stats</string>
     <string name="combo_pump_state_label">State</string>
-    <string name="combo_pump_activity">Activity</string>
+    <string name="combo_pump_activity_label">Activity</string>
     <string name="combo_no_pump_connection">No connection for %d min</string>
-    <string name="combo_connect_attempt_failed">Last connect attempt failed</string>
     <string name="combo_last_connection_time">%s</string>
     <string name="combo_tbr_remaining">%d%% (%d min remaining)</string>
     <string name="combo_last_bolus">%.1f U (%s, %s)</string>
@@ -785,7 +783,7 @@
     <string name="key_raise_urgent_alarms_as_android_notification" translatable="false">raise_urgent_alarms_as_android_notification</string>
     <string name="raise_urgent_alarms_as_android_notification">Use system notifications for alerts</string>
     <string name="combo_pump_never_connected">Never</string>
-    <string name="combo_reservoir_level_insufficant_for_bolus">Not enough insulin left in reservoir for bolus</string>
+    <string name="combo_reservoir_level_insufficient_for_bolus">Not enough insulin left in reservoir for bolus</string>
     <string name="combo_pump_bolus_history_state_mismatch">A bolus has been delivered directly on the pump recently, of which AndroidAPS has only just become aware of. The pump\'s history is currently being read. Please check the Combo page, verify the last bolus and IOB and bolus again if needed. No bolus has been delivered.</string>
     <string name="combo_pump_bolus_verification_failed">Bolus delivery verification failed. The pump history will be read again on the next loop run or when refreshing from the Combo page. Please check and bolus again if needed.</string>
     <string name="combo_pump_unsupported_operation">Requested operation not supported by pump</string>
@@ -795,7 +793,7 @@
     <string name="combo_pump_action_initializing">Initializing</string>
     <string name="combo_pump_connected_now">Now</string>
     <string name="combo_activity_reading_pump_history">Reading pump history</string>
-    <string name="pump_history">pump history</string>
+    <string name="danar_history">pump history</string>
     <string name="combo_pump_alerts">Alerts</string>
     <string name="combo_activity_setting_basal_profile">Setting basal profile</string>
     <string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>