diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 3d4bd490dde..5afa8dc060b 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -105,14 +105,16 @@ print "</tr>\n";
 if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOS_PRINT_METHOD != "browser") {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
-	print '<td colspan="2">';
+	print '</td>';
+	print '<td>';
 	print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
 	//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
 	print '</td></tr>';
 
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("OrderNotes");
-	print '<td colspan="2">';
+	print '</td>';
+	print '<td>';
 	print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
 	//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
 	print '</td></tr>';
@@ -120,14 +122,16 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOS_PRINT_METHOD
 
 print '<tr class="oddeven value"><td>';
 print $langs->trans("BasicPhoneLayout");
-print '<td colspan="2">';
+print '</td>';
+print '<td>';
 //print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
 print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
 print '</td></tr>';
 
 print '<tr class="oddeven value"><td>';
 print $langs->trans("ProductSupplements");
-print '<td colspan="2">';
+print '</td>';
+print '<td>';
 //print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
 print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
 print '</td></tr>';
@@ -136,55 +140,30 @@ if ($conf->global->TAKEPOS_SUPPLEMENTS)
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("SupplementCategory");
-	print '<td colspan="2">';
+	print '</td>';
+	print '<td>';
 	print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
 	print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
 	print "</td></tr>\n";
 }
 
-print '<tr class="oddeven value"><td>';
-print 'QR - '.$langs->trans("AutoOrder");
-print '<td colspan="2">';
-print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
 print '<tr class="oddeven value"><td>';
 print 'QR - '.$langs->trans("CustomerMenu");
-print '<td colspan="2">';
+print '</td>';
+print '<td>';
 print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
 print '</td></tr>';
 
+print '<tr class="oddeven value"><td>';
+print 'QR - '.$langs->trans("AutoOrder");
+print '</td>';
+print '<td>';
+print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
+print '</td></tr>';
+
 print '</table>';
 
 
-if ($conf->global->TAKEPOS_AUTO_ORDER)
-{
-	print '<br>';
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").'</td><td>'.$langs->trans("QR").'</td>';
-	print "</tr>\n";
-
-	//global $dolibarr_main_url_root;
-	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
-    $resql = $db->query($sql);
-    $rows = array();
-    while ($row = $db->fetch_array($resql)) {
-        print '<tr class="oddeven value"><td>';
-		print $langs->trans("Table")." ".$row['label'];
-		print '<td>';
-		print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
-		print '<td>';
-		print "<a target='_blank' href='printqr.php?id=".$row['rowid']."'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'></a>";
-		print '</td></tr>';
-    }
-
-	print '</table>';
-}
-
-
 if ($conf->global->TAKEPOS_QR_MENU)
 {
 	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -202,6 +181,33 @@ if ($conf->global->TAKEPOS_QR_MENU)
 	print '</table>';
 }
 
+if ($conf->global->TAKEPOS_AUTO_ORDER)
+{
+	print '<br>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").'</td><td>'.$langs->trans("QR").'</td>';
+	print "</tr>\n";
+
+	//global $dolibarr_main_url_root;
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
+	$resql = $db->query($sql);
+	$rows = array();
+	while ($row = $db->fetch_array($resql)) {
+		print '<tr class="oddeven value"><td>';
+		print $langs->trans("Table")." ".$row['label'];
+		print '<td>';
+		print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
+		print '<td>';
+		print "<a target='_blank' href='printqr.php?id=".$row['rowid']."'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'></a>";
+		print '</td></tr>';
+	}
+
+	print '</table>';
+}
+
 print '</div>';
 
 print '<br>';
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index c051ae4d673..217da157c2f 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -45,7 +45,7 @@ if (!$conf->global->TAKEPOS_QR_MENU) accessforbidden(); // If Restaurant Menu is
     <div class="grid-container">
       <div class="grid-x grid-padding-x menu2">
         <div class="cell small-12">
-          <h1><?php print $mysoc->name; ?> <small><?php print $langs->trans('RestaurantMenu'); ?></small></h1>
+          <h1><?php print $mysoc->name; ?> - <small><?php print $langs->trans('RestaurantMenu'); ?></small></h1>
 
 <?php
 $categorie = new Categorie($db);
@@ -99,7 +99,7 @@ foreach ($maincategories as $cat){
 	}
 	print '</div>';
 }
-?>		  
+?>
 			</div>
 		</div>
     </div>