diff --git a/e107_core/templates/navigation_template.php b/e107_core/templates/navigation_template.php
index 84bf4bc79..21c38d8bd 100644
--- a/e107_core/templates/navigation_template.php
+++ b/e107_core/templates/navigation_template.php
@@ -13,7 +13,7 @@ $NAVIGATION_TEMPLATE['main']['start'] = '<ul class="nav navbar-nav">';
 // Main Link
 $NAVIGATION_TEMPLATE['main']['item'] = '
 	<li class="dropdown">
-		<a class="dropdown-toggle"  role="button" href="{LINK_URL}"{LINK_OPEN}>
+		<a class="dropdown-toggle"  role="button" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
 		 {LINK_ICON}{LINK_NAME} 
 		</a> 
 	</li>
@@ -22,7 +22,7 @@ $NAVIGATION_TEMPLATE['main']['item'] = '
 // Main Link which has a sub menu. 
 $NAVIGATION_TEMPLATE['main']['item_submenu'] = '
 	<li class="dropdown">
-		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
+		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
 		 {LINK_ICON}{LINK_NAME} 
 		<b class="caret"></b>
 		</a> 
@@ -42,7 +42,7 @@ $NAVIGATION_TEMPLATE['main']['item_submenu_active'] = '
 
 $NAVIGATION_TEMPLATE['main']['item_active'] = '
 	<li class="dropdown active">
-		<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}"{LINK_OPEN}>
+		<a class="dropdown-toggle e-tip" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}"{LINK_OPEN} title="{LINK_DESCRIPTION}">
 		 {LINK_ICON} {LINK_NAME}
 		</a>
 	</li>
diff --git a/e107_plugins/page/e_sitelink.php b/e107_plugins/page/e_sitelink.php
index 15e14b0d5..2e85ef3b7 100644
--- a/e107_plugins/page/e_sitelink.php
+++ b/e107_plugins/page/e_sitelink.php
@@ -92,7 +92,7 @@ class page_sitelink // include plugin-folder in the name.
 		$sql = e107::getDb();
 		$tp = e107::getParser();
 		
-		if($sql->select("page_chapters", "*", "chapter_parent = ".intval($book)."  ORDER BY chapter_order ASC "))
+		if($sql->select("page_chapters", "*", "chapter_parent = ".intval($book)." AND chapter_visibility IN (".USERCLASS_LIST.")  ORDER BY chapter_order ASC "))
 		{
 			$sublinks = array();
 			
@@ -209,13 +209,13 @@ class page_sitelink // include plugin-folder in the name.
 			);
 		}
 
-		$filter = 1;
+		$filter = "chapter_visibility IN (".USERCLASS_LIST.") " ;
 		
 		if(vartrue($options['chapter']))
 		{
 			//$filter = "chapter_id > ".intval($options['chapter']);
 			
-			$title = $sql->retrieve('page_chapters', 'chapter_name', 'chapter_id='.intval($options['chapter']));
+			$title = $sql->retrieve('page_chapters', 'chapter_name', 'chapter_id='.intval($options['chapter']).' AND chapter_visibility IN ('.USERCLASS_LIST.')' );
 			$outArray 	= array();
 			if(!$title) return e107::getNav()->compile($_pdata, $outArray, $options['chapter']);	
 			return array('title' => $title, 'body' => e107::getNav()->compile($_pdata, $outArray, $options['chapter']));
@@ -235,7 +235,7 @@ class page_sitelink // include plugin-folder in the name.
 		//	print_a('parent='.$parent);
 		}
 
-
+		
 		$books = $sql->retrieve("SELECT * FROM #page_chapters WHERE ".$filter." ORDER BY chapter_order ASC" , true);
 		foreach($books as $row)
 		{