diff --git a/phpgwapi/templates/idots/head.inc.php b/phpgwapi/templates/idots/head.inc.php
index 78921c3b35..c4eed1bea6 100644
--- a/phpgwapi/templates/idots/head.inc.php
+++ b/phpgwapi/templates/idots/head.inc.php
@@ -62,11 +62,6 @@
 		</script>';
 	}
 
-// 030204 ndee for calling foldertree
-
-	$foldertree_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/foldertree/foldertree.js';
-	$js_foldertree = '<script src="'.$foldertree_src.'" type="text/javascript"></script>';
-
 	$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 	$tpl->set_unknowns('remove');
 	$tpl->set_file(array('_head' => 'head.tpl'));
@@ -89,7 +84,6 @@
 		'theme_css'     => $theme_css,
 		'css'           => $GLOBALS['phpgw']->common->get_css(),
 		'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),
-		'js_foldertree'	=> $js_foldertree
 	);
 	$tpl->set_var($var);
 	$tpl->pfp('out','head');
diff --git a/phpgwapi/templates/idots/head.tpl b/phpgwapi/templates/idots/head.tpl
index b6e4144929..08cb9286d7 100644
--- a/phpgwapi/templates/idots/head.tpl
+++ b/phpgwapi/templates/idots/head.tpl
@@ -17,7 +17,6 @@
 		{simple_show_hide}
 		{pngfix}
 		{css}
-		{js_foldertree}
 		{java_script}
 	</head>
 	<!-- we don't need body tags anymore, do we?) we do!!! onload!! LK -->
diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php
index 02786bb0cf..1f8fac9e7b 100644
--- a/phpgwapi/templates/idots/navbar.inc.php
+++ b/phpgwapi/templates/idots/navbar.inc.php
@@ -57,11 +57,14 @@
 		foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
 		{
 			//if($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
-			if($app != 'preferences' && $app != 'about')
+			if($app != 'preferences' && $app != 'about' && $app != 'logout')
 			{
 				$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
 				$icon = '<img src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" />';
 
+// 020204 ndee
+				if($app == 'home') $title = "Home";
+
 				if($i<$max_icons)
 				{
 					$app_icons .= '<td height="66" valign="bottom" align="center"><a href="' . $app_data['url'] . '"';
@@ -129,6 +132,9 @@
 				}
 			}
 
+			$app_icons .= '<td height="32" valign="bottom" align="center"><a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'"><img src="'.$GLOBALS['phpgw_info']['navbar']['logout']['icon'].'"></a></td>';
+			$app_titles .= '<td align=center valign="top" class="appTitles"><a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'">'.$GLOBALS['phpgw_info']['navbar']['logout']['title'].'</a></td>';
+
 //			$var['app_icons'] = $app_icons;
 		if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='text')
 		{
@@ -137,6 +143,7 @@
 
 			if($i > $max_icons)
 			{
+// table width=100% fixed layout bug (ndee130204)
 				$app_extra_icons_div = '
 				<script language="javascript">
 				new ypSlideOutMenu("menu1", "down", 10, 114, 160, 200,\'right\')
@@ -145,9 +152,12 @@
 				<div id="menu1Content" style="position: relative; left: 0; text-align: left;">
 
 				<div id="extraIcons">
-				<table cellspacing="0" cellpadding="0">
-				<tr><td colspan="2" nowrap="nowrap" align="right" style="background-color:#dddddd;padding:1px;"><a href="#" '.$show_menu_event.'="ypSlideOutMenu.hide(\'menu1\')" title="'.lang('close').'"><img style="" border="0" src="'.$var['img_root'].'/close.png"/></a></td></tr>
-				'.$app_extra_icons.'					</table>
+
+				<table cellspacing="0" cellpadding="0" border="0" width="100%">
+				<tr><td colspan="2" nowrap="nowrap" align="right" style="background-color:#dddddd;padding:1px;">
+				<a href="#" '.$show_menu_event.'="ypSlideOutMenu.hide(\'menu1\')" title="'.lang('close').'">
+				<img style="" border="0" src="'.$var['img_root'].'/close.png"/></a></td></tr>
+				'.$app_extra_icons.'</table>
 				</div>
 
 				</div>