diff --git a/menutraversal_test/group_test.json b/menutraversal_test/group_test.json
index a219a6c..449c42f 100644
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@@ -54,7 +54,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -95,7 +95,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
@@ -141,7 +141,7 @@
                 },
                 {
                     "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                 },
                 {
                     "input": "1",
diff --git a/menutraversal_test/test_setup.json b/menutraversal_test/test_setup.json
index 13166a4..3acb889 100644
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@@ -23,7 +23,7 @@
                     },
                     {
                         "input": "1111",
-                        "expectedContent": "The PIN is not a match. Try again\n1:retry\n9:Quit"
+                        "expectedContent": "The PIN is not a match. Try again\n1:Retry\n9:Quit"
                     },
                     {
                         "input": "1",
@@ -65,7 +65,7 @@
                     },
                     {
                         "input": "000",
-                        "expectedContent": "000 is not registered or invalid, please try again:\n1:retry\n9:Quit"
+                        "expectedContent": "000 is not registered or invalid, please try again:\n1:Retry\n9:Quit"
                     },
                     {
                         "input": "1",
@@ -77,7 +77,7 @@
                     },
                     {
                         "input": "10000000",
-                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:retry\n9:Quit"
+                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:Retry\n9:Quit"
                     },
                     {
                         "input": "1",
@@ -89,7 +89,7 @@
                     },
                     {
                         "input": "1222",
-                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                        "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                     },
                     {
                         "input": "1",
@@ -140,7 +140,7 @@
                     },
                     {
                         "input": "6",
-                        "expectedContent": "Address: {public_key}\n9:Quit"
+                        "expectedContent": "Address: {public_key}\n0:Back\n9:Quit"
                     },
                     {
                         "input": "9",
diff --git a/services/registration/address.vis b/services/registration/address.vis
index f3ba04a..dfc46d1 100644
--- a/services/registration/address.vis
+++ b/services/registration/address.vis
@@ -1,6 +1,8 @@
 LOAD check_identifier 0
 RELOAD check_identifier
 MAP check_identifier
+MOUT back 0
 MOUT quit 9
 HALT
+INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/address_swa b/services/registration/address_swa
new file mode 100644
index 0000000..3e7a55e
--- /dev/null
+++ b/services/registration/address_swa
@@ -0,0 +1 @@
+Anwani:{{.check_identifier}}
\ No newline at end of file
diff --git a/services/registration/confirm_others_new_pin_swa b/services/registration/confirm_others_new_pin_swa
new file mode 100644
index 0000000..f0b09c8
--- /dev/null
+++ b/services/registration/confirm_others_new_pin_swa
@@ -0,0 +1 @@
+Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}
\ No newline at end of file
diff --git a/services/registration/enter_other_number_swa b/services/registration/enter_other_number_swa
new file mode 100644
index 0000000..214fc4a
--- /dev/null
+++ b/services/registration/enter_other_number_swa
@@ -0,0 +1 @@
+Weka nambari ya simu ili kutuma ombi la kubadilisha nambari ya siri:
\ No newline at end of file
diff --git a/services/registration/enter_others_new_pin_swa b/services/registration/enter_others_new_pin_swa
new file mode 100644
index 0000000..77ec2f3
--- /dev/null
+++ b/services/registration/enter_others_new_pin_swa
@@ -0,0 +1 @@
+Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}
\ No newline at end of file
diff --git a/services/registration/no_admin_privilege_swa b/services/registration/no_admin_privilege_swa
new file mode 100644
index 0000000..6c6d3dc
--- /dev/null
+++ b/services/registration/no_admin_privilege_swa
@@ -0,0 +1 @@
+Huna mapendeleo ya kufanya kitendo hiki
\ No newline at end of file
diff --git a/services/registration/others_pin_mismatch_swa b/services/registration/others_pin_mismatch_swa
new file mode 100644
index 0000000..5787790
--- /dev/null
+++ b/services/registration/others_pin_mismatch_swa
@@ -0,0 +1 @@
+PIN uliyoweka hailingani.Jaribu tena.
\ No newline at end of file
diff --git a/services/registration/pin_reset_mismatch_swa b/services/registration/pin_reset_mismatch_swa
new file mode 100644
index 0000000..5787790
--- /dev/null
+++ b/services/registration/pin_reset_mismatch_swa
@@ -0,0 +1 @@
+PIN uliyoweka hailingani.Jaribu tena.
\ No newline at end of file
diff --git a/services/registration/pin_reset_result_swa b/services/registration/pin_reset_result_swa
new file mode 100644
index 0000000..30de04e
--- /dev/null
+++ b/services/registration/pin_reset_result_swa
@@ -0,0 +1 @@
+Ombi la kuweka upya PIN ya {{.retrieve_blocked_number}} limefanikiwa
\ No newline at end of file
diff --git a/services/registration/retry_menu b/services/registration/retry_menu
new file mode 100644
index 0000000..ffde86c
--- /dev/null
+++ b/services/registration/retry_menu
@@ -0,0 +1 @@
+Retry
\ No newline at end of file
diff --git a/services/registration/retry_menu_swa b/services/registration/retry_menu_swa
new file mode 100644
index 0000000..c43b419
--- /dev/null
+++ b/services/registration/retry_menu_swa
@@ -0,0 +1 @@
+Jaribu tena
\ No newline at end of file
diff --git a/services/registration/select_voucher_menu_swa b/services/registration/select_voucher_menu_swa
new file mode 100644
index 0000000..2cb4daf
--- /dev/null
+++ b/services/registration/select_voucher_menu_swa
@@ -0,0 +1 @@
+Chagua Sarafu
\ No newline at end of file
diff --git a/services/registration/unregistered_number_swa b/services/registration/unregistered_number_swa
new file mode 100644
index 0000000..19810cb
--- /dev/null
+++ b/services/registration/unregistered_number_swa
@@ -0,0 +1 @@
+Nambari uliyoingiza haijasajiliwa na Sarafu au sio sahihi.
\ No newline at end of file
diff --git a/services/registration/voucher_details_menu_swa b/services/registration/voucher_details_menu_swa
new file mode 100644
index 0000000..e84661b
--- /dev/null
+++ b/services/registration/voucher_details_menu_swa
@@ -0,0 +1 @@
+Maelezo ya Sarafu
\ No newline at end of file