diff --git a/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf b/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
index 7eea778..28f98be 100644
--- a/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
+++ b/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
@@ -1,12 +1,10 @@
 <%@ page import="org.gcube.common.portal.GCubePortalConstants" %>
-
+<%@ page import="org.gcube.common.portal.PortalContext" %>
 
 <%
-	//themeDisplay.getUser().getScreenName();
-	String currentVirtualHost = request.getServerName();
-	String groupName = currentVirtualHost.split("\\.")[0];
-	
-	String mySiteURL = GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName;
+	PortalContext context = PortalContext.getConfiguration();
+	String groupName = context.getGatewayName(request);
+	String mySiteURL = context.getSiteLandingPagePath(request);
 %>
 
 <script>
@@ -178,22 +176,22 @@
 <div class="collapse nav-collapse">
 	<ul class="nav nav-add-controls">
 		<li class="dockbar-item"><a class=""
-			href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName%>" id="homeIcon"
-			title="<%=groupName%> Infrastructure Gateway Home"> <i
+			href="<%=mySiteURL%>" id="homeIcon"
+			title="<%=groupName%> Home"> <i
 				class="icon-home" style="font-size: 24px;"></i>
 		</a></li>
 		<li class="dockbar-item"><a class=""
-			href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName + GCubePortalConstants.USER_WORKSPACE_FRIENDLY_URL%>" id="wsIcon"
+			href="<%=mySiteURL+ GCubePortalConstants.USER_WORKSPACE_FRIENDLY_URL%>" id="wsIcon"
 			alt='Workspace' title='Virtual Workspace'> <i
 				class="icon-folder-open" style="font-size: 24px;"></i>
 		</a></li>
 		<li class="dockbar-item"><a class=""
-			href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName + GCubePortalConstants.CATALOGUE_FRIENDLY_URL%>" id="catalougueIcon"
+			href="<%=mySiteURL + GCubePortalConstants.CATALOGUE_FRIENDLY_URL%>" id="catalougueIcon"
 			alt='See Data Catalogue' title='Data Catalogue'> <i
 				class="icon-book" style="font-size: 24px;"></i>
 		</a></li>
 		<li class="dockbar-item"><a class=""
-			href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName + GCubePortalConstants.USER_MESSAGES_FRIENDLY_URL%>" id="messagesIcon"
+			href="<%=mySiteURL + GCubePortalConstants.USER_MESSAGES_FRIENDLY_URL%>" id="messagesIcon"
 			alt='See Messages' title='Messages'> <i class="icon-envelope"
 				style="font-size: 24px;"></i>
 		</a></li>
@@ -207,24 +205,24 @@
 </div>
 <!-- When phone or tablet -->
 <span><a class="btn btn-navbar"
-	href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName%>" id="homeIcon"
+	href="<%=mySiteURL%>" id="homeIcon"
 	title="<%=groupName%> Infrastructure Gateway Home"> <i
 		class="icon-home" style="font-size: 24px;"></i>
 	</a>
 </span>
 <span> <a class="btn btn-navbar"
-	href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName + GCubePortalConstants.USER_WORKSPACE_FRIENDLY_URL%>" id="wsIcon"
+	href="<%=mySiteURL + GCubePortalConstants.USER_WORKSPACE_FRIENDLY_URL%>" id="wsIcon"
 	alt='Workspace' title='Virtual Workspace'> <i
 		class="icon-folder-open" style="font-size: 24px;"></i>
 </a>
 </span>
 <span> <a class="btn btn-navbar"
-	href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName + GCubePortalConstants.CATALOGUE_FRIENDLY_URL%>" id="catalougueIcon"
+	href="<%=mySiteURL + GCubePortalConstants.CATALOGUE_FRIENDLY_URL%>" id="catalougueIcon"
 	alt='See Data Catalogue' title='Data Catalogue'> <i class="icon-book"
 		style="font-size: 24px;"></i>
 </a>
 <span> <a class="btn btn-navbar"
-	href="<%=GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName + GCubePortalConstants.USER_MESSAGES_FRIENDLY_URL%>" id="messagesIcon"
+	href="<%=mySiteURL + GCubePortalConstants.USER_MESSAGES_FRIENDLY_URL%>" id="messagesIcon"
 	alt='See Messages' title='Messages'> <i class="icon-envelope"
 		style="font-size: 24px;"></i>
 </a>