diff --git a/cms/src/modules/node/node_module.e b/cms/src/modules/node/node_module.e
index 25b47c3..e1e59a5 100644
--- a/cms/src/modules/node/node_module.e
+++ b/cms/src/modules/node/node_module.e
@@ -153,7 +153,7 @@ feature -- Hooks
 			perms: detachable ARRAYED_LIST [READABLE_STRING_8]
 		do
 			create lnk.make ("List of nodes", "/nodes")
-			a_menu_system.navigation_menu.extend (lnk)
+			a_menu_system.main_menu.extend (lnk)
 		end
 
 end
diff --git a/cms/src/theme/cms_theme.e b/cms/src/theme/cms_theme.e
index 74c947f..6066077 100644
--- a/cms/src/theme/cms_theme.e
+++ b/cms/src/theme/cms_theme.e
@@ -103,9 +103,9 @@ feature {NONE} -- Implementation
 			else
 				s.append ("<li class=%""+ cl + "%">")
 			end
---			s.append ("<a href=%"" + url (lnk.location, lnk.options) + "%">" + html_encoded (lnk.title) + "</a>")
+			s.append ("<a href=%"" +  (lnk.location) + "%">" + html_encoded (lnk.title) + "</a>")
 			if
---				(lnk.is_expanded or lnk.is_collapsed) and then
+				(lnk.is_expanded or lnk.is_collapsed) and then
 				attached lnk.children as l_children
 			then
 				s.append ("<ul>%N")
diff --git a/examples/roc_api/site/www/themes/bootstrap/page.tpl b/examples/roc_api/site/www/themes/bootstrap/page.tpl
index 853a611..1b4566c 100644
--- a/examples/roc_api/site/www/themes/bootstrap/page.tpl
+++ b/examples/roc_api/site/www/themes/bootstrap/page.tpl
@@ -33,7 +33,9 @@
     
     <!-- Page Header -->
     <div id="header">
-       {include file="tpl/page_header2.tpl"/}
+      {if isset="$page.primary_nav"}
+          {$page.primary_nav/}
+      {/if}    
     </div> 
     
     <!-- General Page Content -->