diff --git a/static/resources/js/components/log/list-log.directive.html b/static/resources/js/components/log/list-log.directive.html
index 54a2f62a8..fae521674 100644
--- a/static/resources/js/components/log/list-log.directive.html
+++ b/static/resources/js/components/log/list-log.directive.html
@@ -14,17 +14,26 @@
     <advanced-search ng-show="vm.isOpen" is-open="vm.isOpen" op="vm.op" others="vm.others" search='vm.search({op: vm.op, username: vm.username})' from-date="vm.fromDate" to-date="vm.toDate"></advanced-search>
     <div class="pane">
       <div class="sub-pane">
-        <table class="table table-pane">
-      	    <thead>
-      		    <th>// 'username' | tr //</th><th>// 'repository_name' | tr //</th><th>// 'operation' | tr //</th><th>// 'timestamp' | tr //</th>
-      		  </thead>
-      		  <tbody>
-      		    <tr ng-repeat="log in vm.logs">
-        	    	<td>//log.username//</td><td>//log.repo_name//</td><td>//log.operation//</td><td>//log.op_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
-          		</tr>
-      		  </tbody>
-    		  </table>
+        <div class="table-head-container">
+          <table class="table table-pane table-header">
+            <thead>
+              <th width="14%">// 'username' | tr //</th>
+              <th width="32%">// 'repository_name' | tr //</th>
+              <th width="14%">// 'operation' | tr //</th>
+              <th width="40%">// 'timestamp' | tr //</th>
+            </thead>
+          </table>
+        </div>
+        <div class="table-body-container" style="height: 300px;">
+          <table class="table table-pane">
+            <tbody>
+              <tr ng-repeat="log in vm.logs">
+                <td>//log.username//</td><td>//log.repo_name//</td><td>//log.operation//</td><td>//log.op_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/static/resources/js/components/project-member/list-project-member.directive.html b/static/resources/js/components/project-member/list-project-member.directive.html
index 9fda56790..b42b2e922 100644
--- a/static/resources/js/components/project-member/list-project-member.directive.html
+++ b/static/resources/js/components/project-member/list-project-member.directive.html
@@ -13,16 +13,22 @@
     <div class="pane"> 	           
       <modal-dialog modal-title="// vm.modalTitle //" modal-message="// vm.modalMessage //" confirm-only="true"></modal-dialog>
       <add-project-member ng-show="vm.isOpen" is-open="vm.isOpen" project-id="//vm.projectId//" reload='vm.search({projectId: vm.projectId, username: vm.username})'></add-project-member>
-      <div class="sub-pane">  
-        <table class="table table-pane" >
-    			 <thead>
-    			   <th width="30%">// 'username' | tr //</th><th width="40%">// 'role' | tr //</th><th width="30%">// 'operation' | tr //</th>
-    			 </thead>
-    			 <tbody>
-            <tr ng-repeat="pr in vm.projectMembers" edit-project-member username="pr.username" project-id="vm.projectId" user-id="pr.user_id" delete="vm.deleteProjectMember({projectId: vm.projectId, userId: pr.user_id})" current-user-id="vm.user.user_id" role-name="pr.role_name" reload='vm.search({projectId: vm.projectId, username: vm.username})'></tr> 
-          </tbody>
-    		</table>
+      <div class="sub-pane">   
+          <div class="table-head-container">
+            <table class="table table-pane table-header">
+              <thead>
+                <th width="30%">// 'username' | tr //</th><th width="45%">// 'role' | tr //</th><th width="25%">// 'operation' | tr //</th>
+              </thead>
+            </table>
+          </div>
+          <div class="table-body-container" style="height: 300px;">
+            <table class="table table-pane">
+              <tbody>
+                <tr ng-repeat="pr in vm.projectMembers" edit-project-member username="pr.username" project-id="vm.projectId" user-id="pr.user_id" delete="vm.deleteProjectMember({projectId: vm.projectId, userId: pr.user_id})" current-user-id="vm.user.user_id" role-name="pr.role_name" reload='vm.search({projectId: vm.projectId, username: vm.username})'></tr> 
+              </tbody>
+            </table>
+          </div>
       </div>
     </div>
   </div>              
-</div>
\ No newline at end of file
+</div>
diff --git a/static/resources/js/components/system-management/destination.directive.html b/static/resources/js/components/system-management/destination.directive.html
index aaafe23ef..13b37b487 100644
--- a/static/resources/js/components/system-management/destination.directive.html
+++ b/static/resources/js/components/system-management/destination.directive.html
@@ -11,18 +11,23 @@
       <button ng-if="!vm.isOpen" class="btn btn-success" type="button" ng-click="vm.addDestination()" data-toggle="modal" data-target="#createDestinationModal"><span class="glyphicon glyphicon-plus"></span>// 'add_new_destination' | tr //</button>
       <create-destination action="//vm.action//" target-id="//vm.targetId//" reload="vm.retrieve()"></create-destination>
     </div>
-    <div class="pane"> 
-      <div class="sub-pane">
-        <table class="table table-pane">
-    			 <thead>
+  <div class="pane">   
+    <div class="sub-pane">
+      <div class="table-head-container">
+        <table class="table table-pane table-header">
+          <thead>
             <th width="20%">// 'name' | tr //</th>
-            <th width="40%">// 'endpoint' | tr //</th>
-            <th width="20%">// 'creation_time' | tr //</th>
-            <th width="20%">// 'actions' | tr //</th>
-    			 </thead>
-    			 <tbody>
+            <th width="30%">// 'endpoint' | tr //</th>
+            <th width="35%">// 'creation_time' | tr //</th>
+            <th width="15%">// 'actions' | tr //</th>
+          </thead>
+        </table>
+      </div>
+      <div class="table-body-container" style="height: 200px;">
+        <table class="table table-pane">
+          <tbody>
             <tr ng-if="vm.destinations.length == 0">
-              <td colspan="7" height="100%" class="empty-hint" ><h3 class="text-muted">// 'no_destinations' | tr //</h3></td>
+                <td colspan="7" height="100%" class="empty-hint" ><h3 class="text-muted">// 'no_destinations' | tr //</h3></td>
             </tr>
             <tr ng-if="vm.destinations.length > 0" ng-repeat="r in vm.destinations"> 
               <td>//r.name//</td>
@@ -35,9 +40,11 @@
               </td>
             </tr>
           </tbody>
-    		</table>
+        </table>
       </div>
     </div>
-    <div class="col-xs-4 col-md-12 well well-sm well-custom"><div class="col-md-offset-10">//vm.destinations ? vm.destinations.length : 0// // 'items' | tr //</div></div>  
-  </div>          
-</div>
\ No newline at end of file
+  </div> 
+
+  <div class="col-xs-4 col-md-12 well well-sm well-custom"><div class="col-md-offset-10">//vm.destinations ? vm.destinations.length : 0// // 'items' | tr //</div></div>
+  </div>  
+</div>          
diff --git a/static/resources/js/components/system-management/replication.directive.html b/static/resources/js/components/system-management/replication.directive.html
index c020966c1..18a68ffe0 100644
--- a/static/resources/js/components/system-management/replication.directive.html
+++ b/static/resources/js/components/system-management/replication.directive.html
@@ -9,47 +9,54 @@
       </div>
       <create-policy reload="vm.retrieve()" action="vm.action" modal-title="//vm.modalTitle//" policy-id="//vm.policyId//"></create-policy>
     </div>
-    <div class="pane"> 	           
+    <div class="pane">   
       <div class="sub-pane">
-        <table class="table table-pane">
-    			 <thead>
-            <th width="14%">// 'name' | tr //</th>
-            <th width="18%">// 'description' | tr //</th>
-            <th width="14%">// 'projects' | tr //</th>
-            <th width="12%">// 'destination' | tr //</th>
-            <th width="18%">// 'start_time' | tr //</th>
-            <th width="12%">// 'activation' | tr //</th>
-            <th width="12%">// 'actions' | tr //</th>
-    			 </thead>
-    			 <tbody>
-            <tr ng-if="vm.replications.length == 0">
-              <td colspan="7" height="100%" class="empty-hint" ><h3 class="text-muted">// 'no_replications' | tr //</h3></td>
-            </tr>
-            <tr ng-if="vm.replications.length > 0" ng-repeat="r in vm.replications"> 
-              <td><a href="repository#/replication?project_id=//r.project_id//">//r.name//</a></td>
-              <td>//r.description//</td>
-              <td>//r.project_name//</td>
-              <td>//r.target_name//</td>
-              <td>//r.start_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
-              <td ng-switch on="//r.enabled//">
-                <span ng-switch-when="1">// 'enabled' | tr //</span>
-                <span ng-switch-when="0">// 'disabled' | tr //</span>
-              </td>
-              <td>
-                <div class="display-inline-block" ng-switch on="//r.enabled//">
-                 <a href="javascript:void(0);" ng-click="vm.togglePolicy(r.id, 0)"><span ng-switch-when="1" class="glyphicon glyphicon-stop color-danger"></span></a>
-                 <a href="javascript:void(0);" ng-click="vm.togglePolicy(r.id, 1)"><span ng-switch-when="0" class="glyphicon glyphicon-play color-success"></span></a>
-                </div>
-                &nbsp;
-                <a href="javascript:void(0);" data-toggle="modal" data-target="#createPolicyModal" ng-click="vm.editReplication(r.id)"><span class="glyphicon glyphicon-pencil"></span></a>
-                &nbsp;
-                <!--a href="javascript:void(0);"><span class="glyphicon glyphicon-trash"></span></a-->
-              </td>
-            </tr>
-          </tbody>
-    		</table>
+        <div class="table-head-container">
+          <table class="table table-pane table-header">
+            <thead>
+              <th width="14%">// 'name' | tr //</th>
+              <th width="18%">// 'description' | tr //</th>
+              <th width="14%">// 'projects' | tr //</th>
+              <th width="12%">// 'destination' | tr //</th>
+              <th width="18%">// 'start_time' | tr //</th>
+              <th width="12%">// 'activation' | tr //</th>
+              <th width="12%">// 'actions' | tr //</th>    
+            </thead>
+          </table>
+        </div>
+        <div class="table-body-container" style="height: 200px;">
+          <table class="table table-pane">
+            <tbody>
+              <tr ng-if="vm.replications.length == 0">
+                <td colspan="7" height="100%" class="empty-hint" ><h3 class="text-muted">// 'no_replications' | tr //</h3></td>
+              </tr>
+              <tr ng-if="vm.replications.length > 0" ng-repeat="r in vm.replications"> 
+                <td><a href="repository#/replication?project_id=//r.project_id//">//r.name//</a></td>
+                <td>//r.description//</td>
+                <td>//r.project_name//</td>
+                <td>//r.target_name//</td>
+                <td>//r.start_time | dateL : 'YYYY-MM-DD HH:mm:ss'//</td>
+                <td ng-switch on="//r.enabled//">
+                  <span ng-switch-when="1">// 'enabled' | tr //</span>
+                  <span ng-switch-when="0">// 'disabled' | tr //</span>
+                </td>
+                <td>
+                  <div class="display-inline-block" ng-switch on="//r.enabled//">
+                    <a href="javascript:void(0);" ng-click="vm.togglePolicy(r.id, 0)"><span ng-switch-when="1" class="glyphicon glyphicon-stop color-danger"></span></a>
+                    <a href="javascript:void(0);" ng-click="vm.togglePolicy(r.id, 1)"><span ng-switch-when="0" class="glyphicon glyphicon-play color-success"></span></a>
+                  </div>
+                  &nbsp;
+                  <a href="javascript:void(0);" data-toggle="modal" data-target="#createPolicyModal" ng-click="vm.editReplication(r.id)"><span class="glyphicon glyphicon-pencil"></span></a>
+                  &nbsp;
+                    <!--a  href="javascript:void(0);"><span class="glyphicon glyphicon-trash"></span></a-->
+                </td>
+              </tr>     
+            </tbody>
+          </table>
+        </div>
       </div>
-    </div>
-    <div class="col-xs-4 col-md-12 well well-sm well-custom"><div class="col-md-offset-10">//vm.replications ? vm.replications.length : 0// // 'items' | tr //</div></div>  
+    </div>  
+  </div>  
+  <div class="col-xs-4 col-md-12 well well-sm well-custom"><div class="col-md-offset-10">//vm.replications ? vm.replications.length : 0// // 'items' | tr //</div></div>  
   </div>          
-</div>
\ No newline at end of file
+</div>
diff --git a/static/resources/js/components/top-repository/top-repository.directive.html b/static/resources/js/components/top-repository/top-repository.directive.html
index 7693dc78f..372aae120 100644
--- a/static/resources/js/components/top-repository/top-repository.directive.html
+++ b/static/resources/js/components/top-repository/top-repository.directive.html
@@ -1,16 +1,24 @@
 <h4 class="page-header title-color underlined">// 'popular_repositories' | tr //</h4>
 <div class="col-xs-4 col-md-12 up-table-pane">
-  <table class="table">
-    <thead>
-      <th>// 'repository_name' | tr //</th><th>// 'count' | tr //</th><th>// 'creator' | tr //</th>
-    </thead>
-    <tbody>
-      <tr>
-        <td colspan="5" height="120px" class="empty-hint" ng-if="vm.top10Repositories.length === 0"><h3 class="text-muted">// 'no_top_repositories' | tr //</h3></td>
-      </tr>
-      <tr ng-if="vm.top10Repositories.length > 0" ng-repeat="t in vm.top10Repositories">
-        <td>//t.name//</td><td>//t.count//</td><td>//t.creator === '' ? 'N/A' : t.creator //</td>
-      </tr>
-    </tbody>
-  </table>
-</div>  
\ No newline at end of file
+  <div class="table-head-container" style="width: 650px">
+    <table class="table table-pane table-header">
+      <thead>
+        <th width="60%">// 'repository_name' | tr //</th>
+        <th width="15%">// 'count' | tr //</th>
+        <th width="25%">// 'creator' | tr //</th>
+      </thead>
+    </table>
+  </div>
+  <div class="table-body-container" style="height: 120px; width: 650px">
+    <table class="table table-pane">
+      <tbody>
+        <tr>
+          <td colspan="5" height="120px" class="empty-hint" ng-if="vm.top10Repositories.length === 0"><h3 class="text-muted">// 'no_top_repositories' | tr //</h3></td>
+        </tr>
+        <tr ng-if="vm.top10Repositories.length > 0" ng-repeat="t in vm.top10Repositories">
+          <td>//t.name//</td><td>//t.count//</td><td>//t.creator === '' ? 'N/A' : t.creator //</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>