diff --git a/src/main/webapp/custom_jsps/html/taglib/ui/my_sites/page.jsp b/src/main/webapp/custom_jsps/html/taglib/ui/my_sites/page.jsp
index bc88287..6cabd23 100644
--- a/src/main/webapp/custom_jsps/html/taglib/ui/my_sites/page.jsp
+++ b/src/main/webapp/custom_jsps/html/taglib/ui/my_sites/page.jsp
@@ -46,10 +46,14 @@
 	}
 	
 	if (! isAdmin) {
-		for (Group group : user.getMySiteGroups(classNames,	includeControlPanel, max)) {
-			if (group.getChildren(true).isEmpty()) {
-				mySiteGroups.add(group);
+		try {
+			for (Group group : user.getMySiteGroups(classNames,	includeControlPanel, max)) {
+				if (group.getChildren(true).isEmpty() && (group.getFriendlyURL().compareTo("/data-e-infrastructure-gateway") != 0) ) {
+					mySiteGroups.add(group);
+				}
 			}
+		} catch (SystemException e1) {
+			e1.printStackTrace();
 		}
 	}
 %>
@@ -215,8 +219,7 @@
  									|| showPrivateSiteStaging) {
  								iconCssClass = "icon-eye-open";
  							}
- %> <%@ include
-									file="/html/taglib/ui/my_sites/page_site_name.jspf"%>
+ %> <%@ include file="/html/taglib/ui/my_sites/page_site_name.jspf"%>
 
 								<c:if
 									test="<%=(mySiteGroup
@@ -295,8 +298,7 @@
  									|| showPublicSiteStaging) {
  								iconCssClass = "icon-eye-close";
  							}
- %> <%@ include
-									file="/html/taglib/ui/my_sites/page_site_name.jspf"%>
+ %> <%@ include file="/html/taglib/ui/my_sites/page_site_name.jspf"%>
 
 								<c:if
 									test="<%=(mySiteGroup
@@ -410,13 +412,15 @@
 											}
 					%>
 
-					<li class="<%=selectedSite ? "active"
+					<li
+						class="<%=selectedSite ? "active"
 										: StringPool.BLANK%>">
 						<c:choose>
 							<c:when test="<%=mySiteGroup.isControlPanel()%>">
 								<h3>
 									<a href="<%=themeDisplay
-												.getURLControlPanel()%>"> <%=escapedSiteName%>
+												.getURLControlPanel()%>">
+										<%=escapedSiteName%>
 									</a>
 								</h3>
 							</c:when>
@@ -458,8 +462,8 @@
 														.getPublicLayoutsPageCount() > 0)%>">
 													onclick="Liferay.Util.forcePost(this); return false;"
 												</c:if>
-											role="menuitem"><liferay-ui:message
-													key="public-pages" /> <span class="page-count">(<%=mySiteGroup
+											role="menuitem"><liferay-ui:message key="public-pages" />
+												<span class="page-count">(<%=mySiteGroup
 													.getPublicLayoutsPageCount()%>)
 											</span></a> <c:if test="<%=publicAddPageHREF != null%>">
 												<a class="add-page"
@@ -493,8 +497,8 @@
 														.getPrivateLayoutsPageCount() > 0%>">
 													onclick="Liferay.Util.forcePost(this); return false;"
 												</c:if>
-											role="menuitem"><liferay-ui:message
-													key="private-pages" /> <span class="page-count">(<%=mySiteGroup
+											role="menuitem"><liferay-ui:message key="private-pages" />
+												<span class="page-count">(<%=mySiteGroup
 													.getPrivateLayoutsPageCount()%>)
 											</span></a> <c:if test="<%=privateAddPageHREF != null%>">
 												<a class="add-page"