diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html
--- a/rhodecode/templates/admin/repos/repos.html
+++ b/rhodecode/templates/admin/repos/repos.html
@@ -2,7 +2,10 @@
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Repositories administration')} &middot; ${c.rhodecode_name}
+    ${_('Repositories administration')}
+    %if c.rhodecode_name:
+        &middot; ${c.rhodecode_name}
+    %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
@@ -19,112 +22,41 @@
         <ul class="links">
          %if h.HasPermissionAny('hg.admin','hg.create.repository')():
           <li>
-            <span>${h.link_to(_(u'Add repository'),h.url('new_repo'))}</span>
+            <a href="${h.url('new_repo')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_(u'Add Repository')}</a>
           </li>
          %endif
         </ul>
     </div>
-    <div class="table yui-skin-sam" id="repos_list_wrap"></div>
+    <div class="table-grid table yui-skin-sam" id="datatable_list_wrap"></div>
     <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
 
 
 </div>
 <script>
-  var url = "${h.url('formatted_users', format='json')}";
   var data = ${c.data|n};
-  var myDataSource = new YAHOO.util.DataSource(data);
-  myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
-
-  myDataSource.responseSchema = {
-      resultsList: "records",
-      fields: [
-         {key:"menu"},
-         {key:"raw_name"},
-         {key:"name"},
-         {key:"desc"},
-         {key:"last_changeset"},
-         {key:"owner"},
-         {key:"action"},
-      ]
-   };
-  myDataSource.doBeforeCallback = function(req,raw,res,cb) {
-      // This is the filter function
-      var data     = res.results || [],
-          filtered = [],
-          i,l;
-
-      if (req) {
-          req = req.toLowerCase();
-          for (i = 0; i<data.length; i++) {
-              var pos = data[i].raw_name.toLowerCase().indexOf(req)
-              if (pos != -1) {
-                  filtered.push(data[i]);
-              }
-          }
-          res.results = filtered;
-      }
-      YUD.get('repo_count').innerHTML = res.results.length;
-      return res;
-  }
-
-  // main table sorting
-  var myColumnDefs = [
-      {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
-      {key:"name",label:"${_('Name')}",sortable:true,
-          sortOptions: { sortFunction: nameSort }},
-      {key:"desc",label:"${_('Description')}",sortable:true},
-      {key:"last_changeset",label:"${_('Tip')}",sortable:true,
-          sortOptions: { sortFunction: revisionSort }},
-      {key:"owner",label:"${_('Owner')}",sortable:true},
-      {key:"action",label:"${_('Action')}",sortable:false},
+  var fields = [
+    {key:"menu"},
+    {key:"raw_name"},
+    {key:"name"},
+    {key:"desc"},
+    {key:"last_changeset"},
+    {key:"last_rev_raw"},
+    {key:"owner"},
+    {key:"state"},
+    {key:"action"},
   ];
-
-  var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
-    sortedBy:{key:"name",dir:"asc"},
-    paginator: YUI_paginator(25, ['user-paginator']),
-
-    MSG_SORTASC:"${_('Click to sort ascending')}",
-    MSG_SORTDESC:"${_('Click to sort descending')}",
-    MSG_EMPTY:"${_('No records found.')}",
-    MSG_ERROR:"${_('Data error.')}",
-    MSG_LOADING:"${_('Loading...')}",
-  }
-  );
-  myDataTable.subscribe('postRenderEvent',function(oArgs) {
-      tooltip_activate();
-      quick_repo_menu();
-  });
-
-  var filterTimeout = null;
-
-  updateFilter  = function () {
-      // Reset timeout
-      filterTimeout = null;
-
-      // Reset sort
-      var state = myDataTable.getState();
-      state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
-
-      // Get filtered data
-      myDataSource.sendRequest(YUD.get('q_filter').value,{
-          success : myDataTable.onDataReturnInitializeTable,
-          failure : myDataTable.onDataReturnInitializeTable,
-          scope   : myDataTable,
-          argument: state
-      });
-
-  };
-  YUE.on('q_filter','click',function(){
-      if(!YUD.hasClass('q_filter', 'loaded')){
-          //TODO: load here full list later to do search within groups
-          YUD.addClass('q_filter', 'loaded');
-      }
-   });
-
-  YUE.on('q_filter','keyup',function (e) {
-      clearTimeout(filterTimeout);
-      filterTimeout = setTimeout(updateFilter,600);
-  });
+  var column_defs = [
+    {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
+    {key:"name",label:"${_('Name')}",sortable:true, sortOptions: { sortFunction: nameSort }},
+    {key:"desc",label:"${_('Description')}",sortable:true},
+    {key:"last_changeset",label:"${_('Tip')}",sortable:true, sortOptions: { sortFunction: revisionSort }},
+    {key:"owner",label:"${_('Owner')}",sortable:true},
+    {key:"state",label:"${_('State')}",sortable:true},
+    {key:"action",label:"${_('Action')}",sortable:false},
+  ];
+  var counter = YUD.get('repo_count');
+  var sort_key = "name";
+  YUI_datatable(data, fields, column_defs, counter, sort_key, ${c.visual.admin_grid_items});
 </script>
 
 </%def>