diff --git a/apps/picsa-tools/farmer-activity/src/app/pages/activity-details/activity-details.component.html b/apps/picsa-tools/farmer-activity/src/app/pages/activity-details/activity-details.component.html
index 2561b317d..f89045a1e 100644
--- a/apps/picsa-tools/farmer-activity/src/app/pages/activity-details/activity-details.component.html
+++ b/apps/picsa-tools/farmer-activity/src/app/pages/activity-details/activity-details.component.html
@@ -36,7 +36,7 @@ <h2 *ngIf="videoUri">{{ videoResource.title | translate }}</h2>
         <mat-icon class="tab-icon">edit_square</mat-icon>
         Activity
       </ng-template>
-      <div class="tab-content">(TODO)</div>
+      <div class="tab-content">Coming soon...</div>
     </mat-tab>
 
     <mat-tab *ngIf="activity.tool">
diff --git a/libs/i18n/assets/debug.json b/libs/i18n/assets/debug.json
index 53783183e..3d03ebb58 100644
--- a/libs/i18n/assets/debug.json
+++ b/libs/i18n/assets/debug.json
@@ -10,7 +10,9 @@
   "Add Option": "•Add Option•",
   "afforestation": "•afforestation•",
   "After the season": "•After the season•",
+  "After watching continue to the activity": "•After watching continue to the activity•",
   "All": "•All•",
+  "All Submitted": "•All Submitted•",
   "Analyse": "•Analyse•",
   "and": "•and•",
   "apply fertiliser": "•apply fertiliser•",
@@ -58,7 +60,6 @@
   "Cotton": "•Cotton•",
   "Cowpeas": "•Cowpeas•",
   "cowpeas": "•cowpeas•",
-  "Create": "•Create•",
   "Create New": "•Create New•",
   "Create New Budget": "•Create New Budget•",
   "Crop": "•Crop•",
@@ -94,6 +95,7 @@
   "Family Labour": "•Family Labour•",
   "family labour": "•family labour•",
   "Farmer": "•Farmer•",
+  "Farmer Activities": "•Farmer Activities•",
   "Farmers choose": "•Farmers choose•",
   "Feb": "•Feb•",
   "February": "•February•",
@@ -125,9 +127,10 @@
   "How long is your budget for?": "•How long is your budget for?•",
   "Import": "•Import•",
   "Import Budget Code": "•Import Budget Code•",
+  "In this video you will learn about the PICSA step:": "•In this video you will learn about the PICSA step:•",
   "Increase Scale": "•Increase Scale•",
-  "Info Sheet": "•Info Sheet•",
   "Inputs": "•Inputs•",
+  "Intro": "•Intro•",
   "Introduction": "•Introduction•",
   "Investment": "•Investment•",
   "Investment in terms of money and time": "•Investment in terms of money and time•",
@@ -220,8 +223,8 @@
   "purchase": "•purchase•",
   "Purchased": "•Purchased•",
   "Quantity": "•Quantity•",
-  "Quiz": "•Quiz•",
   "Rain": "•Rain•",
+  "Records": "•Records•",
   "Reload": "•Reload•",
   "relocation": "•relocation•",
   "Resource Allocation Map (RAM)": "•Resource Allocation Map (RAM)•",
diff --git a/libs/i18n/assets/en.json b/libs/i18n/assets/en.json
index 9e4a6f67d..9e00d73c7 100644
--- a/libs/i18n/assets/en.json
+++ b/libs/i18n/assets/en.json
@@ -232,6 +232,7 @@
   "Budget": "Budget",
   "Click on the button below to retry": "Click on the button below to retry",
   "Climate": "Climate",
+  "Farmer Activities": "Farmer Activities",
   "Manual": "Manual",
   "Monitoring": "Monitoring",
   "Options": "Options",
@@ -242,17 +243,18 @@
   "Seasonal Calendar": "Seasonal Calendar",
   "Something went wrong...": "Something went wrong...",
   "Take App Tour": "Take App Tour",
+  "After watching continue to the activity": "After watching continue to the activity",
+  "In this video you will learn about the PICSA step:": "In this video you will learn about the PICSA step:",
+  "Intro": "Intro",
   "Activity Flow Chart": "Activity Flow Chart",
   "After the season": "After the season",
   "Compare different options and plans": "Compare different options and plans",
   "Comparing different options and planning using Participatory Budgets": "Comparing different options and planning using Participatory Budgets",
-  "Create": "Create",
   "Crop Info": "Crop Info",
   "Download the PICSA Manual": "Download the PICSA Manual",
   "During the season": "During the season",
   "Farmers choose": "Farmers choose",
   "Historic climate": "Historic climate",
-  "Info Sheet": "Info Sheet",
   "Introduction": "Introduction",
   "Is the climate changing?": "Is the climate changing?",
   "Just before the season": "Just before the season",
@@ -263,7 +265,6 @@
   "Options by context": "Options by context",
   "PICSA": "PICSA",
   "Probability and Risk": "Probability and Risk",
-  "Quiz": "Quiz",
   "Resource Allocation Map (RAM)": "Resource Allocation Map (RAM)",
   "Response to forecast": "Response to forecast",
   "Review": "Review",
@@ -288,8 +289,10 @@
   "What are the options for the farmer?": "What are the options for the farmer?",
   "What are the probabilities and risks?": "What are the probabilities and risks?",
   "What does the farmer currently do?": "What does the farmer currently do?",
+  "All Submitted": "All Submitted",
   "Create New": "Create New",
   "Forms": "Forms",
+  "Records": "Records",
   "Submissions": "Submissions",
   "Submit": "Submit",
   "Activities": "Activities",
diff --git a/libs/i18n/assets/mw_ny.json b/libs/i18n/assets/mw_ny.json
index afa3e6a00..df81cb247 100644
--- a/libs/i18n/assets/mw_ny.json
+++ b/libs/i18n/assets/mw_ny.json
@@ -10,7 +10,9 @@
   "Add Option": "•Add Option•",
   "afforestation": "kudzala mitengo",
   "After the season": "Pakutha pa nyengo",
+  "After watching continue to the activity": "•After watching continue to the activity•",
   "All": "•All•",
+  "All Submitted": "•All Submitted•",
   "Analyse": "Kuzukuta",
   "and": "•and•",
   "apply fertiliser": "kuthira feteleza",
@@ -58,7 +60,6 @@
   "Cotton": "•Cotton•",
   "Cowpeas": "•Cowpeas•",
   "cowpeas": "khobwe",
-  "Create": "Pangani",
   "Create New": "•Create New•",
   "Create New Budget": "Pangani bajeti yatsopano",
   "Crop": "•Crop•",
@@ -94,6 +95,7 @@
   "Family Labour": "ntchito yogwiridwa ndi amubanjamo",
   "family labour": "ntchito yogwiridwa ndi amubanjamo",
   "Farmer": "Mlimi",
+  "Farmer Activities": "•Farmer Activities•",
   "Farmers choose": "Alimi amasankha",
   "Feb": "•Feb•",
   "February": "•February•",
@@ -125,9 +127,10 @@
   "How long is your budget for?": "bajeti yanu imakhala yayitali bwanji?",
   "Import": "Kutenga bajeti yokonzedwa",
   "Import Budget Code": "lowetsani nambala ya bajeti",
+  "In this video you will learn about the PICSA step:": "•In this video you will learn about the PICSA step:•",
   "Increase Scale": "onjezerani mulingo",
-  "Info Sheet": "Tsamba la mauthenga",
   "Inputs": "zolowa",
+  "Intro": "•Intro•",
   "Introduction": "•Introduction•",
   "Investment": "•Investment•",
   "Investment in terms of money and time": "•Investment in terms of money and time•",
@@ -220,8 +223,8 @@
   "purchase": "kugula",
   "Purchased": "•Purchased•",
   "Quantity": "kuchuluka",
-  "Quiz": "Mayeso",
   "Rain": "Mvula",
+  "Records": "•Records•",
   "Reload": "bwezeraninso",
   "relocation": "kusamutsa ziweso",
   "Resource Allocation Map (RAM)": "Mapu ogawa zinthu zimene tikuyenera kugwiritsa ntchito",
diff --git a/libs/i18n/assets/sw.json b/libs/i18n/assets/sw.json
index af732f385..81b40483f 100644
--- a/libs/i18n/assets/sw.json
+++ b/libs/i18n/assets/sw.json
@@ -10,7 +10,9 @@
   "Add Option": "•Add Option•",
   "afforestation": "•afforestation•",
   "After the season": "•After the season•",
+  "After watching continue to the activity": "•After watching continue to the activity•",
   "All": "•All•",
+  "All Submitted": "•All Submitted•",
   "Analyse": "•Analyse•",
   "and": "•and•",
   "apply fertiliser": "•apply fertiliser•",
@@ -58,7 +60,6 @@
   "Cotton": "•Cotton•",
   "Cowpeas": "•Cowpeas•",
   "cowpeas": "•cowpeas•",
-  "Create": "•Create•",
   "Create New": "•Create New•",
   "Create New Budget": "Unda bajeti mpya",
   "Crop": "•Crop•",
@@ -94,6 +95,7 @@
   "Family Labour": "Kazi ya Familia",
   "family labour": "•family labour•",
   "Farmer": "•Farmer•",
+  "Farmer Activities": "•Farmer Activities•",
   "Farmers choose": "•Farmers choose•",
   "Feb": "•Feb•",
   "February": "Februari",
@@ -125,9 +127,10 @@
   "How long is your budget for?": "•How long is your budget for?•",
   "Import": "•Import•",
   "Import Budget Code": "•Import Budget Code•",
+  "In this video you will learn about the PICSA step:": "•In this video you will learn about the PICSA step:•",
   "Increase Scale": "•Increase Scale•",
-  "Info Sheet": "•Info Sheet•",
   "Inputs": "Pembejeo",
+  "Intro": "•Intro•",
   "Introduction": "•Introduction•",
   "Investment": "•Investment•",
   "Investment in terms of money and time": "•Investment in terms of money and time•",
@@ -220,8 +223,8 @@
   "purchase": "•purchase•",
   "Purchased": "•Purchased•",
   "Quantity": "•Quantity•",
-  "Quiz": "•Quiz•",
   "Rain": "•Rain•",
+  "Records": "•Records•",
   "Reload": "Pakia tena",
   "relocation": "•relocation•",
   "Resource Allocation Map (RAM)": "•Resource Allocation Map (RAM)•",
diff --git a/libs/i18n/assets/tg.json b/libs/i18n/assets/tg.json
index 59917e5f3..4a01ecb25 100644
--- a/libs/i18n/assets/tg.json
+++ b/libs/i18n/assets/tg.json
@@ -10,7 +10,9 @@
   "Add Option": "•Add Option•",
   "afforestation": "орадодӣ",
   "After the season": "•After the season•",
+  "After watching continue to the activity": "•After watching continue to the activity•",
   "All": "Ҳама",
+  "All Submitted": "•All Submitted•",
   "Analyse": "•Analyse•",
   "and": "•and•",
   "apply fertiliser": "Ба кор нуриҳо муроҷиат кунед",
@@ -58,7 +60,6 @@
   "Cotton": "•Cotton•",
   "Cowpeas": "•Cowpeas•",
   "cowpeas": "гов",
-  "Create": "•Create•",
   "Create New": "•Create New•",
   "Create New Budget": "Эҷоди буҷети нав",
   "Crop": "•Crop•",
@@ -94,6 +95,7 @@
   "Family Labour": "Меҳнати оила",
   "family labour": "меҳнати оила",
   "Farmer": "•Farmer•",
+  "Farmer Activities": "•Farmer Activities•",
   "Farmers choose": "•Farmers choose•",
   "Feb": "Феврал",
   "February": "Феврал",
@@ -125,9 +127,10 @@
   "How long is your budget for?": "Буҷаи шумо чанд вақт аст?",
   "Import": "•Import•",
   "Import Budget Code": "•Import Budget Code•",
+  "In this video you will learn about the PICSA step:": "•In this video you will learn about the PICSA step:•",
   "Increase Scale": "•Increase Scale•",
-  "Info Sheet": "•Info Sheet•",
   "Inputs": "Саҳмҳо",
+  "Intro": "•Intro•",
   "Introduction": "•Introduction•",
   "Investment": "•Investment•",
   "Investment in terms of money and time": "•Investment in terms of money and time•",
@@ -220,8 +223,8 @@
   "purchase": "харидан",
   "Purchased": "•Purchased•",
   "Quantity": "•Quantity•",
-  "Quiz": "•Quiz•",
   "Rain": "•Rain•",
+  "Records": "•Records•",
   "Reload": "Баргиред",
   "relocation": "кӯчдиҳӣ",
   "Resource Allocation Map (RAM)": "•Resource Allocation Map (RAM)•",
diff --git a/libs/i18n/assets/zm_ny.json b/libs/i18n/assets/zm_ny.json
index b44a4ed55..cff17e2c0 100644
--- a/libs/i18n/assets/zm_ny.json
+++ b/libs/i18n/assets/zm_ny.json
@@ -10,7 +10,9 @@
   "Add Option": "•Add Option•",
   "afforestation": "kubyala mitengo",
   "After the season": "Pambuyo pakutha kwa Nyengo",
+  "After watching continue to the activity": "•After watching continue to the activity•",
   "All": "•All•",
+  "All Submitted": "•All Submitted•",
   "Analyse": "Fufuza",
   "and": "•and•",
   "apply fertiliser": "thirani fatatleza",
@@ -58,7 +60,6 @@
   "Cotton": "•Cotton•",
   "Cowpeas": "•Cowpeas•",
   "cowpeas": "nyemba",
-  "Create": "Pangani",
   "Create New": "•Create New•",
   "Create New Budget": "Pangani bajeti yatsopano",
   "Crop": "•Crop•",
@@ -94,6 +95,7 @@
   "Family Labour": "ntchito ya banja",
   "family labour": "ntchito ya banja",
   "Farmer": "Mlimi",
+  "Farmer Activities": "•Farmer Activities•",
   "Farmers choose": "Alimi asankha",
   "Feb": "•Feb•",
   "February": "•February•",
@@ -125,9 +127,10 @@
   "How long is your budget for?": "bajeti yanu imakhala yayitali motani?",
   "Import": "Kuika nji",
   "Import Budget Code": "nambala ya bajeti",
+  "In this video you will learn about the PICSA step:": "•In this video you will learn about the PICSA step:•",
   "Increase Scale": "kuchulukitsa",
-  "Info Sheet": "Tsamba la zambiri",
   "Inputs": "zolowa",
+  "Intro": "•Intro•",
   "Introduction": "•Introduction•",
   "Investment": "•Investment•",
   "Investment in terms of money and time": "•Investment in terms of money and time•",
@@ -220,8 +223,8 @@
   "purchase": "gulani",
   "Purchased": "•Purchased•",
   "Quantity": "kuchuluka kwake",
-  "Quiz": "Mafunso",
   "Rain": "Mvula",
+  "Records": "•Records•",
   "Reload": "bwezeraninso",
   "relocation": "kusamukira",
   "Resource Allocation Map (RAM)": "Chitunzi cha Zomwe tilinazo",
diff --git a/libs/i18n/templates/_template.csv b/libs/i18n/templates/_template.csv
index 985d7a2fb..c1893f17c 100644
--- a/libs/i18n/templates/_template.csv
+++ b/libs/i18n/templates/_template.csv
@@ -232,6 +232,7 @@ tool,context,text
 "extension",,"Budget"
 "extension",,"Click on the button below to retry"
 "extension",,"Climate"
+"extension",,"Farmer Activities"
 "extension",,"Manual"
 "extension",,"Monitoring"
 "extension",,"Options"
@@ -242,17 +243,18 @@ tool,context,text
 "extension",,"Seasonal Calendar"
 "extension",,"Something went wrong..."
 "extension",,"Take App Tour"
+"farmer-activity",,"After watching continue to the activity"
+"farmer-activity",,"In this video you will learn about the PICSA step:"
+"farmer-activity",,"Intro"
 "manual",,"Activity Flow Chart"
 "manual",,"After the season"
 "manual",,"Compare different options and plans"
 "manual",,"Comparing different options and planning using Participatory Budgets"
-"manual",,"Create"
 "manual",,"Crop Info"
 "manual",,"Download the PICSA Manual"
 "manual",,"During the season"
 "manual",,"Farmers choose"
 "manual",,"Historic climate"
-"manual",,"Info Sheet"
 "manual",,"Introduction"
 "manual",,"Is the climate changing?"
 "manual",,"Just before the season"
@@ -263,7 +265,6 @@ tool,context,text
 "manual",,"Options by context"
 "manual",,"PICSA"
 "manual",,"Probability and Risk"
-"manual",,"Quiz"
 "manual",,"Resource Allocation Map (RAM)"
 "manual",,"Response to forecast"
 "manual",,"Review"
@@ -288,8 +289,10 @@ tool,context,text
 "manual",,"What are the options for the farmer?"
 "manual",,"What are the probabilities and risks?"
 "manual",,"What does the farmer currently do?"
+"monitoring",,"All Submitted"
 "monitoring",,"Create New"
 "monitoring",,"Forms"
+"monitoring",,"Records"
 "monitoring",,"Submissions"
 "monitoring",,"Submit"
 "option",,"Activities"
diff --git a/libs/i18n/templates/_template.json b/libs/i18n/templates/_template.json
index 7089250be..7941362c1 100644
--- a/libs/i18n/templates/_template.json
+++ b/libs/i18n/templates/_template.json
@@ -1063,6 +1063,10 @@
     "text": "Climate",
     "tool": "extension"
   },
+  {
+    "text": "Farmer Activities",
+    "tool": "extension"
+  },
   {
     "text": "Manual",
     "tool": "extension"
@@ -1103,6 +1107,18 @@
     "text": "Take App Tour",
     "tool": "extension"
   },
+  {
+    "text": "After watching continue to the activity",
+    "tool": "farmer-activity"
+  },
+  {
+    "text": "In this video you will learn about the PICSA step:",
+    "tool": "farmer-activity"
+  },
+  {
+    "text": "Intro",
+    "tool": "farmer-activity"
+  },
   {
     "text": "Activity Flow Chart",
     "tool": "manual"
@@ -1119,10 +1135,6 @@
     "text": "Comparing different options and planning using Participatory Budgets",
     "tool": "manual"
   },
-  {
-    "text": "Create",
-    "tool": "manual"
-  },
   {
     "text": "Crop Info",
     "tool": "manual"
@@ -1143,10 +1155,6 @@
     "text": "Historic climate",
     "tool": "manual"
   },
-  {
-    "text": "Info Sheet",
-    "tool": "manual"
-  },
   {
     "text": "Introduction",
     "tool": "manual"
@@ -1187,10 +1195,6 @@
     "text": "Probability and Risk",
     "tool": "manual"
   },
-  {
-    "text": "Quiz",
-    "tool": "manual"
-  },
   {
     "text": "Resource Allocation Map (RAM)",
     "tool": "manual"
@@ -1287,6 +1291,10 @@
     "text": "What does the farmer currently do?",
     "tool": "manual"
   },
+  {
+    "text": "All Submitted",
+    "tool": "monitoring"
+  },
   {
     "text": "Create New",
     "tool": "monitoring"
@@ -1295,6 +1303,10 @@
     "text": "Forms",
     "tool": "monitoring"
   },
+  {
+    "text": "Records",
+    "tool": "monitoring"
+  },
   {
     "text": "Submissions",
     "tool": "monitoring"