diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 8eb2216dc..f8be6e65b 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -1510,7 +1510,7 @@ input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-i
   display: block;
   width: 100%;
   height: 27px;
-  padding: 4px 12px;
+  padding: 4px 8px;
   font-size: 12px;
   line-height: 1.42857;
   color: #555555;
@@ -1732,7 +1732,7 @@ textarea.input-lg, .input-group-lg > textarea, .input-group-lg > textarea.input-
 /* line 10, ../bower_components/sass-bootstrap/lib/_buttons.scss */
 .btn {
   display: inline-block;
-  padding: 4px 12px;
+  padding: 4px 8px;
   margin-bottom: 0;
   font-size: 12px;
   font-weight: normal;
@@ -3170,7 +3170,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
 
 /* line 59, ../bower_components/sass-bootstrap/lib/_input-groups.scss */
 .input-group-addon {
-  padding: 4px 12px;
+  padding: 4px 8px;
   font-size: 12px;
   font-weight: normal;
   line-height: 1;
@@ -3842,7 +3842,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
 .pagination > li > a, .pagination > li > span {
   position: relative;
   float: left;
-  padding: 4px 12px;
+  padding: 4px 8px;
   line-height: 1.42857;
   text-decoration: none;
   background-color: white;
diff --git a/admin-dev/themes/default/css/bootstrap/_variables.scss b/admin-dev/themes/default/css/bootstrap/_variables.scss
index e1e21ef3f..cef16e82d 100644
--- a/admin-dev/themes/default/css/bootstrap/_variables.scss
+++ b/admin-dev/themes/default/css/bootstrap/_variables.scss
@@ -64,7 +64,7 @@ $headings-font-weight:    300 ;
 // Based on 14px font-size and 1.428 line-height (~20px to start)
 
 $padding-base-vertical:          4px ;
-// $padding-base-horizontal:        12px ;
+$padding-base-horizontal:        8px ;
 
 // $padding-large-vertical:         14px ;
 // $padding-large-horizontal:       16px ;
diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
index e1038efd8..56d2b855e 100644
--- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
@@ -63,25 +63,25 @@
 			</section>
 
 			<section class="dash_links panel">
-				<h4><i class="icon-link"></i>{l s="Useful PrestaShop Links"}</h4>
+				<h4><i class="icon-link"></i> {l s="Useful PrestaShop Links"}</h4>
 					<dl>
-						<dt>{l s="Discover the latest official documentation :"}</dt>
+						<dt>{l s="Discover the official documentation"}</dt>
 						<dd><a href="http://doc.prestashop.com/display/PS16?utm_source=backoffice_dashboard" target="_blank">{l s="Go to doc.prestashop.com"}</a></dd>
 					</dl>
 					<dl>
-						<dt>{l s="Use the PrestaShop forum & discover a great community :"}</dt>
+						<dt>{l s="Use the forum & discover a great community"}</dt>
 						<dd><a href="http://www.prestashop.com/forums?utm_source=backoffice_dashboard" target="_blank">{l s="Go to forums.prestashop.com"}</a></dd>
 					</dl>
 					<dl>
-						<dt>{l s="Enhance your Shop with new templates & modules :"}</dt>
+						<dt>{l s="Enhance your Shop with new templates & modules"}</dt>
 						<dd><a href="http://addons.prestashop.com?utm_source=backoffice_dashboard" target="_blank">{l s="Go to addons.prestashop.com"}</a></dd>
 					</dl>
 					<dl>
-						<dt>{l s="PrestaShop BugTracker :"}</dt>
+						<dt>{l s="Report issues in the Bug Tracker"}</dt>
 						<dd><a href="http://forge.prestashop.com?utm_source=backoffice_dashboard" target="_blank">{l s="Go to forge.prestashop.com"}</a></dd>
 					</dl>
 					<dl>
-						<dt>{l s="Contact US :"}</dt>
+						<dt>{l s="Contact Us"}</dt>
 						<dd><a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_dashboard" target="_blank">{l s="Go to prestashop.com"}</a></dd>
 					</dl>
 			</section>
diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
index 119ecefb8..406b1bb19 100644
--- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="form-horizontal">
+<div class="form-horizontal well">
 	<div class="form-group">
 		<label class="control-label col-lg-3">
 			{l s='Name'}
@@ -95,7 +95,7 @@
 	</div>
 	{/if}
 
-	<div class="form-group">
+	<div class="row">
 		<div class="col-lg-9 col-lg-offset-3">
 			<button class="btn btn-default" type="button" id="cancel_add_voucher">
 				<i class="icon-remove text-danger"></i>
diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
index 1e5ab206e..b1e836c8f 100644
--- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl
@@ -48,7 +48,7 @@
 	</td>
 
 	<td style="display:none;">
-		<div class="form-group">
+		<div class="row">
 			<div class="input-group fixed-width-xl">
 				<div class="input-group-addon">
 					{$currency->sign}
@@ -57,7 +57,7 @@
 				<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" disabled="disabled" />
 			</div>
 		</div>
-		<div class="form-group">
+		<div class="row">
 			<div class="input-group fixed-width-xl">
 				<div class="input-group-addon">
 					{$currency->sign}
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index fe47a3685..56efb8436 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -186,8 +186,8 @@
 		</div>
 		<div class="col-lg-6">
 			<!-- Customer informations -->
-			{if $customer->id}
 			<div class="panel">
+			{if $customer->id}
 				<h3>
 					<i class="icon-user"></i>
 					{l s='Customer information'}
@@ -220,15 +220,450 @@
 						</div>
 					{/if}
 				{else}
-				<ul>
+				<ul class="list-unstyled">
 					<li>{l s='Account registered:'} <strong>{dateFormat date=$customer->date_add full=true}</strong></li>
 					<li>{l s='Valid orders placed:'} <strong>{$customerStats['nb_orders']}</strong></li>
 					<li>{l s='Total spent since registration:'} <strong>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</strong></li>
 				</ul>
 				{/if}
-			</div>
 			{/if}
 
+			<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
+<!-- 				<fieldset>
+					<h3>
+						<i class="icon-envelope"></i>
+						{l s='New message'}
+					</h3>
+
+					<p id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}">
+						{l s='to add a comment or send a message to the customer.'}
+					</p> -->
+
+
+					<div id="message" class="form-horizontal well" style="display:none">
+						<div class="form-group">
+							<label class="control-label col-lg-3">{l s='Choose a standard message'}</label>
+							<div class="col-lg-9">
+								<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
+									<option value="0" selected="selected">--</option>
+									{foreach from=$orderMessages item=orderMessage}
+									<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
+									{/foreach}
+								</select>
+							</div>
+						</div>
+
+						<div class="form-group">
+							<label class="control-label col-lg-3">{l s='Display to customer?'}</label>
+							<div class="col-lg-9">
+								<div class="row">
+									<div class="input-group col-lg-2">
+										<span class="switch prestashop-switch">
+											<input type="radio" name="visibility" id="visibility_on" value="0" />
+											<label class="radio" for="visibility_on">
+												<i class="icon-check-sign text-success"></i>
+												{l s='Yes'}
+											</label>
+											<input type="radio" name="visibility" id="visibility_off" value="1" checked="checked" /> 
+											<label class="radio" for="visibility_off">
+												<i class="icon-ban-circle text-danger"></i>
+												{l s='No'}
+											</label>
+											<span class="slide-button btn btn-default"></span>
+										</span>
+									</div>
+								</div>				
+							</div>
+						</div>
+
+						<div class="form-group">
+							<label class="control-label col-lg-3">{l s='Message'}</label>
+							<div class="col-lg-9">
+								<textarea id="txt_msg" class="textarea-autosize" name="message">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea>
+								<p id="nbchars"></p>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-lg-9 col-lg-offset-3">
+								<input type="hidden" name="id_order" value="{$order->id}" />
+								<input type="hidden" name="id_customer" value="{$order->id_customer}" />
+								<button type="button" id="cancelMessage" class="btn btn-default">
+									<i class="icon-remove text-danger"></i>
+									{l s='Cancel'}
+								</button>
+								<button type="submit" id="submitMessage" class="btn btn-default" name="submitMessage">
+									<i class="icon-ok text-success"></i>
+									{l s='Send'}
+								</button>
+							</div>
+						</div>
+					</div>
+					<hr/>
+					<button id="newMessage" type="button" class="btn btn-default">
+						<i class="icon-envelope"></i>
+						{l s='New message'}
+					</button>
+					<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">
+						<b>{l s='Click here'}</b> {l s='to see all messages.'}
+						<i class="icon-external-link"></i>
+					</a>
+				</div>
+			</form>
+		</div>
+	</div>
+
+<div>
+	<ul class="nav nav-tabs" id="myTab">
+		<li class="active"><a href="#payment">
+			<i class="icon-money"></i>
+			Payment</a>
+		</li>
+		<li><a href="#shipping">
+			<i class="icon-truck"></i>
+			Shipping</a>
+		</li>
+		<li><a href="#returns">
+			<i class="icon-undo"></i>
+			Merchandise Returns</a>
+		</li>
+		<li><a href="#documents">
+			<i class="icon-file-text"></i>
+			Documents</a>
+		</li>
+	</ul>
+
+	<div class="tab-content">
+		<div class="tab-pane active" id="payment">
+			<!-- Payments block -->
+			<fieldset>
+				<h3>
+					<i class="icon-money"></i>
+					{l s='Payment'}
+				</h3>
+				{if count($order->getOrderPayments()) > 0}
+				<p class="alert alert-danger" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
+					{l s='Warning'}
+					<strong>{displayPrice price=$total_paid currency=$currency->id}</strong>
+					{l s='paid instead of'}
+					<strong class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</strong>
+					
+					{foreach $order->getBrother() as $brother_order}
+						{if $brother_order@first}
+							{if count($order->getBrother()) == 1}
+								<br />{l s='This warning also concerns order '}
+							{else}
+								<br />{l s='This warning also concerns the next orders:'}
+							{/if}
+						{/if}
+						<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+							#{'%06d'|sprintf:$brother_order->id}
+						</a>
+					{/foreach}
+				</p>
+				{/if}
+				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+					<table class="table">
+						<thead>
+							<tr>
+								<th><span class="title_box ">{l s='Date'}</span></th>
+								<th><span class="title_box ">{l s='Payment method'}</span></th>
+								<th><span class="title_box ">{l s='Transaction ID'}</span></th>
+								<th><span class="title_box ">{l s='Amount'}</span></th>
+								<th><span class="title_box ">{l s='Invoice'}</span></th>
+								<th></th>
+							</tr>
+						</thead>
+						<tbody>
+							{foreach from=$order->getOrderPaymentCollection() item=payment}
+							<tr>
+								<td>{dateFormat date=$payment->date_add full=true}</td>
+								<td>{$payment->payment_method}</td>
+								<td>{$payment->transaction_id}</td>
+								<td>{displayPrice price=$payment->amount currency=$payment->id_currency}</td>
+								<td>
+								{if $invoice = $payment->getOrderInvoice($order->id)}
+									{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
+								{else}
+									{l s='No invoice'}
+								{/if}
+								</td>
+								<td>
+									<button class="btn btn-default open_payment_information">
+										<i class="icon-search"></i>
+										{l s='See payment information'}
+									</button>
+								</td>
+							</tr>
+							<tr class="payment_information" style="display: none;">
+								<td colspan="6">
+									<p>
+										<b>{l s='Card Number'}</b>&nbsp;
+										{if $payment->card_number}
+											{$payment->card_number}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
+									<p>
+										<b>{l s='Card Brand'}</b>&nbsp;
+										{if $payment->card_brand}
+											{$payment->card_brand}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
+									<p>
+										<b>{l s='Card Expiration'}</b>&nbsp;
+										{if $payment->card_expiration}
+											{$payment->card_expiration}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
+									<p>
+										<b>{l s='Card Holder'}</b>&nbsp;
+										{if $payment->card_holder}
+											{$payment->card_holder}
+										{else}
+											<i>{l s='Not defined'}</i>
+										{/if}
+									</p>
+								</td>
+							</tr>
+							{foreachelse}
+							<tr>
+								<td class="text-center" colspan="6">
+									<i class="icon-warning-sign"></i>
+									{l s='No payments are available'}
+								</td>
+							</tr>
+							{/foreach}
+							<tr class="current-edit">
+								<td>
+									<input type="text" name="payment_date" class="datepicker" value="{date('Y-m-d H:i:s')}" />
+								</td>
+								<td>
+									<select name="payment_method" class="payment_method">
+									{foreach from=$payment_methods item=payment_method}
+										<option value="{$payment_method}">{$payment_method}</option>
+									{/foreach}
+									</select>
+								</td>
+								<td>
+									<input type="text" name="payment_transaction_id" value="" />
+								</td>
+								<td>
+									<div class="form-group">
+										<div class="col-lg-9">
+											<input type="text" name="payment_amount" value="" />
+										</div>
+										<div class="col-lg-3">
+											<select name="payment_currency" class="payment_currency">
+											{foreach from=$currencies item=current_currency}
+												<option value="{$current_currency['id_currency']}"{if $current_currency['id_currency'] == $currency->id} selected="selected"{/if}>{$current_currency['sign']}</option>
+											{/foreach}
+											</select>
+										</div>								
+									</div>
+								</td>
+								{if count($invoices_collection) > 0}
+								<td>
+									<select name="payment_invoice" id="payment_invoice">
+									{foreach from=$invoices_collection item=invoice}
+										<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}</option>
+									{/foreach}
+									</select>
+								</td>
+								{/if}
+								<td>
+									<button class="btn btn-default" type="submit" name="submitAddPayment">
+										<i class="icon-ok"></i>
+										{l s='Save'}
+									</button>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+				</form>
+				{if (!$order->valid && sizeof($currencies) > 1)}
+				<form class="form-horizontal" method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+					<label class="control-label col-lg-3">{l s='Change currency'}</label>
+					<div class="col-lg-6">
+						<select name="new_currency">
+						{foreach from=$currencies item=currency_change}
+							{if $currency_change['id_currency'] != $order->id_currency}
+							<option value="{$currency_change['id_currency']}">{$currency_change['name']} - {$currency_change['sign']}</option>
+							{/if}
+						{/foreach}
+						</select>
+						<p class="help-block">{l s='Do not forget to update your exchange rate before making this change.'}</p>
+					</div>
+					<div class="col-lg-3">
+						<input type="submit" class="btn btn-default" name="submitChangeCurrency" value="{l s='Change'}" />
+					</div>
+				</form>
+				{/if}
+			</fieldset>
+		</div>
+		<div class="tab-pane" id="shipping">
+			
+			<div class="panel">
+				<div class="row">
+					<!-- Shipping block -->
+					{if !$order->isVirtual()}
+					<div class="col-lg-6">
+						<fieldset class="form-horizontal">
+							<h3>
+								<i class="icon-truck"></i>
+								{l s='Shipping'}
+							</h3>
+							<div class="form-group">
+								<label class="control-label col-lg-3">{l s='Recycled packaging'}</label>
+								<div class="col-lg-9 ">
+									<p class="form-control-static">
+										{if $order->recyclable}
+										<span class="label label-success">
+											<i class="icon-check-sign"></i>
+											{l s='Yes'}
+										</span>
+										{else}
+										<span class="label label-warning">
+											<i class="icon-ban-circle"></i>
+											{l s='No'}
+										</span>
+										{/if}
+									</p>
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="control-label col-lg-3">{l s='Gift wrapping'}</label>
+								<div class="col-lg-9">
+									<p class="form-control-static">
+										{if $order->gift}
+										<span class="label label-success">
+											<i class="icon-check-sign"></i>
+											{l s='Yes'}
+										</span>
+										{else}
+										<span class="label label-warning">
+											<i class="icon-ban-circle"></i>
+											{l s='No'}
+										</span>
+										{/if}
+									</p>
+								</div>
+							</div>
+							{if $order->gift_message}
+							<div class="form-group">
+								<label class="control-label col-lg-3">{l s='Message'}</label>
+								<div class="col-lg-9">
+									<p class="form-control-static">{$order->gift_message|nl2br}</p>
+								</div>
+							</div>
+							{/if}
+							<hr/>
+							{include file='controllers/orders/_shipping.tpl'}
+							{if $carrierModuleCall}
+								{$carrierModuleCall}
+							{/if}
+						</fieldset>
+					</div>
+					{/if}
+
+					<!-- Addresses -->
+					{if !$order->isVirtual()}
+					<div class="col-lg-3">
+						<!-- Shipping address -->
+						<fieldset>
+							<h3>
+								<i class="icon-map-marker"></i>
+								{l s='Shipping address'}
+							</h3>
+							{if $can_edit}
+							<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
+								<div class="form-group">
+									<div class="col-lg-9">
+										<select name="id_address">
+											{foreach from=$customer_addresses item=address}
+											<option value="{$address['id_address']}"
+												{if $address['id_address'] == $order->id_address_delivery}
+													selected="selected"
+												{/if}>
+												{$address['alias']} -
+												{$address['address1']}
+												{$address['postcode']}
+												{$address['city']}
+												{if !empty($address['state'])}
+													{$address['state']}
+												{/if},
+												{$address['country']}
+											</option>
+											{/foreach}
+										</select>
+									</div>
+									<div class="col-lg-3">
+										<input class="btn btn-default" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
+									</div>
+								</div>
+							</form>
+							{/if}
+							<div class="well">
+								<a class="btn btn-default pull-right" href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}">
+									<i class="icon-pencil"></i>
+									{l s='Edit'}
+								</a>
+								{displayAddressDetail address=$addresses.delivery newLine='<br />'}
+								{if $addresses.delivery->other}
+									<hr />{$addresses.delivery->other}<br />
+								{/if}
+							</div>
+							<img src="http://maps.googleapis.com/maps/api/staticmap?center={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}&markers={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}&zoom=7&size=600x200&scale=2&sensor=false" class="thumbnail" alt="">
+						</fieldset>
+					</div>
+					{/if}
+
+				
+					<!-- Invoice address -->
+					<div class="col-lg-3">
+						<fieldset>
+							<h3>
+								<i class="icon-file-text"></i>
+								{l s='Invoice address'}
+							</h3>
+							
+							{if $can_edit}
+							<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
+								<div class="form-group">
+									<div class="col-lg-9">
+										<select name="id_address">
+											{foreach from=$customer_addresses item=address}
+											<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
+											{/foreach}
+										</select>
+									</div>
+									<div class="col-lg-3">
+										<input class="btn btn-default" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
+									</div>
+								</div>
+							</form>
+							{/if}
+
+							<div class="well">
+								<a class="btn btn-default pull-right" href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}">
+									<i class="icon-pencil"></i>
+									{l s='Edit'}
+								</a>
+								{displayAddressDetail address=$addresses.invoice newLine='<br />'}
+								{if $addresses.invoice->other}
+									<hr />{$addresses.invoice->other}<br />
+								{/if}
+							</div>
+						</fieldset>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="tab-pane" id="documents">
 			<!-- Documents block -->
 			<div class="panel">
 				<h3>
@@ -240,19 +675,67 @@
 				{include file='controllers/orders/_documents.tpl'}
 			</div>
 		</div>
-	</div>
+		<div class="tab-pane" id="returns">
+			{if !$order->isVirtual()}
+			<!-- Return block -->
+			<fieldset>
+				<h3>
+					<i class="icon-return"></i>
+					{l s='Merchandise returns'}
+				</h3>
 
-<div class="panel">
-	<ul class="nav nav-tabs" id="myTab">
-		<li class="active"><a href="#home">Home</a></li>
-		<li><a href="#profile">Profile</a></li>
-		<li><a href="#messages">Messages</a></li>
-	</ul>
-
-	<div class="tab-content">
-		<div class="tab-pane active" id="home">1</div>
-		<div class="tab-pane" id="profile">2</div>
-		<div class="tab-pane" id="messages">3</div>
+				{if $order->getReturn()|count > 0}
+				<table class="table">
+					<thead>
+						<tr>
+							<th><span class="title_box ">Date</span></th>
+							<th><span class="title_box ">Type</span></th>
+							<th><span class="title_box ">Carrier</span></th>
+							<th><span class="title_box ">Tracking number</span></th>
+						</tr>
+					</thead>
+					<tbody>
+						{foreach from=$order->getReturn() item=line}
+						<tr>
+							<td>{$line.date_add}</td>
+							<td>{$line.type}</td>
+							<td>{$line.state_name}</td>
+							<td>
+								<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
+								{if $line.can_edit}
+								<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
+									<span class="shipping_number_edit" style="display:none;">
+										<button type="button" name="tracking_number">
+											{$line.tracking_number|htmlentities}
+										</button>
+										<button type="submit" class="btn btn-default" name="submitShippingNumber">
+											{l s='Update'}
+										</button>
+									</span>
+									<button href="#" class="edit_shipping_number_link">
+										<i class="icon-pencil"></i>
+										{l s='Edit'}
+									</button>
+									<button href="#" class="cancel_shipping_number_link" style="display: none;">
+										<i class="icon-remove"></i>
+										{l s='Cancel'}
+									</button>
+								</form>
+								{/if}
+							</td>
+						</tr>
+						{/foreach}
+					</tbody>
+				</table>
+				{else}
+				{l s='No merchandise returned yet.'}
+				{/if}
+				{if $carrierModuleCall}
+					{$carrierModuleCall}
+				{/if}
+			</fieldset>
+			{/if}
+		</div>
 	</div>
 </div>
 <script>
@@ -328,386 +811,9 @@
 		</div>
 		{/if}
 
-		<!-- Payments block -->
-		<fieldset>
-			<h3>
-				<i class="icon-money"></i>
-				{l s='Payment'}
-			</h3>
-			
-			{if count($order->getOrderPayments()) > 0}
-			<p class="alert alert-danger" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
-				{l s='Warning'}
-				<strong>{displayPrice price=$total_paid currency=$currency->id}</strong>
-				{l s='paid instead of'}
-				<strong class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</strong>
-				
-				{foreach $order->getBrother() as $brother_order}
-					{if $brother_order@first}
-						{if count($order->getBrother()) == 1}
-							<br />{l s='This warning also concerns order '}
-						{else}
-							<br />{l s='This warning also concerns the next orders:'}
-						{/if}
-					{/if}
-					<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-						#{'%06d'|sprintf:$brother_order->id}
-					</a>
-				{/foreach}
-			</p>
-			{/if}
+		
 
-			<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-				<table class="table">
-					<thead>
-						<tr>
-							<th><span class="title_box ">{l s='Date'}</span></th>
-							<th><span class="title_box ">{l s='Payment method'}</span></th>
-							<th><span class="title_box ">{l s='Transaction ID'}</span></th>
-							<th><span class="title_box ">{l s='Amount'}</span></th>
-							<th><span class="title_box ">{l s='Invoice'}</span></th>
-							<th></th>
-						</tr>
-					</thead>
-					<tbody>
-						{foreach from=$order->getOrderPaymentCollection() item=payment}
-						<tr>
-							<td>{dateFormat date=$payment->date_add full=true}</td>
-							<td>{$payment->payment_method}</td>
-							<td>{$payment->transaction_id}</td>
-							<td>{displayPrice price=$payment->amount currency=$payment->id_currency}</td>
-							<td>
-							{if $invoice = $payment->getOrderInvoice($order->id)}
-								{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}
-							{else}
-								{l s='No invoice'}
-							{/if}
-							</td>
-							<td>
-								<button class="btn btn-default open_payment_information">
-									<i class="icon-search"></i>
-									{l s='See payment information'}
-								</button>
-							</td>
-						</tr>
-						<tr class="payment_information" style="display: none;">
-							<td colspan="6">
-								<p>
-									<b>{l s='Card Number'}</b>&nbsp;
-									{if $payment->card_number}
-										{$payment->card_number}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-								<p>
-									<b>{l s='Card Brand'}</b>&nbsp;
-									{if $payment->card_brand}
-										{$payment->card_brand}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-								<p>
-									<b>{l s='Card Expiration'}</b>&nbsp;
-									{if $payment->card_expiration}
-										{$payment->card_expiration}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-								<p>
-									<b>{l s='Card Holder'}</b>&nbsp;
-									{if $payment->card_holder}
-										{$payment->card_holder}
-									{else}
-										<i>{l s='Not defined'}</i>
-									{/if}
-								</p>
-							</td>
-						</tr>
-						{foreachelse}
-						<tr>
-							<td class="text-center" colspan="6">
-								<i class="icon-warning-sign"></i>
-								{l s='No payments are available'}
-							</td>
-						</tr>
-						{/foreach}
-						<tr class="current-edit">
-							<td>
-								<input type="text" name="payment_date" class="datepicker" value="{date('Y-m-d H:i:s')}" />
-							</td>
-							<td>
-								<select name="payment_method" class="payment_method">
-								{foreach from=$payment_methods item=payment_method}
-									<option value="{$payment_method}">{$payment_method}</option>
-								{/foreach}
-								</select>
-							</td>
-							<td>
-								<input type="text" name="payment_transaction_id" value="" />
-							</td>
-							<td>
-								<div class="form-group">
-									<div class="col-lg-9">
-										<input type="text" name="payment_amount" value="" />
-									</div>
-									<div class="col-lg-3">
-										<select name="payment_currency" class="payment_currency">
-										{foreach from=$currencies item=current_currency}
-											<option value="{$current_currency['id_currency']}"{if $current_currency['id_currency'] == $currency->id} selected="selected"{/if}>{$current_currency['sign']}</option>
-										{/foreach}
-										</select>
-									</div>								
-								</div>
-							</td>
-							{if count($invoices_collection) > 0}
-							<td>
-								<select name="payment_invoice" id="payment_invoice">
-								{foreach from=$invoices_collection item=invoice}
-									<option value="{$invoice->id}" selected="selected">{$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)}</option>
-								{/foreach}
-								</select>
-							</td>
-							{/if}
-							<td>
-								<button class="btn btn-default" type="submit" name="submitAddPayment">
-									<i class="icon-ok"></i>
-									{l s='Save'}
-								</button>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</form>
-			{if (!$order->valid && sizeof($currencies) > 1)}
-			<form class="form-horizontal" method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-				<label class="control-label col-lg-3">{l s='Change currency'}</label>
-				<div class="col-lg-6">
-					<select name="new_currency">
-					{foreach from=$currencies item=currency_change}
-						{if $currency_change['id_currency'] != $order->id_currency}
-						<option value="{$currency_change['id_currency']}">{$currency_change['name']} - {$currency_change['sign']}</option>
-						{/if}
-					{/foreach}
-					</select>
-					<p class="help-block">{l s='Do not forget to update your exchange rate before making this change.'}</p>
-				</div>
-				<div class="col-lg-3">
-					<input type="submit" class="btn btn-default" name="submitChangeCurrency" value="{l s='Change'}" />
-				</div>
-			</form>
-			{/if}
-		</fieldset>
-
-		<!-- Shipping block -->
-		{if !$order->isVirtual()}
-		<fieldset class="form-horizontal">
-			<h3>
-				<i class="icon-truck"></i>
-				{l s='Shipping'}
-			</h3>
-			<div class="form-group">
-				<label class="control-label col-lg-3">{l s='Recycled packaging'}</label>
-				<div class="col-lg-9 ">
-					<p class="form-control-static">
-						{if $order->recyclable}
-						<span class="label label-success">
-							<i class="icon-check-sign"></i>
-							{l s='Yes'}
-						</span>
-						{else}
-						<span class="label label-warning">
-							<i class="icon-ban-circle"></i>
-							{l s='No'}
-						</span>
-						{/if}
-					</p>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="control-label col-lg-3">{l s='Gift wrapping'}</label>
-				<div class="col-lg-9">
-					<p class="form-control-static">
-						{if $order->gift}
-						<span class="label label-success">
-							<i class="icon-check-sign"></i>
-							{l s='Yes'}
-						</span>
-						{else}
-						<span class="label label-warning">
-							<i class="icon-ban-circle"></i>
-							{l s='No'}
-						</span>
-						{/if}
-					</p>
-				</div>
-			</div>
-			{if $order->gift_message}
-			<div class="form-group">
-				<label class="control-label col-lg-3">{l s='Message'}</label>
-				<div class="col-lg-9">
-					<p class="form-control-static">{$order->gift_message|nl2br}</p>
-				</div>
-			</div>
-			{/if}
-			<hr/>
-			{include file='controllers/orders/_shipping.tpl'}
-			{if $carrierModuleCall}
-				{$carrierModuleCall}
-			{/if}
-		</fieldset>
-		<!-- Return block -->
-		<fieldset>
-			<h3>
-				<i class="icon-reply"></i>
-				{l s='Merchandise returns'}
-			</h3>
-
-			{if $order->getReturn()|count > 0}
-			<table class="table">
-				<thead>
-					<tr>
-						<th><span class="title_box ">Date</span></th>
-						<th><span class="title_box ">Type</span></th>
-						<th><span class="title_box ">Carrier</span></th>
-						<th><span class="title_box ">Tracking number</span></th>
-					</tr>
-				</thead>
-				<tbody>
-					{foreach from=$order->getReturn() item=line}
-					<tr>
-						<td>{$line.date_add}</td>
-						<td>{$line.type}</td>
-						<td>{$line.state_name}</td>
-						<td>
-							<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
-							{if $line.can_edit}
-							<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
-								<span class="shipping_number_edit" style="display:none;">
-									<button type="button" name="tracking_number">
-										{$line.tracking_number|htmlentities}
-									</button>
-									<button type="submit" class="btn btn-default" name="submitShippingNumber">
-										{l s='Update'}
-									</button>
-								</span>
-								<button href="#" class="edit_shipping_number_link">
-									<i class="icon-pencil"></i>
-									{l s='Edit'}
-								</button>
-								<button href="#" class="cancel_shipping_number_link" style="display: none;">
-									<i class="icon-remove"></i>
-									{l s='Cancel'}
-								</button>
-							</form>
-							{/if}
-						</td>
-					</tr>
-					{/foreach}
-				</tbody>
-			</table>
-			{else}
-			{l s='No merchandise returned yet.'}
-			{/if}
-			{if $carrierModuleCall}
-				{$carrierModuleCall}
-			{/if}
-		</fieldset>
-		{/if}
-
-	<div class="row">
-		<!-- Addresses -->
-		{if !$order->isVirtual()}
-		<div class="col-lg-6">
-			<!-- Shipping address -->
-			<fieldset>
-				<h3>
-					<i class="icon-map-marker"></i>
-					{l s='Shipping address'}
-				</h3>
-				{if $can_edit}
-				<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
-					<div class="form-group">
-						<div class="col-lg-9">
-							<select name="id_address">
-								{foreach from=$customer_addresses item=address}
-								<option value="{$address['id_address']}"
-									{if $address['id_address'] == $order->id_address_delivery}
-										selected="selected"
-									{/if}>
-									{$address['alias']} -
-									{$address['address1']}
-									{$address['postcode']}
-									{$address['city']}
-									{if !empty($address['state'])}
-										{$address['state']}
-									{/if},
-									{$address['country']}
-								</option>
-								{/foreach}
-							</select>
-						</div>
-						<div class="col-lg-3">
-							<input class="btn btn-default" type="submit" name="submitAddressShipping" value="{l s='Change'}" />
-						</div>
-					</div>
-				</form>
-				{/if}
-				<div class="well">
-					<a class="btn btn-default pull-right" href="?tab=AdminAddresses&id_address={$addresses.delivery->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=1{/if}&token={getAdminToken tab='AdminAddresses'}&back={$smarty.server.REQUEST_URI|urlencode}">
-						<i class="icon-pencil"></i>
-						{l s='Edit'}
-					</a>
-					{displayAddressDetail address=$addresses.delivery newLine='<br />'}
-					{if $addresses.delivery->other}
-						<hr />{$addresses.delivery->other}<br />
-					{/if}
-				</div>
-				<img src="http://maps.googleapis.com/maps/api/staticmap?center={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}&markers={$addresses.delivery->address1} {$addresses.delivery->postcode} {$addresses.delivery->city} {if ($addresses.delivery->id_state)} {$addresses.deliveryState->name}{/if}&zoom=7&size=600x200&scale=2&sensor=false" class="thumbnail" alt="">
-			</fieldset>
-		</div>
-		{/if}
-
-		<div class="col-lg-6">
-			<!-- Invoice address -->
-			<fieldset>
-				<h3>
-					<i class="icon-file-text"></i>
-					{l s='Invoice address'}
-				</h3>
-				
-				{if $can_edit}
-				<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
-					<div class="form-group">
-						<div class="col-lg-9">
-							<select name="id_address">
-								{foreach from=$customer_addresses item=address}
-								<option value="{$address['id_address']}"{if $address['id_address'] == $order->id_address_invoice} selected="selected"{/if}>{$address['alias']} - {$address['address1']} {$address['postcode']} {$address['city']}{if !empty($address['state'])} {$address['state']}{/if}, {$address['country']}</option>
-								{/foreach}
-							</select>
-						</div>
-						<div class="col-lg-3">
-							<input class="btn btn-default" type="submit" name="submitAddressInvoice" value="{l s='Change'}" />
-						</div>
-					</div>
-				</form>
-				{/if}
-
-				<div class="well">
-					<a class="btn btn-default pull-right" href="?tab=AdminAddresses&id_address={$addresses.invoice->id}&addaddress&realedit=1&id_order={$order->id}{if ($addresses.delivery->id == $addresses.invoice->id)}&address_type=2{/if}&back={$smarty.server.REQUEST_URI|urlencode}&token={getAdminToken tab='AdminAddresses'}">
-						<i class="icon-pencil"></i>
-						{l s='Edit'}
-					</a>
-					{displayAddressDetail address=$addresses.invoice newLine='<br />'}
-					{if $addresses.invoice->other}
-						<hr />{$addresses.invoice->other}<br />
-					{/if}
-				</div>
-			</fieldset>
-		</div>
-	</div>
+		
 
 	<form class="container-command-top-spacing" action="{$current_index}&vieworder&token={$smarty.get.token}&id_order={$order->id}" method="post" onsubmit="return orderDeleteProduct('{l s='This product cannot be returned.'}', '{l s='Quantity to cancel is greater than quantity available.'}');">
 		<input type="hidden" name="id_order" value="{$order->id}" />
@@ -804,58 +910,6 @@
 			</div>
 			{/if}
 
-<div class="row">
-	<div class="col-lg-6 panel col-lg-offset-6">
-	{if (sizeof($discounts) || $can_edit)}
-				<table class="table">
-					<thead>
-						<tr>
-							<th>
-								<span class="title_box ">
-									{l s='Discount name'}
-								</span>
-							</th>
-							<th>
-								<span class="title_box ">
-									{l s='Value'}
-								</span>
-							</th>
-							{if $can_edit}
-							<th></th>
-							{/if}
-						</tr>
-					</thead>
-					<tbody>
-						{foreach from=$discounts item=discount}
-						<tr>
-							<td>{$discount['name']}</td>
-							<td>
-							{if $discount['value'] != 0.00}
-								-
-							{/if}
-							{displayPrice price=$discount['value'] currency=$currency->id}
-							</td>
-							{if $can_edit}
-							<td>
-								<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-									<i class="icon-minus-sign"></i>
-									{l s='Delete voucher'}
-								</a>
-							</td>
-							{/if}
-						</tr>
-						{/foreach}
-					</tbody>
-				</table>
-				<div class="current-edit" id="voucher_form" style="display:none;">
-					{include file='controllers/orders/_discount_form.tpl'}
-				</div>
-	{/if}
-	</div>
-</div>
-
-
-
 			<div class="row">
 				<div class="col-lg-6">
 					<div class="alert alert-warning">
@@ -867,51 +921,101 @@
 					</div>
 				</div>
 				<div class="col-lg-6">
-					<table class="table">
-						<tr id="total_products">
-							<td class="text-right">{l s='Products:'}</td>
-							<td class="amount text-right">
-								{displayPrice price=$order->total_products_wt currency=$currency->id}
-							</td>
-							<td class="partial_refund_fields current-edit" style="display:none;"></td>
-						</tr>
-						<tr id="total_discounts" {if $order->total_discounts_tax_incl == 0}style="display: none;"{/if}>
-							<td class="text-right">{l s='Discounts'}</td>
-							<td class="amount text-right">
-								-{displayPrice price=$order->total_discounts_tax_incl currency=$currency->id}
-							</td>
-							<td class="partial_refund_fields current-edit" style="display:none;"></td>
-						</tr>
-						<tr id="total_wrapping" {if $order->total_wrapping_tax_incl == 0}style="display: none;"{/if}>
-							<td class="text-right">{l s='Wrapping'}</td>
-							<td class="amount text-right">
-								{displayPrice price=$order->total_wrapping_tax_incl currency=$currency->id}
-							</td>
-							<td class="partial_refund_fields current-edit" style="display:none;"></td>
-						</tr>
-						<tr id="total_shipping">
-							<td class="text-right">{l s='Shipping'}</td>
-							<td class="amount text-right" >
-								{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}
-							</td>
-							<td class="partial_refund_fields current-edit" style="display:none;">
-								<div class="input-group">
-									<div class="input-group-addon">
-										{$currency->prefix}
-										{$currency->suffix}
+
+					<div class="panel">
+						{if (sizeof($discounts) || $can_edit)}
+						<table class="table">
+							<thead>
+								<tr>
+									<th>
+										<span class="title_box ">
+											{l s='Discount name'}
+										</span>
+									</th>
+									<th>
+										<span class="title_box ">
+											{l s='Value'}
+										</span>
+									</th>
+									{if $can_edit}
+									<th></th>
+									{/if}
+								</tr>
+							</thead>
+							<tbody>
+								{foreach from=$discounts item=discount}
+								<tr>
+									<td>{$discount['name']}</td>
+									<td>
+									{if $discount['value'] != 0.00}
+										-
+									{/if}
+									{displayPrice price=$discount['value'] currency=$currency->id}
+									</td>
+									{if $can_edit}
+									<td>
+										<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+											<i class="icon-minus-sign"></i>
+											{l s='Delete voucher'}
+										</a>
+									</td>
+									{/if}
+								</tr>
+								{/foreach}
+							</tbody>
+						</table>
+						<div class="current-edit" id="voucher_form" style="display:none;">
+							{include file='controllers/orders/_discount_form.tpl'}
+						</div>
+						{/if}
+					</div>
+					<div class="panel">
+						<table class="table">
+							<tr id="total_products">
+								<td class="text-right">{l s='Products:'}</td>
+								<td class="amount text-right">
+									{displayPrice price=$order->total_products_wt currency=$currency->id}
+								</td>
+								<td class="partial_refund_fields current-edit" style="display:none;"></td>
+							</tr>
+							<tr id="total_discounts" {if $order->total_discounts_tax_incl == 0}style="display: none;"{/if}>
+								<td class="text-right">{l s='Discounts'}</td>
+								<td class="amount text-right">
+									-{displayPrice price=$order->total_discounts_tax_incl currency=$currency->id}
+								</td>
+								<td class="partial_refund_fields current-edit" style="display:none;"></td>
+							</tr>
+							<tr id="total_wrapping" {if $order->total_wrapping_tax_incl == 0}style="display: none;"{/if}>
+								<td class="text-right">{l s='Wrapping'}</td>
+								<td class="amount text-right">
+									{displayPrice price=$order->total_wrapping_tax_incl currency=$currency->id}
+								</td>
+								<td class="partial_refund_fields current-edit" style="display:none;"></td>
+							</tr>
+							<tr id="total_shipping">
+								<td class="text-right">{l s='Shipping'}</td>
+								<td class="amount text-right" >
+									{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}
+								</td>
+								<td class="partial_refund_fields current-edit" style="display:none;">
+									<div class="input-group">
+										<div class="input-group-addon">
+											{$currency->prefix}
+											{$currency->suffix}
+										</div>
+										<input type="text" name="partialRefundShippingCost" value="0" />
 									</div>
-									<input type="text" name="partialRefundShippingCost" value="0" />
-								</div>
-							</td>
-						</tr>
-						<tr id="total_order">
-							<td class="text-right"><strong>{l s='Total'}</strong></td>
-							<td class="amount text-right">
-								<strong>{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</strong>
-							</td>
-							<td class="partial_refund_fields current-edit" style="display:none;"></td>
-						</tr>
-					</table>
+								</td>
+							</tr>
+							<tr id="total_order">
+								<td class="text-right"><strong>{l s='Total'}</strong></td>
+								<td class="amount text-right">
+									<strong>{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</strong>
+								</td>
+								<td class="partial_refund_fields current-edit" style="display:none;"></td>
+							</tr>
+						</table>
+					</div>
 				</div>
 			</div>
 			<div style="display: none;" class="standard_refund_fields form-horizontal">
@@ -970,87 +1074,7 @@
 		</fieldset>
 	</form>
 
-	<form action="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}" method="post" onsubmit="if (getE('visibility').checked == true) return confirm('{l s='Do you want to send this message to the customer?'}');">
-		<fieldset>
-			<h3>
-				<i class="icon-envelope"></i>
-				{l s='New message'}
-			</h3>
-
-			<p id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}">
-				{l s='to add a comment or send a message to the customer.'}
-			</p>
-
-			<button id="newMessage" type="button" class="btn btn-default">
-				<i class="icon-envelope"></i>
-				{l s='New message'}
-			</button>
-
-			<div id="message" class="form-horizontal" style="display:none">
-				<div class="form-group">
-					<label class="control-label col-lg-3">{l s='Choose a standard message'}</label>
-					<div class="col-lg-9">
-						<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
-							<option value="0" selected="selected">--</option>
-							{foreach from=$orderMessages item=orderMessage}
-							<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
-							{/foreach}
-						</select>
-					</div>
-				</div>
-
-				<div class="form-group">
-					<label class="control-label col-lg-3">{l s='Display to customer?'}</label>
-					<div class="col-lg-9">
-						<div class="row">
-							<div class="input-group col-lg-2">
-								<span class="switch prestashop-switch">
-									<input type="radio" name="visibility" id="visibility_on" value="0" />
-									<label class="radio" for="visibility_on">
-										<i class="icon-check-sign text-success"></i>
-										{l s='Yes'}
-									</label>
-									<input type="radio" name="visibility" id="visibility_off" value="1" checked="checked" /> 
-									<label class="radio" for="visibility_off">
-										<i class="icon-ban-circle text-danger"></i>
-										{l s='No'}
-									</label>
-									<span class="slide-button btn btn-default"></span>
-								</span>
-							</div>
-						</div>				
-					</div>
-				</div>
-
-				<div class="form-group">
-					<label class="control-label col-lg-3">{l s='Message'}</label>
-					<div class="col-lg-9">
-						<textarea id="txt_msg" class="textarea-autosize" name="message">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea>
-						<p id="nbchars"></p>
-					</div>
-				</div>
-				<div class="form-group">
-					<div class="col-lg-9 col-lg-offset-3">
-						<input type="hidden" name="id_order" value="{$order->id}" />
-						<input type="hidden" name="id_customer" value="{$order->id_customer}" />
-						<button type="button" id="cancelMessage" class="btn btn-default">
-							<i class="icon-remove text-danger"></i>
-							{l s='Cancel'}
-						</button>
-						<button type="submit" id="submitMessage" class="btn btn-default" name="submitMessage">
-							<i class="icon-ok text-success"></i>
-							{l s='Send'}
-						</button>
-					</div>
-				</div>
-			</div>
-			<hr/>
-			<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">
-				<b>{l s='Click here'}</b> {l s='to see all messages.'}
-				<i class="icon-external-link"></i>
-			</a>
-		</fieldset>
-	</form>
+	
 
 	{if (sizeof($messages))}
 	<fieldset>
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index 3fd65e7e7..07ba4b9d5 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -242,7 +242,7 @@
 				<p>
 					<span >
 					{l s='Your product will be saved as a draft.'}</span>
-					<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview.'}</a></span>
+					<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >{l s='Save and preview'}</a></span>
 					<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
 				</p>
 			</div>
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 3ceedff5f..829caa3b3 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -152,10 +152,8 @@
 								if (submited)
 									return false;
 								submited = true;
-
 								//add hidden input to emulate submit button click when posting the form -> field name posted
 								btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
-
 								$('#{$table}_form').submit();
 								return false;
 							});
@@ -165,7 +163,6 @@
 								btn_save_and_stay.click(function() {
 									//add hidden input to emulate submit button click when posting the form -> field name posted
 									btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
-
 									$('#{$table}_form').submit();
 									return false;
 								});
@@ -265,11 +262,21 @@
 									<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
 								</select>
 							{elseif $params.type == 'date' || $params.type == 'datetime'}
-								<div class="date_range form-group">
-									<label>{l s='From'}</label>
-									<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
-									<label>{l s='To'}</label>
-									<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"{if isset($params.width)} style="width:70px"{/if}/>
+								<div class="date_range row">
+									<div class="input-group fixed-width-xl">
+										<span class="input-group-addon">{l s='From'}</span>
+										<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_0" name="{$params.name_date}[0]" value="{if isset($params.value.0)}{$params.value.0}{/if}"/>
+										<span class="input-group-addon">
+											<i class="icon-calendar"></i>
+										</span>
+									</div>
+									<div class="input-group fixed-width-xl">
+										<span class="input-group-addon">{l s='To'}</span>
+										<input type="text" class="filter datepicker date-input form-control" id="{$params.id_date}_1" name="{$params.name_date}[1]" value="{if isset($params.value.1)}{$params.value.1}{/if}"/>
+										<span class="input-group-addon">
+											<i class="icon-calendar"></i>
+										</span>
+									</div>
 								</div>
 							{elseif $params.type == 'select'}
 								{if isset($params.filter_key)}
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index d02f87448..ed16d2b03 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -337,7 +337,8 @@ class FrontControllerCore extends Controller
 			'PS_CATALOG_MODE' => (bool)Configuration::get('PS_CATALOG_MODE') || !(bool)Group::getCurrent()->show_prices,
 			'b2b_enable' => (bool)Configuration::get('PS_B2B_ENABLE'),
 			'request' => $link->getPaginationLink(false, false, false, true),
-			'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT')
+			'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT'),
+			'quick_view' => Configuration::get('PS_QUICK_VIEW'),
 		));
 
 		// Add the tpl files directory for mobile
@@ -740,6 +741,12 @@ class FrontControllerCore extends Controller
 		}
 		if ($this->context->language->is_rtl)
 			$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
+		
+		if (Configuration::get('PS_QUICK_VIEW'))
+		{
+			$this->addjqueryPlugin('fancybox');
+			$this->addJS(_THEME_JS_DIR_.'quick-view.js');
+		}
 
 		// Execute Hook FrontController SetMedia
 		Hook::exec('actionFrontControllerSetMedia', array());
@@ -1142,4 +1149,40 @@ class FrontControllerCore extends Controller
 	            'logo_url' => $logo
   				);
 	}
+	
+	protected function addColorsToProductList(&$products)
+	{
+		if (!count($products))
+			return;
+
+		$products_need_cache = array();
+		foreach ($products as &$product)
+			if (!$this->isCached(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product'])))
+				$products_need_cache[] = (int)$product['id_product']; 
+
+		$colors = false;
+		if (count($products_need_cache))
+			$colors = Product::getAttributesColorList($products_need_cache);
+
+		Tools::enableCache();
+		foreach ($products as &$product)
+		{
+			$tpl = $this->context->smarty->createTemplate(_PS_THEME_DIR_.'product-list-colors.tpl');
+			if (isset($colors[$product['id_product']]))
+					$tpl->assign(array(
+						'id_product' => $product['id_product'],
+						'colors_list' => $colors[$product['id_product']]
+					));
+			if (!in_array($product['id_product'], $products_need_cache) || isset($colors[$product['id_product']]))
+				$product['color_list'] = $tpl->fetch(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product']));
+			else
+				$product['color_list'] = '';
+		}
+		Tools::restoreCacheSettings();
+	}
+	
+	protected function getColorsListCacheId($id_product)
+	{
+		return 'productlist_colors|'.(int)$id_product.'|'.$this->context->shop->id;
+	}
 }
diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php
index db0b49245..61c958b28 100644
--- a/controllers/admin/AdminDashboardController.php
+++ b/controllers/admin/AdminDashboardController.php
@@ -149,7 +149,7 @@ class AdminDashboardControllerCore extends AdminController
 			'translations' => $translations,
 			'action' => '#',
 			'warning' => $this->getWarningDomainName(),
-			'new_version_url' => Tools::getCurrentUrlProtocolPrefix().'api.dev.prestashop.com/version/check_version.php?v='._PS_VERSION_.'&l='.$this->context->language->iso_code,
+			'new_version_url' => Tools::getCurrentUrlProtocolPrefix().'api.prestashop.com/version/check_version.php?v='._PS_VERSION_.'&lang='.$this->context->language->iso_code,
 			'dashboard_use_push' => Configuration::get('PS_DASHBOARD_USE_PUSH'),
 			'datepickerFrom' => Tools::getValue('datepickerFrom', $this->context->employee->stats_date_from),
 			'datepickerTo' => Tools::getValue('datepickerTo', $this->context->employee->stats_date_to)
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 273bca812..ebb557f0c 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2423,7 +2423,7 @@ class AdminProductsControllerCore extends AdminController
 				<span style="float: left">
 				'.$this->l('Your product will be saved as a draft.').'
 				</span>
-				<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview.').'</a></span>
+				<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
 				<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
 				<br class="clear" />
 				</p>
@@ -2506,7 +2506,7 @@ class AdminProductsControllerCore extends AdminController
 						$this->toolbar_btn['delete'] = array(
 							'short' => 'Delete',
 							'href' => $this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;deleteproduct',
-							'desc' => $this->l('Delete this product.'),
+							'desc' => $this->l('Delete this product'),
 							'confirm' => 1,
 							'js' => 'if (confirm(\''.$this->l('Delete product?').'\')){return true;}else{event.preventDefault();}'
 						);
@@ -2614,7 +2614,7 @@ class AdminProductsControllerCore extends AdminController
 		{
 			$this->product_exists_in_shop = false;
 			if ($this->tab_display == 'Informations')
-				$this->displayWarning($this->l('Warning: The product does not exist in this shop.'));
+				$this->displayWarning($this->l('Warning: The product does not exist in this shop'));
 			
 			$default_product = new Product();
 			$definition = ObjectModel::getDefinition($product);
@@ -2771,7 +2771,7 @@ class AdminProductsControllerCore extends AdminController
 						);
 
 						if ($id_currency <= 0 || ( !($result = Currency::getCurrency($id_currency)) || empty($result) ))
-							$this->errors[] = Tools::displayError($this->l('The selected currency is not valid.'));
+							$this->errors[] = Tools::displayError('The selected currency is not valid');
 
 						// Save product-supplier data
 						$product_supplier_id = (int)ProductSupplier::getIdByProductAndSupplier($product->id, $attribute['id_product_attribute'], $supplier->id_supplier);
@@ -3177,7 +3177,7 @@ class AdminProductsControllerCore extends AdminController
 		if (!file_exists($exists_file)
 			&& !empty($product->productDownload->display_filename)
 			&& empty($product->cache_default_attribute))
-			$msg = sprintf(Tools::displayError('This file "%s" is missing.'), $product->productDownload->display_filename);
+			$msg = sprintf(Tools::displayError('This file "%s" is missing'), $product->productDownload->display_filename);
 		else
 			$msg = '';
 
@@ -4383,7 +4383,7 @@ class AdminProductsControllerCore extends AdminController
 				<span>
 				'.$this->l('Your product will be saved as a draft.').'
 				</span>
-				<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview.').'</a></span>
+				<span style="float:right"><a href="#" class="button" style="display: block" onclick="submitAddProductAndPreview()" >'.$this->l('Save and preview').'</a></span>
 				<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
 				</p>
 			</div>';
diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php
index f75765774..95e1efd6e 100644
--- a/controllers/front/CategoryController.php
+++ b/controllers/front/CategoryController.php
@@ -199,45 +199,16 @@ class CategoryControllerCore extends FrontController
 			// Pagination must be call after "getProducts"
 			$this->pagination($this->nbProducts);
 
-		$products_need_cache = array();
+
 		foreach ($this->cat_products as &$product)
-		{
 			if ($product['id_product_attribute'] && isset($product['product_attribute_minimal_quantity']))
 				$product['minimal_quantity'] = $product['product_attribute_minimal_quantity'];
 
-			if (!$this->isCached(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product'])))
-				$products_need_cache[] = (int)$product['id_product']; 
-		}
-		unset($product);
-
-		$colors = false;
-		if (count($products_need_cache))
-			$colors = Product::getAttributesColorList($products_need_cache);
-
-		Tools::enableCache();
-		foreach ($this->cat_products as &$product)
-		{
-			$tpl = $this->context->smarty->createTemplate(_PS_THEME_DIR_.'product-list-colors.tpl');
-			if (isset($colors[$product['id_product']]))
-					$tpl->assign(array(
-						'id_product' => $product['id_product'],
-						'colors_list' => $colors[$product['id_product']]
-					));
-			if (!in_array($product['id_product'], $products_need_cache) || isset($colors[$product['id_product']]))
-				$product['color_list'] = $tpl->fetch(_PS_THEME_DIR_.'product-list-colors.tpl', $this->getColorsListCacheId($product['id_product']));
-			else
-				$product['color_list'] = '';
-		}
-		Tools::restoreCacheSettings();
+		$this->addColorsToProductList($this->cat_products);
 
 		$this->context->smarty->assign('nb_products', $this->nbProducts);
 	}
 	
-	protected function getColorsListCacheId($id_product)
-	{
-		return 'productlist_colors|'.(int)$id_product.'|'.$this->context->shop->id;
-	}
-	
 	/**
 	 * Get instance of current category
 	 */
diff --git a/controllers/front/ManufacturerController.php b/controllers/front/ManufacturerController.php
index 4cc8d6b62..665ad295a 100644
--- a/controllers/front/ManufacturerController.php
+++ b/controllers/front/ManufacturerController.php
@@ -97,9 +97,13 @@ class ManufacturerControllerCore extends FrontController
 		$this->manufacturer->description = Tools::nl2br(trim($this->manufacturer->description));
 		$nbProducts = $this->manufacturer->getProducts($this->manufacturer->id, null, null, null, $this->orderBy, $this->orderWay, true);
 		$this->pagination((int)$nbProducts);
+
+		$products = $this->manufacturer->getProducts($this->manufacturer->id, $this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay);
+		$this->addColorsToProductList($products);
+
 		$this->context->smarty->assign(array(
 			'nb_products' => $nbProducts,
-			'products' => $this->manufacturer->getProducts($this->manufacturer->id, $this->context->language->id, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
+			'products' => $products,
 			'path' => ($this->manufacturer->active ? Tools::safeOutput($this->manufacturer->name) : ''),
 			'manufacturer' => $this->manufacturer,
 			'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php
index 3e1a543a2..5e686d1ce 100644
--- a/controllers/front/SearchController.php
+++ b/controllers/front/SearchController.php
@@ -75,6 +75,9 @@ class SearchControllerCore extends FrontController
 			Hook::exec('actionSearch', array('expr' => $query, 'total' => $search['total']));
 			$nbProducts = $search['total'];
 			$this->pagination($nbProducts);
+
+			$this->addColorsToProductList($search['result']);
+
 			$this->context->smarty->assign(array(
 				'products' => $search['result'], // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
 				'search_products' => $search['result'],
@@ -83,7 +86,7 @@ class SearchControllerCore extends FrontController
 				'instant_search' => $this->instant_search,
 				'homeSize' => Image::getSize(ImageType::getFormatedName('home'))));
 		}
-		else if (($query = Tools::getValue('search_query', Tools::getValue('ref'))) && !is_array($query))
+		elseif (($query = Tools::getValue('search_query', Tools::getValue('ref'))) && !is_array($query))
 		{
 			$this->productSort();
 			$this->n = abs((int)(Tools::getValue('n', Configuration::get('PS_PRODUCTS_PER_PAGE'))));
@@ -93,6 +96,9 @@ class SearchControllerCore extends FrontController
 			Hook::exec('actionSearch', array('expr' => $query, 'total' => $search['total']));
 			$nbProducts = $search['total'];
 			$this->pagination($nbProducts);
+
+			$this->addColorsToProductList($search['result']);
+
 			$this->context->smarty->assign(array(
 				'products' => $search['result'], // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
 				'search_products' => $search['result'],
@@ -100,12 +106,15 @@ class SearchControllerCore extends FrontController
 				'search_query' => $query,
 				'homeSize' => Image::getSize(ImageType::getFormatedName('home'))));
 		}
-		else if (($tag = urldecode(Tools::getValue('tag'))) && !is_array($tag))
+		elseif (($tag = urldecode(Tools::getValue('tag'))) && !is_array($tag))
 		{
 			$nbProducts = (int)(Search::searchTag($this->context->language->id, $tag, true));
 			$this->pagination($nbProducts);
 			$result = Search::searchTag($this->context->language->id, $tag, false, $this->p, $this->n, $this->orderBy, $this->orderWay);
 			Hook::exec('actionSearch', array('expr' => $tag, 'total' => count($result)));
+
+			$this->addColorsToProductList($search['result']);
+
 			$this->context->smarty->assign(array(
 				'search_tag' => $tag,
 				'products' => $result, // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
diff --git a/controllers/front/SupplierController.php b/controllers/front/SupplierController.php
index 78fda9152..ec31da243 100644
--- a/controllers/front/SupplierController.php
+++ b/controllers/front/SupplierController.php
@@ -99,9 +99,13 @@ class SupplierControllerCore extends FrontController
 		$this->supplier->description = Tools::nl2br(trim($this->supplier->description));
 		$nbProducts = $this->supplier->getProducts($this->supplier->id, null, null, null, $this->orderBy, $this->orderWay, true);
 		$this->pagination((int)$nbProducts);
+
+		$products = $this->supplier->getProducts($this->supplier->id, $this->context->cookie->id_lang, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay);
+		$this->addColorsToProductList($products);
+
 		$this->context->smarty->assign(array(
 			'nb_products' => $nbProducts,
-			'products' => $this->supplier->getProducts($this->supplier->id, $this->context->cookie->id_lang, (int)$this->p, (int)$this->n, $this->orderBy, $this->orderWay),
+			'products' => $products,
 			'path' => ($this->supplier->active ? Tools::safeOutput($this->supplier->name) : ''),
 			'supplier' => $this->supplier,
 			'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM')
diff --git a/install-dev/classes/languages.php b/install-dev/classes/languages.php
index f076b39f2..760954e59 100644
--- a/install-dev/classes/languages.php
+++ b/install-dev/classes/languages.php
@@ -65,6 +65,7 @@ class InstallLanguages
 		foreach (scandir(_PS_INSTALL_LANGS_PATH_) as $lang)
 			if ($lang[0] != '.' && is_dir(_PS_INSTALL_LANGS_PATH_.$lang) && $lang != self::DEFAULT_ISO && file_exists(_PS_INSTALL_LANGS_PATH_.$lang.'/install.php'))
 				$this->languages[$lang] = new InstallLanguage($lang);
+		uasort($this->languages, 'ps_usort_languages');
 	}
 
 	/**
@@ -76,7 +77,6 @@ class InstallLanguages
 	{
 		if (!in_array($iso, $this->getIsoList()))
 			throw new PrestashopInstallerException('Language '.$iso.' not found');
-
 		$this->language = $iso;
 	}
 
@@ -202,3 +202,12 @@ class InstallLanguages
 		return false;
 	}
 }
+
+function ps_usort_languages($a, $b)
+{
+	$aname = $a->getMetaInformation('name');
+	$bname = $b->getMetaInformation('name');
+    if ($aname == $bname)
+        return 0;
+    return ($aname < $bname) ? -1 : 1;
+}
\ No newline at end of file
diff --git a/install-dev/theme/js/welcome.js b/install-dev/theme/js/welcome.js
index b9a987c49..48cc69dfa 100644
--- a/install-dev/theme/js/welcome.js
+++ b/install-dev/theme/js/welcome.js
@@ -1,7 +1,7 @@
 $(document).ready(function()
 {
 	// Submit change of language
-	$('#langList li input').click(function()
+	$('#langList').change(function()
 	{
 		var form = $('#mainForm');
         form.attr('action', form.attr('action')+'#licenses-agreement');
diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css
index e9c96d71f..ce22310f6 100644
--- a/install-dev/theme/view.css
+++ b/install-dev/theme/view.css
@@ -443,7 +443,7 @@ ul#footer a:link, ul#footer a:active, ul#footer a:visited {
 #formSetMethod {padding-bottom:20px;}
 	#formSetMethod p {padding-bottom:0;}
 
-ul#langList {list-style-type:none;}
+#langList {margin-bottom:20px}
 
 /* ETAPE 2 - required ******************************************************* */
 #sheet_system #req_bt_refresh {float:right;}
diff --git a/install-dev/theme/views/welcome.phtml b/install-dev/theme/views/welcome.phtml
index ec22c7177..9839d8fe3 100644
--- a/install-dev/theme/views/welcome.phtml
+++ b/install-dev/theme/views/welcome.phtml
@@ -19,22 +19,14 @@
 
 <!-- List of languages -->
 <?php if (count($this->language->getIsoList()) > 1): ?>
-	<h2><?php echo $this->l('Continue the installation in:') ?></h2>
-	<ul id="langList" style="line-height: 20px;">
+	<h3><?php echo $this->l('Continue the installation in:') ?></h3>
+	<select id="langList" name="language">
 	<?php foreach ($this->language->getIsoList() as $iso): ?>
-		<li>
-			<label>
-				<input type="radio" value="<?php echo $iso ?>" <?php echo ($iso == $this->language->getLanguageIso()) ? 'checked="checked"' : '' ?> name="language" style="vertical-align: middle; margin-right: 0;" />
-				<?php if (file_exists(_PS_INSTALL_LANGS_PATH_.$iso.'/flag.jpg')): ?>
-					<img src="langs/<?php echo $iso ?>/flag.jpg" alt="<?php echo $iso ?>" style="vertical-align: middle;" />
-				<?php else: ?>
-					<img src="theme/img/noflag.jpg" alt="<?php echo $iso ?>" style="vertical-align: middle;" />
-				<?php endif; ?>
-				<?php echo $this->language->getLanguage($iso)->getMetaInformation('name') ?>
-			</label>
-		</li>
+		<option value="<?php echo $iso ?>" <?php if ($iso == $this->language->getLanguageIso()) echo 'selected="selected"' ?>>
+			<?php echo $this->language->getLanguage($iso)->getMetaInformation('name') ?>
+		</option>
 	<?php endforeach; ?>
-	</ul>
+	</select>
 <?php endif; ?>
 
 <p><?php echo $this->l('The language selection above only applies to the Installation Assistant. Once your store is installed, you can choose the language of your store from over %d translations, all for free!', 55); ?> </p>
diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
index 2a45d2b91..4552b4db8 100644
--- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
+++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl
@@ -86,7 +86,7 @@
 	{/if}
 	{if $DASHACTIVITY_SHOW_NOTIFICATION}
 	<section id="dash_notifications" class="loading">
-		<header><i class="icon-exclamation-sign"></i> {l s='Notification'}</header>
+		<header><i class="icon-exclamation-sign"></i> {l s='Notifications'}</header>
 		<ul class="data_list_vertical">
 			<li>
 				<span class="data_label">{l s='New Messages'}</span>
@@ -95,7 +95,7 @@
 				</span>
 			</li>
 			<li>
-				<span class="data_label">{l s='Order Inquires'}</span>
+				<span class="data_label">{l s='Order Inquiries'}</span>
 				<span class="data_value size_l">
 					<span id="order_inquires"></span>
 				</span>
diff --git a/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl b/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
index a9dbcf8ba..3889a424b 100644
--- a/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
+++ b/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl
@@ -25,7 +25,7 @@
 
 <section id="dashtrends" class="panel widget">
 	<header class="panel-heading">
-		<i class="icon-bar-chart"></i> {l s='Score Trends'}
+		<i class="icon-bar-chart"></i> {l s='Dashboard'}
 		<span class="panel-heading-action">
 			<a class="list-tooolbar-btn" href="javascript:void(0);" title="configure">
 				<i class="process-icon-configure"></i>
diff --git a/themes/default/js/quick-view.js b/themes/default/js/quick-view.js
new file mode 100644
index 000000000..ab0c888e8
--- /dev/null
+++ b/themes/default/js/quick-view.js
@@ -0,0 +1,33 @@
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+$(document).ready(function() {
+	$('.quick-view').hover(function() {
+		$.fancybox({
+			'type': 'iframe',
+			'href': this.href+'&content_only=1'
+		});
+	});
+});
diff --git a/themes/default/product-list.tpl b/themes/default/product-list.tpl
index 08c6152e3..484e294b6 100644
--- a/themes/default/product-list.tpl
+++ b/themes/default/product-list.tpl
@@ -37,13 +37,13 @@
 				{/if}
 			</div>
 			<div class="center_block">
-				<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}">
+				<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link {if $quick_view}quick-view{/if}" title="{$product.name|escape:'htmlall':'UTF-8'}" data-toto="fuck">
 					<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} />
 					{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}
 				</a>
 				<h3>{if isset($product.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></h3>
 				<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}" >{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}</a></p>
-				{$product.color_list}
+				{if isset($product.color_list)}{$product.color_list}{/if}
 			</div>
 			<div class="right_block">
 				{if isset($product.on_sale) && $product.on_sale && isset($product.show_price) && $product.show_price && !$PS_CATALOG_MODE}<span class="on_sale">{l s='On sale!'}</span>