diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index e948f15f2b0..69137bfd998 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -52,4 +52,5 @@ CashFenceDone=Cash fence done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Payment Num Pad
 Numberspad=Numbers Pad
-BillsCoinsPad=Bills and Coins Pad
\ No newline at end of file
+BillsCoinsPad=Bills and Coins Pad
+DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
\ No newline at end of file
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 2216d0b7659..88b6151621b 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -273,14 +273,14 @@ print '<br><br>';
 // Marketplace
 print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
 print "<tr class=\"liste_titre\">\n";
-print '<td colspan="2">TakePOS Marketplace</td>';
+print '<td colspan="2">'.$langs->trans("WebSiteDesc").'</td>';
 print '<td>'.$langs->trans("URL").'</td>';
 print '</tr>';
 
 print "<tr class=\"oddeven\">\n";
-$url='https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html';
-print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/marketplace/takeposmobile.jpg"></a></td>';
-print '<td>TakePOS for mobile devices</td>';
+$url='https://www.dolistore.com/45-pos';
+    print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
+print '<td>'.$langs->trans("DolistorePosCategory").'</td>';
 print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
 print '</tr>';
 
diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css
index 15a2993f593..122f55ac974 100644
--- a/htdocs/takepos/css/pos.css
+++ b/htdocs/takepos/css/pos.css
@@ -2,10 +2,7 @@ html,body {
     padding:0;
     margin:0;
     height:100%;
-}
-
-body {
-    width:100%;
+	width:100%;
 }
 
 .row {
@@ -90,7 +87,7 @@ div.wrapper{
 div.wrapper2{
 	float:left; /* important */
 	position:relative; /* important(so we can absolutely position the description div */
-	width:10.2%;
+	width:10.9%;
 	height:23%;
 	margin-top:0.5%;
 	margin-bottom:0.5%;
@@ -126,6 +123,68 @@ div.description{
 	}
 }
 
+.container{
+	width: 98%;
+	height: 98%;
+	margin: 0 auto;
+	overflow: visible;
+	box-sizing: border-box;
+}
+
+.row1{
+	margin: 0 auto;
+	width: 100%;
+	height: 34%;
+}
+
+.row2{
+	margin: 0 auto;
+	width: 100%;
+	height: 66%;
+}
+
+.div1{
+	height:100%;
+	width: 33%;
+	float: left;
+	text-align: center;
+	box-sizing: border-box;
+}
+
+.div2{
+	height: 100%;
+	width: 33%;
+	font-size: 0;
+	float: left;
+	text-align: center;
+	padding-left: 10px;
+	box-sizing: border-box;
+}
+
+.div3{
+	height: 100%;
+	width: 33%;
+	float: left;
+	text-align: center;
+	box-sizing: border-box;
+}
+
+.div4{
+	height: 100%;
+	width: 34%;
+	float: left;
+	box-sizing: border-box;
+	font-size: 6px;
+}
+
+.div5{
+	height: 100%;
+	width: 66%;
+	float: left;
+	box-sizing: border-box;
+	font-size: 6px;
+}
+
 p.description_content{
 	padding:10px;
 	margin:0px;
diff --git a/htdocs/takepos/img/marketplace/cashcontrol.jpg b/htdocs/takepos/img/marketplace/cashcontrol.jpg
deleted file mode 100644
index 66240218dff..00000000000
Binary files a/htdocs/takepos/img/marketplace/cashcontrol.jpg and /dev/null differ
diff --git a/htdocs/takepos/img/marketplace/takeposmobile.jpg b/htdocs/takepos/img/marketplace/takeposmobile.jpg
deleted file mode 100644
index 918f7c49d5e..00000000000
Binary files a/htdocs/takepos/img/marketplace/takeposmobile.jpg and /dev/null differ
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 1701b82a770..6baf5e6cd0a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -325,7 +325,7 @@ if ($placeid > 0) {
         if ($line->special_code == "3") { print ' order';
         }
         print '" id="' . $line->rowid . '">';
-        print '<td>' . $line->product_label . $line->desc . '</td>';
+        print '<td align="left">' . $line->product_label . $line->desc . '</td>';
         print '<td align="right">' . $line->qty . '</td>';
         print '<td align="right">' . price($line->total_ttc) . '</td>';
         print '</tr>';
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 83f21a506ea..c8d9b3f07bc 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -55,7 +55,7 @@ $head='<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
 ?>
-<link rel="stylesheet" href="css/pos.css?a=xxx">
+<link rel="stylesheet" href="css/pos.css">
 <script type="text/javascript" src="js/takepos.js" ></script>
 <link rel="stylesheet" href="css/colorbox.css" type="text/css" media="screen" />
 <script type="text/javascript" src="js/jquery.colorbox-min.js"></script>
@@ -353,27 +353,30 @@ $( document ).ready(function() {
 
 <body style="overflow: hidden; background-color:#E8E8E8;">
 
-<div id="poslines" style="position:absolute; top:2%; left:0.5%; height:36%; width:31%; overflow: auto;">
-</div>
+<div class="container">
+	<div class="row1">
 
-<div style="position:absolute; top:1%; left:32.5%; height:37%; width:32.5%; font-size: 0;">
-    <button type="button" class="calcbutton" onclick="Edit(7);">7</button>
-    <button type="button" class="calcbutton" onclick="Edit(8);">8</button>
-    <button type="button" class="calcbutton" onclick="Edit(9);">9</button>
-    <button type="button" id="qty" class="calcbutton2" onclick="Edit('qty');"><?php echo $langs->trans("Qty"); ?></button>
-    <button type="button" class="calcbutton" onclick="Edit(4);">4</button>
-    <button type="button" class="calcbutton" onclick="Edit(5);">5</button>
-    <button type="button" class="calcbutton" onclick="Edit(6);">6</button>
-    <button type="button" id="price" class="calcbutton2" onclick="Edit('p');"><?php echo $langs->trans("Price"); ?></button>
-    <button type="button" class="calcbutton" onclick="Edit(1);">1</button>
-    <button type="button" class="calcbutton" onclick="Edit(2);">2</button>
-    <button type="button" class="calcbutton" onclick="Edit(3);">3</button>
-    <button type="button" id="reduction" class="calcbutton2" onclick="Edit('r');"><?php echo $langs->trans("ReductionShort"); ?></button>
-    <button type="button" class="calcbutton" onclick="Edit(0);">0</button>
-    <button type="button" class="calcbutton" onclick="Edit('.');">.</button>
-    <button type="button" class="calcbutton" onclick="Edit('c');">C</button>
-    <button type="button" class="calcbutton2" id="delete" style="color: red;" onclick="deleteline();"><b>X</b></button>
-</div>
+		<div id="poslines" class="div1" style="overflow: auto;">
+		</div>
+
+		<div class="div2">
+			<button type="button" class="calcbutton" onclick="Edit(7);">7</button>
+			<button type="button" class="calcbutton" onclick="Edit(8);">8</button>
+			<button type="button" class="calcbutton" onclick="Edit(9);">9</button>
+			<button type="button" id="qty" class="calcbutton2" onclick="Edit('qty');"><?php echo $langs->trans("Qty"); ?></button>
+			<button type="button" class="calcbutton" onclick="Edit(4);">4</button>
+			<button type="button" class="calcbutton" onclick="Edit(5);">5</button>
+			<button type="button" class="calcbutton" onclick="Edit(6);">6</button>
+			<button type="button" id="price" class="calcbutton2" onclick="Edit('p');"><?php echo $langs->trans("Price"); ?></button>
+			<button type="button" class="calcbutton" onclick="Edit(1);">1</button>
+			<button type="button" class="calcbutton" onclick="Edit(2);">2</button>
+			<button type="button" class="calcbutton" onclick="Edit(3);">3</button>
+			<button type="button" id="reduction" class="calcbutton2" onclick="Edit('r');"><?php echo $langs->trans("ReductionShort"); ?></button>
+			<button type="button" class="calcbutton" onclick="Edit(0);">0</button>
+			<button type="button" class="calcbutton" onclick="Edit('.');">.</button>
+			<button type="button" class="calcbutton" onclick="Edit('c');">C</button>
+			<button type="button" class="calcbutton2" id="delete" style="color: red;" onclick="deleteline();"><b>X</b></button>
+		</div>
 
 <?php
 // User menu and external TakePOS modules
@@ -420,7 +423,7 @@ if (!empty($reshook))
 	}
 
 ?>
-<div style="position:absolute; top:1%; left:65.5%; height:37%; width:32.5%;">
+		<div class="div3">
 <?php
 $i = 0;
 foreach($menus as $menu) {
@@ -434,44 +437,46 @@ foreach($menus as $menu) {
 	else echo '<button type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
 }
 ?>
-</div>
-
-<div style="position:absolute; top:39%; left:0.3%; height:59%; width:32%;">
+		</div>
+	</div>
+	<div class="row2">
+		<div class="div4">
 	<?php
 	$count=0;
 	while ($count<16)
 	{
 	?>
-	<div class='wrapper' <?php if ($count==14) echo 'onclick="MoreCategories(\'less\');"'; else if ($count==15) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"';?> id='catdiv<?php echo $count;?>'>
-		<img class='imgwrapper' <?php if ($count==14) echo 'src="img/arrow-prev-top.png"'; if ($count==15) echo 'src="img/arrow-next-top.png"';?> width="98%" id='catimg<?php echo $count;?>'/>
-		<div class='description'>
-			<div class='description_content' id='catdesc<?php echo $count;?>'></div>
-		</div>
-	</div>
+			<div class='wrapper' <?php if ($count==14) echo 'onclick="MoreCategories(\'less\');"'; else if ($count==15) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"';?> id='catdiv<?php echo $count;?>'>
+				<img class='imgwrapper' <?php if ($count==14) echo 'src="img/arrow-prev-top.png"'; if ($count==15) echo 'src="img/arrow-next-top.png"';?> width="98%" id='catimg<?php echo $count;?>'/>
+				<div class='description'>
+					<div class='description_content' id='catdesc<?php echo $count;?>'></div>
+				</div>
+			</div>
 	<?php
     $count++;
 	}
 	?>
-</div>
+		</div>
 
-<div style="position:absolute; top:39%; left:32%; height:58%; width:72%;">
+		<div class="div5">
 <?php
 $count=0;
 while ($count<32)
 	{
 	?>
-	<div class='wrapper2' id='prodiv<?php echo $count;?>' <?php if ($count==30) {?> onclick="MoreProducts('less');" <?php } if ($count==31) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"';?>>
-		<img class='imgwrapper' <?php if ($count==30) echo 'src="img/arrow-prev-top.png"'; if ($count==31) echo 'src="img/arrow-next-top.png"';?> width="95%" id='proimg<?php echo $count;?>'/>
-		<div class='description'>
-			<div class='description_content' id='prodesc<?php echo $count;?>'></div>
-		</div>
-	</div>
+			<div class='wrapper2' id='prodiv<?php echo $count;?>' <?php if ($count==30) {?> onclick="MoreProducts('less');" <?php } if ($count==31) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"';?>>
+				<img class='imgwrapper' <?php if ($count==30) echo 'src="img/arrow-prev-top.png"'; if ($count==31) echo 'src="img/arrow-next-top.png"';?> width="95%" id='proimg<?php echo $count;?>'/>
+				<div class='description'>
+					<div class='description_content' id='prodesc<?php echo $count;?>'></div>
+				</div>
+			</div>
 	<?php
 	$count++;
 	}
 ?>
+		</div>
+	</div>
 </div>
-
 </body>
 <?php