Index: trunk/kernel/admin_templates/incs/tree.js
===================================================================
diff -u -r4684 -r4724
--- trunk/kernel/admin_templates/incs/tree.js	(.../tree.js)	(revision 4684)
+++ trunk/kernel/admin_templates/incs/tree.js	(.../tree.js)	(revision 4724)
@@ -28,6 +28,7 @@
 
 		this.Tr = tr;
 		this.Rendered = true;
+//		alert(this.Tr.innerHTML)
 	}
 }
 
@@ -110,7 +111,7 @@
 
 TreeItem.prototype.display = function()
 {
-	this.Tr.style.display = 'block';
+	this.Tr.style.display = is.ie ? 'block' : 'table-row';
 	this.Displayed = true;
 }
 
@@ -223,7 +224,6 @@
 	last_item = this.locateLastItem();
 	this.Children.push(an_item);
 	an_item.Render(last_item.Tr.nextSibling);
-	this.locateTopItem().updateLastNodes();
 	if (this.Expanded)
 	{
 		an_item.display();
@@ -233,10 +233,14 @@
 
 TreeFolder.prototype.AddFromXML = function(xml, render)
 {
+//	start = new Date();
 	if (!isset(render)) render = true;
 	doc = getDocumentFromXML(xml);
 	this.LastFolder = this;
 	this.ProcessXMLNode(doc, render);
+//	end = new Date();
+	this.locateTopItem().updateLastNodes();
+//	alert('AddFromXML took: '+(end - start))
 }
 
 TreeFolder.prototype.ProcessXMLNode = function(node, render)
@@ -331,6 +335,7 @@
 					obj.ProcessXMLNode(request.responseXML);
 					obj.Loaded = true;
 					obj.Render();
+					obj.locateTopItem().updateLastNodes();
 					obj.expand();
 				}
 			}
Index: trunk/kernel/admin_templates/tree.tpl
===================================================================
diff -u -r4702 -r4724
--- trunk/kernel/admin_templates/tree.tpl	(.../tree.tpl)	(revision 4702)
+++ trunk/kernel/admin_templates/tree.tpl	(.../tree.tpl)	(revision 4724)
@@ -14,6 +14,16 @@
 		var screen_y = (screen.availHeight-height)/2;
 		window.open(url, 'credits', 'width=280,height=520,left='+screen_x+',top='+screen_y);
 	}
+
+
+	function checkEditMode()
+	{
+		if (window.parent.getFrame('main').$edit_mode) {
+			return confirm('<inp2:m_Phrase label="la_EditingInProgress" escape="1"/>') ? true : false;
+		}
+
+		return true;
+	}
 </script>
 
 <script src="incs/tree.js"></script>
@@ -36,8 +46,9 @@
 	.tree tr td {
 		padding: 0px;
 		margin: 0px;
-		font-family: arial,verdana;
-		font-size: 10pt;
+		font-family: helvetica, arial, verdana,;
+		font-size: 11px;
+		white-space: nowrap;
 	}
 
 	.tree tr td a {
@@ -72,23 +83,19 @@
 		<td colspan="2" style="padding: 5px;">
 			<inp2:m_DefineElement name="xml_node">
 				<inp2:m_if check="m_ParamEquals" param="children_count" value="0">
-					<item href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif">
-						<inp2:m_phrase name="$label" escape="1"/>
-					</item>
+					<item href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif"><inp2:m_phrase name="$label" escape="1"/></item>
 				<inp2:m_else/>
-					<folder href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>">
-						<inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/>
-					</folder>
+					<folder href="<inp2:m_param name="section_url"/>" onclick="checkEditMode()" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>"><inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/></folder>
 				</inp2:m_if>
 			</inp2:m_DefineElement>
-		
+
 			<table class="tree">
 			<tbody id="tree">
 			</tbody>
 			</table>
 			<script type="text/javascript">
 				var TREE_ICONS_PATH = 'img/tree'
-				
+
 				<inp2:m_DefineElement name="root_node">
 					var the_tree = new TreeFolder('tree', '<inp2:m_param name="label"/>', '<inp2:m_param name="section_url"/>', '<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif');
 				</inp2:m_DefineElement>
@@ -105,14 +112,14 @@
 	// when changing language submit is made to frameset, not the current frame
 	var $kf = document.getElementById($form_name);
 	$kf.target = 'main_frame';
-	
+
 	function checkEditMode()
 	{
 		var $phrase = "<inp2:adm_TreeEditWarrning label="la_EditingInProgress" escape="1"/>";
 		if (window.parent.getFrame('main').$edit_mode) {
 			return confirm($phrase) ? true : false;
 		}
-		
+
 		return true;
 	}
 </script>
\ No newline at end of file
Index: trunk/kernel/admin_templates/incs/script.js
===================================================================
diff -u -r4610 -r4724
--- trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 4610)
+++ trunk/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 4724)
@@ -918,7 +918,7 @@
 		if (is.ie) {
 			el.attachEvent("on" + evname, func);
 		} else {
-			el.addEventListener(evname, func, false);
+			el.addEventListener(evname, func, true);
 		}
 	};