diff --git a/trunk/module/bug/view/browse.html.php b/trunk/module/bug/view/browse.html.php
index 2e9b34d28b..85bb535b0a 100644
--- a/trunk/module/bug/view/browse.html.php
+++ b/trunk/module/bug/view/browse.html.php
@@ -73,15 +73,6 @@ function browseBySearch(active)
 </div>
 
 <div class='yui-d0 <?php if($browseType == 'bymodule') echo 'yui-t7';?>' id='mainbox'>
-  <div class='yui-b  <?php if($browseType != 'bymodule') echo 'hidden';?>' id='treebox'>
-    <div class='box-title'><?php echo $productName;?></div>
-    <div class='box-content'>
-      <?php echo $moduleTree;?>
-      <div class='a-right'>
-        <?php if(common::hasPriv('tree', 'browse')) echo html::a($this->createLink('tree', 'browse', "productID=$productID&view=bug"), $lang->tree->manage);?>
-      </div>
-    </div>
-  </div>
 
   <div class="yui-main">
     <div class="yui-b">
@@ -127,6 +118,17 @@ function browseBySearch(active)
       <?php $pager->show();?>
     </div>
   </div>
+
+  <div class='yui-b  <?php if($browseType != 'bymodule') echo 'hidden';?>' id='treebox'>
+    <div class='box-title'><?php echo $productName;?></div>
+    <div class='box-content'>
+      <?php echo $moduleTree;?>
+      <div class='a-right'>
+        <?php if(common::hasPriv('tree', 'browse')) echo html::a($this->createLink('tree', 'browse', "productID=$productID&view=bug"), $lang->tree->manage);?>
+      </div>
+    </div>
+  </div>
+
 </div>  
 <script language='javascript'>
 $("#<?php echo $browseType;?>Tab").addClass('active'); 
diff --git a/trunk/module/common/view/treeview.html.php b/trunk/module/common/view/treeview.html.php
index 3b89a1f7a5..ed14b7e835 100644
--- a/trunk/module/common/view/treeview.html.php
+++ b/trunk/module/common/view/treeview.html.php
@@ -1,3 +1,3 @@
 <link rel='stylesheet' href='<?php echo $clientTheme;?>treeview.css' type='text/css' />
 <script src='<?php echo $jsRoot;?>jquery/treeview/min.js' type='text/javascript'></script>
-<script language='javascript'>$(function() { $("#tree").treeview( { persist: "cookie", collapsed: false }) })</script>
+<script language='javascript'>$(function() { $("#tree").treeview({ persist: "cookie", collapsed: true, unique: true }) })</script>
diff --git a/trunk/module/company/view/browse.html.php b/trunk/module/company/view/browse.html.php
index 7727d13720..8d692cbb15 100644
--- a/trunk/module/company/view/browse.html.php
+++ b/trunk/module/company/view/browse.html.php
@@ -28,19 +28,6 @@ include '../../common/view/treeview.html.php';
 include '../../common/view/tablesorter.html.php';
 ?>
 <div class="yui-d0 yui-t7">
-  <div class="yui-b">
-    <div class='box-title'><?php echo $lang->dept->common;?></div>
-    <div class='box-content'>
-      <?php echo $deptTree;?>
-      <div class='a-right'>
-        <?php 
-        common::printLink('dept', 'browse', '', $lang->dept->manage);
-        common::printLink('user', 'create', "dept=$deptID&from=company", $lang->user->create);
-        common::printLink('company', 'browse', '', $lang->user->allUsers);
-        ?>
-      </div>
-    </div>
-  </div>
   <div class="yui-main">
     <div class="yui-b">
       <table class='table-1 tablesorter'>
@@ -85,6 +72,21 @@ include '../../common/view/tablesorter.html.php';
       </table>
     </div>
   </div>
+
+  <div class="yui-b">
+    <div class='box-title'><?php echo $lang->dept->common;?></div>
+    <div class='box-content'>
+      <?php echo $deptTree;?>
+      <div class='a-right'>
+        <?php 
+        common::printLink('dept', 'browse', '', $lang->dept->manage);
+        common::printLink('user', 'create', "dept=$deptID&from=company", $lang->user->create);
+        common::printLink('company', 'browse', '', $lang->user->allUsers);
+        ?>
+      </div>
+    </div>
+  </div>
+
 </div>  
 <script lanugage='Javascript'>$('#dept<?php echo $deptID;?>').addClass('active');</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/trunk/module/dept/view/browse.html.php b/trunk/module/dept/view/browse.html.php
index a382f38ccc..c6c21ac3c2 100644
--- a/trunk/module/dept/view/browse.html.php
+++ b/trunk/module/dept/view/browse.html.php
@@ -25,19 +25,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/treeview.html.php';?>
 <div class="yui-d0 yui-t3">                 
-  <div class="yui-b">
-    <form method='post' target='hiddenwin' action='<?php echo $this->createLink('dept', 'updateOrder');?>'>
-    <table class='table-1'>
-      <caption><?php echo $header->title;?></caption>
-      <tr>
-        <td>
-          <div id='main'><?php echo $depts;?></div>
-          <div class='a-center'><?php echo html::submitButton($lang->dept->updateOrder);?></div>
-        </td>
-      </tr>
-    </table>
-    </form>
-  </div>
   <div class="yui-main">
     <div class="yui-b">
     <form method='post' target='hiddenwin' action='<?php echo $this->createLink('dept', 'manageChild');?>'>
@@ -74,5 +61,20 @@
       </form>
     </div>
   </div>
+
+  <div class="yui-b">
+    <form method='post' target='hiddenwin' action='<?php echo $this->createLink('dept', 'updateOrder');?>'>
+    <table class='table-1'>
+      <caption><?php echo $header->title;?></caption>
+      <tr>
+        <td>
+          <div id='main'><?php echo $depts;?></div>
+          <div class='a-center'><?php echo html::submitButton($lang->dept->updateOrder);?></div>
+        </td>
+      </tr>
+    </table>
+    </form>
+  </div>
+
 </div>  
 <?php include '../../common/view/footer.html.php';?>
diff --git a/trunk/module/product/view/browse.html.php b/trunk/module/product/view/browse.html.php
index 3a8e922063..f6e4ea9b62 100644
--- a/trunk/module/product/view/browse.html.php
+++ b/trunk/module/product/view/browse.html.php
@@ -63,17 +63,6 @@ function search(active)
 </div>
 
 <div class='yui-d0 <?php if($browseType == 'bymodule') echo 'yui-t1';?>' id='mainbox'>
-  <div class='yui-b <?php if($browseType != 'bymodule') echo 'hidden';?>' id='treebox'>
-    <div class='box-title'><?php echo $productName;?></div>
-    <div class='box-content'>
-      <?php echo $moduleTree;?>
-      <div class='a-right'>
-        <?php if(common::hasPriv('product', 'edit'))   echo html::a($this->createLink('product', 'edit',   "productID=$productID"), $lang->edit);?>
-        <?php if(common::hasPriv('product', 'delete')) echo html::a($this->createLink('product', 'delete', "productID=$productID&confirm=no"),   $lang->delete, 'hiddenwin');?>
-        <?php if(common::hasPriv('tree', 'browse'))    echo html::a($this->createLink('tree',    'browse', "productID=$productID&view=product"), $lang->tree->manage);?>
-      </div>
-    </div>
-  </div>
 
   <div class="yui-main">
     <div class="yui-b">
@@ -124,6 +113,19 @@ function search(active)
       <?php $pager->show();?>
     </div>
   </div>
+
+  <div class='yui-b <?php if($browseType != 'bymodule') echo 'hidden';?>' id='treebox'>
+    <div class='box-title'><?php echo $productName;?></div>
+    <div class='box-content'>
+      <?php echo $moduleTree;?>
+      <div class='a-right'>
+        <?php if(common::hasPriv('product', 'edit'))   echo html::a($this->createLink('product', 'edit',   "productID=$productID"), $lang->edit);?>
+        <?php if(common::hasPriv('product', 'delete')) echo html::a($this->createLink('product', 'delete', "productID=$productID&confirm=no"),   $lang->delete, 'hiddenwin');?>
+        <?php if(common::hasPriv('tree', 'browse'))    echo html::a($this->createLink('tree',    'browse', "productID=$productID&view=product"), $lang->tree->manage);?>
+      </div>
+    </div>
+  </div>
+
 </div>  
 <script language='javascript'>
 $('#module<?php echo $moduleID;?>').addClass('active')
diff --git a/trunk/module/testcase/view/browse.html.php b/trunk/module/testcase/view/browse.html.php
index 772b78b020..8b226f3849 100644
--- a/trunk/module/testcase/view/browse.html.php
+++ b/trunk/module/testcase/view/browse.html.php
@@ -65,15 +65,6 @@ function browseBySearch(active)
 </div>
 
 <div class='yui-d0 <?php if($browseType == 'bymodule') echo 'yui-t7';?>' id='mainbox'>
-  <div class='yui-b  <?php if($browseType != 'bymodule') echo 'hidden';?>' id='treebox'>
-    <div class='box-title'><?php echo $productName;?></div>
-    <div class='box-content'>
-      <?php echo $moduleTree;?>
-      <div class='a-right'>
-        <?php common::printLink('tree', 'browse', "productID=$productID&view=case", $lang->tree->manage);?>
-      </div>
-    </div>
-  </div>
   <div class="yui-main">
     <div class='yui-b'>
       <?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
@@ -112,6 +103,17 @@ function browseBySearch(active)
       <?php $pager->show();?>
     </div>
   </div>
+
+  <div class='yui-b  <?php if($browseType != 'bymodule') echo 'hidden';?>' id='treebox'>
+    <div class='box-title'><?php echo $productName;?></div>
+    <div class='box-content'>
+      <?php echo $moduleTree;?>
+      <div class='a-right'>
+        <?php common::printLink('tree', 'browse', "productID=$productID&view=case", $lang->tree->manage);?>
+      </div>
+    </div>
+  </div>
+
 </div>  
 <script language="Javascript">
 $("#<?php echo $browseType;?>Tab").addClass('active');
diff --git a/trunk/module/tree/view/browse.html.php b/trunk/module/tree/view/browse.html.php
index 6f71369bca..1e9b58e127 100644
--- a/trunk/module/tree/view/browse.html.php
+++ b/trunk/module/tree/view/browse.html.php
@@ -32,21 +32,6 @@ $(document).ready(function()
 });
 </script>
 <div class="yui-d0 yui-t3">
-  <div class="yui-b">
-    <form method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "product={$product->id}&viewType=$viewType");?>'>
-    <table class='table-1'>
-      <caption><?php echo $header->title;?></caption>
-      <tr>
-        <td>
-          <div id='main'><?php echo $modules;?></div>
-          <div class='a-center'>
-            <?php if(common::hasPriv('tree', 'updateorder')) echo html::submitButton($lang->tree->updateOrder);?>
-          </div>
-        </td>
-      </tr>
-    </table>
-    </form>
-  </div>
   <div class="yui-main">
     <div class="yui-b">
     <form method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "product={$product->id}&viewType=$viewType");?>'>
@@ -92,5 +77,22 @@ $(document).ready(function()
       </form>
     </div>
   </div>
+
+  <div class="yui-b">
+    <form method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "product={$product->id}&viewType=$viewType");?>'>
+    <table class='table-1'>
+      <caption><?php echo $header->title;?></caption>
+      <tr>
+        <td>
+          <div id='main'><?php echo $modules;?></div>
+          <div class='a-center'>
+            <?php if(common::hasPriv('tree', 'updateorder')) echo html::submitButton($lang->tree->updateOrder);?>
+          </div>
+        </td>
+      </tr>
+    </table>
+    </form>
+  </div>
+
 </div>  
 <?php include '../../common/view/footer.html.php';?>