diff --git a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
index 8ce702b06..db49a35d2 100644
--- a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
@@ -30,55 +30,44 @@
 <h2>{$supplier->name}</h2>
 
 <h3>{l s='Number of products:'} {count($products)}</h3>
+<table border="0" cellpadding="0" cellspacing="0" class="table" style="">
+	<tr>
+		<th>{l s='Product name'}</th>
+		<th>{l s='Attribute name'}</th>
+		<th>{l s='Supplier Reference'}</th>
+		<th>{l s='Wholesale price'}</th>
+		<th>{l s='Reference'}</th>
+		<th>{l s='EAN13'}</th>
+		<th>{l s='UPC'}</th>
+		{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<th class="right">{l s='Available Quantity'}</th>{/if}
+	</tr>
 {foreach $products AS $product}
-	<hr />
 	{if !$product->hasAttributes()}
-		<table border="0" cellpadding="0" cellspacing="0" class="table" style="">
-			<tr>
-				<th  width="450">{l s='Name'} {$product->name}</th>
-				{if !empty($product->product_supplier_reference)}<th width="190">{l s='Supplier Reference:'} {$product->product_supplier_reference}</th>{/if}
-				{if !empty($product->product_supplier_price_te)}<th width="190">{l s='Wholesale price:'} {$product->product_supplier_price_te}</th>{/if}
-				{if !empty($product->reference)}<th width="150">{l s='Reference:'} {$product->reference}</th>{/if}
-				{if !empty($product->ean13)}<th width="120">{l s='EAN13:'} {$product->ean13}</th>{/if}
-				{if !empty($product->upc)}<th width="120">{l s='UPC:'} {$product->upc}</th>{/if}
-				{if $stock_management}<th class="right" width="150">{l s='Available Quantity:'} {$product->quantity}</th>{/if}
-			</tr>
-		</table>
+		<tr>
+			<td><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></td>
+			<td>{l s='N/A'}</td>
+			<td>{if empty($product->product_supplier_reference)}{l s='N/A'}{else}{$product->product_supplier_reference}{/if}</td>
+			<td>{if empty($product->product_supplier_price_te)}{l s='N/A'}{else}{$product->product_supplier_price_te}{/if}</td>
+			<td>{if empty($product->reference)}{l s='N/A'}{else}{$product->reference}{/if}</td>
+			<td>{if empty($product->ean13)}{l s='N/A'}{else}{$product->ean13}{/if}</td>
+			<td>{if empty($product->upc)}{l s='N/A'}{else}{$product->upc}{/if}</td>
+			{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<td class="right" width="150">{$product->quantity}</td>{/if}
+		</tr>
 	{else}
-		<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
-		<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
-			<colgroup>
-				<col>
-				<col width="190">
-				<col width="190">
-				<col width="80">
-				<col width="80">
-				<col width="80">
-				<col width="80">
-			</colgroup>
-			<tr>
-				<th style="height:40px;">{l s='Attribute name'}</th>
-				<th>{l s='Supplier Reference'}</th>
-				<th >{l s='Wholesale price'}</th>
-				<th>{l s='Reference'}</th>
-				<th>{l s='EAN13'}</th>
-				<th>{l s='UPC'}</th>
-				{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<th class="right">{l s='Available Quantity'}</th>{/if}
+		{foreach $product->combination AS $id_product_attribute => $product_attribute}
+			<tr {if $id_product_attribute %2}class="alt_row"{/if} >
+				<td><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></td>
+				<td>{if empty($product_attribute.attributes)}{l s='N/A'}{else}{$product_attribute.attributes}{/if}</td>
+				<td>{if empty($product_attribute.product_supplier_reference)}{l s='N/A'}{else}{$product_attribute.product_supplier_reference}{/if}</td>
+				<td>{if empty($product_attribute.product_supplier_price_te)}{l s='N/A'}{else}{$product_attribute.product_supplier_price_te}{/if}</td>
+				<td>{if empty($product_attribute.reference)}{l s='N/A'}{else}{$product_attribute.reference}{/if}</td>
+				<td>{if empty($product_attribute.ean13)}{l s='N/A'}{else}{$product_attribute.ean13}{/if}</td>
+				<td>{if empty($product_attribute.upc)}{l s='N/A'}{else}{$product_attribute.upc}{/if}</td>
+				{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<td class="right">{$product_attribute.quantity}</td>{/if}
 			</tr>
-			{foreach $product->combination AS $id_product_attribute => $product_attribute}
-				<tr {if $id_product_attribute %2}class="alt_row"{/if} >
-					<td>{$product_attribute.attributes}</td>
-					<td>{$product_attribute.product_supplier_reference}</td>
-					<td>{$product_attribute.product_supplier_price_te}</td>
-					<td>{$product_attribute.reference}</td>
-					<td>{$product_attribute.ean13}</td>
-					<td>{$product_attribute.upc}</td>
-					{if $stock_management && $shopContext != Shop::CONTEXT_ALL}<td class="right">{$product_attribute.quantity}</td>{/if}
-				</tr>
-			{/foreach}
-		</table>
+		{/foreach}
 	{/if}
 {/foreach}
-
+</table>
 {/block}