diff --git a/app_data/assets/contents.json b/app_data/assets/contents.json
index 5f3a80b..546f794 100644
--- a/app_data/assets/contents.json
+++ b/app_data/assets/contents.json
@@ -271,6 +271,10 @@
     "md5Checksum": "bfa1481824dc135d25527d63175fb4df",
     "size_kb": 10
   },
+  "images/gb.svg": {
+    "md5Checksum": "d3ddd6025a06a78535b0d432d14905bf",
+    "size_kb": 0.5
+  },
   "images/gender_box_1.jpg": {
     "md5Checksum": "9525932e5536ed941400ec4bd4dd7b41",
     "size_kb": 112.6
@@ -527,6 +531,10 @@
     "md5Checksum": "a850396cfae4bb31f6d5b3f703f1c26d",
     "size_kb": 75.7
   },
+  "images/shield.svg": {
+    "md5Checksum": "7bef996b92b5d2cadd4e1ca2bac7c2d1",
+    "size_kb": 2.8
+  },
   "images/south_africa_medical_research_council_logo.jpg": {
     "md5Checksum": "9dbff98c117c766774ab84fecb371979",
     "size_kb": 68.5
diff --git a/app_data/assets/images/gb.svg b/app_data/assets/images/gb.svg
new file mode 100644
index 0000000..132dbed
--- /dev/null
+++ b/app_data/assets/images/gb.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icon-css-gb" viewBox="0 0 640 480">
+  <path fill="#012169" d="M0 0h640v480H0z"/>
+  <path fill="#FFF" d="M75 0l244 181L562 0h78v62L400 241l240 178v61h-80L320 301 81 480H0v-60l239-178L0 64V0h75z"/>
+  <path fill="#C8102E" d="M424 281l216 159v40L369 281h55zm-184 20l6 35L54 480H0l240-179zM640 0v3L391 191l2-44L590 0h50zM0 0l239 176h-60L0 42V0z"/>
+  <path fill="#FFF" d="M241 0v480h160V0H241zM0 160v160h640V160H0z"/>
+  <path fill="#C8102E" d="M0 193v96h640v-96H0zM273 0v480h96V0h-96z"/>
+</svg>
diff --git a/app_data/assets/images/shield.svg b/app_data/assets/images/shield.svg
new file mode 100644
index 0000000..877928e
--- /dev/null
+++ b/app_data/assets/images/shield.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" enable-background="new 0 0 256 256" height="512" viewBox="0 0 256 256" width="512" xmlns="http://www.w3.org/2000/svg"><g><g><path d="m33.134 55.667v4.703c0 75.177 35.084 146.048 94.866 191.63 59.782-45.582 94.866-116.452 94.866-191.63v-4.703l-94.866-51.667z" fill="#fcc24c"/></g><g><path d="m214.639 51.186v1.563c0 80.874-31.975 140.883-86.639 199.251 59.782-45.582 94.866-116.453 94.866-191.63v-4.703z" fill="#dea42e"/></g><g><path d="m41.361 51.186v1.563c0 80.874 31.974 140.883 86.639 199.251-59.782-45.582-94.866-116.453-94.866-191.63v-4.703z" fill="#fce06a"/></g><g><path d="m128 254c-.428 0-.854-.137-1.213-.41-29.575-22.551-53.931-52.088-70.431-85.42-16.501-33.331-25.223-70.608-25.223-107.8v-4.704c0-.732.4-1.406 1.043-1.756l94.866-51.666c.598-.325 1.316-.325 1.914 0l94.866 51.666c.643.35 1.043 1.024 1.043 1.756v4.704c0 37.192-8.722 74.469-25.223 107.8-16.5 33.332-40.855 62.869-70.431 85.42-.356.273-.783.41-1.211.41zm-92.866-197.146v3.516c0 36.58 8.578 73.243 24.808 106.025 16.002 32.327 39.515 61.025 68.058 83.084 28.543-22.059 52.056-50.756 68.059-83.083 16.23-32.782 24.808-69.445 24.808-106.025v-3.516l-92.867-50.578z" fill="#690589"/></g><g><path d="m44.824 99.061c-.956 0-1.802-.688-1.969-1.662-.743-4.321-1.633-11.787-1.671-12.103-.13-1.097.653-2.092 1.75-2.222 1.089-.133 2.092.652 2.223 1.749.009.077.915 7.68 1.64 11.897.188 1.089-.543 2.123-1.632 2.31-.114.021-.229.031-.341.031z" fill="#690589"/></g><g><path d="m156.081 102.412c-1.105 0-2-.896-2-2v-13.96c0-14.381-11.7-26.081-26.081-26.081s-26.081 11.7-26.081 26.081v13.96c0 1.104-.896 2-2 2s-2-.896-2-2v-13.96c0-16.587 13.494-30.081 30.081-30.081s30.081 13.494 30.081 30.081v13.96c0 1.104-.895 2-2 2z" fill="#690589"/></g><g><path d="m158.029 177.63h-60.058c-4.738 0-8.58-3.841-8.58-8.58v-60.059c0-4.739 3.841-8.58 8.58-8.58h60.058c4.738 0 8.58 3.841 8.58 8.58v60.059c0 4.738-3.841 8.58-8.58 8.58z" fill="#f4efed"/></g><g><path d="m158.029 179.629h-60.058c-5.834 0-10.58-4.746-10.58-10.58v-60.059c0-5.834 4.746-10.58 10.58-10.58h60.059c5.834 0 10.58 4.746 10.58 10.58v60.059c-.001 5.834-4.747 10.58-10.581 10.58zm-60.058-77.217c-3.628 0-6.58 2.952-6.58 6.58v60.059c0 3.628 2.952 6.58 6.58 6.58h60.059c3.628 0 6.58-2.952 6.58-6.58v-60.059c0-3.628-2.952-6.58-6.58-6.58z" fill="#690589"/></g><g><g><path d="m123.193 159.255-23.598-22.369 8.143-8.589 15.73 14.91 25.47-22.614 7.846 8.864z" fill="#526faa"/></g></g><g><g><g><path d="m123.193 161.255c-.495 0-.991-.184-1.376-.548l-23.599-22.369c-.385-.365-.609-.868-.623-1.398-.015-.53.183-1.044.548-1.429l8.143-8.589c.759-.802 2.026-.835 2.827-.076l14.397 13.648 24.099-21.396c.397-.353.916-.533 1.448-.501.53.032 1.025.273 1.378.671l7.846 8.864c.732.827.655 2.089-.171 2.822l-33.591 29.798c-.377.335-.852.503-1.326.503zm-20.771-24.444 20.816 19.731 30.725-27.255-5.194-5.868-23.973 21.284c-.778.689-1.952.669-2.704-.044l-14.278-13.535z" fill="#690589"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/app_data/sheets/contents.json b/app_data/sheets/contents.json
index e96cf88..4ef8991 100644
--- a/app_data/sheets/contents.json
+++ b/app_data/sheets/contents.json
@@ -1039,11 +1039,6 @@
       "flow_subtype": "generated",
       "flow_type": "template"
     },
-    "onboarding_user_name": {
-      "flow_name": "onboarding_user_name",
-      "flow_subtype": "generated",
-      "flow_type": "template"
-    },
     "parent_childhood_abilities_tbg": {
       "flow_name": "parent_childhood_abilities_tbg",
       "flow_subtype": "generated",
diff --git a/app_data/sheets/data_list/app_config_language_list/language.json b/app_data/sheets/data_list/app_config_language_list/language.json
index a0f3f29..7273acb 100644
--- a/app_data/sheets/data_list/app_config_language_list/language.json
+++ b/app_data/sheets/data_list/app_config_language_list/language.json
@@ -9,12 +9,12 @@
       "id": "gb_en",
       "country_code": "gb",
       "country_label": "United Kingdom",
-      "country_icon": "images/flags/gb.svg",
+      "country_icon": "images/gb.svg",
       "language_code": "en",
       "language_label": "English",
       "name": "gb_en",
       "text": "English",
-      "image": "images/flags/gb.svg"
+      "image": "images/gb.svg"
     }
   ],
   "_xlsxPath": "global/data_lists/deployment_data_pfr.xlsx"
diff --git a/app_data/sheets/data_list/generated/onboarding_tasks.json b/app_data/sheets/data_list/generated/onboarding_tasks.json
index 5e6e4cc..87776d0 100644
--- a/app_data/sheets/data_list/generated/onboarding_tasks.json
+++ b/app_data/sheets/data_list/generated/onboarding_tasks.json
@@ -31,13 +31,6 @@
       "completed_field": "task_onboarding_ground_rules_completed",
       "completed": "@fields.task_onboarding_ground_rules_completed"
     },
-    {
-      "id": "onboarding_user_name",
-      "data_list_name": "onboarding_content",
-      "row_id": "user_name",
-      "completed_field": "task_onboarding_user_name_completed",
-      "completed": "@fields.task_onboarding_user_name_completed"
-    },
     {
       "id": "onboarding_praise",
       "data_list_name": "praise",
diff --git a/app_data/sheets/data_list/onboarding.json b/app_data/sheets/data_list/onboarding.json
index c8e70e2..8abec91 100644
--- a/app_data/sheets/data_list/onboarding.json
+++ b/app_data/sheets/data_list/onboarding.json
@@ -23,11 +23,6 @@
       "data_list_name": "onboarding_content",
       "row_id": "ground_rules"
     },
-    {
-      "id": "onboarding_user_name",
-      "data_list_name": "onboarding_content",
-      "row_id": "user_name"
-    },
     {
       "id": "onboarding_praise",
       "data_list_name": "praise",
diff --git a/app_data/sheets/data_list/onboarding_content.json b/app_data/sheets/data_list/onboarding_content.json
index bd12557..b906fe3 100644
--- a/app_data/sheets/data_list/onboarding_content.json
+++ b/app_data/sheets/data_list/onboarding_content.json
@@ -20,13 +20,6 @@
       "text": "These may include:\n* Complete all sessions and activities.\n* If you have a spouse, encourage them to take these sessions as well.\n* Encourage their spouses to enrol in the programme.\n* Do home practice when given.\n* Commit yourself to becoming a role model and a champion of good parenting in your community.\n* Maintaining confidentiality.",
       "question_text": "What will enable you to participate freely in the programme?",
       "question_type": "text_input_long"
-    },
-    {
-      "id": "user_name",
-      "title": "About you",
-      "icon_asset": "images/icons/paper_pencil.svg",
-      "question_text": "What is your name?",
-      "question_type": "text_input"
     }
   ],
   "_xlsxPath": "global/data_lists/onboarding.xlsx"
diff --git a/app_data/sheets/template/generated/onboarding_user_name.json b/app_data/sheets/template/generated/onboarding_user_name.json
deleted file mode 100644
index bcc6c4e..0000000
--- a/app_data/sheets/template/generated/onboarding_user_name.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "flow_name": "onboarding_user_name",
-  "flow_subtype": "generated",
-  "flow_type": "template",
-  "rows": [
-    {
-      "type": "template",
-      "name": "onboarding_content",
-      "value": "onboarding_content",
-      "action_list": [
-        {
-          "trigger": "completed",
-          "action_id": "emit",
-          "args": [
-            "completed"
-          ],
-          "_raw": "completed | emit: completed",
-          "_cleaned": "completed | emit: completed"
-        },
-        {
-          "trigger": "uncompleted",
-          "action_id": "emit",
-          "args": [
-            "uncompleted"
-          ],
-          "_raw": "uncompleted | emit: uncompleted",
-          "_cleaned": "uncompleted | emit: uncompleted"
-        }
-      ],
-      "rows": [
-        {
-          "name": "id",
-          "value": "user_name",
-          "_translations": {
-            "value": {}
-          },
-          "type": "set_variable",
-          "_nested_name": "onboarding_content.id"
-        }
-      ],
-      "_nested_name": "onboarding_content"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/app_data/sheets/template/onboarding_content.json b/app_data/sheets/template/onboarding_content.json
index dd7b41d..4fe7bc9 100644
--- a/app_data/sheets/template/onboarding_content.json
+++ b/app_data/sheets/template/onboarding_content.json
@@ -13,7 +13,7 @@
     },
     {
       "name": "session_task_id",
-      "value": "onboarding_user_name",
+      "value": "onboarding_pfr_goals",
       "_translations": {
         "value": {}
       },
diff --git a/app_data/sheets/template/session_card.json b/app_data/sheets/template/session_card.json
index e50e66d..3527dec 100644
--- a/app_data/sheets/template/session_card.json
+++ b/app_data/sheets/template/session_card.json
@@ -718,7 +718,7 @@
       "parameter_list": {
         "task_group_id": "@local.session_id@local.tasks",
         "task_group_data": "@local.session_id@local.tasks",
-        "completed_field": "@local.completed_field",
+        "completed_field": "@local.session_tasks_data.completed_field",
         "title": "@local.card_title",
         "subtitle": "@local.card_subtitle",
         "image": "@local.card_image",
@@ -819,10 +819,10 @@
           ],
           "completed_field": [
             {
-              "fullExpression": "@local.completed_field",
-              "matchedExpression": "@local.completed_field",
+              "fullExpression": "@local.session_tasks_data.completed_field",
+              "matchedExpression": "@local.session_tasks_data.completed_field",
               "type": "local",
-              "fieldName": "completed_field"
+              "fieldName": "session_tasks_data"
             }
           ],
           "title": [
@@ -884,7 +884,7 @@
           "parameter_list.task_group_id",
           "parameter_list.task_group_data"
         ],
-        "@local.completed_field": [
+        "@local.session_tasks_data.completed_field": [
           "parameter_list.completed_field"
         ],
         "@local.card_title": [
diff --git a/config.ts b/config.ts
index c2c2c21..e34a817 100644
--- a/config.ts
+++ b/config.ts
@@ -13,7 +13,7 @@ config.google_drive = {
 
 config.git = {
   content_repo: "https://github.com/IDEMSInternational/pfr-app-content.git",
-  content_tag_latest: "1.1.9",
+  content_tag_latest: "1.1.10",
 };
 
 config.error_logging = {