diff --git a/src/website/federation/organizations/organization/services/service/ServiceHeaderView.java b/src/website/federation/organizations/organization/services/service/ServiceHeaderView.java
index f5c28d3..6bac146 100644
--- a/src/website/federation/organizations/organization/services/service/ServiceHeaderView.java
+++ b/src/website/federation/organizations/organization/services/service/ServiceHeaderView.java
@@ -58,8 +58,9 @@ public class ServiceHeaderView
         {
             TagDataManager data = new TagDataManager();
 
-            data.setAttribute("serviceLogo", "src", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/"
-                    + service.getTechnicalName() + "/" + service.getLogoFileName());
+            String servicePath = "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/"
+                    + service.getTechnicalName();
+            data.setAttribute("serviceLogo", "src", servicePath + "/" + service.getLogoFileName());
 
             data.setEscapedContent("serviceName", service.getName());
             if (service.getWebsiteURL() != null)
@@ -89,14 +90,13 @@ public class ServiceHeaderView
 
             data.setAttribute("organizationsLink", "href",
                     "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services.xhtml");
-            data.setAttribute("servicesLink", "href", "services.xhtml");
+            data.setAttribute("servicesLink", "href", servicePath + "/services.xhtml");
 
-            data.setAttribute("rawLink", "href", service.getTechnicalName() + ".properties");
-            data.setAttribute("rawCheckLink", "href", "propertyCheck.xhtml");
+            data.setAttribute("rawLink", "href", servicePath + "/" + service.getTechnicalName() + ".properties");
+            data.setAttribute("rawCheckLink", "href", servicePath + "/propertyCheck.xhtml");
 
-            data.setAttribute("statsLink", "href", "stats.xhtml");
-            data.setAttribute("metricsLink", "href", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/"
-                    + service.getTechnicalName() + "/metrics/");
+            data.setAttribute("statsLink", "href", servicePath + "/stats.xhtml");
+            data.setAttribute("metricsLink", "href", servicePath + "/metrics/");
 
             if (service.getLegalURL() != null)
             {
@@ -179,7 +179,7 @@ public class ServiceHeaderView
                 data.getIdData("softwareSourceLinkImg").getAttribute("class").setMode(DisplayMode.REPLACE);
             }
 
-            data.setAttribute("crawlLink", "href", "crawl.xhtml");
+            data.setAttribute("crawlLink", "href", servicePath + "/crawl.xhtml");
             if (service.getCrawlJournal().getErrors().isEmpty())
             {
                 data.setAttribute("crawlLinkImg", "src", "/commons/circle-icons/download-mono.svg");
@@ -189,8 +189,7 @@ public class ServiceHeaderView
                 data.setAttribute("crawlLinkImg", "src", "/commons/circle-icons/download.svg");
             }
 
-            data.setAttribute("uptimeLink", "href", "/federation/organizations/" + service.getOrganization().getTechnicalName() + "/services/"
-                    + service.getTechnicalName() + "/uptime.xhtml");
+            data.setAttribute("uptimeLink", "href", servicePath + "/uptime.xhtml");
             Services services = new Services();
             services.add(service);
             if (uptimeJournal.hasRecentError(services))
@@ -208,7 +207,7 @@ public class ServiceHeaderView
                 data.setContent("warningCount", checks.getWarningCount());
                 data.setContent("voidCount", checks.getVoidCount());
 
-                data.setAttribute("alertLink", "href", "propertyAlert.xhtml");
+                data.setAttribute("alertLink", "href", servicePath + "/propertyAlert.xhtml");
             }
 
             //