diff --git a/html/budget.php b/html/budget.php
index b3cace1e4..0b74d8b9e 100644
--- a/html/budget.php
+++ b/html/budget.php
@@ -26,7 +26,7 @@
 /*! \brief module budget
  *
  */
-
+require_once ('user_menu.php');
 require_once("constant.php");
 include_once ("postgres.php");
 require_once('class_dossier.php');
@@ -46,6 +46,7 @@ $User=new User($rep);
 $User->Check();
 
 echo '<div class="u_tmenu">';
+/*
 echo '<div style="float:left">';
 echo "<H2 class=\"info\">Budget : ".dossier::name()."<h2> ";
 echo '</div>';
@@ -55,7 +56,8 @@ echo '<div style="float:none;text-align:right;" title="Recherche">
 <A HREF="login.php" title="Accueil"><IMG src="image/home.png" width="36" title="Accueil"  border="0"  ></A>
 <A HREF="logout.php" title="Sortie"><IMG src="image/logout.png" title="Logout"  width="36"  border="0"></A>
 </div>';
-
+*/
+echo menu_tool("budget");
 echo '<div style="clear:both">';
 /* security */
 
diff --git a/html/commercial.php b/html/commercial.php
index 107c832b6..cb532efd2 100644
--- a/html/commercial.php
+++ b/html/commercial.php
@@ -29,6 +29,7 @@
 include_once ("ac_common.php");
 require_once("constant.php");
 include_once ("postgres.php");
+
 echo JS_AJAX_FICHE;
 require_once('class_dossier.php');
 $gDossier=dossier::id();
@@ -70,65 +71,7 @@ include_once("preference.php");
 include_once("user_menu.php");
 $str_dossier=dossier::get();
 echo '<div class="u_tmenu">';
-<<<<<<< commercial.php
-echo '<div style="float:left;background-color:#879ED4">';
-echo '<div style="float:left;margin-left:10px">';
-echo "<H2 class=\"info\">Commercial ".dossier::name()."</h2> ";
-echo '</div>';
-/* echo '<div style="text-align:right" title="Recherche"> */
-/* <input type="IMAGE" src="image/search.png" width="36" onclick="openRecherche(\''.$_REQUEST['PHPSESSID'].'\','.$gDossier.');"> */
-/* <A HREF="?p_action=pref&'.$str_dossier.'" title="Pr&eacute;f&eacute;rence"><IMG SRC="image/preference.png" width="36" border="0" ></A> */
-
-/* <A HREF="comptanalytic.php?gDossier='.$gDossier.'" title="CA"><IMG SRC="image/comptaanal.png" width="36"  border="0" ></A> */
-
-/* <A HREF="parametre.php?gDossier='.$gDossier.'" title="Param&egrave;tre"><IMG SRC="image/param.png" width="36" border="0" ></A> */
-/* <A HREF="login.php" title="Accueil"><IMG src="image/home.png" width="36" title="Accueil"  border="0"  ></A> */
-/* <A HREF="logout.php" title="Sortie"><IMG src="image/logout.png" title="Logout"  width="36"  border="0"></A> */
-
-/* </div> '; */
-
-echo '<div style="float:right;margin-right:10px;text-align:right">';
-
-
-$amodule=array(
-	       array('value'=>'budget','label'=>'Budget'),
-	       array('value'=>'compta','label'=>'Comptabilite'),
-	       array('value'=>'analytic','label'=>'Compt. Analytique'),
-	       array('value'=>'home','label'=>'Accueil'),
-	       array('value'=>'param','label'=>'Parametre'),
-	       array('value'=>'logout','label'=>'Sortir')
-	       );
-    
-echo '<form method="GET" action="control.php">';
-$w=new widget('select');
-$w->name='m';
-$w->value=$amodule;
-echo    '<table><tr><td class="mtitle">';
-echo '<A class="mtitle" HREF="javascript:openRecherche(\''.$_REQUEST['PHPSESSID'].'\','.$gDossier.')">'.
-'Recheche</a></td>';
-echo '<td>'.$w->IOValue().'</td>';
-echo dossier::hidden();
-echo '<td>'.widget::submit('','Acces Direct').'</td>';
-echo '</table>';
-echo '</form>';
-echo '</div>';
-=======
-echo '<div style="float:left">';
-echo "<H2 class=\"info\">Commercial ".dossier::name()."</h2> ";
->>>>>>> 1.35
-echo '</div>';
-
-<<<<<<< commercial.php
-echo '</div>';
-=======
-<A HREF="comptanalytic.php?gDossier='.$gDossier.'" title="CA"><IMG SRC="image/comptaanal.png" width="36"  border="0" ></A>
-
-<A HREF="parametre.php?gDossier='.$gDossier.'" title="Param&egrave;tre"><IMG SRC="image/param.png" width="36" border="0" ></A>
-<A HREF="login.php" title="Accueil"><IMG src="image/home.png" width="36" title="Accueil"  border="0"  ></A>
-<A HREF="logout.php" title="Sortie"><IMG src="image/logout.png" title="Logout"  width="36"  border="0"></A>
-
-</div> ';
->>>>>>> 1.35
+echo menu_tool('gestion');
 
 $p_action=(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:"";
 // TODO Menu with all the customer
diff --git a/html/comptanalytic.php b/html/comptanalytic.php
index be7725188..959709d21 100644
--- a/html/comptanalytic.php
+++ b/html/comptanalytic.php
@@ -34,6 +34,7 @@ $gDossier=dossier::id();
 $str_dossier=dossier::get();
 $cn=DbConnect($gDossier);
 require_once ("class_user.php");
+require_once ('user_menu.php');
 $User=new User($cn);
 $User->Check();
 
@@ -44,7 +45,7 @@ html_page_start($_SESSION['g_theme']);
 //-----------------------------------------------------------------
 //Header
 echo '<div class="u_tmenu">';
-echo '<div style="float:left">';
+/*echo '<div style="float:left">';
 echo "<H2 class=\"info\">Analytique ".dossier::name()."</h2> ";
 echo '</div>';
 echo '<div style="float:none;text-align:right;" title="Recherche">
@@ -55,9 +56,9 @@ echo '<div style="float:none;text-align:right;" title="Recherche">
 <A HREF="login.php" title="Accueil"><IMG src="image/home.png" width="36" title="Accueil"  border="0"  ></A>
 <A HREF="logout.php" title="Sortie"><IMG src="image/logout.png" title="Logout"  width="36"  border="0"></A>
 </div>';
-
+*/
 //-----------------------------------------------------------------
-
+echo menu_tool('analytic');
 $def=-1;
 if ( isset ($_REQUEST['p_action']))
   {
@@ -80,6 +81,7 @@ if ( isset ($_REQUEST['p_action']))
 	    break;
 	  }
   }
+echo '<div style="float:left">';
 echo ShowItem(array(
 	array('?p_action=ca_pa&'.$str_dossier,'Plan Analytique',"Plan Analytique",0),
 	array('?p_action=ca_od&'.$str_dossier,'Op&eacute;rations Diverses',"Permet d'enregistrer des opérations sur la compta analytique",1),
@@ -88,6 +90,7 @@ echo ShowItem(array(
 		    ),
 	      'H',"mtitle","mtitle",$def,' width="100%"');
 echo '</div>';
+echo '</div>';
 
 if ( !isset($_REQUEST['p_action']))
   exit();
diff --git a/html/control.php b/html/control.php
index dae586d74..ffe94fe32 100644
--- a/html/control.php
+++ b/html/control.php
@@ -27,12 +27,13 @@ extract ($_GET);
 /* m for requested module 
  * f from module
  */
-foreach (array('gDossier','m','f') as $i) {
-  if ( ! isset (${i}) ) {
+foreach (array('gDossier','m') as $i) {
+  if ( ! isset (${$i}) ) {
     echo "Erreur parametre manquant";
     exit();
   }
 }
+
 require_once('class_dossier.php');
 require_once('user_common.php');
 
@@ -55,10 +56,9 @@ switch ($m) {
  case 'param':
    get_redirect('parametre.php?'.dossier::get());
    break;
-/*  case 'search': */
-/*    echo '<script src="js/script.js">'. */
-/*      'openRecherche(\''.$_REQUEST['PHPSESSID'].'\','.$dossier::id().');"'. */
-/*      '</script>'; */
+ case 'pref':
+   get_redirect('user_pref.php?'.dossier::get());
+   break;
 
  case 'logout':
    get_redirect('logout.php');
diff --git a/html/parametre.php b/html/parametre.php
index 5a04fca78..6d54ffe65 100644
--- a/html/parametre.php
+++ b/html/parametre.php
@@ -40,6 +40,7 @@ $User->Check();
 include_once("preference.php");
 include_once("user_menu.php");
 echo '<div class="u_tmenu">';
+/*
 echo '<div style="float:left">';
 echo "<H2 class=\"info\"> Param&egrave;tre ".dossier::name().'<h2>'.
 '</div>'.'
@@ -49,8 +50,10 @@ echo "<H2 class=\"info\"> Param&egrave;tre ".dossier::name().'<h2>'.
 <A HREF="login.php" title="Accueil"><IMG src="image/home.png" width="36"  border="0"  ></A>
 <A HREF="logout.php" title="Sortie"><IMG src="image/logout.png" title="Logout"  width="36"  border="0"></A>
 </div>
-</div>';
+*/
 
+echo menu_tool('param');
+echo '<div style="float:left">';
 
 include_once ("check_priv.php");
 
@@ -100,7 +103,8 @@ switch ($p_action) {
  }
 
 echo ShowMenuParam($default);
-
+echo '</div>';
+echo '</div>';
 
 // sub action
 $action="";
@@ -113,6 +117,7 @@ echo_debug("parametre",__LINE__,$_POST);
 //-----------------------------------------------------
 if ( $p_action == "tva" ) 
 {
+  echo '</div>';
   require_once("tva.inc.php");
   // 
 }
@@ -256,14 +261,14 @@ if ( $p_action == 'sec' ) {
 //----------------------------------------------------------------------
 if ( $p_action == 'jrn' ) {
   $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
-  echo '<div class="u_content">';
+  //  echo '<div class="u_content">';
   if ( $sa == "add") 
     require_once ('param_jrn_add.inc.php');
   elseif ($sa=='detail') 
     require_once ('param_jrn_detail.inc.php');
   else
     require_once('param_jrn.inc.php');
-  echo '</div>';
+  //  echo '</div>';
 }  
 
 
diff --git a/html/style.css b/html/style.css
index d4445b321..354f83afe 100644
--- a/html/style.css
+++ b/html/style.css
@@ -91,11 +91,25 @@ background-color:yellow;
 }
 
 div.u_tmenu {
-position: float;
-margin-top:1px;
-width:100%;
-background-color:#36559b;
+	    position: float;
+	    margin-top:1px;
+	    width:100%;
+	    background-color:#36559b;
 }
+div.u_tmenu div.u_tool {
+	    background-color:#36559b;	
+	   float:left;
+}
+div.u_tool div.name {
+       float:left;
+       margin-left:10px;
+}
+div.u_tool div.acces_direct{
+        float:right;
+	margin-right:10px;
+	text-align:right
+}
+
 div.u_subtmenu {
 float:left;
 clear:both;
diff --git a/html/user_compta.php b/html/user_compta.php
index f727a504b..04e17c4ae 100644
--- a/html/user_compta.php
+++ b/html/user_compta.php
@@ -18,7 +18,7 @@
 */
 // Auteur Dany De Bontridder ddebontridder@yahoo.fr
 require_once('class_dossier.php');
-
+require_once ('class_widget.php');
 include_once ("ac_common.php");
 /* $Revision$ */
 include_once ("class_user.php");
diff --git a/html/user_jrn.php b/html/user_jrn.php
index 14b5b98b7..bc48d5ebb 100644
--- a/html/user_jrn.php
+++ b/html/user_jrn.php
@@ -51,6 +51,7 @@ $jrn_type=(isset($_REQUEST['jrn_type']))?$_REQUEST['jrn_type']:-1;
 
 
 echo '<div class="u_tmenu">';
+
 echo ShowMenuCompta("user_jrn.php?jrn_type=".$jrn_type."&".dossier::get());
 echo '</div>';
 
diff --git a/html/user_pref.php b/html/user_pref.php
index 2f66e5f9e..0810773f3 100644
--- a/html/user_pref.php
+++ b/html/user_pref.php
@@ -29,7 +29,7 @@ include_once ("postgres.php");
 $Rep=DbConnect();
 include_once ("class_user.php");
 require_once('class_dossier.php');
-
+require_once ('class_widget.php');
 $cn=DbConnect();
 
 /* if the dossier is not set then we have to connect to the
@@ -75,7 +75,8 @@ if ( isset ($_REQUEST['gDossier']) )
     if ( $_REQUEST['gDossier'] != 0 )  
       {
 	echo '<div class="u_tmenu">';
-	echo    ShowMenuCompta();
+	//	echo    ShowMenuCompta();
+	echo menu_tool('pref');
 	echo "</div>";
       }
   }
diff --git a/include/tva.inc.php b/include/tva.inc.php
index 1139f9b72..dc44a8e26 100644
--- a/include/tva.inc.php
+++ b/include/tva.inc.php
@@ -21,7 +21,7 @@
 /*! \file
  * \brief included file for customizing with the vat (account,rate...)
  */
-
+echo '<div class="u_content">';
   // Confirm remove
   if ( isset ($_POST['confirm_rm'])) 
   {
@@ -255,6 +255,6 @@ if (   ! isset ($_POST['add'])
 <input type="submit" value="Cancel" name="no">
  </FORM>
 <?php   
-    }
+						    echo '</div>';    }
 
 ?>
diff --git a/include/user_menu.php b/include/user_menu.php
index 2f0addcde..9f9ba1859 100644
--- a/include/user_menu.php
+++ b/include/user_menu.php
@@ -25,7 +25,7 @@
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
 /* $Revision$ */
 
-
+require_once ('class_widget.php');
 
 
 /*!
@@ -192,6 +192,7 @@ function ShowMenuCompta($p_high="")
   $result=ShowItem($p_array,'H',"mtitle","mtitle",$default,' width="100%"');
   $str_dossier=dossier::get();
   $r="";
+  /*
   $r.='<div style="float:left;background-color:#879ED4;">';
   $r.="<H2 class=\"info\">Comptabilit&eacute;  ".dossier::name()."</h2>";
   $r.='</div>';
@@ -208,9 +209,14 @@ function ShowMenuCompta($p_high="")
 
 
 </div> ';
-  $r.='<div style="float:left;clear:both;">';
+  */
+  //  $r.='<div class="u_tmenu">';
+  $r.=menu_tool("");
+  $r.='<div style="float:left">';
   $r.=$result;
   $r.='</div>';
+  //  $r.='</div>';
+  
   return $r;
 
 
@@ -817,3 +823,39 @@ function ShowMenuImport(){
   echo "</TABLE>";
 }
 
+function menu_tool($p_from) {
+  $r="";
+  $r.= '<div class="u_tool">';
+  $r.= '<div class="name">';
+  $r.= "<H2 class=\"info\">Commercial ".dossier::name()."</h2> ";
+  $r.= '</div>';
+  $r.= '<div class="acces_direct">';
+
+
+  $amodule=array(
+		 array('value'=>'pref','label'=>'Preference'),
+		 array('value'=>'compta','label'=>'Comptabilite'),
+		 array('value'=>'gestion','label'=>'Gestion'),
+		 array('value'=>'analytic','label'=>'Compt. Analytique'),
+		 array('value'=>'budget','label'=>'Budget'),
+		 array('value'=>'param','label'=>'Parametre'),
+		 array('value'=>'home','label'=>'Accueil'),
+		 array('value'=>'logout','label'=>'Sortir')
+	       );
+
+ $gDossier=dossier::id();
+ $r.= '<form method="GET" action="control.php">';
+ $w=new widget('select');
+ $w->name='m';
+ $w->value=$amodule;
+ $r.=    '<table><tr><td class="mtitle">';
+ $r.= '<A class="mtitle" HREF="javascript:openRecherche(\''.$_REQUEST['PHPSESSID'].'\','.$gDossier.')">'.
+   'Recheche</a></td>';
+ $r.= '<td>'.$w->IOValue().'</td>';
+ $r.= dossier::hidden();
+ $r.= '<td>'.widget::submit('','Acces Direct').'</td>';
+ $r.= '</table>';
+ $r.= '</form>';
+ $r.= '</div>';
+ return $r;
+}