diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
index 96021a35d..00f822257 100644
--- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
@@ -26,20 +26,23 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-<div class="panel">
-	<h3>{$manufacturer->name}</h3>
-	<span>{l s='Total addresses'} {count($addresses)}</span>
+<fieldset>
+	<h3>{l s='Addresses'} <span class="badge">{count($addresses)}</span></h3>
 	{if !count($addresses)}
 		{l s='No address has been found for this manufacturer.'}
 	{else}
 		{foreach $addresses AS $addresse}
+		<div class="panel">
+			<div class="panel-heading">
+				{$addresse.firstname} {$addresse.lastname}
+				<div class="pull-right">
+					<a class="btn btn-default" href="{$link->getAdminLink('AdminManufacturers')}&id_address={$addresse.id_address}&editaddresses=1">
+						<i class="icon-edit"></i>
+						{l s='Edit'}</a>
+				</div>
+			</div>
+
 			<table class="table">
-				<thead>
-					<tr>
-						<th>{$addresse.firstname} {$addresse.lastname}
-						</th>
-					</tr>
-				</thead>
 				<tbody>
 					<tr>
 						<td>
@@ -56,20 +59,13 @@
 						</td>
 					</tr>
 				</tbody>
-				<tfoot>
-					<tr>
-						<td>
-							<a class="btn btn-default" href="{$link->getAdminLink('AdminManufacturers')}&id_address={$addresse.id_address}&editaddresses=1">
-							<i class="icon-edit"></i>
-							{l s='Edit'}</a>
-						</td>
-					</tr>
-				</tfoot>
 			</table>
+		</div>
 		{/foreach}
 	{/if}
-
-	<span>{l s='Total products'} {count($products)}</span>
+</fieldset>
+<fieldset>
+	<h3>{l s='Products'} <span class="badge">{count($products)}</span></h3>
 
 	{foreach $products AS $product}
 		{if !$product->hasAttributes()}
@@ -146,5 +142,5 @@
 			</div>
 		{/if}
 	{/foreach}
-</div>
+</fieldset>
 {/block}
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index 9ca07b529..f854ee81c 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -596,6 +596,9 @@ class AdminManufacturersControllerCore extends AdminController
 					'href' => $this->context->link->getAdminLink('AdminManufacturers').'&addaddress=1&id_manufacturer='.(int)$manufacturer->id,
 					'desc' => $this->l('Add address')
 				);
+
+		$this->toolbar_title = is_array($this->breadcrumbs) ? array_unique($this->breadcrumbs) : array($this->breadcrumbs);
+		$this->toolbar_title[] = $manufacturer->name;
 		
 		$addresses = $manufacturer->getAddresses($this->context->language->id);