diff --git a/class2.php b/class2.php
index 2a9d5edfe..4570c3f6e 100644
--- a/class2.php
+++ b/class2.php
@@ -1087,6 +1087,10 @@ if(e_ADMIN_AREA)
 else
 {
 	require_once (THEME.'theme.php');
+	if(isset($SC_WRAPPER))
+	{
+		e107::scStyle($SC_WRAPPER);
+	}
 }
 
 
diff --git a/e107_core/shortcodes/single/navigation.php b/e107_core/shortcodes/single/navigation.php
index 0d3f99159..947ef1b1b 100644
--- a/e107_core/shortcodes/single/navigation.php
+++ b/e107_core/shortcodes/single/navigation.php
@@ -17,9 +17,7 @@ function navigation_shortcode($parm='')
 	$data 			= $nav->initData($category);
 //	$data 			= $nav->collection($category);
 
-	if($data)
-	{
-		return $nav->render($data, $template);
-	}
+	return $nav->render($data, $template);
+
 }
 	
\ No newline at end of file
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index f3407a64a..7d2a0e49a 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -1371,7 +1371,10 @@ class e_navigation
 		
 		$sc 			= e107::getScBatch('navigation');	
 		$sc->template 	= $template; 
-		$ret 			= $template['start'];
+		$head			= $template['start'];
+		$foot 			= $template['end'];
+		$ret 			= "";
+		
 		foreach ($data as $_data) 
 		{		
 			$sc->setVars($_data);
@@ -1379,10 +1382,8 @@ class e_navigation
 			$itemTmpl 		= count($_data['link_sub']) > 0 ? $template['item_submenu'.$active] : $template['item'.$active];
 			$ret 			.= e107::getParser()->parseTemplate($itemTmpl, TRUE);			
 		}
-		
-		$ret .= $template['end'];
-		
-		return $ret;
+
+		return ($ret != '') ? $head.$ret.$foot : '';
 	}
 
 	
diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php
index 2295e2ca2..01d020af4 100644
--- a/e107_themes/bootstrap/theme.php
+++ b/e107_themes/bootstrap/theme.php
@@ -118,10 +118,11 @@ function tablestyle($caption, $text, $mode='')
 	}
 }
 
-
+// $SC_WRAPPER['NAVIGATION=side'] = '<div class="well sidebar-nav">{---}</div><!--/.well -->'; //FIXME 
 
 // TODO Convert to : default-home and default-other layouts. 
 
+
 $HEADER['default'] = '
 <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
@@ -144,10 +145,7 @@ $HEADER['default'] = '
 <div class="container-fluid">
 	<div class="row-fluid">
 		 <div class="span3">
-          <div class="well sidebar-nav">
-            {NAVIGATION=side}
-			
-          </div><!--/.well -->
+           {NAVIGATION=side}          
           {SETSTYLE=menu}
           {MENU=1}
         </div><!--/span-->