diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index 7c71b5387..8f4c432e6 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -44,79 +44,81 @@
 		</td>
 		{foreach $fields_display AS $key => $params}
 			{block name="open_td"}
-				<td
-					{if isset($params.position)}
+					<td
+				{if isset($params.position)}
 						id="td_{if $id_category}{$id_category}{else}0{/if}_{$tr.$identifier}"
-					{/if}
-					class="{if !$no_link}pointer{/if}
-					{if isset($params.position) && $order_by == 'position'} dragHandle{/if}
-					{if isset($params.align)} {$params.align}{/if}"
+				{/if}
+						class="{if !$no_link}pointer{/if}
+						{if isset($params.position) && $order_by == 'position'} dragHandle{/if}
+						{if isset($params.align)} {$params.align}{/if}"
 
 				{if (!isset($params.position) && !$no_link && !isset($params.remove_onclick))}
-					onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">
-				{else}
+						onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">
+					{else}
 					>
 				{/if}
 			{/block}
-			{if isset($params.prefix)}{$params.prefix}{/if}
-			{if isset($params.color) && isset($tr[$params.color])}
-				<span class="color_field" style="background-color: {$tr.color}">
-			{/if}
-
-			{if isset($params.active)}
-				{$tr.$key}
-			{elseif isset($params.activeVisu)}
-				<img src="../img/admin/{if $tr.$key}enabled.gif{else}disabled.gif{/if}"
-				alt="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" title="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" />
-			{elseif isset($params.position)}
-				{if $order_by == 'position' && $order_way != 'DESC'}
-					<a href="{$tr.$key.position_url_down}" {if !($tr.$key.position != $positions[count($positions) - 1])}style="display: none;"{/if}>
-						<img src="../img/admin/{if $order_way == 'ASC'}down{else}up{/if}.gif" alt="{l s='Down'}" title="{l s='Down'}" />
-					</a>
-
-					<a href="{$tr.$key.position_url_up}" {if !($tr.$key.position != $positions.0)}style="display: none;"{/if}>
-						<img src="../img/admin/{if $order_way == 'ASC'}up{else}down{/if}.gif" alt="{l s='Up'}" title="{l s='Up'}" />
-					</a>
-				{else}
-					{$tr.$key.position + 1}
+			{block name="td_content"}
+				{if isset($params.prefix)}{$params.prefix}{/if}
+				{if isset($params.color) && isset($tr[$params.color])}
+					<span class="color_field" style="background-color: {$tr.color}">
 				{/if}
-			{elseif isset($params.image)}
-				{$tr.$key}
-			{elseif isset($params.icon)}
-				<img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" />
-			{elseif isset($params.price)}
-				{$tr.$key}
-			{elseif isset($params.float)}
-				{$tr.$key}
-			{elseif isset($params.type) && $params.type == 'date'}
-				{$tr.$key}
-			{elseif isset($params.type) && $params.type == 'datetime'}
-				{$tr.$key}
-            {elseif isset($params.type) && $params.type == 'decimal'}
-                {$tr.$key|string_format:"%.2f"}
-            {elseif isset($params.type) && $params.type == 'percent'}
-                {$tr.$key} {l s='%'}
-			{* If type is 'editable', an input is created *}
-			{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
-				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|htmlentities}" class="{$key}" />
-			{elseif isset($params.callback)}
-				{$tr.$key}
-			{elseif isset($tr.$key) && $key == 'color'}
-				<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
-			{elseif isset($tr.$key)}
-				{if isset($params.maxlength) && Tools::strlen($tr.$key) > $params.maxlength}
-					<span title="{$tr.$key|escape:'htmlall':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'htmlall':'UTF-8'}</span>
+
+				{if isset($params.active)}
+					{$tr.$key}
+				{elseif isset($params.activeVisu)}
+					<img src="../img/admin/{if $tr.$key}enabled.gif{else}disabled.gif{/if}"
+					alt="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" title="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" />
+				{elseif isset($params.position)}
+					{if $order_by == 'position' && $order_way != 'DESC'}
+						<a href="{$tr.$key.position_url_down}" {if !($tr.$key.position != $positions[count($positions) - 1])}style="display: none;"{/if}>
+							<img src="../img/admin/{if $order_way == 'ASC'}down{else}up{/if}.gif" alt="{l s='Down'}" title="{l s='Down'}" />
+						</a>
+
+						<a href="{$tr.$key.position_url_up}" {if !($tr.$key.position != $positions.0)}style="display: none;"{/if}>
+							<img src="../img/admin/{if $order_way == 'ASC'}up{else}down{/if}.gif" alt="{l s='Up'}" title="{l s='Up'}" />
+						</a>
+					{else}
+						{$tr.$key.position + 1}
+					{/if}
+				{elseif isset($params.image)}
+					{$tr.$key}
+				{elseif isset($params.icon)}
+					<img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" />
+				{elseif isset($params.price)}
+					{$tr.$key}
+				{elseif isset($params.float)}
+					{$tr.$key}
+				{elseif isset($params.type) && $params.type == 'date'}
+					{$tr.$key}
+				{elseif isset($params.type) && $params.type == 'datetime'}
+					{$tr.$key}
+				{elseif isset($params.type) && $params.type == 'decimal'}
+					{$tr.$key|string_format:"%.2f"}
+				{elseif isset($params.type) && $params.type == 'percent'}
+					{$tr.$key} {l s='%'}
+				{* If type is 'editable', an input is created *}
+				{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
+					<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|htmlentities}" class="{$key}" />
+				{elseif isset($params.callback)}
+					{$tr.$key}
+				{elseif isset($tr.$key) && $key == 'color'}
+					<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
+				{elseif isset($tr.$key)}
+					{if isset($params.maxlength) && Tools::strlen($tr.$key) > $params.maxlength}
+						<span title="{$tr.$key|escape:'htmlall':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'htmlall':'UTF-8'}</span>
+					{else}
+						{$tr.$key|escape:'htmlall':'UTF-8'}
+					{/if}
 				{else}
-					{$tr.$key|escape:'htmlall':'UTF-8'}
+					{block name="default_field_block"}--{/block}
 				{/if}
-			{else}
-				{block name="default_field_block"}--{/block}
-			{/if}
-			{if isset($params.suffix)}{$params.suffix}{/if}
-			{if isset($params.color) && isset($tr.color)}
-				</span>
-			{/if}
-			</td>
+				{if isset($params.suffix)}{$params.suffix}{/if}
+				{if isset($params.color) && isset($tr.color)}
+					</span>
+				{/if}
+				</td>
+			{/block}
 		{/foreach}
 
 	{if $shop_link_type}