diff --git a/xsl/common.xsl b/xsl/common.xsl
index a9e1e120a..e0016b4d2 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -508,14 +508,12 @@
     <xsl:copy-of select="."/>
   </xsl:template>
 
-  <xsl:template name="navitem">
-    <xsl:param name="file"/>
-    <xsl:param name="baseurl"/>
-    <xsl:param name="title"/>
+  <xsl:template mode="navitem" match="file">
+    <xsl:variable name="file" select="."/>
     <li>
       <a href="{$baseurl}{$file}.html">
         <xsl:choose>
-          <xsl:when test="string-length($title) = 0">
+          <xsl:when test="string-length(@title) = 0">
             <xsl:if test="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle">
               <xsl:attribute name="title"><xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@pagetitle"/></xsl:attribute>
             </xsl:if>
@@ -523,7 +521,7 @@
             <xsl:value-of select="document(concat('../content/pages/', $file, '.xml'))/page/@title"/>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="$title"/>
+            <xsl:value-of select="@title"/>
           </xsl:otherwise>
         </xsl:choose>
       </a>
@@ -533,13 +531,7 @@
   <xsl:template name="navitems">
     <xsl:for-each select="document('../content/navigation.xml')/navigation/group">
       <ul>
-    <xsl:for-each select="file">
-          <xsl:call-template name="navitem">
-            <xsl:with-param name="file" select="."/>
-            <xsl:with-param name="title" select="@title"/>
-            <xsl:with-param name="baseurl" select="$baseurl"/>
-          </xsl:call-template>
-    </xsl:for-each>
+        <xsl:apply-templates mode="navitem"/>
       </ul>
     </xsl:for-each>
   </xsl:template>