--- alt_db_navframe.php	Tue Aug 15 22:34:34 2006
+++ __alt_db_navframe.php	Fri Aug 18 10:13:00 2006
@@ -195,9 +195,13 @@
 			<script type="text/javascript" src="../t3lib/prototype.js"></script>
 			<ul class="tree">
 		';
+		// IE takes anchor as parameter.
+        if(ereg("#",t3lib_div::_GP('PM')))
+            $PM_temp = substr(t3lib_div::_GP('PM'),0,strpos(t3lib_div::_GP('PM'),"#"));
+        else
+            $PM_temp = t3lib_div::_GP('PM');
 
-
-		$PM = explode('_',t3lib_div::_GP('PM'));
+		$PM = explode('_',$PM_temp);
 		if($isAjaxCall = t3lib_div::_GP('isAjaxCall') && is_array($PM) && count($PM)==4) {
 			if($PM[1]) {
 				$expandedPageUid = $PM[2];
@@ -217,7 +221,10 @@
 			$itemHTML = '';
 
 			if($v['isFirst'] && !($doCollapse && $collapsedPageUid == $v['row']['uid']) && !($doExpand && $expandedPageUid == $v['row']['uid'])) {
-				$itemHTML = '<ul>';
+			if($v['isLast'] && $v['hasSub'])
+				$itemHTML = '<ul class="tree-sub">';
+            else
+                $itemHTML = '<ul>';
 			}
 
 			if($v['hasSub']) {
@@ -226,7 +233,14 @@
 				}
 				$v['row']['_CSSCLASS'] .= 'expanded';
 			}
-
+            //New class for last item
+			if($v['isLast']) {
+				if($v['row']['_CSSCLASS']) {
+					$v['row']['_CSSCLASS'] .= ' ';
+				}
+				$v['row']['_CSSCLASS'] .= 'last';
+            }
+            
 			$itemHTML .='
 				<li id="'.$idAttr.'" '.($v['row']['_CSSCLASS'] ? ' class="'.$v['row']['_CSSCLASS'].'"' : '').'>'.
 					$v['HTML'].
@@ -237,8 +251,8 @@
 			if(!$v['hasSub']) {
 				$itemHTML .= '</li>';
 			}
-
-			if($v['isLast']) {
+            //Only not if item is last, then we need another ul closing tag
+			if($v['isLast'] &! $v['hasSub']) {
 				$itemHTML .= '</ul></li>';
 			}
 
@@ -261,9 +275,10 @@
 		}
 
 		if($ajaxOutput) die($ajaxOutput);
-
+        //finally close first and last ul
 		$out .= '
-			</ul>';
+			</ul></ul></ul>';
+
 		return $out;
 	}
 
@@ -320,10 +335,10 @@
 					});
 				}
 			';
-			
+
 			$javascript = 'ajaxPageTreeLoader(\''.$cmd.$anchor.'\', '.intval($isExpand).', this)';
-			
-			return '<a style="cursor:pointer;" href="#'.htmlspecialchars($javascript).'" onclick="'.htmlspecialchars($javascript).'"'.$name.'>'.$icon.'</a>';
+            //take href out
+			return '<a style="cursor:pointer;" onclick="'.htmlspecialchars($javascript).'"'.$name.'>'.$icon.'</a>';
 		} else {
 			return $icon;
 		}