diff --git a/www/extras/admin/admin.css b/www/extras/admin/admin.css
index 68d72ff3f..3a5dc9a6e 100644
--- a/www/extras/admin/admin.css
+++ b/www/extras/admin/admin.css
@@ -362,4 +362,34 @@ dl.accordion-menu dd.a-m-d {
     overflow-x: hidden;
 }
 
+#treeTab {
+    height: 100%;
+    overflow: auto;
+    margin-bottom: 30px;
+}
 
+#treeCrumbtrail {
+    margin: 5px;
+}
+
+#treeDataTableContainer {
+    margin-bottom: 50px; /* Same as treeBottom height */
+}
+
+#treeBottom {
+    position: fixed;
+    bottom: 0px;
+    width: 100%;
+    background: white;
+    border-top: 2px outset gray;
+}
+
+#treeButtons {
+    margin : 5px;
+    float: left;
+}
+
+#treePagination {
+    margin: 5px;
+    float: left;
+}
diff --git a/www/extras/admin/admin.js b/www/extras/admin/admin.js
index 4a21867fb..b3bb5dcb8 100644
--- a/www/extras/admin/admin.js
+++ b/www/extras/admin/admin.js
@@ -1125,7 +1125,7 @@ WebGUI.Admin.AssetTable
         rowsPerPage           : 100,
         previousPageLinkLabel : window.admin.i18n.get('WebGUI', '< prev'),
         nextPageLinkLabel     : window.admin.i18n.get('WebGUI', 'next >'),
-        template              : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink}"
+        template              : "{PreviousPageLink} <strong>{CurrentPageReport}</strong> {NextPageLink}"
     });
 
    // initialize the data source
@@ -1210,7 +1210,7 @@ WebGUI.Admin.AssetTable.prototype.init
 = function ( ) {
     // Initialize the data table
     this.dataTable
-        = new YAHOO.widget.DataTable( this.cfg.dataTableId, 
+        = new YAHOO.widget.ScrollingDataTable( this.cfg.dataTableId, 
             this.columnDefs,
             this.dataSource, 
             {
@@ -1627,7 +1627,7 @@ WebGUI.Admin.Tree
     WebGUI.Admin.Tree.superclass.constructor.call( this, admin, {
         dataSourceUrl   : '?op=admin;method=getTreeData;',
         dataTableId     : 'treeDataTableContainer',
-        paginatorIds    : [ 'treePaginator' ]
+        paginatorIds    : [ 'treePagination' ]
     } );
 
     // Add Rank column for ordering