diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index dbb08a103..4fb8bf31e 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -25,7 +25,6 @@ namespace Thelia\Controller\Admin;
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Router;
 use Thelia\Controller\BaseController;
 use Symfony\Component\HttpFoundation\Response;
 use Thelia\Core\Security\Exception\AuthorizationException;
@@ -40,6 +39,7 @@ use Thelia\Model\LangQuery;
 use Thelia\Form\BaseForm;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Log\Tlog;
+use Symfony\Component\Routing\Router;
 
 class BaseAdminController extends BaseController
 {
diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
index a3323ae2a..349fa178a 100755
--- a/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
+++ b/core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
@@ -29,6 +29,7 @@ use Assetic\Filter;
 use Assetic\Factory\AssetFactory;
 use Assetic\Factory\Worker\CacheBustingWorker;
 use Assetic\AssetWriter;
+use Thelia\Model\ConfigQuery;
 
 /**
  * This class is a simple helper for generating assets using Assetic.
@@ -126,25 +127,28 @@ class AsseticHelper
         //
         if ($dev_mode == true || ! file_exists($target_file)) {
 
-            // Delete previous version of the file
-            list($commonPart, $dummy) = explode('-', $asset_target_path);
+            if (ConfigQuery::read('process_assets', true)) {
 
-            foreach (glob("$output_path/$commonPart-*") as $filename) {
-                @unlink($filename);
-            }
+                // Delete previous version of the file
+                list($commonPart, $dummy) = explode('-', $asset_target_path);
 
-            // Apply filters now
-            foreach ($filter_list as $filter) {
-                if ('?' != $filter[0]) {
-                    $asset->ensureFilter($fm->get($filter));
-                } elseif (!$debug) {
-                    $asset->ensureFilter($fm->get(substr($filter, 1)));
+                foreach (glob("$output_path/$commonPart-*") as $filename) {
+                    @unlink($filename);
                 }
+
+                // Apply filters now
+                foreach ($filter_list as $filter) {
+                    if ('?' != $filter[0]) {
+                        $asset->ensureFilter($fm->get($filter));
+                    } elseif (!$debug) {
+                        $asset->ensureFilter($fm->get(substr($filter, 1)));
+                    }
+                }
+
+                $writer = new AssetWriter($output_path);
+
+                $writer->writeAsset($asset);
             }
-
-            $writer = new AssetWriter($output_path);
-
-            $writer->writeAsset($asset);
         }
 
         return rtrim($output_url, '/').'/'.$asset_target_path;
diff --git a/core/lib/Thelia/Form/AddressCreateForm.php b/core/lib/Thelia/Form/AddressCreateForm.php
index 472a7429c..ed1750047 100644
--- a/core/lib/Thelia/Form/AddressCreateForm.php
+++ b/core/lib/Thelia/Form/AddressCreateForm.php
@@ -23,6 +23,7 @@
 
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class AddressCreateForm
@@ -59,65 +60,104 @@ class AddressCreateForm extends BaseForm
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "address name",
+                "label" => Translator::getInstance()->trans("Address label *"),
+                "label_attr" => array(
+                    "for" => "label_create"
+                ),
                 "required" => true
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "title"
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title_create"
+                )
             ))
             ->add("firstname", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "first name"
+                "label" => Translator::getInstance()->trans("Firstname"),
+                "label_attr" => array(
+                    "for" => "firstname_create"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "last name"
+                "label" => Translator::getInstance()->trans("Lastname"),
+                "label_attr" => array(
+                    "for" => "lastname_create"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "address"
+                "label" => Translator::getInstance()->trans("Street Address"),
+                "label_attr" => array(
+                    "for" => "address1_create"
+                )
             ))
-            ->add("address2", "text", array(
-                "label" => "address (line 2)"
+            ->add("address2", "text", array(                
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address2_create"
+                )
             ))
             ->add("address3", "text", array(
-                "label" => "address (line 3)"
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address3_create"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode_create"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "city"
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city_create"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new NotBlank()
                 ),
-                "label" => "country"
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country_create"
+                )
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone_create"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone_create"
+                )
             ))
             ->add("company", "text", array(
-                "label" => "company"
+                "label" => Translator::getInstance()->trans("Compagny"),
+                "label_attr" => array(
+                    "for" => "company_create"
+                )
             ))
             ;
     }
diff --git a/core/lib/Thelia/Form/AddressUpdateForm.php b/core/lib/Thelia/Form/AddressUpdateForm.php
index 556841261..4fcf6e29c 100644
--- a/core/lib/Thelia/Form/AddressUpdateForm.php
+++ b/core/lib/Thelia/Form/AddressUpdateForm.php
@@ -23,6 +23,7 @@
 
 namespace Thelia\Form;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class AddressUpdateForm
@@ -55,6 +56,112 @@ class AddressUpdateForm extends AddressCreateForm
     {
         parent::buildForm();
 
+        $this->formBuilder
+            ->add("label", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Address label *"),
+                "label_attr" => array(
+                    "for" => "label_update"
+                ),
+                "required" => true
+            ))
+            ->add("title", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title_update"
+                )
+            ))
+            ->add("firstname", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Firstname"),
+                "label_attr" => array(
+                    "for" => "firstname_update"
+                )
+            ))
+            ->add("lastname", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Lastname"),
+                "label_attr" => array(
+                    "for" => "lastname_update"
+                )
+            ))
+            ->add("address1", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Street Address"),
+                "label_attr" => array(
+                    "for" => "address1_update"
+                )
+            ))
+            ->add("address2", "text", array(                
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address2_update"
+                )
+            ))
+            ->add("address3", "text", array(
+                "label" => Translator::getInstance()->trans("Additional address"),
+                "label_attr" => array(
+                    "for" => "address3_update"
+                )
+            ))
+            ->add("zipcode", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode_update"
+                )
+            ))
+            ->add("city", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city_update"
+                )
+            ))
+            ->add("country", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country_update"
+                )
+            ))
+            ->add("phone", "text", array(
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone_update"
+                )
+            ))
+            ->add("cellphone", "text", array(
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone_update"
+                )
+            ))
+            ->add("company", "text", array(
+                "label" => Translator::getInstance()->trans("Compagny"),
+                "label_attr" => array(
+                    "for" => "company_update"
+                )
+            ))
+            ;
+
     }
 
     /**
diff --git a/core/lib/Thelia/Form/CustomerModification.php b/core/lib/Thelia/Form/CustomerModification.php
index 61f1e0834..358154a18 100755
--- a/core/lib/Thelia/Form/CustomerModification.php
+++ b/core/lib/Thelia/Form/CustomerModification.php
@@ -24,6 +24,7 @@
 namespace Thelia\Form;
 
 use Symfony\Component\Validator\Constraints;
+use Thelia\Core\Translation\Translator;
 
 /**
  * Class CustomerModification
@@ -56,60 +57,93 @@ class CustomerModification extends BaseForm
     {
 
         $this->formBuilder
-            ->add('update_logged_in_user', 'boolean') // In a front office context, update the in-memory logged-in user data
+            ->add('update_logged_in_user', 'integer') // In a front office context, update the in-memory logged-in user data
             ->add("firstname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "firstname"
+                "label" => Translator::getInstance()->trans("First Name"),
+                "label_attr" => array(
+                    "for" => "firstname"
+                )
             ))
             ->add("lastname", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "lastname"
+                "label" => Translator::getInstance()->trans("Last Name"),
+                "label_attr" => array(
+                    "for" => "lastname"
+                )
             ))
             ->add("address1", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "address"
+                "label_attr" => array(
+                    "for" => "address"
+                ),
+                "label" => Translator::getInstance()->trans("Street Address")
             ))
             ->add("address2", "text", array(
-                "label" => "Address Line 2"
+                "label" => Translator::getInstance()->trans("Address Line 2"),
+                "label_attr" => array(
+                    "for" => "address2"
+                )
             ))
             ->add("address3", "text", array(
-                "label" => "Address Line 3"
+                "label" => Translator::getInstance()->trans("Address Line 3"),
+                "label_attr" => array(
+                    "for" => "address3"
+                )
             ))
             ->add("phone", "text", array(
-                "label" => "phone"
+                "label" => Translator::getInstance()->trans("Phone"),
+                "label_attr" => array(
+                    "for" => "phone"
+                )
             ))
             ->add("cellphone", "text", array(
-                "label" => "cellphone"
+                "label" => Translator::getInstance()->trans("Cellphone"),
+                "label_attr" => array(
+                    "for" => "cellphone"
+                )
             ))
             ->add("zipcode", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "zipcode"
+                "label" => Translator::getInstance()->trans("Zip code"),
+                "label_attr" => array(
+                    "for" => "zipcode"
+                )
             ))
             ->add("city", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "city"
+                "label" => Translator::getInstance()->trans("City"),
+                "label_attr" => array(
+                    "for" => "city"
+                )
             ))
             ->add("country", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "country"
+                "label" => Translator::getInstance()->trans("Country"),
+                "label_attr" => array(
+                    "for" => "country"
+                )
             ))
             ->add("title", "text", array(
                 "constraints" => array(
                     new Constraints\NotBlank()
                 ),
-                "label" => "title"
+                "label" => Translator::getInstance()->trans("Title"),
+                "label_attr" => array(
+                    "for" => "title"
+                )
             ))
         ;
     }
diff --git a/install/insert.sql b/install/insert.sql
index da1414ce3..4ef9de276 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -17,8 +17,8 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('image_cache_dir_from_web_root', 'cache/images', 0, 0, NOW(), NOW()),
 ('currency_rate_update_url', 'http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml', 0, 0, NOW(), NOW()),
 ('page_not_found_view', '404.html', 0, 0, NOW(), NOW()),
-('use_tax_free_amounts', 1, 1, 0, NOW(), NOW());
-
+('use_tax_free_amounts', '1', 0, 0, NOW(), NOW());
+('process_assets', '1', 0, 0, NOW(), NOW());
 
 INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namespace`, `created_at`, `updated_at`) VALUES
 (1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW());
diff --git a/local/modules/DebugBar/Config/config.xml b/local/modules/DebugBar/Config/config.xml
index 6713c8ce6..12c5ccd24 100644
--- a/local/modules/DebugBar/Config/config.xml
+++ b/local/modules/DebugBar/Config/config.xml
@@ -30,7 +30,7 @@
 
 
     <services>
-        <service id="debugBar" class="DebugBar\StandardDebugBar"/>
+        <service id="debugBar" class="DebugBar\DebugBar"/>
 
         <service id="smarty.debugbar" class="DebugBar\Smarty\Plugin\DebugBar">
             <argument type="service" id="debugBar"/>
diff --git a/local/modules/DebugBar/Listeners/DebugBarListeners.php b/local/modules/DebugBar/Listeners/DebugBarListeners.php
index 7d0981d5d..f789a9a13 100644
--- a/local/modules/DebugBar/Listeners/DebugBarListeners.php
+++ b/local/modules/DebugBar/Listeners/DebugBarListeners.php
@@ -22,7 +22,11 @@
 /*************************************************************************************/
 
 namespace DebugBar\Listeners;
+use DebugBar\DataCollector\MemoryCollector;
+use DebugBar\DataCollector\MessagesCollector;
+use DebugBar\DataCollector\PhpInfoCollector;
 use DebugBar\DataCollector\PropelCollector;
+use DebugBar\DataCollector\TimeDataCollector;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Thelia\Action\BaseAction;
@@ -40,6 +44,12 @@ class DebugBarListeners extends BaseAction implements EventSubscriberInterface {
     {
         $debugBar = $this->container->get("debugBar");
 
+
+        $debugBar->addCollector(new PhpInfoCollector());
+        //$debugBar->addCollector(new MessagesCollector());
+        //$debugBar->addCollector(new RequestDataCollector());
+        $debugBar->addCollector(new TimeDataCollector());
+        $debugBar->addCollector(new MemoryCollector());
         $debugBar->addCollector(new PropelCollector());
     }
 
diff --git a/templates/admin/default/assets/js/main.js b/templates/admin/default/assets/js/main.js
index c8fc1a7b7..d472a22a9 100644
--- a/templates/admin/default/assets/js/main.js
+++ b/templates/admin/default/assets/js/main.js
@@ -69,6 +69,11 @@
             
         }
 
+        // -- Bootstrap tooltip --
+        if($('[rel="tooltip"]').length){            
+            $('[rel="tooltip"]').tooltip();
+        }
+
         // -- Confirm Box --
         if($('[data-toggle="confirm"]').length){
             $('[data-toggle="confirm"]').click(function(e){		
diff --git a/templates/admin/default/assets/less/thelia/variables.less b/templates/admin/default/assets/less/thelia/variables.less
index 35bc931b5..77ef1dfd3 100755
--- a/templates/admin/default/assets/less/thelia/variables.less
+++ b/templates/admin/default/assets/less/thelia/variables.less
@@ -49,5 +49,8 @@
 // Forms
 // -------------------------
 
+@input-border-focus:             @link-color;
 
-@input-border-focus:             @link-color;
\ No newline at end of file
+// Breadcrumbs
+// -------------------------
+@breadcrumb-color:            #333;
\ No newline at end of file
diff --git a/templates/admin/default/customer-edit.html b/templates/admin/default/customer-edit.html
new file mode 100644
index 000000000..c512bb056
--- /dev/null
+++ b/templates/admin/default/customer-edit.html
@@ -0,0 +1,522 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit a customer'}{/block}
+
+{block name="check-permissions"}admin.customer.edit{/block}
+
+{block name="main-content"}
+    <div class="customers edit-customer">
+
+        <div id="wrapper" class="container">
+
+            {loop name="customer_edit" type="customer" current="false" id="$customer_id" backend_context="1" lang="$edit_language_id"}
+                
+                <ul class="breadcrumb">
+        			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>                    
+                    <li><a href="{url path='/admin/customers'}">{intl l="Customers"}</a></li>
+                    <li>{intl l='Editing customer "%name"' name="{$FIRSTNAME} {$LASTNAME}"}</li>
+                </ul>
+
+        		<div class="row">
+        			<div class="col-md-12 general-block-decorator">
+        				<div class="row">
+
+        					<div class="col-md-12 title title-without-tabs">
+        					   {intl l="Edit customer $FIRSTNAME $LASTNAME"}
+        					</div>
+
+                            <div class="form-container">
+                                <div class="col-md-12">
+
+        						    {form name="thelia.customer.modification"}
+        						    	<form method="POST" action="{url path='/admin/customers/save'}" {form_enctype form=$form} class="clearfix">
+
+        	                                {* Be sure to get the customer ID, even if the form could not be validated *}
+        	                                <input type="hidden" name="customer_id" value="{$customer_id}" />
+
+                                        	{include file="includes/inner-form-toolbar.html"}
+
+        						        	{form_hidden_fields form=$form}
+
+        						        	{form_field form=$form field='success_url'}
+        						        		<input type="hidden" name="{$name}" value="{url path='/admin/customers'}" />
+        						        	{/form_field}
+
+        					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
+
+                                            <div class="col-md-6">                                                
+                                                <p class="title title-without-tabs">{intl l="Customer informations"}</p>
+
+                                                {form_field form=$form field='title'}                
+                                                    <div class="form-group {if $error}has-error{/if}">
+                                                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                        
+                                                        <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                                                            {loop type="title" name="title1"}
+                                                                <option value="{$ID}">{$LONG}</option>
+                                                            {/loop}
+                                                        </select>                    
+                                                    </div>
+                                                {/form_field}
+
+                                                {form_field form=$form field='firstname'}
+                                                    <div class="form-group {if $error}has-error{/if}">
+                                                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$FIRSTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                                                    </div>
+                                                {/form_field}
+
+                                                {form_field form=$form field='lastname'}
+                                                    <div class="form-group {if $error}has-error{/if}">
+                                                        <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$LASTNAME}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                                                    </div>
+                                                {/form_field}
+
+                                                {loop name="address" type="address" customer="$customer_id" backend_context="1" default="true"}
+                                                    
+                                                    <p class="title title-without-tabs">{intl l="Default address"}</p>
+
+                                                    {form_field form=$form field='address1'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ADDRESS1}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">
+                                                        </div>
+                                                    {/form_field}
+
+                                                    {form_field form=$form field='address2'}
+                                                        <div class="form-group">                                                        
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ADDRESS2}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">                                                                        
+                                                        </div>
+                                                    {/form_field}   
+
+                                                    {form_field form=$form field='address3'}
+                                                        <div class="form-group">                                                            
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ADDRESS3}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">                                                        
+                                                        </div>
+                                                    {/form_field}                                            
+
+                                                    {form_field form=$form field='zipcode'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$ZIPCODE}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                                                        </div>
+                                                    {/form_field}
+
+                                                    {form_field form=$form field='city'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$CITY}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                                                        </div>
+                                                    {/form_field}
+
+                                                    {form_field form=$form field='country'}
+                                                        <div class="form-group {if $error}has-error{/if}">
+                                                            <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                                                            <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                                                                {loop type="country" name="country1"}
+                                                                    <option value="{$ID}">{$TITLE}</option>
+                                                                {/loop}
+                                                            </select>
+                                                        </div>
+                                                    {/form_field} 
+
+                                                {/loop}                                                                                        
+
+                                            </div>
+
+                                            <div class="col-md-6">
+                                                <p class="title title-without-tabs clearfix">
+                                                    {intl l="Other addresses"}
+                                                    <span class="pull-right">                                                        
+                                                        <a class="btn btn-default btn-primary" title="{intl l='Add a new address'}" href="#address_creation_dialog" data-toggle="modal">
+                                                            <span class="glyphicon glyphicon-plus-sign"></span>
+                                                        </a>
+                                                    </span>
+                                                </p>
+
+                                                <table class="table table-bordered table-striped">
+                                                    <thead>
+                                                        <tr>
+                                                            <th>{intl l="Address"}</th>
+                                                            <th>{intl l="Actions"}</th>
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody>
+                                                        <tr>
+                                                            <td>
+                                                                <address>
+                                                                    <strong>Twitter, Inc.</strong><br>
+                                                                    795 Folsom Ave, Suite 600<br>
+                                                                    San Francisco, CA 94107<br>
+                                                                    <abbr title="Phone">P:</abbr> (123) 456-7890
+                                                                </address>
+                                                            </td>
+                                                            <td>
+                                                                <div class="btn-group">
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-edit"></span>
+                                                                    </a>
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
+                                                                        <span class="glyphicon glyphicon-pushpin"></span>
+                                                                    </a>
+
+                                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-trash"></span>
+                                                                    </a>
+                                                                    
+                                                                </div>
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>
+                                                                <address>
+                                                                    <strong>Twitter, Inc.</strong><br>
+                                                                    795 Folsom Ave, Suite 600<br>
+                                                                    San Francisco, CA 94107<br>
+                                                                    <abbr title="Phone">P:</abbr> (123) 456-7890
+                                                                </address>
+                                                            </td>
+                                                            <td>
+                                                                <div class="btn-group">
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-edit"></span>
+                                                                    </a>
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
+                                                                        <span class="glyphicon glyphicon-pushpin"></span>
+                                                                    </a>
+
+                                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-trash"></span>
+                                                                    </a>
+                                                                    
+                                                                </div>
+                                                            </td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>
+                                                                <address>
+                                                                    <strong>Twitter, Inc.</strong><br>
+                                                                    795 Folsom Ave, Suite 600<br>
+                                                                    San Francisco, CA 94107<br>
+                                                                    <abbr title="Phone">P:</abbr> (123) 456-7890
+                                                                </address>
+                                                            </td>
+                                                            <td>
+                                                                <div class="btn-group">
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Edit this address'}" href="#edit_address_dialog" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-edit"></span>
+                                                                    </a>
+                                                                    
+                                                                    <a class="btn btn-default btn-xs" title="{intl l='Use this address by default'}" href="#use_address_dialog" data-toggle="modal" rel="tooltip">
+                                                                        <span class="glyphicon glyphicon-pushpin"></span>
+                                                                    </a>
+
+                                                                    <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_address_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                        <span class="glyphicon glyphicon-trash"></span>
+                                                                    </a>
+                                                                    
+                                                                </div>
+                                                            </td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+
+                                        </form>
+        							{/form}
+
+        						</div>
+        					</div>
+
+        				</div>
+        			</div>
+
+        		</div>
+
+    		{/loop}
+
+            {elseloop rel="customer_edit"}
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="alert alert-error">
+                            {intl l="Sorry, customer ID=$customer_id was not found."}
+                        </div>
+                    </div>
+                </div>
+            {/elseloop}
+
+        </div>
+    </div>
+
+
+    {* Add an Address *}
+
+    {form name="thelia.address.create"}
+        
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "address_creation_dialog"}
+            
+            {form_hidden_fields form=$form}
+                    
+            {form_field form=$form field='label'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Label'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='company'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Company'}">
+                </div>
+            {/form_field}
+            
+            {form_field form=$form field='title'}                
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="title" name="title1"}
+                            <option value="{$ID}">{$LONG}</option>
+                        {/loop}
+                    </select>                    
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='firstname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='lastname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='address1'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address2'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address3'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='zipcode'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='city'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='country'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="country" name="country1"}
+                            <option value="{$ID}">{$TITLE}</option>
+                        {/loop}
+                    </select>
+                </div>
+            {/form_field}         
+
+        {/capture}
+    
+        {include
+            file = "includes/generic-create-dialog.html"
+
+            dialog_id    = "address_creation_dialog"
+            dialog_title = {intl l="Create an address"}
+            dialog_body  = {$smarty.capture.address_creation_dialog nofilter}
+
+            dialog_ok_label     = {intl l="Create this address"}
+            dialog_cancel_label = {intl l="Cancel"}
+
+            form_action        = {url path='/admin/address/create'}
+            form_enctype       = {form_enctype form=$form}
+            form_error_message = $form_error_message
+        }
+
+    {/form}
+
+    {* Update an Address *}
+
+    {form name="thelia.address.update"}
+        
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "edit_address_dialog"}
+            
+            {form_hidden_fields form=$form}
+                    
+            {form_field form=$form field='label'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Label'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='company'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Company'}">
+                </div>
+            {/form_field}
+            
+            {form_field form=$form field='title'}                
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="title" name="title1"}
+                            <option value="{$ID}">{$LONG}</option>
+                        {/loop}
+                    </select>                    
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='firstname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Firstname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='lastname'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Lastname'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='address1'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address2'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}                    
+                </div>
+
+                <div class="form-group">
+                    {form_field form=$form field='address3'}
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
+                    {/form_field}
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='zipcode'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Zip code'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='city'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='City'}">
+                </div>
+            {/form_field}
+
+            {form_field form=$form field='country'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <select name="{$name}" id="{$label_attr.for}" class="form-control">
+                        {loop type="country" name="country1"}
+                            <option value="{$ID}">{$TITLE}</option>
+                        {/loop}
+                    </select>
+                </div>
+            {/form_field}         
+
+        {/capture}
+    
+        {include
+            file = "includes/generic-create-dialog.html"
+
+            dialog_id    = "edit_address_dialog"
+            dialog_title = {intl l="Edit an address"}
+            dialog_body  = {$smarty.capture.edit_address_dialog nofilter}
+
+            dialog_ok_label     = {intl l="Edit this address"}
+            dialog_cancel_label = {intl l="Cancel"}
+
+            form_action        = {url path='/admin/address/update'}
+            form_enctype       = {form_enctype form=$form}
+            form_error_message = $form_error_message
+        }
+
+    {/form}
+    
+    
+    {* Default confirmation dialog *}
+
+    {capture "use_address_dialog"}
+        <input type="hidden" name="address_id" id="address_use_id" value="" />
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "use_address_dialog"
+        dialog_title    = {intl l="Use address by default"}
+        dialog_message  = {intl l="Do you really want to use this address by default ?"}
+
+        form_action         = {url path='/admin/address/use'}
+        form_content        = {$smarty.capture.use_address_dialog nofilter}
+    }
+
+    {* Delete confirmation dialog *}
+
+    {capture "delete_address_dialog"}
+        <input type="hidden" name="address_id" id="address_delete_id" value="" />
+    {/capture}
+
+    {include
+        file = "includes/generic-confirm-dialog.html"
+
+        dialog_id       = "delete_address_dialog"
+        dialog_title    = {intl l="Delete address"}
+        dialog_message  = {intl l="Do you really want to delete this address ?"}
+
+        form_action         = {url path='/admin/address/delete'}
+        form_content        = {$smarty.capture.delete_dialog nofilter}
+    }
+{/block}
+
+{block name="javascript-initialization"}
+    {javascripts file='assets/js/main.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+{/block}
\ No newline at end of file
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index 570c38bdc..a43c59131 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -9,9 +9,13 @@
     {assign var=customer_page value={$smarty.get.page|default:1}}
 
 
-    <div class="catalog">
+    <div class="customer">
         <div id="wrapper" class="container">
-
+            
+            <ul class="breadcrumb">
+                <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>                    
+                <li><a href="{url path='/admin/customers'}">{intl l="Customers"}</a></li>
+            </ul>
 
             {module_include location='customer_top'}
 
@@ -150,7 +154,13 @@
                <input type="hidden" name="{$name}" value="{url path='/admin/customer/update/_ID_'}" />
             {/form_field}
             
-
+            {form_field form=$form field='company'}
+                <div class="form-group {if $error}has-error{/if}">
+                    <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Company'}">
+                </div>
+            {/form_field}
+            
             {form_field form=$form field='title'}                
                 <div class="form-group {if $error}has-error{/if}">
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>