diff --git a/bureau/admin/adm_add.php b/bureau/admin/adm_add.php
index 8e7130ad..4f5f61df 100644
--- a/bureau/admin/adm_add.php
+++ b/bureau/admin/adm_add.php
@@ -73,10 +73,10 @@ if (isset($error) && $error) {
 	<td><input type="password" id="passconf" name="passconf" class="int" value="<?php ehe($passconf); ?>" size="20" maxlength="64" /></td>
 </tr>
 <tr>
-	<th><label for="canpass"><?php __("Can he change its password"); ?></label></th>
+	<th><label><?php __("Can he change its password"); ?></label></th>
 	<td>
-        <input type="radio" class="inc" id="canpass0" name="canpass" value="0"<?php cbox($canpass==0); ?>><label for="canpass0"><?php __("No"); ?></label><br />
-	<input type="radio" class="inc" id="canpass1" name="canpass" value="1"<?php cbox($canpass==1); ?>><label for="canpass1"><?php __("Yes"); ?></label><br />	
+        <input type="radio" class="inc" id="canpass0" name="canpass" value="0"<?php cbox($canpass==0); ?>/><label for="canpass0"><?php __("No"); ?></label><br />
+	<input type="radio" class="inc" id="canpass1" name="canpass" value="1"<?php cbox($canpass==1); ?>/><label for="canpass1"><?php __("Yes"); ?></label><br />	
 	</td>
 </tr>
 <tr>
diff --git a/bureau/admin/adm_authip_whitelist.php b/bureau/admin/adm_authip_whitelist.php
index 5a255a93..487f741e 100644
--- a/bureau/admin/adm_authip_whitelist.php
+++ b/bureau/admin/adm_authip_whitelist.php
@@ -39,27 +39,27 @@ $list_ip = $authip->list_ip_whitelist();
   <p class="error"><?php __("Warning"); echo "<br/>"; __("The IP and subnet you have here are allowed for ALL users and ALL usages"); ?></p>
 </center>
 
-<p>
+<br/>
       <fieldset>
         <legend><?php __("Add an IP");?> - <a href="javascript:edit_ip('','<?php echo htmlentities(get_remote_ip())."','Home IP'";?>);" ><?php echo __("Add my current IP"); ?></a></legend>
         <span id="form_add_ip">
         <form method="post" action="adm_authip_whitelist.php" name="main" id="main">
           <p id="reset_edit_ip" style="display:none;"><a href="javascript:reset_edit_ip();"><?php __("Cancel edit")?></a></p>
-          <input type="hidden" name="id" value="" id="edit_id" >
+          <input type="hidden" name="id" value="" id="edit_id" />
           <p>
             <?php __("Enter here the IP address you want. <br/> <i>IPv4, IPv6 and subnet allowed</i>"); ?> <br/>
-            <input type="text" size=20 maxlength=39 name="ipsub" id="edit_ip" />
+            <input type="text" size='20' maxlength='39' name="ipsub" id="edit_ip" />
           </p>
           <p>
             <?php __("Add a comment");?><br/>
-            <input type="text" size=25 maxlength=200 name="infos" id="edit_infos" />
+            <input type="text" size='25' maxlength='200' name="infos" id="edit_infos" />
           </p>
           <input type="submit" class="inb" value="<?php __("Save")?>" />
         </form>
         </span>
       </fieldset>
  
-</p>
+<br/>
       <table class='tlist'>
       <tr><th><?php __("Type"); ?></th><th><?php __("IP"); ?></th><th><?php __("Informations"); ?></th><th colspan='2' /></tr>
       <?php 
diff --git a/bureau/admin/adm_defquotas.php b/bureau/admin/adm_defquotas.php
index 522434e9..17bb5854 100644
--- a/bureau/admin/adm_defquotas.php
+++ b/bureau/admin/adm_defquotas.php
@@ -70,10 +70,9 @@ if (isset($error) && $error) {
 ?>
 <form method="post" action="adm_dodefquotas.php">
 <table border="0" cellpadding="4" cellspacing="0">
-<p>
-<input type="hidden" name="action" value="delete" />
 <tr class="lst1">
 <td>
+<input type="hidden" name="action" value="delete" />
 <select name="type" id="type" class="inl">
 <?php
 foreach($quota->listtype() as $type) {
@@ -113,7 +112,7 @@ foreach($q as $name => $value) {
 
 <tr class="lst<?php echo $col; ?>">
 <td><label for="<?php echo $key; ?>"><?php echo $qarray[$name] ; ?></label></td>
-<td><input type="text" class="int" size="16" maxlength="16" name="<?php echo $key; ?>" id="<?php echo $name; ?>" value="<?php ehe($value); ?>" /></td></tr>
+<td><input type="text" class="int" size="16" maxlength="16" name="<?php echo $key; ?>" id="<?php echo $key;?>" value="<?php ehe($value); ?>" /></td></tr>
 
 <?php
   }
diff --git a/bureau/admin/adm_dnsweberror.php b/bureau/admin/adm_dnsweberror.php
index cf0351fb..96a7b6e2 100644
--- a/bureau/admin/adm_dnsweberror.php
+++ b/bureau/admin/adm_dnsweberror.php
@@ -95,7 +95,6 @@ $db->query("select d.compte, m.login, d.domaine, d.dns_result from domaines d, m
 
 while($db->next_record()) { 
 ++$pair;
-print_r($d);
 ?>
 <tr class="lst<?php echo $pair%2+1 ?>">
     <td><?php echo $db->f('compte');?></td>
diff --git a/bureau/admin/adm_doms.php b/bureau/admin/adm_doms.php
index 5548550b..7edf9792 100644
--- a/bureau/admin/adm_doms.php
+++ b/bureau/admin/adm_doms.php
@@ -66,7 +66,7 @@ $c=$admin->dom_list(true,$forcecheck);
 </p>
 <form method="post" action="adm_dodom.php" name="main" id="main">
 <table class="tlist">
-    <tr><th></th><th><?php __("Action"); ?></th><th><?php __("Domain"); ?></th><th><?php __("Creator"); ?></th><th><?php __("Connect as"); ?><th><?php __("OK?"); ?></th><th><?php __("Status"); ?></th></tr>
+    <tr><th></th><th><?php __("Action"); ?></th><th><?php __("Domain"); ?></th><th><?php __("Creator"); ?></th><th><?php __("Connect as"); ?></th><th><?php __("OK?"); ?></th><th><?php __("Status"); ?></th></tr>
 <?php
 $col=1;
 for($i=0;$i<count($c);$i++) {
diff --git a/bureau/admin/adm_doms_def_type.php b/bureau/admin/adm_doms_def_type.php
index 5e62b56c..b0db0e73 100644
--- a/bureau/admin/adm_doms_def_type.php
+++ b/bureau/admin/adm_doms_def_type.php
@@ -48,22 +48,24 @@ $tab=$dom->lst_default_subdomains();
    <tr><th>&nbsp;</th><th><?php __("Sub"); ?></th><th><?php __("Type"); ?></th><th><?php __("settings"); ?></th><th><?php __("Concerned"); ?></th><th><?php __("Activation"); ?></th></tr>
 <?php
 $col=1;
-for($i=0;$i<count($tab)+1;$i++) {
+for($i=0;$i<count($tab)+1;$i++) {?>
+	<tr  class="lst<?php echo $col; ?>">
+  <td>
+
+<?php
   @$val=$tab[$i];
   $col=3-$col;
     if (isset($tab[$i])){ 
     echo "<input type='hidden' name='domup[$i][id]' value='".$val['id']."' />";  
     }
 ?>
-	<tr  class="lst<?php echo $col; ?>">
-  <td>
-  <div class="ina"><a href=dom_defdel.php?id=<?php echo $val['id']; ?> type=''><img src="images/delete.png" alt="<?php __("Delete"); ?>" /><?php __("Delete"); ?></a></div>
+  <div class="ina"><a href='dom_defdel.php?id=<?php echo $val['id']; ?>' type=''><img src="images/delete.png" alt="<?php __("Delete"); ?>" /><?php __("Delete"); ?></a></div>
   </td>
 
   <td><input type='text' size="16" name='domup[<?php echo $i; ?>][sub]' value="<?php echo $val['sub']; ?>"/></td>
   <?php $type=array("VHOST","URL","WEBMAIL","");
   if(in_array($val['domain_type'],$type)){?> 
-  <td><select width="100px" style="width:100px"  name='domup[<?php echo $i; ?>][domain_type]'>
+  <td><select name='domup[<?php echo $i; ?>][domain_type]'>
         <option value='VHOST' <?php if($val['domain_type']=='VHOST') echo "selected=\"selected\""; ?> >VHOST</option>
         <option value='URL' <?php if($val['domain_type']=='URL') echo "selected=\"selected\""; ?> >URL</option>
         <option value='WEBMAIL' <?php if($val['domain_type']=='WEBMAIL') echo "selected=\"selected\""; ?> >WEBMAIL</option>
@@ -72,20 +74,21 @@ for($i=0;$i<count($tab)+1;$i++) {
     <td><input type ='text'  width="100px" style="width:100px" name='domup[<?php echo $i; ?>][domain_type]' value='<?php echo $val['domain_type']?>' ></td>
  <? }?>
   </td>
-  <td><input type ='text' name='domup[<?php echo $i; ?>][domain_type_parameter]' value='<?php echo $val['domain_type_parameter']?>' ></td>
+  <td><input type ='text' name='domup[<?php echo $i; ?>][domain_type_parameter]' value='<?php echo $val['domain_type_parameter']?>' /></td>
   <td><select name='domup[<?php echo $i; ?>][concerned]'>
         <option value='MAIN' <?php if($val['concerned']=='MAIN') echo "selected=\"selected\""; ?> >MAIN</option>
         <option value='SLAVE' <?php if($val['concerned']=='SLAVE') echo "selected=\"selected\""; ?> >SLAVE</option>
         <option value='BOTH' <?php if($val['concerned']=='BOTH') echo "selected=\"selected\""; ?> >BOTH</option>
       </select>
   </td>
-  <td><input type="checkbox"  id="enabled" name="domup[<?php echo $i; ?>][enabled]" value="1" <?php if ($val['enabled']==1) echo "checked=\"checked\""; ?> /></td>
+  <td><input type="checkbox" name="domup[<?php echo $i; ?>][enabled]" value="1" <?php if ($val['enabled']==1) echo "checked=\"checked\""; ?> /></td>
   </tr>
 <?php
 }
 ?>
-
-  <td><p><input type="submit" class="inb" name="submit" value="<?php __("Save"); ?>" /></p></td>
+  <tr>
+  <td colspan='6'><p><input type="submit" class="inb" name="submit" value="<?php __("Save"); ?>" /></p></td>
+  </tr>
 </table>
 </form>
 <?php
diff --git a/bureau/admin/adm_email.php b/bureau/admin/adm_email.php
index 4dfbb398..1b727499 100644
--- a/bureau/admin/adm_email.php
+++ b/bureau/admin/adm_email.php
@@ -68,8 +68,8 @@ if (isset($error) && $error) {
 	  <td><span><input type="text" name="subject" size="45" maxlength="100" tabindex="2" value="" /></span></td>
 	</tr>
 	<tr>
-	  <th align="right" valign="top"> <span><b><?php __("Mail"); ?></b></span>
-	  <td><span> <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3"></textarea></span>
+	  <th align="right" valign="top"> <span><b><?php __("Mail"); ?></b></span></th>
+	  <td><span> <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3"></textarea></span></td>
 	</tr>
 	<tr>
 	  <td class="catBottom" align="center" colspan="2"><input type="submit" value="<?php __("Send");?>" name="submit" /></td>
diff --git a/bureau/admin/adm_mxaccount.php b/bureau/admin/adm_mxaccount.php
index 2b2bcfcf..3cced3b6 100644
--- a/bureau/admin/adm_mxaccount.php
+++ b/bureau/admin/adm_mxaccount.php
@@ -57,8 +57,6 @@ if ($newlogin) {
 
 include_once("head.php");
 ?>
-</head>
-<body>
 <h3><?php __("Manage allowed accounts for secondary mx"); ?></h3>
 <hr id="topbar"/>
 <br />
@@ -104,6 +102,7 @@ for($i=0;$i<count($c);$i++) {
 </tr>
 <tr class="trbtn"><td colspan="2">
 	<input type="submit" value="<?php __("Add this account to the allowed list"); ?>" class="inb" />
+  </td></tr>
 </table>
 
 </form>
diff --git a/bureau/admin/adm_slaveaccount.php b/bureau/admin/adm_slaveaccount.php
index 819c42b0..1235da62 100644
--- a/bureau/admin/adm_slaveaccount.php
+++ b/bureau/admin/adm_slaveaccount.php
@@ -104,6 +104,7 @@ for($i=0;$i<count($c);$i++) {
 </tr>
 <tr class="trbtn"><td colspan="2">
 	<input type="submit" value="<?php __("Add this account to the allowed list"); ?>" class="inb" />
+  </td></tr>
 </table>
 <script type="text/javascript">
 document.forms['main'].newlogin.focus();
diff --git a/bureau/admin/adm_slaveip.php b/bureau/admin/adm_slaveip.php
index 2ee6d63d..042c42b6 100644
--- a/bureau/admin/adm_slaveip.php
+++ b/bureau/admin/adm_slaveip.php
@@ -102,6 +102,7 @@ for($i=0;$i<count($c);$i++) {
 </tr>
 <tr><td colspan="2">
 	<input type="submit" value="<?php __("Add this ip to the slave list"); ?>" class="inb" />
+</td></tr>
 </table>
 </form>
 <script type="text/javascript">
diff --git a/bureau/admin/adm_tldedit.php b/bureau/admin/adm_tldedit.php
index 66f735cb..1fc7cad8 100644
--- a/bureau/admin/adm_tldedit.php
+++ b/bureau/admin/adm_tldedit.php
@@ -60,7 +60,7 @@ include_once("head.php");
 <h3><?php __("Edit a TLD"); ?></h3>
 
 <form method="post" action="adm_tlddoedit.php">
-<table name="main" id="main" class="tedit">
+<table id="main" class="tedit">
 <tr><th><label for="tld"><?php __("TLD"); ?></label></th><td><code><?php echo $tld; ?></code><input type="hidden" name="tld" id="tld" value="<?php echo $tld; ?>" /></td></tr>
 <tr><th><label for="mode"><?php __("Allowed Mode"); ?></label></th><td><select name="mode" class="inl" id="mode">
         <?php $admin->selecttldmode($mode); ?>
diff --git a/bureau/admin/sql_bck.php b/bureau/admin/sql_bck.php
index 82eefa97..8aed1a59 100644
--- a/bureau/admin/sql_bck.php
+++ b/bureau/admin/sql_bck.php
@@ -67,13 +67,13 @@ if (is_array($r)) {
 <form action="sql_dobck.php" method="post" id="main" name="main">
 <table class="tedit">
 <tr>
-	<th><label for="bck_mode"><?php __("Do MySQL backup?"); ?></label></th>
+	<th><label><?php __("Do MySQL backup?"); ?></label></th>
 	<td>
         <input type="hidden" name="id" value="<?php echo $id; ?>" />
-        <input type="radio" class="inc" id="bck_mode0" name="bck_mode" value="0"<?php cbox($r["bck"]==0); ?>><label for="bck_mode0"><?php __("No backup"); ?></label><br />
-	<input type="radio" class="inc" id="bck_mode1" name="bck_mode" value="1"<?php cbox($r["bck"]==1); ?>><label for="bck_mode1"><?php __("Weekly backup"); ?></label><br />
-	<input type="radio" class="inc" id="bck_mode2" name="bck_mode" value="2"<?php cbox($r["bck"]==2); ?>><label for="bck_mode2"><?php __("Daily backup"); ?></label><br />
-	</select></td>
+        <input type="radio" class="inc" id="bck_mode0" name="bck_mode" value="0"<?php cbox($r["bck"]==0); ?>/><label for="bck_mode0"><?php __("No backup"); ?></label><br />
+	<input type="radio" class="inc" id="bck_mode1" name="bck_mode" value="1"<?php cbox($r["bck"]==1); ?>/><label for="bck_mode1"><?php __("Weekly backup"); ?></label><br />
+	<input type="radio" class="inc" id="bck_mode2" name="bck_mode" value="2"<?php cbox($r["bck"]==2); ?>/><label for="bck_mode2"><?php __("Daily backup"); ?></label><br />
+	</td>
 </tr>
 <tr>
 	<th><label for="bck_history"><?php __("How many backups should be kept?"); ?></label></th>
@@ -88,11 +88,11 @@ if (is_array($r)) {
 	</select></td>
 </tr>
 <tr>
-	<th><label for="bck_gzip"><?php __("Compress the backups? (gzip)"); ?></label></th>
+	<th><label><?php __("Compress the backups? (gzip)"); ?></label></th>
 	<td>
 
-        <input type="radio" class="inc" id="bck_gzip0" name="bck_gzip" value="0"<?php cbox($r["gzip"]==0); ?>><label for="bck_gzip0"><?php __("No"); ?></label><br />
-	<input type="radio" class="inc" id="bck_gzip1" name="bck_gzip" value="1"<?php cbox($r["gzip"]==1); ?>><label for="bck_gzip1"><?php __("Yes"); ?></label><br />
+        <input type="radio" class="inc" id="bck_gzip0" name="bck_gzip" value="0"<?php cbox($r["gzip"]==0); ?>/><label for="bck_gzip0"><?php __("No"); ?></label><br />
+	<input type="radio" class="inc" id="bck_gzip1" name="bck_gzip" value="1"<?php cbox($r["gzip"]==1); ?>/><label for="bck_gzip1"><?php __("Yes"); ?></label><br />
 
 </td>
 </tr>