diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 0dcaa023a1d..7a71eff2208 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -58,7 +58,9 @@ if ($_POST["action"] == 'update')
   dolibarr_set_const($db, "MAIN_SEARCHFORM_SOCIETE",$_POST["main_searchform_societe"]);
   dolibarr_set_const($db, "MAIN_SEARCHFORM_PRODUITSERVICE",$_POST["main_searchform_produitservice"]);
 
-  Header("Location: ihm.php");
+  $_SESSION["mainmenu"]="";
+  
+  Header("Location: ihm.php?mainmenu=home&leftmenu=setup");
 }
 
 
@@ -85,13 +87,13 @@ if ($_GET["action"] == 'edit')
   print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
   // Langue par defaut
-  print '<tr class="pair"><td width="25%">'.$langs->trans("DefaultLanguage").'</td><td>';
+  print '<tr class="pair"><td width="30%">'.$langs->trans("DefaultLanguage").'</td><td>';
   $html=new Form($db);
   $html->select_lang(MAIN_LANG_DEFAULT,'main_lang_default');
   print '</td></tr>';
 
   // Menu top
-  print '<tr class="impair"><td width="25%">'.$langs->trans("MenuTopManager").'</td>';
+  print '<tr class="impair"><td>'.$langs->trans("MenuTopManager").'</td>';
   print '<td><select name="main_menu_barretop">';
   $dir = "../includes/menus/barre_top/";
   $handle=opendir($dir);
@@ -115,7 +117,7 @@ if ($_GET["action"] == 'edit')
   print '</td></tr>';
 
   // Menu left
-  print '<tr class="pair"><td width="25%">'.$langs->trans("MenuLeftManager").'</td>';
+  print '<tr class="pair"><td>'.$langs->trans("MenuLeftManager").'</td>';
   print '<td><select name="main_menu_barreleft">';
   $dir = "../includes/menus/barre_left/";
   $handle=opendir($dir);
@@ -162,10 +164,10 @@ if ($_GET["action"] == 'edit')
   print '</td></tr>';
 
   // Taille max des listes
-  print '<tr class="pair"><td width="25%">'.$langs->trans("MaxSizeList").'</td><td><input name="size_liste_limit" size="20" value="' . SIZE_LISTE_LIMIT . '"></td></tr>';
+  print '<tr class="pair"><td>'.$langs->trans("MaxSizeList").'</td><td><input name="size_liste_limit" size="20" value="' . SIZE_LISTE_LIMIT . '"></td></tr>';
 
   // Message of the day
-  print '<tr class="impair"><td width="25%">'.$langs->trans("MessageOfDay").'</td><td><textarea cols="40" rows="3" name="main_motd" size="20">' .stripslashes(MAIN_MOTD) . '</textarea></td></tr>';
+  print '<tr class="impair"><td>'.$langs->trans("MessageOfDay").'</td><td><textarea cols="40" rows="3" name="main_motd" size="20">' .stripslashes(MAIN_MOTD) . '</textarea></td></tr>';
 
   print '</table><br>';
 
@@ -193,19 +195,19 @@ else
   print '<table class="noborder" width="100%">';
   print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-  print '<tr class="pair"><td width="25%">'.$langs->trans("DefaultLanguage").'</td><td>' . MAIN_LANG_DEFAULT . '</td></tr>';
-  print '<tr class="impair"><td width="25%">'.$langs->trans("MenuTopManager").'</td><td>';
+  print '<tr class="pair"><td width="30%">'.$langs->trans("DefaultLanguage").'</td><td>' . MAIN_LANG_DEFAULT . '</td></tr>';
+  print '<tr class="impair"><td>'.$langs->trans("MenuTopManager").'</td><td>';
   $filelib=eregi_replace('\.php$','',MAIN_MENU_BARRETOP);
   print $filelib;
   print '</td></tr>';
-  print '<tr class="pair"><td width="25%">'.$langs->trans("MenuLeftManager").'</td><td>';
+  print '<tr class="pair"><td>'.$langs->trans("MenuLeftManager").'</td><td>';
   $filelib=eregi_replace('\.php$','',MAIN_MENU_BARRELEFT);
   print $filelib;
   print '</td></tr>';
-  print '<tr class="impair"><td width="25%">'.$langs->trans("Skin").'</td><td>' . MAIN_THEME . '</td></tr>';
+  print '<tr class="impair"><td>'.$langs->trans("Skin").'</td><td>' . MAIN_THEME . '</td></tr>';
   print '<tr class="pair"><td>'.$langs->trans("MaxSizeList").'</td><td>' . SIZE_LISTE_LIMIT . '</td></tr>';
 
-  print '<tr class="impair"><td width="25%">'.$langs->trans("MessageOfDay").'</td><td>' . stripslashes(nl2br(MAIN_MOTD)) . '</td></tr>';
+  print '<tr class="impair"><td>'.$langs->trans("MessageOfDay").'</td><td>' . stripslashes(nl2br(MAIN_MOTD)) . '</td></tr>';
 
   print '</table><br>';
 
diff --git a/htdocs/includes/menus/barre_top/eldy.php b/htdocs/includes/menus/barre_top/eldy.php
index a20d940fb94..582b850cb37 100644
--- a/htdocs/includes/menus/barre_top/eldy.php
+++ b/htdocs/includes/menus/barre_top/eldy.php
@@ -20,7 +20,8 @@
  *
  */
 
-/**	    \file       htdocs/includes/menus/barre_top/eldy.php
+/**
+	    \file       htdocs/includes/menus/barre_top/eldy.php
 		\brief      Gestionnaire nommé eldy du menu du haut
 		\version    $Revision$
 
@@ -203,7 +204,9 @@ class MenuTop {
                 $class = 'class="tmenu"';
             }
             
-            print '<a '.$class.' href="'.DOL_URL_ROOT.'/comm/mailing/index.php?mainmenu=tools&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a>';
+            //print '<a '.$class.' href="'.DOL_URL_ROOT.'/comm/mailing/index.php?mainmenu=tools&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a>';
+            //print '<a '.$class.' href="'.DOL_URL_ROOT.'/societe.php?mainmenu=tools&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a>';
+            print '<a '.$class.' href="'.DOL_URL_ROOT.'/index.php?mainmenu=tools&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a>';
         }
         
         // Webcal
diff --git a/htdocs/index.php b/htdocs/index.php
index 2cef52ffb13..5bed5d597ee 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -34,7 +34,7 @@ $user->getrights('');
 
 
 // Simule le menu par défaut sur Home
-$_GET["mainmenu"]="home";
+if (! isset($_GET["mainmenu"])) $_GET["mainmenu"]="home";
 
 
 llxHeader();