diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index e632059d4..0ab29fb31 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -630,21 +630,25 @@
             <xsl:otherwise>
                 <xsl:choose>
                     <xsl:when test="$template-map/content-item[@content-type = $content-type
-                                                               and @category = $category]">
+                                                               and @category = $category
+                                                               and not(@style)]">
                         <xsl:call-template name="foundry:process-contentitem-template">
                             <xsl:with-param name="template-file"
                                             select="$template-map/content-item[@content-type = $content-type
-                                                                               and @category = $category]"/>
+                                                                               and @category = $category
+                                                                               and not(@style)]"/>
                             <xsl:with-param name="contentitem-tree" 
                                             select="$contentitem-tree"/>
                         </xsl:call-template>
                     </xsl:when>
                     <xsl:when test="$template-map/content-item[@content-type = $content-type
-                                                               and not(@category)]">
+                                                               and not(@category)
+                                                               and not(@style)]">
                         <xsl:call-template name="foundry:process-contentitem-template">
                             <xsl:with-param name="template-file"
                                             select="$template-map/content-item[@content-type = $content-type
-                                                                               and not(@category)]"/>
+                                                                               and not(@category)
+                                                                               and not(@style)]"/>
                             <xsl:with-param name="contentitem-tree" 
                                             select="$contentitem-tree"/>
                         </xsl:call-template>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
index 57be79e7e..4f7629931 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/related-links.xsl
@@ -30,29 +30,21 @@
                 version="2.0">
     
     <xsl:template match="related-links">
-        <xsl:if test="$data-tree/cms:contentPanel/cms:item/links
-                      or $data-tree/nav:greetingItem/cms:item/links">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/links">
             <xsl:apply-templates/>
         </xsl:if>
     </xsl:template>
 
     <xsl:template match="related-links//related-link">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
         <xsl:variable name="links-layout-tree" select="current()"/>
         
-        <xsl:variable name="contentitem-tree">
-            <xsl:choose>
-                <xsl:when test="$data-tree/nav:greetingItem">
-                    <xsl:copy-of select="$data-tree/nav:greetingItem/cms:item/*"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:copy-of select="$data-tree/cms:contentPanel/cms:item/*"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-        
-        <xsl:for-each select="$contentitem-tree/*[name() = 'links']">
+        <xsl:for-each select="$contentitem-tree/links">
             <xsl:sort select="linkOrder"/>
-            
+         
             <xsl:choose>
                 <xsl:when test="./targetType = 'internalLink'">
                     <xsl:apply-templates select="$links-layout-tree/internal/*">
@@ -64,10 +56,10 @@
                         <xsl:with-param name="target-item-title" 
                                         tunnel="yes" 
                                         select="./targetItem/title"/>
-                        <xsl:with-param name="contentitem-tree" 
+                        <!--<xsl:with-param name="contentitem-tree" 
                                         tunnel="yes">
                             <xsl:copy-of select="./targetItem/*"/>
-                        </xsl:with-param> 
+                        </xsl:with-param>-->
                     </xsl:apply-templates>
                 </xsl:when>
                 <xsl:otherwise>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
index 057b3dce4..fd6877c15 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
@@ -2,6 +2,7 @@
 <!DOCTYPE stylesheet>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:foundry="http://foundry.libreccm.org"
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:nav="http://ccm.redhat.com/navigation"
@@ -13,22 +14,49 @@
         <foundry:doc-file-desc>
             <p>
                 These tags are used to output data provided by the <em>ccm-navigation</em> module.
-                More excalty the navigation menu(s) and the breadcrumbs on a site are generated
+                More exactly the navigation menu(s) and the breadcrumbs on a site are generated
                 using these tags.
             </p>
         </foundry:doc-file-desc>
     </foundry:doc-file>
 
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Show the breadcrumbs for the current page. The separator between each breadcrumb is
+                provided by the child element <code>breakcrumb-separator</code>. The contents
+                of this element is used a separator between the breadcrumbs. This allows it to
+                use simple characters of more complex HTML.
+            </p>
+        </foundry:doc-desc>
+        <foundry:doc:attributes>
+            <foundry:doc-attribute name="omit-root">
+                <p>
+                    If set the <code>yes</code>, the breadcrumb for the root level is omitted. 
+                </p>
+            </foundry:doc-attribute>
+            <foundry:doc-attribute name="omit-last">
+                <p>
+                    If set the <code>yes</code>, the breadcrumb for last entry (the current 
+                    category) is omitted.
+                </p>
+            </foundry:doc-attribute>
+        </foundry:doc:attributes>
+    </foundry:doc>
     <xsl:template match="breadcrumbs">
         <xsl:apply-templates select="./*[not(name = 'breadcrumb-separator')]">
             <xsl:with-param name="breadcrumb-separator" tunnel="yes">
                 <xsl:apply-templates select="./breadcrumb-separator/*"/>
             </xsl:with-param>
+            <xsl:with-param name="omit-root" tunnel="yes" select="foundry:boolean(./@omit-root)"/>
+            <xsl:with-param name="omit-last" tunnel="yes" select="foundry:boolean(./@omit-last)"/>
         </xsl:apply-templates>
     </xsl:template>
     
     <xsl:template match="breadcrumb-link">
         <xsl:param name="breadcrumb-separator" tunnel="yes"/>
+        <xsl:param name="omit-root" tunnel="yes" as="xs:boolean" select="false()"/>
+        <xsl:param name="omit-last" tunnel="yes" as="xs:boolean" select="false()"/>
         
         <xsl:variable name="show-description" 
                       select="foundry:boolean(foundry:get-attribute-value(current(), 
@@ -36,21 +64,28 @@
                                                                           'false'))"/>
         <xsl:variable name="breadcrumb-link-tree" select="current()"/>
         
-        <xsl:apply-templates select="$breadcrumb-link-tree/*">
-            <xsl:with-param name="href" 
-                            tunnel="yes"
-                            select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/>
-            <xsl:with-param name="title" 
-                            tunnel="yes"
-                            select="foundry:get-static-text('breadcrumbs', 'root')"/>
-            <xsl:with-param name="breadcrumb-label" 
-                            tunnel="yes"
-                            select="foundry:get-static-text('breadcrumbs', 'root')"/>
-        </xsl:apply-templates>
-        <xsl:if test="count($data-tree//nav:categoryPath/nav:category) &gt; 1">
-            <xsl:copy-of select="$breadcrumb-separator/*"/>
+        <xsl:variable name="last-index" 
+                      select="if ($omit-last and count($data-tree//nav:categoryPath/nav:category) &gt; 1) 
+                              then count($data-tree//nav:categoryPath/nav:category) - 1
+                              else count($data-tree//nav:categoryPath/nav:category)"/>
+        
+        <xsl:if test="not($omit-root)">
+            <xsl:apply-templates select="$breadcrumb-link-tree/*">
+                <xsl:with-param name="href" 
+                                tunnel="yes"
+                                select="$data-tree//nav:categoryPath/nav:category[position() = 1]/@url"/>
+                <xsl:with-param name="title" 
+                                tunnel="yes"
+                                select="foundry:get-static-text('breadcrumbs', 'root')"/>
+                <xsl:with-param name="breadcrumb-label" 
+                                tunnel="yes"
+                                select="foundry:get-static-text('breadcrumbs', 'root')"/>
+            </xsl:apply-templates>
+            <xsl:if test="count($data-tree//nav:categoryPath/nav:category) &gt; 1">
+                <xsl:copy-of select="$breadcrumb-separator/*"/>
+            </xsl:if>
         </xsl:if>
-        <xsl:for-each select="$data-tree//nav:categoryPath/nav:category[not(position() = 1)]">
+        <xsl:for-each select="$data-tree//nav:categoryPath/nav:category[not(position() = 1) and position() &lt;= $last-index]">
             <xsl:apply-templates select="$breadcrumb-link-tree/*">
                 <xsl:with-param name="href" tunnel="yes" select="./@url"/>
                 <xsl:with-param name="title" tunnel="yes">
@@ -265,7 +300,7 @@
             <xsl:value-of select="concat('    count(category)', count($current-level-tree))"/>
         </xsl:message>
         
-               <!--<dl>
+        <!--<dl>
             <dt>navigation-id</dt>
             <dd>
                 <xsl:value-of select="$navigation-id"/>