diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index a75ac9a504d..e5623dc5ea7 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -143,9 +143,9 @@ if ($id > 0 || ! empty($ref))
 			print '</td>';
 			print '</tr>';
 			
-			include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
-
 			print "</table>";
+			
+			include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
 
 			print '</div>';
 		}
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 152d690fff7..040ca19d933 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -106,11 +106,11 @@ if ($id > 0 || ! empty($ref))
 	// Customer
 	print "<tr><td>".$langs->trans("Company")."</td>";
 	print '<td colspan="3">'.$soc->getNomUrl(1).'</td></tr>';
+	
+	print "</table>";
 
 	include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
 
-	print "</table>";
-
 	print '</div>';
 }
 
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index dd05eede948..946dec53cc5 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -106,11 +106,11 @@ if ($id > 0 || ! empty($ref))
     // Company
     print '<tr><td>'.$langs->trans("Company").'</td>';
     print '<td colspan="3">'.$soc->getNomUrl(1,'compta').'</td>';
+    
+    print "</table>";
 
 	include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
 
-	print "</table>";
-
 	print '</div>';
 
 }
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index e17c34bbef5..dbb4dc1921a 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -25,30 +25,16 @@ else if ($module == 'fichinter') { $module = 'ficheinter'; $note_private = 'note
 ?>
 
 <!-- BEGIN PHP TEMPLATE NOTES -->
-<table class="border allwidth">		
-	<tr>
-		<td width="25%" valign="top"><?php echo $form->editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></td>
-		<td><?php echo $form->editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></td>
-	</tr>
-	
-	<?php if (! $user->societe_id) { ?>
-	<tr>
-		<td width="25%" valign="top"><?php echo $form->editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></td>
-		<td><?php echo $form->editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></td>
-	</tr>
-	<?php } ?>
-	
-</table>
-<!--  Test table with div
 <div class="table-border">
 	<div class="table-border-row">
-		<div class="table-border-col"><?php //echo $form->editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div>
-		<div class="table-border-col"><?php //echo $form->editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div>
+		<div class="table-key-border-col"><?php echo $form->editfieldkey("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div>
+		<div class="table-val-border-col"><?php echo $form->editfieldval("NotePublic",$note_public,$object->note_public,$object,$user->rights->$module->creer,'textarea'); ?></div>
 	</div>
+<?php if (! $user->societe_id) { ?>
 	<div class="table-border-row">
-		<div class="table-border-col"><?php //echo $form->editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div>
-		<div class="table-border-col"><?php //echo $form->editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div>
+		<div class="table-key-border-col"><?php echo $form->editfieldkey("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div>
+		<div class="table-val-border-col"><?php echo $form->editfieldval("NotePrivate",$note_private,$object->note_private,$object,$user->rights->$module->creer,'textarea'); ?></div>
 	</div>
+<?php } ?>
 </div>
--->
 <!-- END PHP TEMPLATE NOTES-->
\ No newline at end of file
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index ce17cc34faf..b5960aa091b 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -85,10 +85,10 @@ if ($id > 0)
 			// Company
 			print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 			
-			include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
-			
 			print "</table>";
 			
+			include(DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php');
+			
 			print '</div>';
 		}
 	}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 09d92d1993f..357e4f14d12 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2331,8 +2331,17 @@ div.table-border {
 div.table-border-row {
 	display:table-row;
 }
-div.table-border-col {
+div.table-key-border-col {
 	display:table-cell;
+	width: 25%;
+	vertical-align:top;
+	padding: 1px 2px 1px 1px;
+	border: 1px solid #9CACBB;
+	border-collapse: collapse;
+}
+div.table-val-border-col {
+	display:table-cell;
+	width:auto;
 	padding: 1px 2px 1px 1px;
 	border: 1px solid #9CACBB;
 	border-collapse: collapse;