diff --git a/static/resources/js/components/user-log/user-log.directive.html b/static/resources/js/components/user-log/user-log.directive.html
index 4308b16b5..43f5e1207 100644
--- a/static/resources/js/components/user-log/user-log.directive.html
+++ b/static/resources/js/components/user-log/user-log.directive.html
@@ -1,15 +1,24 @@
 <div class="col-xs-4 col-md-12 down-table-pane">
-  <table class="table">
-    <thead>
-      <th>// 'task_name' | tr //</th><th>// 'details' | tr //</th><th>// 'user' | tr //</th><th>// 'creation_time' | tr //</th>
-    </thead>
-    <tbody>
-     <tr>
-       <td colspan="5" height="120px" class="empty-hint" ng-if="vm.integratedLogs.length === 0"><h3 class="text-muted">// 'no_user_logs' | tr //</h3></td>
-     </tr>
-      <tr ng-if="vm.integratedLogs.length > 0" ng-repeat="t in vm.integratedLogs">
-    		<td>//t.operation//</td><td>//t.repo_name//</td><td>//t.username//</td><td>//t.op_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
-    	 </tr>
-    </tbody>
-  </table>	
-</div>
\ No newline at end of file
+  <div class="table-head-container">
+    <table class="table table-pane table-header">
+      <thead>
+        <th>// 'task_name' | tr //</th>
+        <th>// 'details' | tr //</th>
+        <th>// 'user' | tr //</th>
+        <th>// 'creation_time' | tr //</th>
+      </thead>
+    </table>
+  </div>
+  <div class="table-body-container">
+    <table class="table table-pane">
+      <tbody>
+        <tr>
+          <td colspan="5" height="120px" class="empty-hint" ng-if="vm.integratedLogs.length === 0"><h3 class="text-muted">// 'no_user_logs' | tr //</h3></td>
+        </tr>
+        <tr ng-if="vm.integratedLogs.length > 0" ng-repeat="t in vm.integratedLogs">
+          <td>//t.operation//</td><td>//t.repo_name//</td><td>//t.username//</td><td>//t.op_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/static/resources/js/components/user/list-user.directive.html b/static/resources/js/components/user/list-user.directive.html
index 4c82a1a8e..997ed6af6 100644
--- a/static/resources/js/components/user/list-user.directive.html
+++ b/static/resources/js/components/user/list-user.directive.html
@@ -10,29 +10,36 @@
     </div> 
     <modal-dialog modal-title="// 'confirm_to_delete_user_title' | tr //" modal-message="// 'confirm_to_delete_user' | tr //" action="vm.deleteUser()"></modal-dialog>
     <div class="pane"> 
-      <div class="sub-pane">     
-        <table class="table table-pane">
-          <thead>
-            <th>// 'username' | tr //</th>
-            <th>// 'email' | tr //</th>
-            <th>// 'registration_time' | tr //</th>
-            <th>// 'administrator' | tr //</th>
-            <th>// 'operation' | tr //</th>
-          </thead>
-          <tbody>
-            <tr ng-repeat="u in vm.users">
-              <td>//u.username//</td>
-              <td>//u.email//</td>
-              <td>//u.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
-              <td>
-                <toggle-admin has-admin-role="u.has_admin_role == 1" user-id="//u.user_id//"></toggle-admin>
-              </td>
-              <td>
-                &nbsp;&nbsp;<a href="javascript:void(0)" data-toggle="modal" data-target="#myModal" ng-click="vm.confirmToDelete(u.user_id)"><span class="glyphicon glyphicon-trash"></span></a>
-              </td>
-            	</tr>
-          </tbody>
-        </table>
+      <div class="sub-pane">  
+        <div class="table-head-container">
+          <table class="table table-pane table-header">
+            <thead>
+              <th width="15%">// 'username' | tr //</th>
+              <th width="20%">// 'email' | tr //</th>
+              <th width="35%">// 'registration_time' | tr //</th>
+              <th width="15%">// 'administrator' | tr //</th>
+              <th width="20%">// 'operation' | tr //</th>
+            </thead>
+          </table>
+        </div>
+      
+        <div class="table-body-container">
+          <table class="table table-pane">
+            <tbody>
+              <tr ng-repeat="u in vm.users">
+                <td>//u.username//</td>
+                <td>//u.email//</td>
+                <td>//u.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
+                <td>
+                  <toggle-admin has-admin-role="u.has_admin_role == 1" user-id="//u.user_id//"></toggle-admin>
+                </td>
+                <td>
+                  &nbsp;&nbsp;<a href="javascript:void(0)" data-toggle="modal" data-target="#myModal" ng-click="vm.confirmToDelete(u.user_id)"><span class="glyphicon glyphicon-trash"></span></a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
       <div class="col-xs-4 col-md-12 well well-sm well-custom">
         <div class="col-md-offset-10">//vm.users ? vm.users.length : 0// items</div>
diff --git a/views/project.htm b/views/project.htm
index 5d44bd1be..664ac8e6f 100644
--- a/views/project.htm
+++ b/views/project.htm
@@ -24,27 +24,37 @@
           </div> 
             <add-project ng-show="vm.isOpen" is-open="vm.isOpen"></add-project>
             <div class="sub-pane">
-      		    <table class="table">
-                <thead>
-                  <th>// 'project_name' | tr //</th><th>// 'repositories' | tr //</th><th ng-if="!vm.publicity">// 'role' | tr //</th><th>// 'creation_time' | tr //</th><th>// 'publicity' | tr //</th>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td colspan="5" height="320px" class="empty-hint" ng-if="vm.projects.length === 0"><h3 class="text-muted">// 'no_projects_add_new_project' | tr //</h3></td>
-                  </tr>
-                  <tr ng-if="vm.projects.length > 0" ng-repeat="p in vm.projects">
-                    <td><a href="/repository#/repositories?project_id=//p.project_id//&is_public=//p.public//">//p.name//</a></td>
-                    <td>//p.repo_count//</td>
-                    <td ng-if="!vm.publicity">//vm.getProjectRole(p.current_user_role_id)//</td>
-                    <td>//p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
-                    <td><publicity-button is-public="p.public" owned="p.owner_id == vm.user.user_id" project-id="p.project_id"></publicity-button></td>
-                  </tr>
-                </tbody>
-              </table>
+              <div class="table-head-container">
+                <table class="table table-pane table-header">
+                  <thead>
+                    <th width="15%">// 'project_name' | tr //</th>
+                    <th width="10%">// 'repositories' | tr //</th>
+                    <th width="25%" ng-if="!vm.publicity">// 'role' | tr //</th>
+                    <th width="30%">// 'creation_time' | tr //</th>
+                    <th width="15%">// 'publicity' | tr //</th>
+                  </thead>
+                </table>
+              </div>
+              <div class="table-body-container">
+                <table class="table table-pane">
+                  <tbody>
+                    <tr>
+                      <td colspan="5" height="320px" class="empty-hint" ng-if="vm.projects.length === 0"><h3 class="text-muted">// 'no_projects_add_new_project' | tr //</h3></td>
+                    </tr>
+                    <tr ng-if="vm.projects.length > 0" ng-repeat="p in vm.projects">
+                      <td><a href="/repository#/repositories?project_id=//p.project_id//&is_public=//p.public//">//p.name//</a></td>
+                      <td>//p.repo_count//</td>
+                      <td ng-if="!vm.publicity">//vm.getProjectRole(p.current_user_role_id)//</td>
+                      <td>//p.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
+                      <td><publicity-button is-public="p.public" owned="p.owner_id == vm.user.user_id" project-id="p.project_id"></publicity-button></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
             </div>
           <div class="col-xs-4 col-md-12 well well-sm well-custom"><div class="col-md-offset-10">//vm.projects ? vm.projects.length : 0// // 'items' | tr //</div></div>               
   	    </div>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>