--- a/site/templates/layout.tmpl	Sat Dec 13 21:00:40 2008 +0200
+++ b/site/templates/layout.tmpl	Fri Feb 06 20:46:43 2009 +0200
@@ -20,8 +20,8 @@
             </div>
  
             <ul id="nav">
-                #for $menu_page in $page_menu
-                <li><a href="$page_root/$menu_page.path"#if isinstance($page, $menu_page) then ' id="selected-page"' else '' #>$menu_page.name</a></li>
+                #for $menu_page_path in $page.parent.menu
+                <li><a href="$page_root/$menu_page_path"#if $page.path == $menu_page_path then ' id="selected-page"' else '' #>$menu_page_path</a></li>
                 #end for
             </ul>