diff --git a/admin.php b/admin.php
index 90a6d63b2..f443bcd23 100644
--- a/admin.php
+++ b/admin.php
@@ -69,7 +69,6 @@ $page['infos']  = array();
 
 $link_start = PHPWG_ROOT_PATH.'admin.php?page=';
 $conf_link = $link_start.'configuration&section=';
-$opt_link = $link_start.'cat_options&section=';
 //----------------------------------------------------- template initialization
 $title = l10n('PhpWebGallery Administration'); // for include/page_header.php
 $page['page_banner'] = '<h1>'.l10n('PhpWebGallery Administration').'</h1>';
@@ -93,10 +92,6 @@ $template->assign_vars(
     'U_CONFIG_DISPLAY'=> $conf_link.'default',
     'U_CATEGORIES'=> $link_start.'cat_list',
     'U_MOVE'=> $link_start.'cat_move',
-    'U_CAT_UPLOAD'=> $opt_link.'upload',
-    'U_CAT_COMMENTS'=> $opt_link.'comments',
-    'U_CAT_VISIBLE'=> $opt_link.'visible',
-    'U_CAT_STATUS'=> $opt_link.'status',
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
     'U_CAT_UPDATE'=> $link_start.'site_update&amp;site=1',
     'U_WAITING'=> $link_start.'waiting',
@@ -121,15 +116,6 @@ if ($conf['ws_access_control']) // Do we need to display ws_checker
       )
     );
 }
-if ($conf['allow_random_representative'])
-{
-  $template->assign_block_vars(
-    'representative',
-    array(
-      'URL' => $opt_link.'representative'
-      )
-    );
-}
 
 // required before plugin page inclusion
 $plugin_menu_links = array(
diff --git a/admin/cat_options.php b/admin/cat_options.php
index 8aaf4ad14..cbc729dc5 100644
--- a/admin/cat_options.php
+++ b/admin/cat_options.php
@@ -31,6 +31,7 @@ if (!defined('PHPWG_ROOT_PATH'))
 }
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php');
 
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
@@ -163,6 +164,46 @@ $template->assign_vars(
    )
  );
 
+// TabSheet initialization
+$opt_link = $link_start.'cat_options&amp;section=';
+$page['tabsheet'] = array
+(
+  'upload' => array
+   (
+    'caption' => l10n('upload'),
+    'url' => $opt_link.'upload'
+   ),
+  'comments' => array
+   (
+    'caption' => l10n('comments'),
+    'url' => $opt_link.'comments'
+   ),
+  'visible' => array
+   (
+    'caption' => l10n('lock'),
+    'url' => $opt_link.'visible'
+   ),
+  'status' => array
+   (
+    'caption' => l10n('cat_security'),
+    'url' => $opt_link.'status'
+   )
+);
+
+if ($conf['allow_random_representative'])
+{
+  $page['tabsheet']['representative'] =
+    array
+    (
+      'caption' => l10n('Representative'),
+      'url' => $opt_link.'representative'
+    );
+}
+$page['tabsheet'][$page['section']]['selected'] = true;
+
+// Assign tabsheet to template
+template_assign_tabsheet();
+
 // +-----------------------------------------------------------------------+
 // |                              form display                             |
 // +-----------------------------------------------------------------------+
diff --git a/admin/include/functions_tabsheet.inc.php b/admin/include/functions_tabsheet.inc.php
index 52cf3f43d..9952769f3 100644
--- a/admin/include/functions_tabsheet.inc.php
+++ b/admin/include/functions_tabsheet.inc.php
@@ -4,10 +4,10 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | file          : $Id$
-// | last update   : $Date$
-// | last modifier : $Author$
-// | revision      : $Revision$
+// | file          : $Id: functions_tabsheet.inc.php 1874 2007-03-06 02:07:15Z rub $
+// | last update   : $Date: 2007-03-06 03:07:15 +0100 (mar., 06 mars 2007) $
+// | last modifier : $Author: rub $
+// | revision      : $Revision: 1874 $
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
 // | it under the terms of the GNU General Public License as published by  |
@@ -71,7 +71,4 @@ function template_assign_tabsheet()
   }
 }
 
-//TOTO:Voir pour intégrer U_TABSHEET_TITLE dans les autres tabs 
-//TODO:Selected sans link
-//Remplacer mode par tab_caption
 ?>
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 0dcb19ed0..b9f4cd98f 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -414,7 +414,6 @@ $lang['synchronize'] = 'synchronize';
 $lang['target'] = 'target';
 $lang['thumbnail'] = 'thumbnail';
 $lang['title'] = 'title';
-$lang['title_cat_options'] = 'Categories options';
 $lang['title_categories'] = 'Categories management';
 $lang['title_configuration'] = 'PhpWebGallery configuration';
 $lang['title_default'] = 'PhpWebGallery administration';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 49fd6a98c..25c371e2a 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -414,7 +414,6 @@ $lang['synchronize'] = 'synchroniser';
 $lang['target'] = 'cible';
 $lang['thumbnail'] = 'miniature';
 $lang['title'] = 'titre';
-$lang['title_cat_options'] = 'Options des catégories';
 $lang['title_categories'] = 'Gestion des catégories';
 $lang['title_configuration'] = 'Configuration de PhpWebGallery';
 $lang['title_default'] = 'Administration de PhpWebGallery';
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index e3f34c2d2..47d6ecf95 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -28,13 +28,7 @@
         <li><a href="{U_CAT_UPDATE}">{lang:update}</a><br />&nbsp;</li>
         <li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
         <li><a href="{U_MOVE}">{lang:Move}</a></li>
-        <li><a href="{U_CAT_UPLOAD}">{lang:upload}</a></li>
-        <li><a href="{U_CAT_COMMENTS}">{lang:comments}</a></li>
-        <li><a href="{U_CAT_VISIBLE}">{lang:lock}</a></li>
-        <li><a href="{U_CAT_STATUS}">{lang:cat_security}</a></li>
-        <!-- BEGIN representative -->
-        <li><a href="{representative.URL}">{lang:Representative}</a></li>
-        <!-- END representative -->
+        <li><a href="{U_CAT_OPTIONS}">{lang:Batch management}</a></li>
         <li><a href="{U_PERMALINKS}">{lang:Permalinks}</a></li>
       </ul>
     </dd>
diff --git a/template/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
index 891dc37d4..2cc1f96a0 100644
--- a/template/yoga/admin/cat_options.tpl
+++ b/template/yoga/admin/cat_options.tpl
@@ -3,7 +3,8 @@
   <ul class="categoryActions">
     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:title_cat_options}</h2>
+  <h2>{lang:Batch management} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
 </div>
 
 <form method="post" action="{F_ACTION}" id="cat_options">
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index f71b83030..a85ef6ed7 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -284,7 +284,7 @@ input.submit:active {
   border: 1px solid #fff;
   border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
   -moz-border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
-  padding: 5px 4em 2px 4em;
+  padding: 5px 2em 2px 2em;
 }
 
 .tabsheet a {