diff --git a/app/helpers/navigation_items_helper.rb b/app/helpers/navigation_items_helper.rb
index adf109f15..59682c86a 100644
--- a/app/helpers/navigation_items_helper.rb
+++ b/app/helpers/navigation_items_helper.rb
@@ -5,18 +5,18 @@ module NavigationItemsHelper
     if current_user.support?
       [
         NavigationItem.new("Organisations", organisations_path, organisations_current?(path)),
-        NavigationItem.new("Users", "/users", users_current?(path)),
+        NavigationItem.new("Users", users_path, users_current?(path)),
         NavigationItem.new("Lettings logs", lettings_logs_path, lettings_logs_current?(path)),
         NavigationItem.new("Sales logs", sales_logs_path, sales_logs_current?(path)),
-        NavigationItem.new("Schemes", "/schemes", supported_housing_schemes_current?(path)),
+        NavigationItem.new("Schemes", schemes_path, supported_housing_schemes_current?(path)),
       ].compact
     else
       [
         NavigationItem.new("Lettings logs", lettings_logs_path, lettings_logs_current?(path)),
         NavigationItem.new("Sales logs", sales_logs_path, sales_logs_current?(path)),
-        (NavigationItem.new("Schemes", "/schemes", supported_housing_schemes_current?(path)) if current_user.organisation.holds_own_stock? || current_user.organisation.stock_owners.present?),
+        (NavigationItem.new("Schemes", schemes_path, supported_housing_schemes_current?(path)) if current_user.organisation.holds_own_stock? || current_user.organisation.stock_owners.present?),
         NavigationItem.new("Users", users_organisation_path(current_user.organisation), subnav_users_path?(path)),
-        NavigationItem.new("About your organisation", "/organisations/#{current_user.organisation.id}", subnav_details_path?(path)),
+        NavigationItem.new("About your organisation", organisation_path(current_user.organisation.id), subnav_details_path?(path)),
         NavigationItem.new("Stock owners", stock_owners_organisation_path(current_user.organisation), stock_owners_path?(path)),
         NavigationItem.new("Managing agents", managing_agents_organisation_path(current_user.organisation), managing_agents_path?(path)),
       ].compact
@@ -25,11 +25,11 @@ module NavigationItemsHelper
 
   def secondary_items(path, current_organisation_id)
     [
-      NavigationItem.new("Lettings logs", "/organisations/#{current_organisation_id}/lettings-logs", subnav_lettings_logs_path?(path)),
-      NavigationItem.new("Sales logs", "/organisations/#{current_organisation_id}/sales-logs", subnav_sales_logs_path?(path)),
-      (NavigationItem.new("Schemes", "/organisations/#{current_organisation_id}/schemes", subnav_supported_housing_schemes_path?(path)) if current_user.organisation.holds_own_stock? || current_user.organisation.stock_owners.present?),
-      NavigationItem.new("Users", "/organisations/#{current_organisation_id}/users", subnav_users_path?(path)),
-      NavigationItem.new("About this organisation", "/organisations/#{current_organisation_id}", subnav_details_path?(path)),
+      NavigationItem.new("Lettings logs", lettings_logs_organisation_path(current_organisation_id), subnav_lettings_logs_path?(path)),
+      NavigationItem.new("Sales logs", sales_logs_organisation_path(current_organisation_id), subnav_sales_logs_path?(path)),
+      (NavigationItem.new("Schemes", schemes_organisation_path(current_organisation_id), subnav_supported_housing_schemes_path?(path)) if current_user.organisation.holds_own_stock? || current_user.organisation.stock_owners.present?),
+      NavigationItem.new("Users", users_organisation_path(current_organisation_id), subnav_users_path?(path)),
+      NavigationItem.new("About this organisation", organisation_path(current_organisation_id), subnav_details_path?(path)),
       NavigationItem.new("Stock owners", stock_owners_organisation_path(current_organisation_id), stock_owners_path?(path)),
       NavigationItem.new("Managing agents", managing_agents_organisation_path(current_organisation_id), managing_agents_path?(path)),
     ].compact
@@ -37,8 +37,8 @@ module NavigationItemsHelper
 
   def scheme_items(path, current_scheme_id, title)
     [
-      NavigationItem.new("Scheme", "/schemes/#{current_scheme_id}", !path.include?("locations")),
-      NavigationItem.new(title, "/schemes/#{current_scheme_id}/locations", path.include?("locations")),
+      NavigationItem.new("Scheme", scheme_path(current_scheme_id), !path.include?("locations")),
+      NavigationItem.new(title, scheme_locations_path(current_scheme_id), path.include?("locations")),
     ]
   end
 
@@ -53,15 +53,15 @@ private
   end
 
   def users_current?(path)
-    path == "/users" || path.include?("/users/")
+    path == users_path || path.include?("/users/")
   end
 
   def supported_housing_schemes_current?(path)
-    path == "/schemes" || path.include?("/schemes/")
+    path == schemes_path || path.include?("/schemes/")
   end
 
   def organisations_current?(path)
-    path == "/organisations" || path.include?("/organisations/")
+    path == organisations_path || path.include?("/organisations/")
   end
 
   def subnav_supported_housing_schemes_path?(path)
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 05eecc89f..da0a2a59e 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -24,3 +24,4 @@ Sentry.init do |config|
 end
 
 Sentry.set_tags("app_host": ENV["APP_HOST"])
+Sentry.set_tags("url_root": ENV["RAILS_RELATIVE_URL_ROOT"])