diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
index a6ee06cd54..8c8aec899f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
@@ -77,14 +77,14 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.profileswitch_unchanged, false))
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
+        tasks.add(new ExamTask(R.string.profileswitch2_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
                         .option(new Option(R.string.profileswitch2_bghigher, true))
                         .option(new Option(R.string.profileswitch2_basalhigher, true))
                         .option(new Option(R.string.profileswitch2_bgunchanged, true))
                         .option(new Option(R.string.profileswitch2_isfhigher, false))
                         .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
+        tasks.add(new ExamTask(R.string.profileswitchtime_label, R.string.profileswitchtime_iwant,"profileswitchtime")
                 .option(new Option(R.string.profileswitchtime_2, false))
                 .option(new Option(R.string.profileswitchtime__2, true))
                 .option(new Option(R.string.profileswitchtime_tt, false))
@@ -134,11 +134,11 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.objectives_hint1))
                 .hint(new Hint(R.string.objectives_hint2))
         );
-        tasks.add(new ExamTask(R.string.objectives_label, R.string.objectives_howtosave,"objectives2")
-                .option(new Option(R.string.objectives_maintenance, true))
-                .option(new Option(R.string.objectives_internalstorage, true))
-                .option(new Option(R.string.objectives_cloud, true))
-                .option(new Option(R.string.objectives_easyrestore, false))
+        tasks.add(new ExamTask(R.string.objectives2_label, R.string.objectives_howtosave,"objectives2")
+                .option(new Option(R.string.objectives2_maintenance, true))
+                .option(new Option(R.string.objectives2_internalstorage, true))
+                .option(new Option(R.string.objectives2_cloud, true))
+                .option(new Option(R.string.objectives2_easyrestore, false))
                 .hint(new Hint(R.string.objectives_hint1))
                 .hint(new Hint(R.string.objectives_hint2))
         );
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 49e0c08972..2d3ce614e2 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -18,7 +18,7 @@
     <string name="offlineprofile_label">Topic: Offline Profile</string>
     <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Topic 10: Reasons for applying "Disconnect pump" in AndroidAPS.</string>
+    <string name="pumpdisconnect_label">Topic 10: Reasons for applying "Disconnect pump" in AndroidAPS</string>
     <string name="pumpdisconnect_whattodo">What should be done when disconnecting the pump?</string>
     <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
     <string name="pumpdisconnect_missinginsulin">It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected. </string>
@@ -26,15 +26,16 @@
     <string name="pumpdisconnect_openloop">It will send AndroidAPS into open loop mode.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
     <string name="objectives_label">Topic 13: AndroidAPS Settings</string>
+    <string name="objectives2_label">Topic 13: More AndroidAPS Settings</string>
     <string name="objectives_howtosave">What are the best practices for backing up your settings?</string>
     <string name="objectives_notesettings">You do not need to export your settings provided that you make a note of them.</string>
     <string name="objectives_afterobjective">Export your settings after you finish completing an objective.</string>
     <string name="objectives_afterchange">Export your settings after changing any of your settings.</string>
     <string name="objectives_afterinitialsetup">Export your settings after you finish your initial set-up and have set your Preferences.</string>
-    <string name="objectives_maintenance">Export your settings locally using the maintenance menu.</string>
-    <string name="objectives_internalstorage">Your settings file is found in the folder Internal Storage/AndroidAPS/preferences on your phone.</string>
-    <string name="objectives_cloud">Copy your preferences file to a safe location outside of your phone (e.g. by using a cloud drive, connecting a cable to a computer, email, etc.)</string>
-    <string name="objectives_easyrestore">If your phone is damaged or lost, there are easy ways to remotely recover your settings without a backup.</string>
+    <string name="objectives2_maintenance">Export your settings locally using the maintenance menu.</string>
+    <string name="objectives2_internalstorage">Your settings file is found in the folder Internal Storage/AndroidAPS/preferences on your phone.</string>
+    <string name="objectives2_cloud">Copy your preferences file to a safe location outside of your phone (e.g. by using a cloud drive, connecting a cable to a computer, email, etc.)</string>
+    <string name="objectives2_easyrestore">If your phone is damaged or lost, there are easy ways to remotely recover your settings without a backup.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
     <string name="noisycgm_label">Topic: Noisy CGM Readings</string>
@@ -45,14 +46,14 @@
     <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-    <string name="exerciseprofile_label">Topic 8: Exercise and Profiles.</string>
+    <string name="exerciseprofile_label">Topic 8: Exercise and Profiles</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
     <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to more than 100%.</string>
     <string name="exerciseprofile_switchprofileabove100">Do a profile switch to less than 100%. </string>
     <string name="exercisprofilee_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="exercise_label">Topic 9: Exercise and Temporary Targets.</string>
+    <string name="exercise_label">Topic 9: Exercise and Temporary Targets</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
     <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>
@@ -169,18 +170,20 @@
     <string name="ic_multiple">You can use more than one value for I:C ratio in your profile.</string>
     <string name="ic_isf">If you change your ISF in your profile you should always change your I:C ratio too.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Topic 7: Profile Switching</string>
+    <string name="profileswitch_label">Topic 7: Profile Switching 1</string>
     <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
     <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
     <string name="profileswitch_isfhigher">ISF will be 10% higher.</string>
     <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
     <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitch2_label">Topic 7: Profile Switching 2</string>
     <string name="profileswitch2_pctwillchange"> When specifying a 120% profile switch, which answers are true?</string>
     <string name="profileswitch2_bghigher">Target blood glucose will be 20% higher.</string>
     <string name="profileswitch2_basalhigher">Basal rates will be 20% higher.</string>
     <string name="profileswitch2_bgunchanged">Target blood glucose will be unchanged.</string>
     <string name="profileswitch2_isfhigher">ISF will be 20% higher.</string>
+    <string name="profileswitchtime_label">Topic 7: Profile Switching 3</string>
     <string name="profileswitchtime_iwant">If you get up 2 hours earlier than usual, how should you notify AndroidAPS of the change in your schedule?</string>
     <string name="profileswitchtime_2">Initiate a profile switch with a timeshift of 2</string>
     <string name="profileswitchtime__2">Initiate a profile switch with a timeshift of -2</string>