diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 243898641a1..749aabceff7 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -75,12 +75,12 @@ print '<TABLE border="0" width="100%" cellspacing="0" cellpadding="4">';
 
 print '<tr><td valign="top" width="30%">';
 
-print '<TABLE border="0" cellspacing="0" cellpadding="3" width="100%">';
-print '<tr class="liste_titre"><td colspan="2">Rechercher une proposition</td></tr>';
 print '<form method="post" action="propal.php">';
+print '<table border="0" cellspacing="0" cellpadding="3" width="100%">';
+print '<tr class="liste_titre"><td colspan="2">Rechercher une proposition</td></tr>';
 print "<tr $bc[1]><td>";
 print 'Num. : <input type="text" name="sf_ref"><input type="submit" value="Rechercher" class="flat"></td></tr>';
-print "</form></table><br>\n";
+print "</table></form><br>\n";
 
 $sql = "SELECT p.rowid, p.ref";
 $sql .= " FROM llx_propal as p";
diff --git a/htdocs/comm/people.php b/htdocs/comm/people.php
index 5d3091aee3c..6b254e85a39 100644
--- a/htdocs/comm/people.php
+++ b/htdocs/comm/people.php
@@ -106,7 +106,7 @@ if ($socid > 0)
 
       if ($objsoc->note)
 	{
-	  print '<table border=0 width="100%" cellspacing="0">';
+	  print '<table border="0" width="100%" cellspacing="0">';
 	  print "<tr><td>".nl2br($objsoc->note)."</td></tr>";
 	  print "</table>";
 	}
@@ -117,7 +117,7 @@ if ($socid > 0)
       print $db->error();
     }
   
-  print "<P><table class=\"tablefuser\" width=\"100%\" cellspacing=0 border=1 cellpadding=2>";
+  print '<p><table class="border" width="100%" cellspacing="0" border="1" cellpadding="2">';
   
   print "<tr><td><b>Prénom Nom</b></td>";
   print "<td><b>Poste</b></td><td><b>Tel</b></td>";
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 03abfabed38..ec1848beaf3 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -635,7 +635,7 @@ else
 		print '<td align="right">'.price($objp->amount)."</TD><td>$_MONNAIE</td>\n";
 		if (! $fac->paye && $user->rights->facture->paiement)
 		  {
-		    print '<td><a href="facture.php?facid='.$facid.'&action=del_paiement&paiementid='.$objp->rowid.'">Del</a>';
+		    print '<td><a href="facture.php?facid='.$facid.'&amp;action=del_paiement&paiementid='.$objp->rowid.'">Del</a>';
 		  }
 		print "</tr>";
 		$total = $total + $objp->amount;
@@ -745,8 +745,8 @@ else
 		print '<TD align="right">'.price($objp->subprice)."</td>\n";
 		if ($fac->statut == 0  && $user->rights->facture->creer) 
 		  {
-		    print '<td align="right"><a href="'.$PHPSELF.'?facid='.$facid.'&action=deleteline&rowid='.$objp->rowid.'">del</a></td>';
-		    print '<td align="right"><a href="'.$PHPSELF.'?facid='.$facid.'&action=editline&rowid='.$objp->rowid.'">edit</a></td>';
+		    print '<td align="right"><a href="'.$PHPSELF.'?facid='.$facid.'&amp;action=deleteline&rowid='.$objp->rowid.'">del</a></td>';
+		    print '<td align="right"><a href="'.$PHPSELF.'?facid='.$facid.'&amp;action=editline&rowid='.$objp->rowid.'">edit</a></td>';
 		  }
 		else
 		  {
@@ -822,11 +822,11 @@ else
 	
 	    if ($fac->statut == 0 && $user->rights->facture->supprimer)
 	      {
-		print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&action=delete\">Supprimer</a>]</td>";
+		print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&amp;action=delete\">Supprimer</a>]</td>";
 	      } 
 	    elseif ($fac->statut == 1 && abs($resteapayer) > 0 && $user->rights->facture->envoyer) 
 	      {
-		print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&action=presend\">Envoyer</a>]</td>";
+		print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&amp;action=presend\">Envoyer</a>]</td>";
 	      }
 	    else
 	      {
@@ -835,7 +835,7 @@ else
 	    
 	    if ($fac->statut == 1 && $resteapayer > 0 && $user->rights->facture->paiement)
 	      {
-		print "<td align=\"center\" width=\"20%\">[<a href=\"paiement.php?facid=$facid&action=create\">Emettre un paiement</a>]</td>";
+		print "<td align=\"center\" width=\"20%\">[<a href=\"paiement.php?facid=$facid&amp;action=create\">Emettre un paiement</a>]</td>";
 	      }
 	    else
 	      {
@@ -846,7 +846,7 @@ else
 	      {
 		if ($user->rights->facture->paiement)
 		  {
-		    print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&action=payed\">Classer 'Payée'</a>]</td>";
+		    print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&amp;action=payed\">Classer 'Payée'</a>]</td>";
 		  }
 		else
 		  {
@@ -855,7 +855,7 @@ else
 	      }
 	    elseif ($fac->statut == 1 && $resteapayer > 0 && $user->rights->facture->envoyer) 
 	      {
-		print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&action=prerelance\">Envoyer une relance</a>]</td>";
+		print "<td align=\"center\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&amp;action=prerelance\">Envoyer une relance</a>]</td>";
 	      }
 	    else
 	      {
@@ -866,7 +866,7 @@ else
 	      {
 		if ($user->rights->facture->valider)
 		  {
-		    print "<td align=\"center\" bgcolor=\"#e0e0e0\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&action=valid\">Valider</a>]</td>";
+		    print "<td align=\"center\" bgcolor=\"#e0e0e0\" width=\"20%\">[<a href=\"$PHP_SELF?facid=$facid&amp;action=valid\">Valider</a>]</td>";
 		  }
 		else
 		  {
@@ -877,7 +877,7 @@ else
 	      {
 		if ($user->rights->facture->creer)
 		  {
-		    print "<td align=\"center\" width=\"20%\"><a href=\"facture.php?facid=$facid&action=pdf\">Générer la facture</a></td>";
+		    print "<td align=\"center\" width=\"20%\"><a href=\"facture.php?facid=$facid&amp;action=pdf\">Générer la facture</a></td>";
 		  }
 		else
 		  {
@@ -893,7 +893,7 @@ else
 	      {
 		//print '<td align="center" width="20%">-</td>';
 
-		print '<td align="center" width="20%"><a href="facture/fiche-rec.php?facid='.$facid.'&action=create">Récurrente</a></td>';
+		print '<td align="center" width="20%"><a href="facture/fiche-rec.php?facid='.$facid.'&amp;action=create">Récurrente</a></td>';
 	      }
 	    else
 	      {
@@ -979,7 +979,7 @@ else
 	    $replytomail = $user->email;
 	    $from_mail = $replytomail;
 	    
-	    print "<form method=\"post\" action=\"$PHP_SELF?facid=$facid&action=send\">\n";
+	    print "<form method=\"post\" action=\"$PHP_SELF?facid=$facid&amp;action=send\">\n";
 	    print '<input type="hidden" name="replytoname" value="'.$replytoname.'">';
 	    print '<input type="hidden" name="replytomail" value="'.$replytomail.'">';
 	    
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 74b97d9c812..ec99de93e58 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -111,7 +111,7 @@ if ( $db->query($sql) )
 	{
 	  $obj = $db->fetch_object( $i);
 	  $var=!$var;
-	  print '<tr '.$bc[$var].'><td><a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</td>';
+	  print '<tr '.$bc[$var].'><td><a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
 	  print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
 	  $i++;
 	}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7e69b506b61..d74df748530 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -431,7 +431,7 @@ Function left_menu($menu, $help_url='')
    * Colonne de gauche
    *
    */
-  print '<table class="leftmenu" border="0" width="100%" cellspacing="1" cellpadding="4">';
+  print "\n".'<table class="leftmenu" border="0" width="100%" cellspacing="1" cellpadding="4">'."\n";
 
 
   for ($i = 0 ; $i < sizeof($menu) ; $i++) 
@@ -499,8 +499,8 @@ Function left_menu($menu, $help_url='')
    *
    *
    */
-  print '</table>';
-  print '</td><td valign="top" width="85%" colspan="6">';
+  print '</table>'."\n";
+  print '</td><td valign="top" width="85%" colspan="6">'."\n";
 
 
 }
@@ -513,7 +513,7 @@ Function left_menu($menu, $help_url='')
 function llxFooter($foot='') 
 {
   global $dolibarr_auto_user;
-  print "</td></tr>";
+  print "\n</td></tr>\n";
   /*
    *
    */