diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index f865c31fca0..3dc3b096a0a 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -665,7 +665,7 @@ else
 		print "\n";
 		print '<script language="JavaScript" type="text/javascript">';
 		print "function CheckVAT(a,b) {\n";
-		print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".$langs->trans("VATIntraCheckableOnEUSite")."',500,260);\n";
+		print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
 		print "}\n";
 		print '</script>';
 		print "\n";
@@ -684,12 +684,12 @@ else
 		$s.=' &nbsp; ';
 		if ($conf->use_javascript_ajax)
 		{
-			$s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>';
+			$s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>';
 			print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
 		}
 		else
 		{
-			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
 		}
 	}
 	else
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 16ad0347afc..855f5fae6ea 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -420,12 +420,20 @@ foreach ($orders as $key => $value)
 
         // Name
         print '<td valign="top">'.$objMod->getName();
-        print "</td>\n  <td valign=\"top\">";
-        print nl2br($objMod->getDesc());
-        print "</td>\n  <td align=\"center\" valign=\"top\">";
-        print $objMod->getVersion();
-        print "</td>\n  <td align=\"center\" valign=\"top\">";
+        print "</td>\n";
 
+        // Desc
+        print "<td valign=\"top\">";
+        print nl2br($objMod->getDesc());
+        print "</td>\n";
+
+        // Version
+        print "<td align=\"center\" valign=\"top\" nowrap=\"nowrap\">";
+        print $objMod->getVersion();
+        print "</td>\n";
+
+        // Tick
+        print "<td align=\"center\" valign=\"top\">";
         if (! empty($conf->global->$const_name))
         {
             print img_tick();
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index 2852a6fccf0..3933f01bf10 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -405,7 +405,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='')
 					$obj = $db->fetch_object($result);
 					print "<tr ".$bc[$var].">";
 
-					print '<td width="100" align="left">'.dol_print_date($obj->dp,'dayhour')."</td>\n";
+					print '<td width="100" align="left" nowrap="nowrap">'.dol_print_date($obj->dp,'dayhour')."</td>\n";
 
 					// Picto warning
 					print '<td width="16">';
@@ -415,7 +415,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='')
 
 					if ($obj->propalrowid)
 					{
-						print '<td width="140" ><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
+						print '<td width="140"><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
 						$transcode=$langs->trans("Action".$obj->acode);
 						$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
 						print $libelle;
@@ -599,7 +599,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
 			print "<tr ".$bc[$var].">";
 
 			// Champ date
-			print '<td width="100" align="left">'.dol_print_date($histo[$key]['date'],'dayhour')."</td>\n";
+			print '<td width="120" nowrap="nowrap">'.dol_print_date($histo[$key]['date'],'dayhour')."</td>\n";
 
 			// Picto
 			print '<td width="16">&nbsp;</td>';
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 5b469889bce..c919099c0c4 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -572,7 +572,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
 			print "\n";
 			print '<script language="JavaScript" type="text/javascript">';
 			print "function CheckVAT(a,b) {\n";
-			print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".$langs->trans("VATIntraCheckableOnEUSite")."',500,230);\n";
+			print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,230);\n";
 			print "}\n";
 			print '</script>';
 			print "\n";
@@ -584,12 +584,12 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
 		$s.=' ';
 		if ($conf->use_javascript_ajax)
 		{
-			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>';
+			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>';
 			print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
 		}
 		else
 		{
-			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
 		}
 		print '</td>';
 
@@ -892,7 +892,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
 			print "\n";
 			print '<script language="JavaScript" type="text/javascript">';
 			print "function CheckVAT(a,b) {\n";
-			print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".$langs->trans("VATIntraCheckableOnEUSite")."',500,260);\n";
+			print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
 			print "}\n";
 			print '</script>';
 			print "\n";
@@ -904,12 +904,12 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
 		$s.=' ';
 		if ($conf->use_javascript_ajax)
 		{
-			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>';
+			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>';
 			print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
 		}
 		else
 		{
-			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -1105,7 +1105,7 @@ else
 		print "\n";
 		print '<script language="JavaScript" type="text/javascript">';
 		print "function CheckVAT(a,b) {\n";
-		print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".$langs->trans("VATIntraCheckableOnEUSite")."',500,260);\n";
+		print "newpopup('".DOL_URL_ROOT."/societe/checkvat/checkVatPopup.php?countryCode='+a+'&vatNumber='+b,'".dol_escape_js($langs->trans("VATIntraCheckableOnEUSite"))."',500,260);\n";
 		print "}\n";
 		print '</script>';
 		print "\n";
@@ -1122,12 +1122,12 @@ else
 		$s.=' &nbsp; ';
 		if ($conf->use_javascript_ajax)
 		{
-			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>';
+			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);">'.$langs->trans("VATIntraCheck").'</a>';
 			print $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
 		}
 		else
 		{
-			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
+			print $s.'<a href="'.$langs->transcountry("VATIntraCheckURL",$soc->id_pays).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help').'</a>';
 		}
 	}
 	else