diff --git a/fsfeurope.css b/fsfeurope.css
index cc224a9737..0fad88c8db 100644
--- a/fsfeurope.css
+++ b/fsfeurope.css
@@ -101,16 +101,8 @@ a[name], a[name]:hover, a.gl img, a.gl:link, a.gl:visited, a.gl:hover {
   list-style: none;
 }
 
-.menu li a, .menu li a:link, .menu li a:visited {
-  display: block;
-}
-
 .menu li.submenu {
   margin: 0;
-}
-
-.menu li.submenu a, .menu li.submenu a:link, .menu li.submenu a:visited {
-  display: block;
   padding-left: 0.6em;
 }
 
diff --git a/fsfeurope.xsl b/fsfeurope.xsl
index b14bb89bca..7e6ce877bf 100644
--- a/fsfeurope.xsl
+++ b/fsfeurope.xsl
@@ -82,6 +82,9 @@
 		    <xsl:when test="not(string(.))">
 		      <xsl:value-of select="/buildinfo/textset/text[@id=$id]"/>
 		    </xsl:when>
+		    <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+		      <xsl:value-of select="/buildinfo/textset/text[@id=$id]"/>
+		    </xsl:when>
 		    <xsl:otherwise>
                       <xsl:element name="a">
 			<xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
@@ -95,10 +98,17 @@
                   <xsl:variable name="mid"><xsl:value-of select="@id"/></xsl:variable>
                   <xsl:element name="li">
                     <xsl:attribute name="class">submenu</xsl:attribute>
-                    <xsl:element name="a">
-                      <xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
-                      <xsl:value-of select="/buildinfo/textset/text[@id=$mid]"/>
-                    </xsl:element>
+		    <xsl:choose>
+		      <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+			<xsl:value-of select="/buildinfo/textset/text[@id=$mid]"/>
+		      </xsl:when>
+		      <xsl:otherwise>
+			<xsl:element name="a">
+			  <xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
+			  <xsl:value-of select="/buildinfo/textset/text[@id=$mid]"/>
+			</xsl:element>
+		      </xsl:otherwise>
+		    </xsl:choose>
                   </xsl:element>
 		</xsl:for-each>
               </xsl:for-each>