diff --git a/admin/template/yoga/admin/user_list.tpl b/admin/template/yoga/admin/user_list.tpl
index 5ad163be8..0f6c1ab95 100644
--- a/admin/template/yoga/admin/user_list.tpl
+++ b/admin/template/yoga/admin/user_list.tpl
@@ -48,21 +48,24 @@
 
 <form method="post" name="preferences" action="">
 
-<table class="table2">
-  <tr class="throw">
-    <th>&nbsp;</th>
-    <th>{'Username'|@translate}</th>
-    <th>{'user_status'|@translate}</th>
-    <th>{'Email address'|@translate}</th>
-    <th>{'Groups'|@translate}</th>
-    <th>{'properties'|@translate}</th>
-    {if not empty($plugin_user_list_column_titles)}
-    {foreach from=$plugin_user_list_column_titles item=title}
-    <th>{$title}</th>
-    {/foreach}
-    {/if}
-    <th>{'Actions'|@translate}</th>
-  </tr>
+<table class="table2" width="97%">
+  <thead>
+    <tr class="throw">
+      <td>&nbsp;</td>
+      <td>{'Username'|@translate}</td>
+      <td>{'user_status'|@translate}</td>
+      <td>{'Email address'|@translate}</td>
+      <td>{'Groups'|@translate}</td>
+      <td>{'properties'|@translate}</td>
+      {if not empty($plugin_user_list_column_titles)}
+      {foreach from=$plugin_user_list_column_titles item=title}
+      <td>{$title}</td>
+      {/foreach}
+      {/if}
+      <td>{'Actions'|@translate}</td>
+    </tr>
+  </thead>
+
   {foreach from=$users item=user name=users_loop}
   <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
     <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" /></td>
diff --git a/admin/template/yoga/default-layout.css b/admin/template/yoga/default-layout.css
index be5c3a131..2f5b2151d 100644
--- a/admin/template/yoga/default-layout.css
+++ b/admin/template/yoga/default-layout.css
@@ -10,13 +10,17 @@ TABLE.table2 {
 }
 
 TABLE.table2 TD {
-  padding: 0 30px;
+  padding: 0 20px;
 }
 
 TABLE.table2 TR {
   text-align: left;
 }
 
+table.table2 thead td { padding:7px 20px 3px 20px; }
+table.table2 tr.throw { text-align: center; }
+table.table2 { margin:0pt auto; }
+.sort { display:block; padding:8px 5px 0px 1px; }
 
 
 .hour {
diff --git a/admin/template/yoga/theme/admin/theme.css b/admin/template/yoga/theme/admin/theme.css
index e181ea89c..e76c2f364 100644
--- a/admin/template/yoga/theme/admin/theme.css
+++ b/admin/template/yoga/theme/admin/theme.css
@@ -73,11 +73,6 @@ right:0; text-align:right; top:0; width:770px; }
 .HelpActions li {list-style-image:none; list-style-position:outside; 
 list-style-type:none; text-align:center; text-indent:0pt; }
 
-table.table2 th { padding:3px 30px; }
-table.table2 tr.throw { text-align: center; }
-table.table2 { margin:0pt auto; }
-.sort { display:block; padding:8px 5px 0px 1px; }
-
 /* tabsheets are often used in admin  pages => No specific css files */
 .tabsheet { 
 background-color:transparent; border:0; display:table;