diff --git a/media/css/seahub.css b/media/css/seahub.css
index 76bea893a6..67b54eb83e 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -2350,6 +2350,7 @@ button.sf-dropdown-toggle:focus {
 #folder-perm-popup .op-target {
     max-width:540px;
 }
+#confirm-popup .op-target,
 #repo-transfer-form .op-target {
     max-width:200px;
 }
@@ -2358,7 +2359,7 @@ button.sf-dropdown-toggle:focus {
     margin-top:30px;
 }
 .user-list .user {
-    display:inline-block; /*to handle different height of items*/
+    display:inline-block; /* to handle different height of items */
     vertical-align:top;
     width:330px;
     margin:0 17px 30px 0;
diff --git a/seahub/api2/endpoints/admin/libraries.py b/seahub/api2/endpoints/admin/libraries.py
index 32dcd1a5e0..80598b8d0a 100644
--- a/seahub/api2/endpoints/admin/libraries.py
+++ b/seahub/api2/endpoints/admin/libraries.py
@@ -20,6 +20,7 @@ from seahub.api2.utils import api_error
 logger = logging.getLogger(__name__)
 
 def get_repo_info(repo):
+
     result = {}
     result['id'] = repo.repo_id
     result['name'] = repo.repo_name
@@ -33,14 +34,57 @@ def get_repo_info(repo):
 
 
 class AdminLibraries(APIView):
-    """ return all libraries
-    """
-
     authentication_classes = (TokenAuthentication, SessionAuthentication)
     throttle_classes = (UserRateThrottle,)
     permission_classes = (IsAdminUser,)
 
     def get(self, request, format=None):
+        """
+        List 'all' libraries (by name/owner/page)
+        """
+
+        ## search libraries (by name/owner)
+        repo_name = request.GET.get('name', '')
+        owner = request.GET.get('owner', '')
+        repos = []
+        if repo_name and owner :
+            # search by name and owner
+            owned_repos = seafile_api.get_owned_repo_list(owner)
+            for repo in owned_repos:
+                if not repo.name:
+                    continue
+                if repo_name in repo.name:
+                    repo_info = get_repo_info(repo)
+                    repos.append(repo_info)
+
+            return Response({
+                "name": repo_name, "owner": owner, "repos": repos})
+
+        elif repo_name:
+            # search by name(keyword in name)
+            repos_all = seafile_api.get_repo_list(-1, -1)
+            for repo in repos_all:
+                if not repo.name:
+                    continue
+                if repo_name in repo.name:
+                    repo_info = get_repo_info(repo)
+                    repos.append(repo_info)
+
+            return Response({
+                "name": repo_name, "owner": '', "repos": repos})
+
+        elif owner:
+            # search by owner
+            owned_repos = seafile_api.get_owned_repo_list(owner)
+            for repo in owned_repos:
+                repo_info = get_repo_info(repo)
+                repos.append(repo_info)
+
+            return Response({
+                "name": '', "owner": owner, "repos": repos})
+
+
+        ##  get libraries by page
         try:
             current_page = int(request.GET.get('page', '1'))
             per_page = int(request.GET.get('per_page', '100'))
@@ -73,7 +117,7 @@ class AdminLibraries(APIView):
             'has_next_page': has_next_page,
             'current_page': current_page
         }
-        return Response((page_info, return_results))
+        return Response({"page_info": page_info, "repos": return_results})
 
 class AdminLibrary(APIView):
 
diff --git a/seahub/api2/endpoints/admin/trash_libraries.py b/seahub/api2/endpoints/admin/trash_libraries.py
index 69731295d8..2988fb5128 100644
--- a/seahub/api2/endpoints/admin/trash_libraries.py
+++ b/seahub/api2/endpoints/admin/trash_libraries.py
@@ -9,6 +9,7 @@ from rest_framework import status
 from seaserv import seafile_api
 from pysearpc import SearpcError
 
+from seahub.utils import is_valid_username 
 from seahub.utils.timeutils import timestamp_to_isoformat_timestr
 
 from seahub.api2.authentication import TokenAuthentication
@@ -25,28 +26,40 @@ class AdminTrashLibraries(APIView):
     permission_classes = (IsAdminUser,)
 
     def get(self, request, format=None):
-        """ get all deleted libraries
         """
+        List deleted repos (by owner)
+        """
+        search_owner = request.GET.get('owner', '')
+        if search_owner and is_valid_username(search_owner):
+            repos = seafile_api.get_trash_repos_by_owner(search_owner)
+            print 'by owner'
+        else:
+            repos = seafile_api.get_trash_repo_list(-1, -1)
+            search_owner = ''
+            print 'all'
 
-        repos_all = seafile_api.get_trash_repo_list(-1, -1)
-        return_results = []
-        for repo in repos_all:
+        return_repos = []
+        for repo in repos:
             result = {}
             result['name'] = repo.repo_name
             result['id'] = repo.repo_id
             result['owner'] = repo.owner_id
             result['delete_time'] = timestamp_to_isoformat_timestr(repo.del_time)
 
-            return_results.append(result)
+            return_repos.append(result)
 
-        return Response(return_results)
+        return Response({"search_owner": search_owner, "repos": return_repos})
 
     def delete(self, request, format=None):
-        """ clean all deleted libraries
+        """ clean all deleted libraries(by owner)
         """
 
+        search_owner = request.data.get('owner', '')
         try:
-            seafile_api.empty_repo_trash()
+            if search_owner and is_valid_username(search_owner):
+                seafile_api.empty_repo_trash_by_owner(search_owner)
+            else:
+                seafile_api.empty_repo_trash()
         except SearpcError as e:
             logger.error(e)
             error_msg = 'Internal Server Error'
diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html
index 7ece74fde1..0592d88e29 100644
--- a/seahub/templates/js/sysadmin-templates.html
+++ b/seahub/templates/js/sysadmin-templates.html
@@ -15,7 +15,7 @@
         </li>
         {% endif %}
         <li class="tab<% if (cur_tab == 'libraries') { %> tab-cur<% } %>">
-            <a href="{{ SITE_ROOT }}sysadmin/#libraries/"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a>
+            <a href="{{ SITE_ROOT }}sysadmin/#all-libs/"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a>
         </li>
         <li class="tab">
             <a href="{{ SITE_ROOT }}sys/useradmin/"><span class="sf2-icon-user"></span>{% trans "Users" %}</a>
@@ -57,6 +57,18 @@
         </li>
         {% endif %}
     </ul>
+    <% if (cur_tab == 'libraries') { %>
+        <% if (option == 'all') { %>
+            <form action="{% url 'sys_repo_search' %}" method="get" class="side-search-form" id="libs-search-form">
+                <input type="text" name="name" class="input" value="" placeholder="{% trans "Search libraries by name..." %}" />
+            </form>
+        <% } %>
+        <% if (option == 'trash') { %>
+            <form action="{% url 'sys_repo_trash' %}" method="get" class="side-search-form" id="trash-libs-search-form">
+                <input type="text" name="name" class="input" value="" placeholder="{% trans "Search libraries by owner..." %}" />
+            </form>
+        <% } %>
+    <% } %>
 </script>
 
 <script type="text/template" id="sysinfo-header-tmpl">
@@ -212,7 +224,7 @@
     <td><%- device_name %> / <%- client_version %></td>
     <td><%- device_ip %>
     <td>
-        <a href="{{ SITE_ROOT }}sys/seafadmin/repo/<%- repo_id %>/"><%- repo_name %></a>
+        <a href="{{ SITE_ROOT }}sysadmin/#libs/<%= repo_id %>/"><%- repo_name %></a>
     </td>
     <td><%- error_msg %></td>
     <td><time title='<%- time %>'><%- time_from_now %></time></td>
@@ -250,43 +262,78 @@
     <% } %>
 </script>
 
-<script type="text/template" id="libraries-tmpl">
-    <div class="hd">
-        <ul class="tab-tabs-nav fleft">
-            <li class="tab <% if (cur_tab == 'all') { %> ui-state-active <% } %>">
-                <a href="#libraries/" class="a">{% trans "All" %}</a>
+<script type="text/template" id="libraries-tabnav-tmpl">
+    <div class="tabnav ovhd">
+        <ul class="tabnav-tabs fleft">
+            <li class="tabnav-tab<% if (cur_tab == 'all') { %> tabnav-tab-cur<% } %>">
+                <a href="#all-libs/">{% trans "All" %}</a>
             </li>
-            <li class="tab <% if (cur_tab == 'system') { %> ui-state-active <% } %>">
-                <a href="#libraries/system/" class="a">{% trans "System" %}</a>
+            <li class="tabnav-tab<% if (cur_tab == 'system') { %> tabnav-tab-cur<% } %>">
+                <a href="#system-lib/">{% trans "System" %}</a>
             </li>
-            <li class="tab <% if (cur_tab == 'trash') { %> ui-state-active <% } %>">
-                <a href="#libraries/trash/" class="a">{% trans "Trash" %}</a>
+            <li class="tabnav-tab<% if (cur_tab == 'trash') { %> tabnav-tab-cur<% } %>">
+                <a href="#trash-libs/">{% trans "Trash" %}</a>
             </li>
         </ul>
+        <% if (cur_tab == 'trash') { %>
+        <button class="js-clean fright hide">{% trans "Clean" %}</button>
+        <% } %>
     </div>
+</script>
+
+<script type="text/template" id="libraries-tmpl">
+    <span class="loading-icon loading-tip"></span>
     <table class="hide">
         <thead>
             <tr>
                 <th width="4%"><!--icon--></th>
                 <th width="34%">{% trans "Name" %}</th>
+                <th width="10%"><!--Operations--></th>
                 <th width="13%">{% trans "Files / Size" %}</th>
                 <th width="19%">ID</th>
                 <th width="20%">{% trans "Owner" %}</th>
-                <th width="10%">{% trans "Operations" %}</th>
             </tr>
         </thead>
         <tbody>
         </tbody>
     </table>
-    <span class="loading-icon loading-tip"></span>
-    <div class="empty-tips hide">
-        <h2 class="alc">{% trans "No libraries" %}</h2>
-    </div>
     <div id="paginator">
         <a class="js-previous hide" href="#">{% trans "Previous" %}</a>
         <a class="js-next hide" href="#">{% trans "Next" %}</a>
     </div>
+    <div class="empty-tips hide">
+        <h2 class="alc">{% trans "No libraries" %}</h2>
+    </div>
 </script>
+<script type="text/template" id="search-libraries-tmpl">
+    <h3>{% trans "Search Library"%}</h3>
+    <form id="search-repo-form" method="get" action="">
+        <p class="tip">{% trans "Tip: you can search by keyword in name or owner or both." %}</p>
+        <label>{% trans "Name" %}</label><input type="text" name="name" class="input" value=""/><br />
+        <label>{% trans "Owner" %}</label><input type="text" name="owner" class="input" value=""/><br />
+        <input type="submit" value="{% trans "Submit" %}" class="submit" />
+    </form>
+    <h3>{% trans "Result"%}</h3>
+    <span class="loading-icon loading-tip"></span>
+    <table class="hide">
+        <thead>
+            <tr>
+                <th width="4%"><!--icon--></th>
+                <th width="34%">{% trans "Name" %}</th>
+                <th width="10%"><!--Operations--></th>
+                <th width="13%">{% trans "Files / Size" %}</th>
+                <th width="19%">ID</th>
+                <th width="20%">{% trans "Owner" %}</th>
+            </tr>
+        </thead>
+        <tbody>
+        </tbody>
+    </table>
+    <div class="empty-tips hide">
+        <h2 class="alc">{% trans "No libraries" %}</h2>
+    </div>
+</script>
+
 
 <script type="text/template" id="library-item-tmpl">
     <td>
@@ -294,15 +341,19 @@
     </td>
     <% if (name) { %>
         <% if (enable_sys_admin_view_repo && is_pro && !encrypted) { %>
-        <td><a href="#libraries/<%- id %>/dirents/"><%- name %></a></td>
+        <td><a href="#libs/<%= id %>/"><%- name %></a></td>
         <% } else { %>
         <td><%- name %></td>
         <% } %>
     <% } else { %>
     <td>--</td>
     <% } %>
-    <td><%- file_count %> / <%- size_formatted %></td>
-    <td style="font-size:11px;"><%- id %></td>
+    <td>
+        <a href="#" class="sf2-icon-delete sf2-x repo-delete-btn op-icon vh" title="{% trans "Delete" %}" aria-label="{% trans "Delete" %}"></a>
+        <a href="#" class="sf2-icon-move sf2-x repo-transfer-btn op-icon vh" title="{% trans "Transfer" %}" aria-label="{% trans "Transfer" %}"></a>
+    </td>
+    <td><%= file_count %> / <%= size_formatted %></td>
+    <td style="font-size:11px;"><%= id %></td>
     <td>
         <% if (owner) { %>
         <a href="{{ SITE_ROOT }}useradmin/info/<% print(encodeURIComponent(owner)); %>/"><%- owner %></a>
@@ -310,26 +361,9 @@
         --
         <% } %>
     </td>
-    <td>
-        <a href="#" class="sf2-icon-delete sf2-x repo-delete-btn op-icon vh" title="{% trans "Delete" %}" aria-label="{% trans "Delete" %}"></a>
-        <a href="#" class="sf2-icon-move sf2-x repo-transfer-btn op-icon vh" title="{% trans "Transfer" %}" aria-label="{% trans "Transfer" %}"></a>
-    </td>
 </script>
 
 <script type="text/template" id="system-library-tmpl">
-    <div class="hd">
-        <ul class="tab-tabs-nav fleft">
-            <li class="tab <% if (cur_tab == 'all') { %> ui-state-active <% } %>">
-                <a href="#libraries/" class="a">{% trans "All" %}</a>
-            </li>
-            <li class="tab <% if (cur_tab == 'system') { %> ui-state-active <% } %>">
-                <a href="#libraries/system/" class="a">{% trans "System" %}</a>
-            </li>
-            <li class="tab <% if (cur_tab == 'trash') { %> ui-state-active <% } %>">
-                <a href="#libraries/trash/" class="a">{% trans "Trash" %}</a>
-            </li>
-        </ul>
-    </div>
     <table class="hide">
         <thead>
             <tr>
@@ -345,43 +379,29 @@
 </script>
 
 <script type="text/template" id="system-library-item-tmpl">
-    <td><a href="#libraries/<%- id %>/dirents/"><%- name %></a></td>
-    <td style="font-size:11px;"><%- id %></td>
-    <td><%- description %></td>
+    <td><a href="#libs/<%= id %>/"><%- name %></a></td>
+    <td style="font-size:11px;"><%= id %></td>
+    <td><%= description %></td>
 </script>
 
 <script type="text/template" id="trash-libraries-tmpl">
-    <div class="hd">
-        <ul class="tab-tabs-nav fleft">
-            <li class="tab <% if (cur_tab == 'all') { %> ui-state-active <% } %>">
-                <a href="#libraries/" class="a">{% trans "All" %}</a>
-            </li>
-            <li class="tab <% if (cur_tab == 'system') { %> ui-state-active <% } %>">
-                <a href="#libraries/system/" class="a">{% trans "System" %}</a>
-            </li>
-            <li class="tab <% if (cur_tab == 'trash') { %> ui-state-active <% } %>">
-                <a href="#libraries/trash/" class="a">{% trans "Trash" %}</a>
-            </li>
-        </ul>
-        <button id="clean-trash-libraries" class="fright"><span class="vam">{% trans "Clean" %}</span></button>
-    </div>
-    <p class="tip">{% trans "Tip: libraries deleted 30 days ago will be cleaned automatically."%}</p>
+    <span class="loading-icon loading-tip"></span>
+    <p class="tip hide">{% trans "Tip: libraries deleted 30 days ago will be cleaned automatically."%}</p>
     <table class="hide">
         <thead>
             <tr>
-                <th width="4%"><!--icon--></th>
-                <th width="30%">{% trans "Name" %}</th>
-                <th width="30%">{% trans "Owner" %}</th>
+                <th width="5%"><!--icon--></th>
+                <th width="40%">{% trans "Name" %}</th>
+                <th width="10%"><!--Operations--></th>
+                <th width="25%">{% trans "Owner" %}</th>
                 <th width="20%">{% trans "Deleted Time" %}</th>
-                <th width="16%">{% trans "Operations" %}</th>
             </tr>
         </thead>
         <tbody>
         </tbody>
     </table>
-    <span class="loading-icon loading-tip"></span>
     <div class="empty-tips hide">
-        <h2 class="alc">{% trans "No libraries" %}</h2>
+        <h2 class="alc">{% trans "No library deleted yet" %}</h2>
     </div>
 </script>
 
@@ -390,12 +410,12 @@
         <img src="<%= icon_url %>" title="<%= icon_title %>" alt="<%= icon_title %>" width="24" />
     </td>
     <td><%- name %></td>
-    <td><a href="{{ SITE_ROOT }}useradmin/info/<% print(encodeURIComponent(owner)); %>/"><%- owner %></a></td>
-    <td><time title='<%- time %>'><%- time_from_now %></time></td>
     <td>
         <a href="#" class="sf2-icon-delete sf2-x repo-delete-btn op-icon vh" title="{% trans "Delete" %}" aria-label="{% trans "Delete" %}"></a>
         <a href="#" class="sf2-icon-reply sf2-x repo-restore-btn op-icon vh" title="{% trans "Restore" %}" aria-label="{% trans "Restore" %}"></a>
     </td>
+    <td><a href="{{ SITE_ROOT }}useradmin/info/<% print(encodeURIComponent(owner)); %>/"><%- owner %></a></td>
+    <td><time title="<%= time %>"><%= time_from_now %></time></td>
 </script>
 
 <script type="text/template" id="dir-view-tmpl">
@@ -407,11 +427,11 @@
         <table class="repo-file-list">
             <thead>
                 <tr>
-                    <th width="4%"><!--icon--></th>
-                    <th width="61%">{% trans "Name" %}</th>
+                    <th width="5%"><!--icon--></th>
+                    <th width="50%">{% trans "Name" %}</th>
                     <th width="10%"></th>
-                    <th width="10%">{% trans "Size" %}</th>
-                    <th width="15%">{% trans "Last Update" %}</th>
+                    <th width="15%">{% trans "Size" %}</th>
+                    <th width="20%">{% trans "Last Update" %}</th>
                 </tr>
             </thead>
             <tbody></tbody>
@@ -422,26 +442,28 @@
 </script>
 
 <script type="text/template" id="dir-path-bar-tmpl">
-    <li><a href="#libraries/" class="path-link normal">{% trans "Libraries" %}</a></li>
+    <% if (is_system_library) { %>
+    <li><a href="#system-lib/" class="path-link normal">{% trans "System" %}</a></li>
+    <% } else { %>
+    <li><a href="#all-libs/" class="path-link normal">{% trans "All" %}</a></li>
+    <% } %>
     <% if (path == '/') { %>
         <li><%- repo_name %></li>
     <% } else { %>
-        <li><a href="#libraries/<%= repo_id %>/dirents" class="path-link normal"><%- repo_name %></a></li>
+        <li><a href="#libs/<%= repo_id %>/" class="path-link normal"><%- repo_name %></a></li>
         <% for (var i = 0, len = path_list.length - 1; i < len; i++) { %>
-        <li><a href="#libraries/<%= repo_id %>/dirents/<% print(path_list_encoded.slice(0, i+1).join('/')); %>" class="path-link normal"><%- path_list[i] %></a></li>
+        <li><a href="#libs/<%= repo_id %>/<% print(path_list_encoded.slice(0, i+1).join('/')); %>" class="path-link normal"><%- path_list[i] %></a></li>
         <% } %>
         <li><%- path_list[i] %></li>
     <% } %>
 </script>
 
 <script type="text/template" id="dir-op-bar-tmpl">
-    <% if (is_system_library) { %>
     <div id="basic-upload" class="inline-block">
         <button class="op-btn basic-upload-btn" >{% trans "Upload" %}</button>
         <input id="basic-upload-input" class="hide" type="file" name="file" multiple />
     </div>
     <button id="add-new-dir" class="op-btn">{% trans "New Folder" %}</button>
-    <% } %>
 </script>
 
 <script type="text/template" id="dirent-item-tmpl">
@@ -449,7 +471,7 @@
     <% if (is_file) { %>
     <td><%- obj_name %></td>
     <% } else { %>
-    <td><span><a href="<%- url %>"><%- obj_name %></a></span></td>
+    <td><a href="<%= url %>"><%- obj_name %></a></td>
     <% } %>
     <td>
         <% if (is_system_library) { %>
@@ -459,12 +481,12 @@
         <a href="#" class="sf2-icon-download sf2-x dirent-download-btn op-icon vh" title="{% trans "Download" %}" aria-label="{% trans "Download" %}"></a>
         <% } %>
     </td>
-    <td><%- file_size %></td>
-    <td><time title="<%- time %>"><%- time_from_now %></time></td>
+    <td><%= file_size %></td>
+    <td><time title="<%= time %>"><%= time_from_now %></time></td>
 </script>
 
 <script type="text/template" id="library-transfer-form-tmpl">
-    <form method="" action="" id="library-transfer-form">
+    <form method="" action="" id="repo-transfer-form">
         <h3><%= title %></h3>
         <input type="hidden" name="email" /><br />
         <p class="error hide"></p>
diff --git a/seahub/templates/sysadmin/admin_repo_view.html b/seahub/templates/sysadmin/admin_repo_view.html
deleted file mode 100644
index ee668a4f39..0000000000
--- a/seahub/templates/sysadmin/admin_repo_view.html
+++ /dev/null
@@ -1,355 +0,0 @@
-{% extends "sysadmin/base.html" %}
-
-{% load seahub_tags avatar_tags i18n upload_tags %}
-
-{% block sub_title %}{{repo.name}} - {% endblock %}
-
-{% block right_panel %}
-    <div id="repo-file-list">
-        <div class="repo-file-list-topbar">
-            <p class="path fleft">
-            {% for name, link in zipped %}
-            {% if forloop.first or not forloop.last %}
-            <a href="{% url 'sys_admin_repo' repo.id %}?p={{link|urlencode}}" class="dir-link normal">{{ name }}</a> /
-            {% else %}
-            <span id="cur-dir-name">{{ name }}</span> /
-            {% endif %}
-            {% endfor %}
-            </p>
-            {% if is_default_repo %}
-            <div class="repo-op fright">
-                <div id="upload-file" class="inline-block">
-                    <button class="op-btn"><span class="icon-upload-alt"></span><span>{% trans "Upload"%}</span></button>
-                    <input class="hide" type="file" name="file" multiple />
-                </div>
-                <button id="add-new-dir" class="op-btn"><span class="icon-plus-sign-alt"></span>{% trans "New Directory"%}</button>
-            </div>
-            {% endif %}
-            <div class="clear"></div>
-        </div>
-
-        <table class="repo-file-list">
-            <tr>
-                <th class="dirent-icon" width="5%"></th>
-                <th width="50%"><span class="dirent-name">{% trans "Name"%}</span></th>
-                <th width="15%" class="dirent-size">{% trans "Size"%}</th>
-                <th width="15%" class="dirent-update">{% trans "Last Update" %}</th>
-                <th width="15%" class="dirent-op">{% trans "Operations"%}</th>
-            </tr>
-            {% for dirent in dir_list %}
-            <tr class="dir-item">
-                <td class="dirent-icon"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon"%}" /></td>
-                <td>
-                    <span class="dirent-name"><a href="?p={{path|urlencode}}{{ dirent.obj_name|urlencode }}" class="dir-link">{{ dirent.obj_name }}</a></span>
-                </td>
-
-                <td class="dirent-size"></td>
-                <td class="dirent-update">
-                    {{ dirent.last_modified|translate_seahub_time }}
-                </td>
-                <td class="dirent-op">
-                    {% if is_default_repo %}
-                    <div class="repo-file-op vh">
-                        <div class="displayed-op">
-                            <a href="#" class="op dirent-del" data-url="{% url 'delete_dir' repo.id %}?parent_dir={{path|urlencode}}&name={{ dirent.obj_name|urlencode }}" title="{% trans "Delete" %}">
-                                <img src="{{MEDIA_URL}}img/rm.png" alt="" />
-                            </a>
-                        </div>
-                    </div>
-                    {% endif %}
-                </td>
-            </tr>
-            {% endfor %}
-            {% for dirent in file_list %}
-            <tr class="file-item">
-                <td class="dirent-icon">
-                    <img src="{{ MEDIA_URL }}img/file/{{ dirent.obj_name|file_icon_filter }}" alt="{% trans "File"%}" />
-                </td>
-                <td>
-                    <span class="dirent-name">{{ dirent.obj_name }}</span>
-                </td>
-                <td class="dirent-size">{{ dirent.file_size|filesizeformat }}</td>
-                <td class="dirent-update">
-                    {{ dirent.last_modified|translate_seahub_time }}
-                </td>
-                <td class="dirent-op">
-                    <div class="repo-file-op vh">
-                        <div class="displayed-op">
-                            {% if is_default_repo %}
-                            <a href="#" class="op dirent-del" data-url="{% url 'delete_file' repo.id %}?parent_dir={{path|urlencode}}&name={{ dirent.obj_name|urlencode }}" title="{% trans "Delete" %}">
-                                <img src="{{MEDIA_URL}}img/rm.png" alt="" />
-                            </a>
-                            {% endif %}
-                            <a class="op file-download" href="{% url 'sys_admin_repo_download_file' repo.id %}?p={{path|urlencode}}{{ dirent.obj_name|urlencode }}" title="{% trans "Download"%}">
-                                <img src="{{MEDIA_URL}}img/download.png" alt="" />
-                            </a>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            {% endfor %}
-        </table>
-    </div>
-
-    {% if is_default_repo %}
-    <form id="add-new-dir-form" action="" method="post" class="hide">{% csrf_token %}
-        <h3>{% trans "New Directory" %}</h3>
-        <label>{% trans "Directory Name" %}</label><br /><!-- <br/> for ie 7 -->
-        <input type="text" name="name" value="" class="input" maxlength="{{max_file_name}}"/><br />
-        <p class="error hide"></p>
-        <button type="submit" class="submit">{% trans "Submit" %}</button>
-        <button class="simplemodal-close">{% trans "Cancel" %}</button>
-    </form>
-
-    <div id="upload-file-dialog" class="hide">
-        <h3 class="hd"><span class="status">{% trans "File Upload" %}</span> <span class="total-progress hide"></span></h3>
-        <div class="ops">
-            <img src="{{MEDIA_URL}}img/minus.png" alt="" class="fold-switch cspt" />
-            <img src="{{MEDIA_URL}}img/close.png" alt="" title="{% trans "close" %}" class="sf-close cspt hide" />
-        </div>
-        <div class="con">
-            <div class="fileupload-buttonbar">
-                <button type="button" class="cancel cspt fright">{% trans "Cancel All" %}</button>
-            </div>
-            <p class="saving-tip alc clear hide">
-                <span class="loading-icon vam"></span>
-                <span class="vam">{% trans "Saving..." %}</span>
-            </p>
-            <table class="fileupload-table"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
-        </div>
-    </div>
-    {% endif %}
-
-{% endblock %}
-
-{% block extra_script %}
-{% if is_default_repo %}
-{% upload_js %}
-{% endif %}
-<script type="text/javascript">
-$('.dir-item, .file-item').unbind().hover( // remove previously binded hover handler at first
-    function() {
-        $(this).addClass('hl').find('.repo-file-op').removeClass('vh');
-    },
-    function() {
-        $(this).removeClass('hl').find('.repo-file-op').addClass('vh');
-    }
-);
-
-{% if is_default_repo %}
-var cur_path = "{{path|escapejs}}";
-$(function() {
-    $.getScript('{{ MEDIA_URL }}js/jquery.fileupload.min.js', function () {
-        var popup = $('#upload-file-dialog').addClass('fixed-upload-file-dialog');;
-        var popup_height = '200px';
-        popup.css({'height': popup_height}).data('height', popup_height);
-
-        var fu_status = $('.status', popup),
-            total_progress = $('.total-progress', popup),
-            cancel_all_btn = $('.fileupload-buttonbar .cancel', popup),
-            close_icon = $('.sf-close', popup),
-            saving_tip = $('.saving-tip', popup);
-
-        var fu_status_ = {
-            'uploading': "{% trans "File Uploading..." %}",
-            'complete': "{% trans "File Upload complete" %}",
-            'canceled': "{% trans "File Upload canceled" %}",
-            'failed': "{% trans "File Upload failed" %}"
-        };
-
-        popup.fileupload({
-            formData: {'parent_dir': cur_path},
-            fileInput: $('#upload-file input'),
-            paramName: 'file',
-            // customize it for 'done'
-            getFilesFromResponse: function (data) {
-                if (data.result) {
-                    return data.result;
-                }
-            },
-            autoUpload:true,
-            {% if max_upload_file_size %}
-            maxFileSize: {{ max_upload_file_size }}, // in bytes
-            {% endif %}
-            maxNumberOfFiles: 500,
-            sequentialUploads: true
-        })
-        .bind('fileuploadadd', function(e, data) {
-            popup.removeClass('hide');
-            cancel_all_btn.removeClass('hide');
-            close_icon.addClass('hide');
-        })
-        .bind('fileuploadstart', function() {
-            fu_status.html(fu_status_.uploading);
-        })
-        .bind('fileuploadsubmit', function(e, data) {
-            if (data.files.length == 0) {
-                return false;
-            }
-            var file = data.files[0];
-            // get url(token) for every file
-            if (!file.error) {
-                $.ajax({
-                    url: '{% url 'get_file_op_url' repo.id %}',
-                    cache: false,
-                    data: {
-                        'op_type': 'upload',
-                        'path': cur_path
-                    },
-                    dataType: 'json',
-                    success: function(ret) {
-                        data.url = ret['url'];
-                        data.jqXHR = popup.fileupload('send', data);
-                    },
-                    error: function() {
-                        file.error = "{% trans "Failed to get upload url" %}";
-                    }
-                });
-                return false;
-            }
-        })
-        .bind('fileuploadprogressall', function (e, data) {
-            total_progress.html(parseInt(data.loaded / data.total * 100, 10) + '% ' + '<span style="font-size:14px;color:#555;">(' + $(this).data('blueimp-fileupload')._formatBitrate(data.bitrate) + ')</span>').removeClass('hide');
-            if (data.loaded > 0 && data.loaded == data.total) {
-                saving_tip.show();
-            }
-        })
-        .bind('fileuploadstop', function() {
-            setTimeout(function() { location.reload(true); }, 1000);
-        })
-        // after tpl has rendered
-        .bind('fileuploadcompleted', function() { // 'done'
-            if ($('.files .cancel', popup).length == 0) {
-                saving_tip.hide();
-                total_progress.addClass('hide');
-                fu_status.html(fu_status_.complete);
-            }
-        })
-        .bind('fileuploadfailed', function(e, data) { // 'fail'
-            if ($('.files .cancel', popup).length == 0) {
-                cancel_all_btn.addClass('hide');
-                close_icon.removeClass('hide');
-                total_progress.addClass('hide');
-                saving_tip.hide();
-                if (data.errorThrown == 'abort') { // 'cancel'
-                    fu_status.html(fu_status_.canceled);
-                } else { // 'error'
-                    fu_status.html(fu_status_.failed);
-                }
-            }
-        });
-
-        // Enable iframe cross-domain access via redirect option:
-        popup.fileupload(
-            'option',
-            'redirect',
-            window.location.href.replace(/\/repo\/[-a-z0-9]{36}\/.*/, '{{ MEDIA_URL }}cors/result.html?%s')
-        );
-    });
-});
-
-$('#upload-file button').click(function() {
-    $('#upload-file input').click();
-});
-
-// fold/unfold the dialog
-$('#upload-file-dialog .fold-switch').click(function() {
-    var popup = $('#upload-file-dialog');
-    var full_ht = parseInt(popup.data('height'));
-    var main_con = $('.fileupload-buttonbar, table', popup);
-    if (popup.height() == full_ht) {
-        popup.height($('.hd', popup).outerHeight(true));
-        main_con.addClass('hide');
-    } else {
-        popup.height(full_ht);
-        main_con.removeClass('hide');
-    }
-});
-
-$('#upload-file-dialog .sf-close').click(function() {
-    $('#upload-file-dialog').addClass('hide');
-    $('#upload-file-dialog .files').empty();
-});
-
-window.locale = {
-    "fileupload": {
-        "errors": {
-            "maxFileSize": "{% trans "File is too big" %}",
-            "minFileSize": "{% trans "File is too small" %}",
-            "acceptFileTypes": "{% trans "Filetype not allowed" %}",
-            "maxNumberOfFiles": "{% trans "Max number of files exceeded" %}",
-            "uploadedBytes": "{% trans "Uploaded bytes exceed file size" %}",
-            "emptyResult": "{% trans "Empty file upload result" %}"
-        },
-        "error": "{% trans "Error" %}",
-        "uploaded": "{% trans "uploaded" %}",
-        "canceled": "{% trans "canceled" %}",
-        "start": "{% trans "Start" %}",
-        "cancel": "{% trans "Cancel" %}",
-        "destroy": "{% trans "Delete" %}"
-    }
-};
-
-$('#add-new-dir').click(function () {
-    $('#add-new-dir-form').modal({appendTo:'#main'});
-    $('#simplemodal-container').css({'height':'auto'});
-});
-
-$('#add-new-dir-form').submit(function() {
-    var form = $(this),
-        form_id = form.attr('id'),
-        dirent_name = $.trim($('[name="name"]', form).val()),
-        submit_btn = $('[type="submit"]', form);
-
-    if (!dirent_name) {
-        apply_form_error(form_id, "{% trans "It is required." %}");
-        return false;
-    }
-
-    disable(submit_btn);
-
-    $.ajax({
-        url: '{% url 'new_dir' repo.id %}?parent_dir=' + e(cur_path),
-        type: 'POST',
-        dataType: 'json',
-        beforeSend: prepareCSRFToken,
-        data: {'dirent_name': dirent_name},
-        success: function(data) {
-            location.reload(true);
-        },
-        error: function(xhr, textStatus, errorThrown) {
-            var err;
-            if (xhr.responseText) {
-                err = $.parseJSON(xhr.responseText).error;
-            } else {
-                err = "{% trans "Failed. Please check the network." %}";
-            }
-            apply_form_error(form_id, err);
-            enable(submit_btn);
-        }
-    });
-    return false;
-});
-
-$('.dirent-del').click(function() {
-    var dirent = $(this).parents('tr'),
-        url = $(this).attr('data-url');
-
-    $.ajax({
-        url: url,
-        type: 'POST',
-        dataType: 'json',
-        beforeSend: prepareCSRFToken,
-        success: function(data) {
-            if (data['success']) {
-                dirent.remove();
-                feedback("{% trans "Delete succeeded." %}", 'success');
-            }
-        },
-        error: ajaxErrorHandler
-    });
-    return false;
-});
-{% endif %}
-</script>
-{% endblock %}
diff --git a/seahub/templates/sysadmin/base.html b/seahub/templates/sysadmin/base.html
index 27a3d37cb0..59350b0481 100644
--- a/seahub/templates/sysadmin/base.html
+++ b/seahub/templates/sysadmin/base.html
@@ -23,7 +23,7 @@
             </li>
             {% endif %}
             <li class="tab {% block cur_repo %}{% endblock %}">
-                <a href="{{ SITE_ROOT }}sysadmin/#libraries/"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a>
+                <a href="{{ SITE_ROOT }}sysadmin/#all-libs/"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a>
             </li>
             <li class="tab {% block cur_users %}{% endblock %}">
                 <a href="{{ SITE_ROOT }}sys/useradmin/"><span class="sf2-icon-user"></span>{% trans "Users" %}</a>
diff --git a/seahub/templates/sysadmin/repoadmin_table.html b/seahub/templates/sysadmin/repoadmin_table.html
deleted file mode 100644
index 910bc549f1..0000000000
--- a/seahub/templates/sysadmin/repoadmin_table.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% load i18n %}
-<table class="repo-list">
-    <tr>
-        <th width="4%"><!--icon--></th>
-        <th width="22%">{% trans "Name" %}</th>
-        <th width="17%">{% trans "Files / Size" %}</th>
-        <th width="21%">ID</th>
-        <th width="21%">{% trans "Owner" %}</th>
-        <th width="15%">{% trans "Operations" %}</th>
-    </tr>
-    {% for repo in repos %}
-    <tr>
-        {% if repo.encrypted %}
-        <td><img src="{{MEDIA_URL}}img/sync-folder-encrypt-20.png" title="{% trans "Encrypted"%}" alt="{% trans "directory icon" %}" /></td>
-        <td>{{ repo.props.name }}</td>
-        {% else %}
-        <td><img src="{{MEDIA_URL}}img/sync-folder-20.png?t=1387267140" title="{% trans "Read-Write"%}" alt="{% trans "directory icon" %}" /></td>
-            {% if enable_sys_admin_view_repo and is_pro_version %}
-            <td><a href="{% url 'sys_admin_repo' repo.id %}">{{ repo.props.name }}</a></td>
-            {% else %}
-            <td>{{ repo.props.name }}</td>
-            {% endif %}
-        {% endif %}
-        <td>{{ repo.file_count }} / {{ repo.size|filesizeformat }}</td>
-        <td style="font-size:11px;">{{ repo.id }}</td>
-        <td>
-            {% if repo.owner %}
-            <a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a>
-            {% else %}
-            --
-            {% endif %}
-        </td>
-        <td data-id="{{ repo.props.id }}" data-name="{{ repo.props.name }}">
-            <div>
-            <a href="#" data-url="{% url "sys_repo_delete" repo.id %}" data-target="{{ repo.name }}" class="repo-delete-btn op vh">{% trans "Delete" %}</a>
-            <a href="#" class="repo-transfer-btn op vh">{% trans "Transfer" %}</a>
-            </div>
-        </td>
-    </tr>
-    {% endfor %}
-</table>
diff --git a/seahub/templates/sysadmin/sys_list_system.html b/seahub/templates/sysadmin/sys_list_system.html
deleted file mode 100644
index b12a494e39..0000000000
--- a/seahub/templates/sysadmin/sys_list_system.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "sysadmin/base.html" %}
-{% load i18n %}
-{% block cur_repo %}tab-cur{% endblock %}
-
-{% block right_panel %}
-<div class="tabnav">
-    <ul class="tabnav-tabs">
-        <li class="tabnav-tab"><a href="{% url 'sys_repo_admin' %}">{% trans "All" %}</a></li>
-        <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_list_system' %}">{% trans "System" %}</a></li>
-        <li class="tabnav-tab"><a href="{% url 'sys_repo_trash' %}">{% trans "Trash" %}</a></li>
-    </ul>
-</div>
-
-{% if repos %}
-<table>
-    <tr>
-        <th width="25%">{% trans "Name" %}</th>
-        <th width="35%">ID</th>
-        <th width="40%">{% trans "Description" %}</th>
-    </tr>
-    {% for repo in repos %}
-    <tr>
-        <td><a href="{% url 'sys_admin_repo' repo.id %}">{{ repo.props.name }}</a></td>
-        <td style="font-size:11px;">{{ repo.id }}</td>
-        <td>{{ repo.props.desc }}</td>
-    </tr>
-    {% endfor %}
-</table>
-{% else %}
-<p>{% trans "None" %}</p>
-{% endif %}
-
-{% endblock %}
diff --git a/seahub/templates/sysadmin/sys_repo_admin.html b/seahub/templates/sysadmin/sys_repo_admin.html
deleted file mode 100644
index 6c8541596b..0000000000
--- a/seahub/templates/sysadmin/sys_repo_admin.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "sysadmin/base.html" %}
-{% load i18n staticfiles %}
-{% block cur_repo %}tab-cur{% endblock %}
-
-{% block extra_style %}
-<link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% static "css/select2.custom.css" %}" />
-{% endblock %}
-
-{% block left_panel %}{{block.super}}
-<form action="{% url 'sys_repo_search' %}" method="get" class="side-search-form">
-    <input type="text" name="name" class="input" value="" placeholder="{% trans "Search libraries by name..." %}" />
-</form>
-{% endblock %}
-
-{% block right_panel %}
-<div class="tabnav">
-    <ul class="tabnav-tabs">
-        <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_repo_admin' %}">{% trans "All" %}</a></li>
-        <li class="tabnav-tab"><a href="{% url 'sys_list_system' %}">{% trans "System" %}</a></li>
-        <li class="tabnav-tab"><a href="{% url 'sys_repo_trash' %}">{% trans "Trash" %}</a></li>
-    </ul>
-</div>
-
-{% if repos %}
-{% include "sysadmin/repoadmin_table.html" %}
-{% include "snippets/admin_paginator.html" %}
-
-{% else %}
-<p>{% trans "None" %}</p>
-{% endif %}
-
-{% include "sysadmin/repo_transfer_form.html" %}
-{% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript" src="{% static "scripts/lib/select2-3.5.2.js" %}"></script>
-<script type="text/javascript">
-{% include "sysadmin/repoadmin_js.html" %}
-</script>
-{% endblock %}
diff --git a/seahub/templates/sysadmin/sys_repo_search.html b/seahub/templates/sysadmin/sys_repo_search.html
deleted file mode 100644
index 745f4e63e0..0000000000
--- a/seahub/templates/sysadmin/sys_repo_search.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends "sysadmin/base.html" %}
-{% load seahub_tags i18n staticfiles %}
-
-{% block cur_repo %}tab-cur{% endblock %}
-
-{% block extra_style %}
-<link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% static "css/select2.custom.css" %}" />
-{% endblock %}
-
-{% block right_panel %}
-<h3>{% trans "Search Library"%}</h3>
-
-<form id="search-repo-form" method="get" action=".">
-    <p class="tip">{% trans "Tip: you can search by keyword in name or owner or both." %}</p>
-    <label>{% trans "Name" %}</label><input type="text" name="name" class="input" value="{{name}}"/><br />
-    <label>{% trans "Owner" %}</label><input type="text" name="owner" class="input" value="{{owner}}"/><br />
-    <input type="submit" value="{% trans "Submit" %}" class="submit" />
-</form>
-
-<h3>{% trans "Result"%}</h3>
-{% if repos %}
-{% include "sysadmin/repoadmin_table.html" %}
-{% else %}
-<p>{% trans "No result" %}</p>
-{% endif %}
-
-{% include "sysadmin/repo_transfer_form.html" %}
-{% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript" src="{% static "scripts/lib/select2-3.5.2.js" %}"></script>
-<script type="text/javascript">
-$('#search-repo-form').submit(function() {
-    var form = $(this),
-        name = $.trim($('[name="name"]', form).val()),
-        owner = $.trim($('[name="owner"]', form).val());
-
-    if (!name && !owner) {
-        return false;
-    }
-});
-{% include "sysadmin/repoadmin_js.html" %}
-</script>
-{% endblock %}
diff --git a/seahub/templates/sysadmin/sys_repo_trash.html b/seahub/templates/sysadmin/sys_repo_trash.html
deleted file mode 100644
index e274ccffd2..0000000000
--- a/seahub/templates/sysadmin/sys_repo_trash.html
+++ /dev/null
@@ -1,84 +0,0 @@
-{% extends "sysadmin/base.html" %}
-{% load i18n seahub_tags %}
-{% block cur_repo %}tab-cur{% endblock %}
-
-{% block left_panel %}{{block.super}}
-<form action="{% url 'sys_repo_trash' %}" method="get" class="side-search-form">
-    <input type="text" name="name" class="input" value="{{ search_owner }}" placeholder="{% trans "Search libraries by owner..." %}" />
-</form>
-{% endblock %}
-
-{% block right_panel %}
-<div class="tabnav">
-    <ul class="tabnav-tabs">
-        <li class="tabnav-tab"><a href="{% url 'sys_repo_admin' %}">{% trans "All" %}</a></li>
-        <li class="tabnav-tab"><a href="{% url 'sys_list_system' %}">{% trans "System" %}</a></li>
-        <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'sys_repo_trash' %}">{% trans "Trash" %}</a></li>
-    </ul>
-    <div class="fright">
-        <button id="repo-trash-clear" data-url="{% url 'sys_repo_trash_clear' %}?owner={% if search_owner %}{{search_owner}}{% endif %}" data-target="{{ search_owner }}"><span class="vam">{% trans "Clear Trash" %}</span></button>
-    </div>
-</div>
-
-{% if repos %}
-<p class="tip">{% trans "Tip: libraries deleted 30 days ago will be cleaned automatically."%}</p>
-<table class="repo-list">
-    <tr>
-        <th width="4%"><!--icon--></th>
-        <th width="30%">{% trans "Name" %}</th>
-        <th width="30%">{% trans "Owner" %}</th>
-        <th width="20%">{% trans "Deleted Time" %}</th>
-        <th width="16%">{% trans "Operations" %}</th>
-    </tr>
-    {% for repo in repos %}
-    <tr>
-        <td><img src="{{MEDIA_URL}}img/sync-folder-20.png?t=1387267140" title="{% trans "Read-Write"%}" alt="{% trans "directory icon" %}" /></td>
-        <td>{{ repo.repo_name }}</td>
-        <td><a href="{% url 'user_info' repo.owner_id %}">{{ repo.owner_id }}</a></td>
-        <td>{{ repo.del_time|translate_seahub_time }}</td>
-        <td>
-            <a href="#" class="repo-delete-btn op vh" data-url="{% url 'sys_repo_trash_remove' repo.repo_id %}" data-target="{{ repo.repo_name }}">{% trans "Delete" %}</a>
-            <a href="#" class="repo-restore-btn op vh" data-url="{% url 'sys_repo_trash_restore' repo.repo_id %}" data-target="{{ repo.repo_name }}">{% trans "Restore" %}</a>
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-{% if not search_owner %}
-{% include "snippets/admin_paginator.html" %}
-{% endif %}
-
-{% else %}
-<div class="empty-tips">
-    <h2 class="alc">{% trans "No library deleted yet" %}</h2>
-</div>
-{% endif %}
-
-{% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript">
-{% if search_owner %}
-addConfirmTo($('#repo-trash-clear'), {
-        'title':"{% trans 'Delete Library By Owner' %}",
-        'con':"{% trans "Are you sure you want to delete all %s's libraries?" %}",
-        'post': true // post request
-});
-{% else %}
-addConfirmTo($('#repo-trash-clear'), {
-        'title':"{% trans 'Clear Trash' %}",
-        'con':"{% trans "Are you sure you want to clear trash?" %}",
-        'post': true // post request
-});
-{% endif %}
-addConfirmTo($('.repo-restore-btn'), {
-        'title':"{% trans 'Restore Library' %}",
-        'con':"{% trans "Are you sure you want to restore %s?" %}",
-        'post': true // post request
-});
-addConfirmTo($('.repo-delete-btn'), {
-        'title':"{% trans 'Delete Library' %}",
-        'con':"{% trans "Are you sure you want to delete %s completely?" %}",
-        'post': true // post request
-});
-</script>
-{% endblock %}
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index dd0d1a3d23..40b5b0eead 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -79,7 +79,6 @@
         {% include 'js/sysadmin-templates.html' %}
 </div><!-- wrapper -->
 
-{% include "js/dir-view.html" %}
 {% include "js/lib-op-popups.html" %}
 <script type="text/javascript">
 var app = {
diff --git a/seahub/urls.py b/seahub/urls.py
index bdc8b080d4..17f7bfba5f 100644
--- a/seahub/urls.py
+++ b/seahub/urls.py
@@ -225,15 +225,11 @@ urlpatterns = patterns(
     url(r'^sysadmin/$', sysadmin, name='sysadmin'),
     url(r'^sys/info/$', sys_info, name='sys_info'),
     url(r'^sys/settings/$', sys_settings, name='sys_settings'),
-    url(r'^sys/seafadmin/$', sys_repo_admin, name='sys_repo_admin'),
-    url(r'^sys/seafadmin/repo/(?P<repo_id>[-0-9a-f]{36})/$', sys_admin_repo, name='sys_admin_repo'),
-    url(r'^sys/seafadmin/repo/(?P<repo_id>[-0-9a-f]{36})/download-file/$', sys_admin_repo_download_file, name='sys_admin_repo_download_file'),
-    url(r'^sys/seafadmin/system/$', sys_list_system, name='sys_list_system'),
-    url(r'^sys/seafadmin/repo-trash/$', sys_repo_trash, name='sys_repo_trash'),
-    url(r'^sys/seafadmin/repo-trash/clear/$', sys_repo_trash_clear, name="sys_repo_trash_clear"),
-    url(r'^sys/seafadmin/repo-trash/(?P<repo_id>[-0-9a-f]{36})/remove/$', sys_repo_trash_remove, name="sys_repo_trash_remove"),
-    url(r'^sys/seafadmin/repo-trash/(?P<repo_id>[-0-9a-f]{36})/restore/$', sys_repo_trash_restore, name="sys_repo_trash_restore"),
-    url(r'^sys/seafadmin/search/$', sys_repo_search, name='sys_repo_search'),
+    url(r'^sysadmin/#all-libs/$', fake_view, name='sys_repo_admin'),
+    url(r'^sysadmin/#libs/(?P<repo_id>[-0-9a-f]{36})/$', fake_view, name='sys_admin_repo'),
+    url(r'^sysadmin/#system-lib/$', fake_view, name='sys_list_system'),
+    url(r'^sysadmin/#trash-libs/$', fake_view, name='sys_repo_trash'),
+    url(r'^sysadmin/#search-libs/$', fake_view, name='sys_repo_search'),
     url(r'^sys/seafadmin/transfer/$', sys_repo_transfer, name='sys_repo_transfer'),
     url(r'^sys/seafadmin/delete/(?P<repo_id>[-0-9a-f]{36})/$', sys_repo_delete, name='sys_repo_delete'),
     url(r'^sys/useradmin/$', sys_user_admin, name='sys_useradmin'),
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 41df81dce9..574ba876d2 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -169,49 +169,6 @@ def sys_info(request):
         'license_dict': license_dict,
     }, context_instance=RequestContext(request))
 
-@login_required
-@sys_staff_required
-def sys_repo_admin(request):
-    # Make sure page request is an int. If not, deliver first page.
-    try:
-        current_page = int(request.GET.get('page', '1'))
-        per_page = int(request.GET.get('per_page', '25'))
-    except ValueError:
-        current_page = 1
-        per_page = 25
-
-    repos_all = seafile_api.get_repo_list(per_page * (current_page -1),
-                                          per_page + 1)
-    repos = repos_all[:per_page]
-    if len(repos_all) == per_page + 1:
-        page_next = True
-    else:
-        page_next = False
-
-    repos = filter(lambda r: not r.is_virtual, repos)
-
-    default_repo_id = get_system_default_repo_id()
-    repos = filter(lambda r: not r.repo_id == default_repo_id, repos)
-
-    for repo in repos:
-        try:
-            repo.owner = seafile_api.get_repo_owner(repo.id)
-        except:
-            repo.owner = "failed to get"
-
-    return render_to_response(
-        'sysadmin/sys_repo_admin.html', {
-            'enable_sys_admin_view_repo': ENABLE_SYS_ADMIN_VIEW_REPO,
-            'is_pro_version': is_pro_version(),
-            'repos': repos,
-            'current_page': current_page,
-            'prev_page': current_page-1,
-            'next_page': current_page+1,
-            'per_page': per_page,
-            'page_next': page_next,
-        },
-        context_instance=RequestContext(request))
-
 def can_view_sys_admin_repo(repo):
     default_repo_id = get_system_default_repo_id()
     is_default_repo = True if repo.id == default_repo_id else False
@@ -225,278 +182,6 @@ def can_view_sys_admin_repo(repo):
     else:
         return False
 
-@login_required
-@sys_staff_required
-def sys_admin_repo_download_file(request, repo_id):
-
-    next = request.META.get('HTTP_REFERER', None)
-    if not next:
-        next = reverse('sys_admin_repo')
-
-    repo = seafile_api.get_repo(repo_id)
-    if not repo:
-        messages.error(request, _(u'Library does not exist'))
-        return HttpResponseRedirect(next)
-
-    path = request.GET.get('p', '')
-    obj_id = seafile_api.get_file_id_by_path(repo_id, path)
-    if not obj_id:
-        messages.error(request, _(u'Unable to download file, invalid file path'))
-        return HttpResponseRedirect(next)
-
-    if not can_view_sys_admin_repo(repo):
-        messages.error(request, _(u'Unable to view library'))
-        return HttpResponseRedirect(next)
-
-    try:
-        token = seafile_api.get_fileserver_access_token(repo_id, obj_id,
-                                      'download', request.user.username)
-    except SearpcError as e:
-        logger.error(e)
-        messages.error(request, _(u'Unable to view library'))
-        return HttpResponseRedirect(next)
-
-    file_name = os.path.basename(path.rstrip('/'))
-    redirect_url = gen_file_get_url(token, file_name)
-    return HttpResponseRedirect(redirect_url)
-
-@login_required
-@sys_staff_required
-def sys_admin_repo(request, repo_id):
-    next = reverse('sys_repo_admin')
-    repo = seafile_api.get_repo(repo_id)
-    if not repo:
-        messages.error(request, _(u'Library does not exist'))
-        return HttpResponseRedirect(next)
-
-    if not can_view_sys_admin_repo(repo):
-        messages.error(request, _(u'Unable to view library'))
-        return HttpResponseRedirect(next)
-
-    path = request.GET.get('p', '/')
-    if path[-1] != '/':
-        path = path + '/'
-
-    dir_id = seafile_api.get_dir_id_by_path(repo_id, path)
-    if not dir_id:
-        messages.error(request, _(u'Unable to view library, wrong folder path.'))
-        return HttpResponseRedirect(next)
-
-    if is_org_context(request):
-        repo_owner = seafile_api.get_org_repo_owner(repo_id)
-    else:
-        repo_owner = seafile_api.get_repo_owner(repo_id)
-
-    try:
-        dirs = seafserv_threaded_rpc.list_dir_with_perm(repo_id, path,
-                                                        dir_id, repo_owner,
-                                                        -1, -1)
-    except SearpcError as e:
-        logger.error(e)
-        messages.error(request, _(u'Unable to view library'))
-        return HttpResponseRedirect(next)
-
-    file_list, dir_list = [], []
-    for dirent in dirs:
-        dirent.last_modified = dirent.mtime
-        if stat.S_ISDIR(dirent.props.mode):
-            dir_list.append(dirent)
-        else:
-            if repo.version == 0:
-                dirent.file_size = seafile_api.get_file_size(repo.store_id,
-                                                             repo.version,
-                                                             dirent.obj_id)
-            else:
-                dirent.file_size = dirent.size
-            file_list.append(dirent)
-
-    zipped = gen_path_link(path, repo.name)
-    default_repo_id = get_system_default_repo_id()
-    is_default_repo = True if repo_id == default_repo_id else False
-
-    return render_to_response('sysadmin/admin_repo_view.html', {
-            'repo': repo,
-            'repo_owner': repo_owner,
-            'dir_list': dir_list,
-            'file_list': file_list,
-            'path': path,
-            'zipped': zipped,
-            'is_default_repo': is_default_repo,
-            'max_upload_file_size': seaserv.MAX_UPLOAD_FILE_SIZE,
-            }, context_instance=RequestContext(request))
-
-@login_required
-@sys_staff_required
-def sys_list_system(request):
-    """List system repos.
-    """
-    repos = []
-    sys_repo = seafile_api.get_repo(get_system_default_repo_id())
-    repos.append(sys_repo)
-
-    return render_to_response('sysadmin/sys_list_system.html', {
-            'repos': repos,
-            }, context_instance=RequestContext(request))
-
-@login_required
-@sys_staff_required
-def sys_repo_trash(request):
-    """ List deleted repos (by owner) """
-
-    search_owner = request.GET.get('name', '')
-    if search_owner:
-        if is_valid_username(search_owner):
-            repos = seafserv_threaded_rpc.get_trash_repos_by_owner(search_owner)
-            return render_to_response(
-                    'sysadmin/sys_repo_trash.html', {
-                    'repos': repos,
-                    'search_owner': search_owner,
-                }, context_instance=RequestContext(request))
-        else:
-            messages.error(request, _(u'Invalid username'))
-            return HttpResponseRedirect(reverse('sys_repo_trash'))
-
-    try:
-        current_page = int(request.GET.get('page', '1'))
-        per_page = int(request.GET.get('per_page', '25'))
-    except ValueError:
-        current_page = 1
-        per_page = 25
-
-    repos_all = seafserv_threaded_rpc.get_trash_repo_list(per_page * (current_page -1),
-                                          per_page + 1)
-    repos = repos_all[:per_page]
-    if len(repos_all) == per_page + 1:
-        page_next = True
-    else:
-        page_next = False
-
-    return render_to_response(
-            'sysadmin/sys_repo_trash.html', {
-            'repos': repos,
-            'current_page': current_page,
-            'prev_page': current_page-1,
-            'next_page': current_page+1,
-            'per_page': per_page,
-            'page_next': page_next,
-        }, context_instance=RequestContext(request))
-
-@login_required
-@sys_staff_required
-@require_POST
-def sys_repo_trash_restore(request, repo_id):
-    """Restore deleted repo by id"""
-
-    referer = request.META.get('HTTP_REFERER', None)
-    next = reverse('sys_repo_trash') if referer is None else referer
-
-    try:
-        seafserv_threaded_rpc.restore_repo_from_trash(repo_id)
-        messages.success(request, _(u'Success'))
-    except SearpcError, e:
-        logger.error(e)
-        messages.error(request, _(u'Failed'))
-
-    return HttpResponseRedirect(next)
-
-@login_required
-@sys_staff_required
-@require_POST
-def sys_repo_trash_remove(request, repo_id):
-    """Remove deleted repo by id"""
-
-    referer = request.META.get('HTTP_REFERER', None)
-    next = reverse('sys_repo_trash') if referer is None else referer
-
-    try:
-        seafserv_threaded_rpc.del_repo_from_trash(repo_id)
-        messages.success(request, _(u'Success'))
-    except SearpcError, e:
-        logger.error(e)
-        messages.error(request, _(u'Failed'))
-
-    return HttpResponseRedirect(next)
-
-@login_required
-@sys_staff_required
-@require_POST
-def sys_repo_trash_clear(request):
-    """Clear repo trash (by owner)"""
-
-    next = reverse('sys_repo_trash')
-    owner = request.POST.get('owner', '')
-    try:
-        if owner:
-            if is_valid_username(owner):
-                seafserv_threaded_rpc.empty_repo_trash_by_owner(owner)
-            else:
-                messages.error(request, _(u'Invalid username'))
-                return HttpResponseRedirect(next)
-        else:
-            seafserv_threaded_rpc.empty_repo_trash()
-    except SearpcError, e:
-        logger.error(e)
-        messages.error(request, _(u'Failed'))
-
-    messages.success(request, _(u'Success'))
-    return HttpResponseRedirect(next)
-
-def list_repos_by_name_and_owner(repo_name, owner):
-    repos = []
-    owned_repos = seafile_api.get_owned_repo_list(owner)
-    for repo in owned_repos:
-        if not repo.name:
-            continue
-
-        if repo_name in repo.name:
-            repo.owner = owner
-            repos.append(repo)
-    return repos
-
-def list_repos_by_name(repo_name):
-    repos = []
-    repos_all = seafile_api.get_repo_list(-1, -1)
-    for repo in repos_all:
-        if not repo.name:
-            continue
-
-        if repo_name in repo.name:
-            try:
-                repo.owner = seafile_api.get_repo_owner(repo.id)
-            except SearpcError:
-                repo.owner = "failed to get"
-            repos.append(repo)
-    return repos
-
-def list_repos_by_owner(owner):
-    repos = seafile_api.get_owned_repo_list(owner)
-    for e in repos:
-        e.owner = owner
-    return repos
-
-@login_required
-@sys_staff_required
-def sys_repo_search(request):
-    """Search a repo.
-    """
-    repo_name = request.GET.get('name', '')
-    owner = request.GET.get('owner', '')
-    repos = []
-
-    if repo_name and owner : # search by name and owner
-        repos = list_repos_by_name_and_owner(repo_name, owner)
-    elif repo_name:     # search by name
-        repos = list_repos_by_name(repo_name)
-    elif owner:     # search by owner
-        repos = list_repos_by_owner(owner)
-
-    return render_to_response('sysadmin/sys_repo_search.html', {
-            'repos': repos,
-            'name': repo_name,
-            'owner': owner,
-            'enable_sys_admin_view_repo': ENABLE_SYS_ADMIN_VIEW_REPO,
-            }, context_instance=RequestContext(request))
-
 def _populate_user_quota_usage(user):
     """Populate space/share quota to user.
 
diff --git a/static/scripts/sysadmin-app/collection/dirents.js b/static/scripts/sysadmin-app/collection/dirents.js
index 0f3081b26b..fb846541a9 100644
--- a/static/scripts/sysadmin-app/collection/dirents.js
+++ b/static/scripts/sysadmin-app/collection/dirents.js
@@ -8,12 +8,18 @@ define([
 
     var DirentCollection = Backbone.Collection.extend({
         model: DirentModel,
-        parse: function (data) {
+
+        url: function() {
+            return Common.getUrl({name: 'admin-library-dirents', repo_id: this.repo_id});
+        },
+
+        parse: function(data) {
             this.repo_name = data.repo_name;
             this.repo_id = data.repo_id;
             this.is_system_library = data.is_system_library;
             return data.dirent_list; // return the array
         },
+
         setPath: function(repo_id, path) {
             this.repo_id = repo_id;
             this.path = path;
diff --git a/static/scripts/sysadmin-app/collection/repos.js b/static/scripts/sysadmin-app/collection/repos.js
index e932838d08..9f12178bec 100644
--- a/static/scripts/sysadmin-app/collection/repos.js
+++ b/static/scripts/sysadmin-app/collection/repos.js
@@ -10,10 +10,10 @@ define([
         model: RepoModel,
         state: {pageSize: 100},
         parseState: function(data) {
-            return {hasNextPage: data[0].has_next_page, current_page: data[0].current_page};
+            return data.page_info; // {'has_next_page': has_next_page, 'current_page': current_page}   
         },
         parseRecords: function(data) {
-            return data[1];
+            return data.repos;
         },
         url: function () {
             return Common.getUrl({name: 'admin-libraries'});
diff --git a/static/scripts/sysadmin-app/collection/search-repos.js b/static/scripts/sysadmin-app/collection/search-repos.js
new file mode 100644
index 0000000000..53ddab431d
--- /dev/null
+++ b/static/scripts/sysadmin-app/collection/search-repos.js
@@ -0,0 +1,25 @@
+define([
+    'underscore',
+    'backbone',
+    'common',
+    'sysadmin-app/models/repo'
+], function(_, Backbone, Common, RepoModel) {
+    'use strict';
+
+    var RepoCollection = Backbone.Collection.extend({
+
+        model: RepoModel,
+
+        url: function () {
+            return Common.getUrl({name: 'admin-libraries'});
+        },
+
+        parse: function(data) {
+            this.search_name = data.name;
+            this.search_owner = data.owner;
+            return data.repos;
+        }
+    });
+
+    return RepoCollection;
+});
diff --git a/static/scripts/sysadmin-app/collection/trash-repos.js b/static/scripts/sysadmin-app/collection/trash-repos.js
index d9b10c7020..3bb161302d 100644
--- a/static/scripts/sysadmin-app/collection/trash-repos.js
+++ b/static/scripts/sysadmin-app/collection/trash-repos.js
@@ -8,9 +8,16 @@ define([
 
     var TrashRepoCollection = Backbone.Collection.extend({
         model: TrashRepoModel,
+
         url: function () {
             return Common.getUrl({name: 'admin-trash-libraries'});
+        },
+
+        parse: function(data) {
+            this.search_owner = data.search_owner;
+            return data.repos;
         }
+
     });
 
     return TrashRepoCollection;
diff --git a/static/scripts/sysadmin-app/models/dirent.js b/static/scripts/sysadmin-app/models/dirent.js
index 6a04264982..f23b5fb209 100644
--- a/static/scripts/sysadmin-app/models/dirent.js
+++ b/static/scripts/sysadmin-app/models/dirent.js
@@ -18,18 +18,19 @@ define([
             var dirent_path = this.getPath();
 
             if (this.get('is_file')) {
-                return '#';
+                return '';
             } else {
-                return '#libraries/' + dir.repo_id + '/dirents' + Common.encodePath(dirent_path);
+                return '#libs/' + dir.repo_id + Common.encodePath(dirent_path);
             }
         },
 
+        // only for file
         getDownloadUrl: function() {
             var dir = this.collection;
             var dirent_path = this.getPath();
 
             return app.config.siteRoot + "api/v2.1/admin/libraries/" + dir.repo_id
-                + "/dirent/?path=" + Common.encodePath(dirent_path) + "&dl=1";
+                + "/dirent/?path=" + encodeURIComponent(dirent_path) + "&dl=1";
         },
 
         getDeleteUrl: function() {
@@ -37,7 +38,7 @@ define([
             var dirent_path = this.getPath();
 
             return app.config.siteRoot + "api/v2.1/admin/libraries/" + dir.repo_id
-                + "/dirent/?path=" + Common.encodePath(dirent_path);
+                + "/dirent/?path=" + encodeURIComponent(dirent_path);
         },
 
         getIconUrl: function(size) {
diff --git a/static/scripts/sysadmin-app/router.js b/static/scripts/sysadmin-app/router.js
index f7acbab894..d5382515be 100644
--- a/static/scripts/sysadmin-app/router.js
+++ b/static/scripts/sysadmin-app/router.js
@@ -9,14 +9,15 @@ define([
     'sysadmin-app/views/mobile-devices',
     'sysadmin-app/views/device-errors',
     'sysadmin-app/views/repos',
-    'sysadmin-app/views/dir',
+    'sysadmin-app/views/search-repos',
     'sysadmin-app/views/system-repo',
     'sysadmin-app/views/trash-repos',
+    'sysadmin-app/views/dir',
     'app/views/account'
 ], function($, Backbone, Common, SideNavView, DashboardView,
     DesktopDevicesView, MobileDevicesView, DeviceErrorsView,
-    ReposView, DirView, SystemReposView,
-    TrashReposView, AccountView) {
+    ReposView, SearchReposView, SystemReposView, TrashReposView, DirView,
+    AccountView) {
 
     "use strict";
 
@@ -27,10 +28,11 @@ define([
             'desktop-devices/': 'showDesktopDevices',
             'mobile-devices/': 'showMobileDevices',
             'device-errors/': 'showDeviceErrors',
-            'libraries/': 'showLibraries',
-            'libraries/:repo_id/dirents(/*path)': 'showLibraryDir',
-            'libraries/system/': 'showSystemLibrary',
-            'libraries/trash/': 'showTrashLibraries',
+            'all-libs/': 'showLibraries',
+            'search-libs/': 'showSearchLibraries',
+            'system-lib/': 'showSystemLibrary',
+            'trash-libs/': 'showTrashLibraries',
+            'libs/:repo_id(/*path)': 'showLibraryDir',
             // Default
             '*actions': 'showDashboard'
         },
@@ -50,7 +52,9 @@ define([
             this.desktopDevicesView = new DesktopDevicesView();
             this.mobileDevicesView = new MobileDevicesView();
             this.deviceErrorsView = new DeviceErrorsView();
+
             this.reposView = new ReposView();
+            this.searchReposView = new SearchReposView();
             this.systemReposView = new SystemReposView();
             this.trashReposView = new TrashReposView();
             this.dirView = new DirView();
@@ -108,16 +112,27 @@ define([
         },
 
         showLibraries: function() {
-            var url = window.location.href;
-            var page = url.match(/.*?page=(\d+)/);
-            if (page) {
-                var current_page = page[1];
-            } else {
-                var current_page = null;
-            }
+            // url_match: null or an array like ["http://127.0.0.1:8000/sysadmin/#libraries/?page=2", "2"] 
+            var url_match = location.href.match(/.*?page=(\d+)/);
+            var page = url_match ? url_match[1] : 1; // 1: default
+
             this.switchCurrentView(this.reposView);
-            this.sideNavView.setCurTab('libraries');
-            this.reposView.show({'current_page': current_page});
+            this.sideNavView.setCurTab('libraries', {'option': 'all'});
+            this.reposView.show({'page': page});
+        },
+
+        showSearchLibraries: function() {
+            // url_match: null or an array
+            var url_match = location.href.match(/.*?name=(.*)&owner=(.*)/); // search by repo_name/owner
+            var repo_name = url_match ? url_match[1] : '';
+            var owner = url_match ? url_match[2] : '';
+
+            this.switchCurrentView(this.searchReposView);
+            this.sideNavView.setCurTab('libraries', {'option': 'all'});
+            this.searchReposView.show({
+                'name': decodeURIComponent(repo_name),
+                'owner': decodeURIComponent(owner)
+            });
         },
 
         showLibraryDir: function(repo_id, path) {
@@ -128,19 +143,23 @@ define([
             }
             this.switchCurrentView(this.dirView);
             this.dirView.show(repo_id, path);
-            this.sideNavView.setCurTab('libraries');
+            this.sideNavView.setCurTab('libraries', {'option': ''});
         },
 
         showSystemLibrary: function() {
             this.switchCurrentView(this.systemReposView);
-            this.sideNavView.setCurTab('libraries');
+            this.sideNavView.setCurTab('libraries', {'option': 'system'});
             this.systemReposView.show();
         },
 
         showTrashLibraries: function() {
+            // url_match: null or an array
+            var url_match = location.href.match(/.*?name=(.*)/); // search by owner
+            var owner = url_match ? url_match[1] : '';
+
             this.switchCurrentView(this.trashReposView);
-            this.sideNavView.setCurTab('libraries');
-            this.trashReposView.show();
+            this.sideNavView.setCurTab('libraries', {'option': 'trash'});
+            this.trashReposView.show({'owner': decodeURIComponent(owner)});
         }
 
     });
diff --git a/static/scripts/sysadmin-app/views/dir.js b/static/scripts/sysadmin-app/views/dir.js
index 5bb37d06bb..8c5458d26c 100644
--- a/static/scripts/sysadmin-app/views/dir.js
+++ b/static/scripts/sysadmin-app/views/dir.js
@@ -3,11 +3,10 @@ define([
     'underscore',
     'backbone',
     'common',
-    'moment',
     'app/views/fileupload',
     'sysadmin-app/views/dirent',
     'sysadmin-app/collection/dirents'
-], function($, _, Backbone, Common, Moment, FileUploadView,
+], function($, _, Backbone, Common, FileUploadView,
     DirentView, DirentCollection) {
     'use strict';
 
@@ -17,30 +16,34 @@ define([
 
         template: _.template($('#dir-view-tmpl').html()),
         pathBarTemplate: _.template($('#dir-path-bar-tmpl').html()),
-        newDirTemplate: _.template($("#add-new-dir-form-template").html()),
         dir_op_bar_template: _.template($('#dir-op-bar-tmpl').html()),
 
+        newDirTemplate: _.template($("#add-new-dir-form-template").html()),
+
         initialize: function() {
             this.dir = new DirentCollection();
             this.listenTo(this.dir, 'add', this.addOne);
             this.listenTo(this.dir, 'reset', this.reset);
+
             this.fileUploadView = new FileUploadView({dirView: this});
+
             this.render();
         },
 
         render: function() {
             this.$el.html(this.template());
+
             this.$table = this.$('table');
             this.$tableBody = $('tbody', this.$table);
             this.$loadingTip = this.$('.loading-tip');
-            this.$emptyTip = this.$('.empty-tips');
+            //this.$emptyTip = this.$('.empty-tips');
             this.$path_bar = this.$('.path-bar');
             this.$dir_op_bar = this.$('.repo-op');
         },
 
         events: {
             'click .basic-upload-btn': 'uploadFile',
-            'click #add-new-dir': 'newDir',
+            'click #add-new-dir': 'newDir'
         },
 
         uploadFile: function() {
@@ -49,9 +52,19 @@ define([
 
         addNewFile: function(new_dirent) {
             new_dirent.set('last_update', new Date().getTime());
-            var dirView = this;
-            var view = new DirentView({model: new_dirent, dirView: dirView});
-            dirView.$tableBody.prepend(view.render().el);
+            var view = new DirentView({model: new_dirent, dirView: this});
+            var new_file = view.render().el;
+            if ($('tr', this.$tableBody).length == 0) { 
+                this.$tableBody.append(new_file);
+            } else {
+                var dirs = this.dir.where({'is_file':false});
+                if (dirs.length == 0) { 
+                    this.$tableBody.prepend(new_file);
+                } else {
+                    // put the new file after the last dir
+                    $($('tr', this.$tableBody)[dirs.length - 1]).after(new_file);
+                }    
+            }    
         },
 
         newDir: function() {
@@ -120,7 +133,7 @@ define([
 
             this.$tableBody.empty();
             this.$loadingTip.show();
-            this.$emptyTip.hide();
+            //this.$emptyTip.hide();
         },
 
         renderPath: function() {
@@ -129,6 +142,7 @@ define([
             var obj = {
                 path: path,
                 repo_name: dir.repo_name,
+                is_system_library: dir.is_system_library
             };
 
             var path_list = path.substr(1).split('/');
@@ -145,11 +159,12 @@ define([
         },
 
         renderDirOpBar: function() {
-            var data = {
-                'is_system_library': this.dir.is_system_library,
-                'encrypted': this.dir.encrypted,
-            };
-            this.$dir_op_bar.html(this.dir_op_bar_template(data));
+            // only system lib has 'dir op'(upload file, add dir)
+            if (this.dir.is_system_library) {
+                this.$dir_op_bar.html(this.dir_op_bar_template()).show();
+            } else {
+                this.$dir_op_bar.empty().hide();
+            }
         },
 
         setFileInput: function () {
@@ -163,9 +178,8 @@ define([
         fetchLibraryDirents: function() {
             var dir = this.dir;
             dir.fetch({
-                url: Common.getUrl({name: 'admin-library-dirents', repo_id: dir.repo_id}) + '?parent_dir=' + Common.encodePath(dir.path),
-                data: {},
-                cache: false, // for IE
+                data: {'parent_dir': dir.path},
+                cache: false,
                 reset: true,
                 error: function (collection, response, opts) {
                     var err_msg;
@@ -193,7 +207,7 @@ define([
                 this.dir.each(this.addOne, this);
                 this.$table.show();
             } else {
-                this.$emptyTip.show();
+                //this.$emptyTip.show();
             }
         },
 
diff --git a/static/scripts/sysadmin-app/views/dirent.js b/static/scripts/sysadmin-app/views/dirent.js
index 4399ffd135..622ae55e16 100644
--- a/static/scripts/sysadmin-app/views/dirent.js
+++ b/static/scripts/sysadmin-app/views/dirent.js
@@ -15,7 +15,7 @@ define([
 
         events: {
             'click .dirent-download-btn': 'downloadDirent',
-            'click .dirent-delete-btn': 'deleteDirent',
+            'click .dirent-delete-btn': 'deleteDirent'
         },
 
         initialize: function(options) {
@@ -24,12 +24,11 @@ define([
         },
 
         downloadDirent: function() {
-            var _this = this;
             $.ajax({
-                url: _this.model.getDownloadUrl(),
+                url: this.model.getDownloadUrl(),
                 dataType: 'json',
                 success: function(data) {
-                    location.href = data['download_url']
+                    location.href = data['download_url'];
                 },
                 error: function(xhr, textStatus, errorThrown) {
                     Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
@@ -41,7 +40,7 @@ define([
         deleteDirent: function() {
             var _this = this;
             $.ajax({
-                url: _this.model.getDeleteUrl(),
+                url: this.model.getDeleteUrl(),
                 type: 'DELETE',
                 beforeSend: Common.prepareCSRFToken,
                 dataType: 'json',
@@ -64,10 +63,13 @@ define([
             data['time'] = last_update.format('LLLL');
             data['time_from_now'] = Common.getRelativeTimeStr(last_update);
             data['icon_url'] = this.model.getIconUrl(file_icon_size);
-            data['download_url'] = this.model.getDownloadUrl(),
+            if (this.model.get('is_file')) {
+                data['download_url'] = this.model.getDownloadUrl();
+            } else {
+                data['url'] = this.model.getWebUrl();
+            }
             data['repo_id'] = this.dir.repo_id;
             data['is_system_library'] = this.dir.is_system_library;
-            data['url'] = this.model.getWebUrl(),
 
             this.$el.html(this.template(data));
 
diff --git a/static/scripts/sysadmin-app/views/repo.js b/static/scripts/sysadmin-app/views/repo.js
index b67f2fb513..bb5feea7bb 100644
--- a/static/scripts/sysadmin-app/views/repo.js
+++ b/static/scripts/sysadmin-app/views/repo.js
@@ -7,8 +7,7 @@ define([
     'simplemodal',
     'select2',
     'app/views/widgets/hl-item-view'
-], function($, _, Backbone, Common, Moment, Simplemodal,
-    Select2, HLItemView) {
+], function($, _, Backbone, Common, Moment, Simplemodal, Select2, HLItemView) {
     'use strict';
 
     var RepoView = HLItemView.extend({
@@ -19,7 +18,7 @@ define([
 
         events: {
             'click .repo-delete-btn': 'deleteLibrary',
-            'click .repo-transfer-btn': 'transferLibrary',
+            'click .repo-transfer-btn': 'transferLibrary'
         },
 
         initialize: function() {
@@ -29,19 +28,32 @@ define([
 
         deleteLibrary: function() {
             var _this = this;
-            $.ajax({
-                url: Common.getUrl({'name':'admin-library', 'repo_id': _this.model.get('id')}),
-                type: 'DELETE',
-                beforeSend: Common.prepareCSRFToken,
-                dataType: 'json',
-                success: function() {
-                    _this.$el.remove();
-                    Common.feedback(gettext("Success"), 'success');
-                },
-                error: function(xhr, textStatus, errorThrown) {
-                    Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
-                }
-            })
+            var repo_name = this.model.get('name');
+            var popupTitle = gettext("Delete Library");
+            var popupContent = gettext("Are you sure you want to delete %s ?").replace('%s', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(repo_name) + '">' + Common.HTMLescape(repo_name) + '</span>');
+            var yesCallback = function() { 
+                $.ajax({
+                    url: Common.getUrl({
+                        'name':'admin-library',
+                        'repo_id': _this.model.get('id')
+                    }),
+                    type: 'DELETE',
+                    cache: false,
+                    beforeSend: Common.prepareCSRFToken,
+                    dataType: 'json',
+                    success: function() {
+                        _this.$el.remove();
+                        Common.feedback(gettext("Successfully deleted."), 'success');
+                    },
+                    error: function(xhr, textStatus, errorThrown) {
+                        Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
+                    },
+                    complete: function() {
+                        $.modal.close();
+                    }
+                });
+            };
+            Common.showConfirm(popupTitle, popupContent, yesCallback);
             return false;
         },
 
@@ -86,8 +98,8 @@ define([
                     },
                     success: function() {
                         $.modal.close();
-                        Common.feedback(gettext("Successfully transferred the library."), 'success');
                         _this.model.set({'owner': email}); // it will trigger 'change' event
+                        Common.feedback(gettext("Successfully transferred the library."), 'success');
                     },
                     error: function(xhr) {
                         var error_msg;
diff --git a/static/scripts/sysadmin-app/views/repos.js b/static/scripts/sysadmin-app/views/repos.js
index 46d1339d46..e94499adf3 100644
--- a/static/scripts/sysadmin-app/views/repos.js
+++ b/static/scripts/sysadmin-app/views/repos.js
@@ -3,16 +3,16 @@ define([
     'underscore',
     'backbone',
     'common',
-    'moment',
     'sysadmin-app/views/repo',
     'sysadmin-app/collection/repos'
-], function($, _, Backbone, Common, Moment, RepoView, RepoCollection) {
+], function($, _, Backbone, Common, RepoView, RepoCollection) {
     'use strict';
 
     var ReposView = Backbone.View.extend({
 
         id: 'libraries',
 
+        tabNavTemplate: _.template($("#libraries-tabnav-tmpl").html()),
         template: _.template($("#libraries-tmpl").html()),
 
         initialize: function() {
@@ -23,8 +23,10 @@ define([
         },
 
         render: function() {
-            var data = {'cur_tab': 'all'};
-            this.$el.html(this.template(data));
+            var $tabnav = $(this.tabNavTemplate({'cur_tab': 'all'}));
+            this.$el.append($tabnav);
+            this.$el.append(this.template());
+
             this.$table = this.$('table');
             this.$tableBody = $('tbody', this.$table);
             this.$loadingTip = this.$('.loading-tip');
@@ -50,7 +52,7 @@ define([
         getNextPage: function() {
             this.initPage();
             var current_page = this.repoCollection.state.current_page;
-            if (this.repoCollection.state.hasNextPage) {
+            if (this.repoCollection.state.has_next_page) {
                 this.repoCollection.getPage(current_page + 1, {
                     reset: true
                 });
@@ -62,7 +64,7 @@ define([
         getPreviousPage: function() {
             this.initPage();
             var current_page = this.repoCollection.state.current_page;
-            if ( current_page > 1) {
+            if (current_page > 1) {
                 this.repoCollection.getPage(current_page - 1, {
                     reset: true
                 });
@@ -81,19 +83,17 @@ define([
                 this.attached = true;
                 $("#right-panel").html(this.$el);
             }
-            this.showLibraries();
+            this.getContent();
         },
 
-        showLibraries: function() {
+        getContent: function() {
             this.initPage();
-            var _this = this,
-                current_page = this.option.current_page || 1;
-
+            var _this = this;
             this.repoCollection.fetch({
-                data: {'page': current_page},
-                cache: false, // for IE
+                data: {'page': this.option.page},
+                cache: false,
                 reset: true,
-                error: function (collection, response, opts) {
+                error: function(collection, response, opts) {
                     var err_msg;
                     if (response.responseText) {
                         if (response['status'] == 401 || response['status'] == 403) {
@@ -105,29 +105,30 @@ define([
                         err_msg = gettext("Failed. Please check the network.");
                     }
                     Common.feedback(err_msg, 'error');
+                },
+                complete:function() {
+                    _this.$loadingTip.hide();
                 }
             });
         },
 
         reset: function() {
-            var length = this.repoCollection.length,
-                current_page = this.repoCollection.state.current_page;
+            // update the url
+            var current_page = this.repoCollection.state.current_page;
+            app.router.navigate('all-libs/?page=' + current_page);
 
             this.$loadingTip.hide();
-
-            if (length > 0) {
+            if (this.repoCollection.length > 0) {
                 this.repoCollection.each(this.addOne, this);
                 this.$table.show();
                 this.renderPaginator();
             } else {
                 this.$emptyTip.show();
             }
-
-            app.router.navigate('libraries/?page=' + current_page);
         },
 
         renderPaginator: function() {
-            if (this.repoCollection.state.hasNextPage) {
+            if (this.repoCollection.state.has_next_page) {
                 this.$jsNext.show();
             } else {
                 this.$jsNext.hide();
diff --git a/static/scripts/sysadmin-app/views/search-repos.js b/static/scripts/sysadmin-app/views/search-repos.js
new file mode 100644
index 0000000000..4115586a84
--- /dev/null
+++ b/static/scripts/sysadmin-app/views/search-repos.js
@@ -0,0 +1,126 @@
+define([
+    'jquery',
+    'underscore',
+    'backbone',
+    'common',
+    'sysadmin-app/views/repo',
+    'sysadmin-app/collection/search-repos'
+], function($, _, Backbone, Common, RepoView, RepoCollection) {
+    'use strict';
+
+    var ReposView = Backbone.View.extend({
+
+        id: 'search-libraries',
+
+        tabNavTemplate: _.template($("#libraries-tabnav-tmpl").html()),
+        template: _.template($("#search-libraries-tmpl").html()),
+
+        initialize: function() {
+            this.repoCollection = new RepoCollection();
+            this.listenTo(this.repoCollection, 'add', this.addOne);
+            this.listenTo(this.repoCollection, 'reset', this.reset);
+            this.render();
+        },
+
+        render: function() {
+            var $tabnav = $(this.tabNavTemplate({'cur_tab': 'all'}));
+            this.$el.append($tabnav);
+            this.$el.append(this.template());
+
+            this.$form = this.$('#search-repo-form');
+            this.$name = $('[name="name"]', this.$form);
+            this.$owner = $('[name="owner"]', this.$form);
+
+            this.$table = this.$('table');
+            this.$tableBody = $('tbody', this.$table);
+            this.$loadingTip = this.$('.loading-tip');
+            this.$emptyTip = this.$('.empty-tips');
+        },
+
+        events: {
+            'submit #search-repo-form': 'formSubmit'
+        },
+
+        initPage: function() {
+            this.$table.hide();
+            this.$tableBody.empty();
+            this.$loadingTip.show();
+            this.$emptyTip.hide();
+        },
+
+        hide: function() {
+            this.$el.detach();
+            this.attached = false;
+        },
+
+        show: function(option) {
+            if (!this.attached) {
+                this.attached = true;
+                $("#right-panel").html(this.$el);
+            }
+            this.getContent(option);
+        },
+
+        getContent: function(obj) {
+            this.initPage();
+            var _this = this;
+            this.repoCollection.fetch({
+                data: obj,
+                cache: false,
+                reset: true,
+                error: function(collection, response, opts) {
+                    var err_msg;
+                    if (response.responseText) {
+                        if (response['status'] == 401 || response['status'] == 403) {
+                            err_msg = gettext("Permission error");
+                        } else {
+                            err_msg = $.parseJSON(response.responseText).error_msg;
+                        }
+                    } else {
+                        err_msg = gettext("Failed. Please check the network.");
+                    }
+                    Common.feedback(err_msg, 'error');
+                },
+                complete:function() {
+                    _this.$loadingTip.hide();
+                }
+            });
+        },
+
+        reset: function() {
+            var name = this.repoCollection.search_name;
+            var owner = this.repoCollection.search_owner;
+            app.router.navigate('#search-libs/?name=' + encodeURIComponent(name) + '&owner=' + encodeURIComponent(owner));
+            this.$name.val(name);
+            this.$owner.val(owner);
+
+            this.$loadingTip.hide();
+            if (this.repoCollection.length > 0) {
+                this.repoCollection.each(this.addOne, this);
+                this.$table.show();
+            } else {
+                this.$emptyTip.show();
+            }
+        },
+
+        addOne: function(library) {
+            var view = new RepoView({model: library});
+            this.$tableBody.append(view.render().el);
+        },
+
+        formSubmit: function() {
+            var name = $.trim(this.$name.val());
+            var owner = $.trim(this.$owner.val());
+
+            if (!name && !owner) {
+                return false;
+            }
+
+            this.getContent({'name': name, 'owner': owner});
+            return false;
+        }
+    });
+
+    return ReposView;
+
+});
diff --git a/static/scripts/sysadmin-app/views/side-nav.js b/static/scripts/sysadmin-app/views/side-nav.js
index b5ff922864..f898531537 100644
--- a/static/scripts/sysadmin-app/views/side-nav.js
+++ b/static/scripts/sysadmin-app/views/side-nav.js
@@ -31,6 +31,37 @@ define([
                 $.extend(this.data, options);
             }
             this.render();
+        },
+
+        events: {
+            'submit #libs-search-form': 'searchLibs', // for 'all' libs
+            'submit #trash-libs-search-form': 'searchTrashLibs'
+        },
+
+        // search libs by repo_name
+        searchLibs: function() {
+            var $form = this.$('#libs-search-form');
+            var name = $.trim($('[name="name"]', $form).val()); 
+            if (!name) {
+                return false;
+            }
+
+            var url = $form.attr('action') + '?name=' + encodeURIComponent(name) + '&owner=';
+            location.href = url;
+            return false; // necessary
+        },
+
+        // search trash libs by owner
+        searchTrashLibs: function() {
+            var $form = this.$('#trash-libs-search-form');
+            var owner = $.trim($('[name="name"]', $form).val()); 
+            if (!owner) {
+                return false;
+            }
+
+            var url = $form.attr('action') + '?name=' + encodeURIComponent(owner);
+            location.href = url;
+            return false; // necessary
         }
 
     });
diff --git a/static/scripts/sysadmin-app/views/system-repo.js b/static/scripts/sysadmin-app/views/system-repo.js
index 7eee544ffc..b9ef25bfa0 100644
--- a/static/scripts/sysadmin-app/views/system-repo.js
+++ b/static/scripts/sysadmin-app/views/system-repo.js
@@ -11,6 +11,7 @@ define([
 
         id: "system-library",
 
+        tabNavTemplate: _.template($("#libraries-tabnav-tmpl").html()),
         template: _.template($("#system-library-tmpl").html()),
         itemTemplate: _.template($("#system-library-item-tmpl").html()),
 
@@ -20,8 +21,10 @@ define([
         },
 
         render: function() {
-            var data = {'cur_tab': 'system',};
-            this.$el.html(this.template(data));
+            var $tabnav = $(this.tabNavTemplate({'cur_tab': 'system'}));
+            this.$el.append($tabnav);
+            this.$el.append(this.template());
+
             this.$table = this.$('table');
             this.$tableBody = $('tbody', this.$table);
             this.$loadingTip = this.$('.loading-tip');
diff --git a/static/scripts/sysadmin-app/views/trash-repo.js b/static/scripts/sysadmin-app/views/trash-repo.js
index cafb7e6753..b716d5fa6f 100644
--- a/static/scripts/sysadmin-app/views/trash-repo.js
+++ b/static/scripts/sysadmin-app/views/trash-repo.js
@@ -15,7 +15,7 @@ define([
 
         events: {
             'click .repo-delete-btn': 'deleteTrashLibrary',
-            'click .repo-restore-btn': 'restoreTrashLibrary',
+            'click .repo-restore-btn': 'restoreTrashLibrary'
         },
 
         initialize: function() {
@@ -24,37 +24,61 @@ define([
 
         deleteTrashLibrary: function() {
             var _this = this;
-            $.ajax({
-                url: Common.getUrl({'name':'admin-trash-library', 'repo_id': _this.model.get('id')}),
-                type: 'DELETE',
-                beforeSend: Common.prepareCSRFToken,
-                dataType: 'json',
-                success: function() {
-                    _this.$el.remove();
-                    Common.feedback(gettext("Success"), 'success');
-                },
-                error: function(xhr, textStatus, errorThrown) {
-                    Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
-                }
-            })
+            var repo_name = this.model.get('name');
+            var popupTitle = gettext("Delete Library");
+            var popupContent = gettext("Are you sure you want to delete %s completely?").replace('%s', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(repo_name) + '">' + Common.HTMLescape(repo_name) + '</span>'); 
+            var yesCallback = function() { 
+                $.ajax({
+                    url: Common.getUrl({
+                        'name':'admin-trash-library',
+                        'repo_id': _this.model.get('id')
+                    }),
+                    type: 'DELETE',
+                    beforeSend: Common.prepareCSRFToken,
+                    dataType: 'json',
+                    success: function() {
+                        _this.$el.remove();
+                        Common.feedback(gettext("Success"), 'success');
+                    },
+                    error: function(xhr, textStatus, errorThrown) {
+                        Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
+                    },
+                    complete: function() {
+                        $.modal.close();
+                    }
+                });
+            };
+            Common.showConfirm(popupTitle, popupContent, yesCallback);
             return false;
         },
 
         restoreTrashLibrary: function() {
             var _this = this;
-            $.ajax({
-                url: Common.getUrl({'name':'admin-trash-library', 'repo_id': _this.model.get('id')}),
-                type: 'PUT',
-                beforeSend: Common.prepareCSRFToken,
-                dataType: 'json',
-                success: function() {
-                    _this.$el.remove();
-                    Common.feedback(gettext("Success"), 'success');
-                },
-                error: function(xhr, textStatus, errorThrown) {
-                    Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
-                }
-            })
+            var repo_name = this.model.get('name');
+            var popupTitle = gettext("Restore Library");
+            var popupContent = gettext("Are you sure you want to restore %s?").replace('%s', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(repo_name) + '">' + Common.HTMLescape(repo_name) + '</span>'); 
+            var yesCallback = function() { 
+                $.ajax({
+                    url: Common.getUrl({
+                        'name':'admin-trash-library',
+                        'repo_id': _this.model.get('id')
+                    }),
+                    type: 'PUT',
+                    beforeSend: Common.prepareCSRFToken,
+                    dataType: 'json',
+                    success: function() {
+                        _this.$el.remove();
+                        Common.feedback(gettext("Success"), 'success');
+                    },
+                    error: function(xhr, textStatus, errorThrown) {
+                        Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
+                    },
+                    complete: function() {
+                        $.modal.close();
+                    }
+                });
+            };
+            Common.showConfirm(popupTitle, popupContent, yesCallback);
             return false;
         },
 
diff --git a/static/scripts/sysadmin-app/views/trash-repos.js b/static/scripts/sysadmin-app/views/trash-repos.js
index 2713204bb0..fa11548c3c 100644
--- a/static/scripts/sysadmin-app/views/trash-repos.js
+++ b/static/scripts/sysadmin-app/views/trash-repos.js
@@ -14,60 +14,87 @@ define([
 
         id: 'trash-libraries',
 
+        tabNavTemplate: _.template($("#libraries-tabnav-tmpl").html()),
         template: _.template($("#trash-libraries-tmpl").html()),
 
         initialize: function() {
             this.trashRepoCollection = new TrashRepoCollection();
             this.listenTo(this.trashRepoCollection, 'add', this.addOne);
             this.listenTo(this.trashRepoCollection, 'reset', this.reset);
+
+            this.render();
         },
 
         render: function() {
-            var data = {'cur_tab': 'trash',};
-            this.$el.html(this.template(data));
+            this.$el.html(this.tabNavTemplate({'cur_tab': 'trash'}) + this.template());
+
+            this.$tip = this.$('.tip');
             this.$table = this.$('table');
             this.$tableBody = $('tbody', this.$table);
             this.$loadingTip = this.$('.loading-tip');
             this.$emptyTip = this.$('.empty-tips');
+            this.$cleanBtn = this.$('.js-clean');
         },
 
         events: {
-            'click #clean-trash-libraries': 'cleanTrashLibraries',
+            'click .js-clean': 'cleanTrashLibraries'
         },
 
         cleanTrashLibraries: function() {
             var _this = this;
-            $.ajax({
-                url: Common.getUrl({'name':'admin-trash-libraries'}),
-                type: 'DELETE',
-                beforeSend: Common.prepareCSRFToken,
-                dataType: 'json',
-                success: function() {
-                    _this.$table.hide();
-                    _this.$emptyTip.show();
-                    Common.feedback(gettext("Success"), 'success');
-                },
-                error: function(xhr, textStatus, errorThrown) {
-                    Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
-                }
-            })
+            var popupTitle, popupContent;
+            var owner = this.trashRepoCollection.search_owner;
+            if (owner) {
+                popupTitle = gettext("Delete Library By Owner");
+                popupContent = gettext("Are you sure you want to delete all %s's libraries?").replace('%s', '<span class="op-target ellipsis ellipsis-op-target">' + Common.HTMLescape(owner) + '</span>');
+            } else {
+                popupTitle = gettext("Clear Trash");
+                popupContent = gettext("Are you sure you want to clear trash?");
+            }
+            var yesCallback = function() {
+                $.ajax({
+                    url: Common.getUrl({'name':'admin-trash-libraries'}),
+                    type: 'DELETE',
+                    data: {'owner': _this.option.owner},
+                    beforeSend: Common.prepareCSRFToken,
+                    dataType: 'json',
+                    success: function() {
+                        _this.$tip.hide();
+                        _this.$table.hide();
+                        _this.$emptyTip.show();
+                        Common.feedback(gettext("Success"), 'success');
+                    },
+                    error: function(xhr, textStatus, errorThrown) {
+                        Common.ajaxErrorHandler(xhr, textStatus, errorThrown);
+                    },
+                    complete: function() {
+                        $.modal.close();
+                    }
+                });
+            };
+            Common.showConfirm(popupTitle, popupContent, yesCallback);
         },
 
         initPage: function() {
+            this.$tip.hide();
             this.$table.hide();
             this.$tableBody.empty();
             this.$loadingTip.show();
             this.$emptyTip.hide();
+            this.$cleanBtn.hide();
         },
 
         hide: function() {
             this.$el.detach();
+            this.attached = false;
         },
 
         show: function(option) {
             this.option = option;
-            this.render();
-            $("#right-panel").html(this.$el);
+            if (!this.attached) {
+                this.attached = true;
+                $("#right-panel").html(this.$el);
+            }
             this.showTrashLibraries();
         },
 
@@ -76,8 +103,8 @@ define([
             var _this = this;
 
             this.trashRepoCollection.fetch({
-                data: {},
-                cache: false, // for IE
+                data: {'owner': this.option.owner},
+                cache: false,
                 reset: true,
                 error: function (collection, response, opts) {
                     var err_msg;
@@ -102,9 +129,12 @@ define([
 
             if (length > 0) {
                 this.trashRepoCollection.each(this.addOne, this);
+                this.$cleanBtn.show();
+                this.$tip.show();
                 this.$table.show();
             } else {
                 this.$emptyTip.show();
+                this.$cleanBtn.hide();
             }
         },