diff --git a/app/main/views/index.py b/app/main/views/index.py
index 5c13835f7..30818db99 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -236,7 +236,7 @@ def using_notify():
     )
 
 
-@main.route("/using_notify/delivery-status")
+@main.route("/using-notify/delivery-status")
 @user_is_logged_in
 def message_status():
     return render_template(
@@ -251,7 +251,7 @@ def get_started_old():
     return redirect(url_for(".get_started"), 301)
 
 
-@main.route("/using_notify/get-started")
+@main.route("/using-notify/get-started")
 @user_is_logged_in
 def get_started():
     return render_template(
@@ -260,7 +260,7 @@ def get_started():
     )
 
 
-@main.route("/using_notify/who-its-for")
+@main.route("/using-notify/who-its-for")
 def who_its_for():
     return redirect(url_for(".features"), 301)
 
@@ -271,7 +271,7 @@ def trial_mode():
     return redirect(url_for(".trial_mode_new"), 301)
 
 
-@main.route("/using_notify/trial-mode")
+@main.route("/using-notify/trial-mode")
 def trial_mode_new():
     return render_template(
         "views/trial-mode.html",
@@ -279,7 +279,7 @@ def trial_mode_new():
     )
 
 
-@main.route("/using_notify/guidance")
+@main.route("/using-notify/guidance")
 @user_is_logged_in
 def guidance_index():
     return render_template(
@@ -288,7 +288,7 @@ def guidance_index():
     )
 
 
-@main.route("/using_notify/guidance/branding-and-customisation")
+@main.route("/using-notify/guidance/branding-and-customisation")
 @user_is_logged_in
 def branding_and_customisation():
     return render_template(
@@ -297,7 +297,7 @@ def branding_and_customisation():
     )
 
 
-@main.route("/using_notify/guidance/create-and-send-messages")
+@main.route("/using-notify/guidance/create-and-send-messages")
 @user_is_logged_in
 def create_and_send_messages():
     return render_template(
@@ -306,7 +306,7 @@ def create_and_send_messages():
     )
 
 
-@main.route("/using_notify/guidance/edit-and-format-messages")
+@main.route("/using-notify/guidance/edit-and-format-messages")
 @user_is_logged_in
 def edit_and_format_messages():
     return render_template(
@@ -315,7 +315,7 @@ def edit_and_format_messages():
     )
 
 
-@main.route("/using_notify/guidance/send-files-by-email")
+@main.route("/using-notify/guidance/send-files-by-email")
 @user_is_logged_in
 def send_files_by_email():
     return render_template(
diff --git a/app/navigation.py b/app/navigation.py
index abfae9157..b96750dc9 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -62,7 +62,80 @@ class HeaderNavigation(Navigation):
             "guidance_index",
         },
         "accounts-or-dashboard": {
+            "conversation",
+            "inbox",
+            "monthly",
+            "service_dashboard",
+            "template_usage",
+            "view_notification",
+            "view_notifications",
+            "action_blocked",
+            "add_service_template",
+            "check_messages",
+            "check_notification",
+            "choose_template",
+            "choose_template_to_copy",
+            "confirm_redact_template",
+            "conversation_reply",
+            "copy_template",
+            "delete_service_template",
+            "edit_service_template",
+            "manage_template_folder",
+            "send_messages",
+            "send_one_off",
+            "send_one_off_step",
+            "send_one_off_to_myself",
+            "set_sender",
+            "set_template_sender",
+            "view_template",
+            "view_template_version",
+            "view_template_versions",
+            "uploads",
+            "view_job",
+            "view_jobs",
+            "confirm_edit_user_email",
+            "confirm_edit_user_mobile_number",
+            "edit_user_email",
+            "edit_user_mobile_number",
+            "edit_user_permissions",
+            "invite_user",
+            "manage_users",
+            "remove_user_from_service",
             "usage",
+            "email_branding_govuk",
+            "email_branding_govuk_and_org",
+            "email_branding_organization",
+            "email_branding_request",
+            "email_branding_something_else",
+            "estimate_usage",
+            "link_service_to_organization",
+            "request_to_go_live",
+            "service_add_email_reply_to",
+            "service_add_sms_sender",
+            "service_confirm_delete_email_reply_to",
+            "service_confirm_delete_sms_sender",
+            "service_edit_email_reply_to",
+            "service_edit_sms_sender",
+            "service_email_reply_to",
+            "service_name_change",
+            "service_preview_email_branding",
+            "service_set_auth_type",
+            "service_set_channel",
+            "send_files_by_email_contact_details",
+            "service_set_email_branding",
+            "service_set_inbound_number",
+            "service_set_inbound_sms",
+            "service_set_international_sms",
+            "service_set_reply_to_email",
+            "service_set_sms_prefix",
+            "service_verify_reply_to_address",
+            "service_verify_reply_to_address_updates",
+            "service_settings",
+            "service_sms_senders",
+            "set_free_sms_allowance",
+            "set_message_limit",
+            "set_rate_limit",
+            "submit_request_to_go_live",
         },
         "pricing": {
             "how_to_pay",