diff --git a/media/css/seahub.css b/media/css/seahub.css
index 73bf9c77fd..bb6515b83a 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -204,6 +204,7 @@ p {
 }
 .op {
     font-size:13px;
+    margin-right:6px;
 }
 .op-target {
     color:#803;
diff --git a/templates/admin_base.html b/templates/admin_base.html
index 3e296eb9a1..6605bb553d 100644
--- a/templates/admin_base.html
+++ b/templates/admin_base.html
@@ -13,11 +13,6 @@
     <li>
         <a href="{{ SITE_ROOT }}sys/groupadmin/" {% block nav_groupadmin_class %}{% endblock %}>{% trans "Groups" %}</a>
     </li>
-    {% if request.cloud_mode %}
-    <li>
-        <a href="{{ SITE_ROOT }}sys/orgadmin/" {% block nav_orgadmin_class %}{% endblock %}>{% trans "Organizations" %}</a>
-    </li>
-    {% endif %}
     <li>
         <a href="{{ SITE_ROOT }}sys/notificationadmin/" {% block nav_notificationadmin_class %}{% endblock %}>{% trans "Notifications" %}</a>
     </li>
diff --git a/templates/sys_seafadmin.html b/templates/sys_seafadmin.html
index 6ca7f4bd5f..2645aeb32e 100644
--- a/templates/sys_seafadmin.html
+++ b/templates/sys_seafadmin.html
@@ -2,21 +2,21 @@
 {% load i18n %}
 {% block nav_seafadmin_class %}class="cur"{% endblock %}
 
-{% block right_panel %}
+{% block main_panel %}
 <h3>{% trans "All Libraries" %}</h3>
 {% if repos %}
 <table>
     <tr>
-        <th width="4%"><!--icon--></th>
-        <th width="25%">{% trans "Name" %}</th>
-        <th width="28%">{% trans "Owner" %}</th>
-        <th width="31%">{% trans "Description" %}</th>
-        <th width="12%">{% trans "Operations" %}</th>
+        <th width="15%">{% trans "Name" %}</th>
+        <th width="25%">ID</th>
+        <th width="20%">{% trans "Owner" %}</th>
+        <th width="30%">{% trans "Description" %}</th>
+        <th width="10%">{% trans "Operations" %}</th>
     </tr>
     {% for repo in repos %}
     <tr>
-        <td><img src="{{MEDIA_URL}}img/sync-folder-20.png" title="{% trans "Read-Write" %}" alt="{% trans "directory icon" %}" /></td>
-        <td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
+        <td>{{ repo.props.name }}</td>
+        <td style="font-size:11px;">{{ repo.id }}</td>
         <td><a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a></td>
         <td>{{ repo.props.desc }}</td>
         <td><a href="#" data-url="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" data-target="{{ repo.props.name }}" class="repo-delete-btn op">{% trans "Delete" %}</a></td>
diff --git a/templates/sys_useradmin.html b/templates/sys_useradmin.html
index 1e41dc2607..fe7f804522 100644
--- a/templates/sys_useradmin.html
+++ b/templates/sys_useradmin.html
@@ -1,31 +1,31 @@
 {% extends "admin_base.html" %}
-{% load i18n %}
+{% load seahub_tags i18n %}
 {% load url from future %}
 {% block nav_useradmin_class %}class="cur"{% endblock %}
-{% block left_panel %}
-<h3>{% trans "Operations" %}</h3>
-<ul class="op-list">
-    <li><a href="{{ SITE_ROOT }}useradmin/add/">{% trans "Add new user" %}</a></li>
-</ul>
-{% endblock %}
 
-{% block right_panel %}
+{% block main_panel %}
+
 <h3>{% trans "All Members" %}</h3>
+
+>> <a href="{{ SITE_ROOT }}useradmin/add/">{% trans "Add new user" %}</a>
+
 <table>
     <tr>
-        <th width="45%">{% trans "Email" %}</th>
-        <th width="20%">{% trans "Status" %}</th>
-        <th width="35%">{% trans "Operations" %}</th>
+        <th width="40%">{% trans "Email" %}</th>
+        <th width="12%">{% trans "Status" %}</th>
+        <th width="18%">{% trans "Create At" %}</th>
+        <th width="30%">{% trans "Operations" %}</th>
     </tr>
 
     {% for user in users %}
     <tr>
-        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.props.email }}</a></td>
+        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td>
         {% if user.props.is_active %}
         <td>{% trans "Activated" %}</td>
         {% else %}
         <td><a href="{{ SITE_ROOT }}useradmin/activate/{{ user.props.id }}/" class="activate op">{% trans "Active" %}</a></td>
         {% endif %}
+        <td>{{ user.ctime|tsstr_sec }}</td>
         <td>
           {% if not user.is_self %}
           <a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a>