diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
index e1ba3492b..3c3c1f4c6 100644
--- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
@@ -64,22 +64,18 @@
 	{if $input.type == 'checkboxStatuses'}
 		{foreach $input.values.query as $value}
 			{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
-			<input type="checkbox"
-				name="{$input.name}[]"
-				id="{$id_checkbox}"
-				value="{$value[$input.values.id]|intval}"
-				{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
-			<label for="{$id_checkbox}"
-				style="float:none;{if !(isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']])}font-weight:normal;{/if}padding:0;text-align:left;width:100%;color:#000">
-					<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
-					{$value[$input.values.name]}
-					({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
-			</label><br />
+			<p class="checkbox">
+				<label for="{$id_checkbox}" class="control-label">
+					<input type="checkbox" name="{$input.name}[]" id="{$id_checkbox}" value="{$value[$input.values.id]|intval}" {if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
+						<img src="../img/admin/charged_{if $value['invoice']}ok{else}ko{/if}.gif" alt="" />
+						{$value[$input.values.name]}
+						({if isset($statusStats[$value['id_order_state']]) && $statusStats[$value['id_order_state']]}{$statusStats[$value['id_order_state']]}{else}0{/if})
+				</label>
+			</p>
 		{/foreach}
 	{else}
 		{$smarty.block.parent}
 	{/if}
 {/block}
 
-{block name="after"}<div style="clear:both">&nbsp;</div>{/block}
 
diff --git a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
index f5fefa4f0..64d21b662 100644
--- a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
@@ -63,7 +63,7 @@
 			<ul class="nav">
 				{if count($tab_modules_list.installed)}
 					<li>
-						<a id="nav_tabs_modules_installed" class="btn btn-default" href="#" onclick="">
+						<a id="nav_tabs_modules_installed" class="panel-content" href="#" onclick="">
 							<i class="icon-plus-sign-alt"></i>
 							{l s='Installed'}
 						</a>
@@ -71,7 +71,7 @@
 				{/if}
 				{if count($tab_modules_list.not_installed)}
 					<li>
-						<a href="#" id="nav_tabs_modules_not_installed" class="btn btn-default">
+						<a href="#" id="nav_tabs_modules_not_installed" class="panel-content">
 							<i class="icon-minus-sign-alt"></i>
 							{l s='Not Installed'}
 						</a>
@@ -82,14 +82,14 @@
 	</div>
 	<div id="modules_list_container_content">
 		{if count($tab_modules_list.installed)}
-		<table id="tab_modules_list_installed">
+		<table id="tab_modules_list_installed" class="table table-striped table-hover">
 			{foreach from=$tab_modules_list.installed item=module}
 				{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
 			{/foreach}
 		</table>
 		{/if}
 		{if count($tab_modules_list.not_installed)}
-		<table id="tab_modules_list_not_installed">
+		<table id="tab_modules_list_not_installed" class="table table-striped table-hover">
 			{foreach from=$tab_modules_list.not_installed item=module}
 				{include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}}
 			{/foreach}
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 61f0e2b5d..fba0b9d6d 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
@@ -59,457 +59,203 @@
 
 	{assign var="hook_invoice" value={hook h="displayInvoice" id_order=$order->id}}
 	{if ($hook_invoice)}
-	<div style="float: right; margin: -40px 40px 10px 0;">{$hook_invoice}</div><br class="clear" />
+	<div>{$hook_invoice}</div>
 	{/if}
 
-<div class="bloc-command">
-	<div class="button-command">
-			{if (count($invoices_collection))}
-				<a class="button" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
-					<img src="../img/admin/charged_ok.gif" alt="{l s='View invoice'}" /> {l s='View invoice'}
-				</a>
-			{else}
-				<img src="../img/admin/charged_ko.gif" alt="{l s='No invoice'}" /> {l s='No invoice'}
-			{/if}
-			 |
-			{if (($currentState && $currentState->delivery) || $order->delivery_number)}
-				<a class="button"  href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
-					<img src="../img/admin/delivery.gif" alt="{l s='View delivery slip'}" /> {l s='View delivery slip'}
-				</a>
-			{else}
-				<img src="../img/admin/delivery_ko.gif" alt="{l s='No delivery slip'}" /> {l s='No delivery slip'}
-			{/if}
-			 |
-			<a class="button" href="javascript:window.print()"><img src="../img/admin/printer.gif" alt="{l s='Print order'}" title="{l s='Print order'}" /> {l s='Print order'}</a>
-		</div>
-		<div class="metadata-command">
-			<dl>
-				<dt>{l s='Date'} </dt>
-				<dd>{dateFormat date=$order->date_add full=true}</dd>
-			|</dl>
-			<dl>
-				<dt>{l s='Messages:'}</dt>
-				<dd>{sizeof($messages)}</dd>
-			|</dl>
-			<dl>
-				<dt><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{l s='New Customer Messages:'}</a></dt>
-				<dd><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a></dd>
-			|</dl>
-			<dl>
-				<dt>{l s='Products:'}</dt>
-				<dd id="product_number">{sizeof($products)}</dd>
-			|</dl>
-			<dl>
-				<dt>{l s='Total'}</dt>
-				<dd class="total_paid">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
-			</dl>
-		<div class="clear"></div>
-	</div>
-</div>
-	<div class="container-command">
-		<!-- Left column -->
-		<div style="width: 49%; float:left;">
-			<!-- Change status form -->
-			<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
-				<select id="id_order_state" name="id_order_state">
-				{foreach from=$states item=state}
-					{if $state['id_order_state'] != $currentState->id}
-					<option value="{$state['id_order_state']}">{$state['name']|stripslashes}</option>
-					{/if}
-				{/foreach}
-				</select>
-				<input type="hidden" name="id_order" value="{$order->id}" />
-				<input type="submit" name="submitState" value="{l s='Add'}" class="button" />
-			</form>
-			<br />
-
-			<!-- History of status -->
-			<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;">
-				<colgroup>
-					<col width="1%">
-					<col width="">
-					<col width="20%">
-					<col width="20%">
-				</colgroup>
-			{foreach from=$history item=row key=key}
-				{if ($key == 0)}
-				<tr>
-					<th><img src="../img/os/{$row['id_order_state']}.gif" /></th>
-					<th>{$row['ostate_name']|stripslashes}</th>
-					<th>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</th>
-					<th>{dateFormat date=$row['date_add'] full=true}</th>
-				</tr>
+<div class="row">
+	<div class="col-lg-12">
+		<div class="well">
+			<span>
+				{l s='Date:'} {dateFormat date=$order->date_add full=true} 
+			</span>
+			<span>
+				| {l s='Messages:'} {sizeof($messages)}
+			</span>
+			<span>
+				| <a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{l s='New Customer Messages:'}</a> 
+				<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a>
+			</span>
+			<span>
+				| {l s='Products:'} {sizeof($products)}
+			</span>
+			<span>
+				| {l s='Total:'} {displayPrice price=$order->total_paid_tax_incl currency=$currency->id}
+			</span>
+			<span class="pull-right">
+				{if (count($invoices_collection))}
+					<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
+						<i class="icon-file"></i> 
+						{l s='View invoice'}
+					</a>
 				{else}
-				<tr class="{if ($key % 2)}alt_row{/if}">
-					<td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
-					<td>{$row['ostate_name']|stripslashes}</td>
-					<td>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else}&nbsp;{/if}</td>
-					<td>{dateFormat date=$row['date_add'] full=true}</td>
-				</tr>
+					<i class="icon-file"></i> {l s='No invoice'}
+				{/if}
+				 |
+				{if (($currentState && $currentState->delivery) || $order->delivery_number)}
+					<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
+						<i class="icon-suitcase"></i> {l s='View delivery slip'}
+					</a>
+				{else}
+					<i class="icon-suitcase"></i> {l s='No delivery slip'}
+				{/if}
+				 |
+				<a href="javascript:window.print()">
+					<i class="icon-print"></i> 
+					{l s='Print order'}
+				</a>
+			</span>
+		</div>
+	</div>
+
+	<div class="col-lg-12">
+		<div class="breadcrumb pull-right">
+			<b>{l s='Orders'}</b> :
+			{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if}
+			{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
+		</div>
+	</div>
+
+	<div class="col-lg-12">
+		<!-- Change status form -->
+		<form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
+			<select id="id_order_state" name="id_order_state">
+			{foreach from=$states item=state}
+				{if $state['id_order_state'] != $currentState->id}
+				<option value="{$state['id_order_state']}">{$state['name']|stripslashes}</option>
 				{/if}
 			{/foreach}
-			</table>
+			</select>
+			<input type="hidden" name="id_order" value="{$order->id}" />
+			<input type="submit" name="submitState" value="{l s='Add'}" class="button" />
+		</form>
+		<!-- History of status -->
+		<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;">
+			<colgroup>
+				<col width="1%">
+				<col width="">
+				<col width="20%">
+				<col width="20%">
+			</colgroup>
+		{foreach from=$history item=row key=key}
+			{if ($key == 0)}
+			<tr>
+				<th><img src="../img/os/{$row['id_order_state']}.gif" /></th>
+				<th>{$row['ostate_name']|stripslashes}</th>
+				<th>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</th>
+				<th>{dateFormat date=$row['date_add'] full=true}</th>
+			</tr>
+			{else}
+			<tr class="{if ($key % 2)}alt_row{/if}">
+				<td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
+				<td>{$row['ostate_name']|stripslashes}</td>
+				<td>{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{else}&nbsp;{/if}</td>
+				<td>{dateFormat date=$row['date_add'] full=true}</td>
+			</tr>
+			{/if}
+		{/foreach}
+		</table>
 
-			{if $customer->id}
-			<!-- Customer informations -->
-			<br />
-			<fieldset>
-				<legend><img src="../img/admin/tab-customers.gif" /> {l s='Customer information'}</legend>
-				<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
-				(<a href="mailto:{$customer->email}">{$customer->email}</a>)<br /><br />
-				{if ($customer->isGuest())}
-					{l s='This order has been placed by a guest.'}
-					{if (!Customer::customerExists($customer->email))}
-					<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
-						<input type="hidden" name="id_lang" value="{$order->id_lang}" />
-						<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform a guest into a customer'}" /></p>
-						{l s='This feature will generate a random password and send an email to the customer.'}
-					</form>
-					{else}
-						<div><b style="color:red;">{l s='A registered customer account has already claimed this email address'}</b></div>
-					{/if}
+		{if $customer->id}
+	</div>
+	<!-- Left column -->
+
+	<!-- Customer informations -->
+
+	<div class="col-lg-6">
+		<fieldset>
+			<legend><img src="../img/admin/tab-customers.gif" /> {l s='Customer information'}</legend>
+			<span style="font-weight: bold; font-size: 14px;"><a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}"> {$customer->firstname} {$customer->lastname}</a></span> ({l s='#'}{$customer->id})<br />
+			(<a href="mailto:{$customer->email}">{$customer->email}</a>)<br /><br />
+			{if ($customer->isGuest())}
+				{l s='This order has been placed by a guest.'}
+				{if (!Customer::customerExists($customer->email))}
+				<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
+					<input type="hidden" name="id_lang" value="{$order->id_lang}" />
+					<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform a guest into a customer'}" /></p>
+					{l s='This feature will generate a random password and send an email to the customer.'}
+				</form>
 				{else}
-					{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br />
-					{l s='Valid orders placed:'} <b>{$customerStats['nb_orders']}</b><br />
-					{l s='Total spent since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br />
-			</fieldset>
+					<div><b style="color:red;">{l s='A registered customer account has already claimed this email address'}</b></div>
 				{/if}
+			{else}
+				{l s='Account registered:'} <b>{dateFormat date=$customer->date_add full=true}</b><br />
+				{l s='Valid orders placed:'} <b>{$customerStats['nb_orders']}</b><br />
+				{l s='Total spent since registration:'} <b>{displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_orders'], $currency), 2) currency=$currency->id}</b><br />
+		</fieldset>
 			{/if}
+		{/if}
 
-			<!-- Sources block -->
-			{if (sizeof($sources))}
-			<br />
-			<fieldset>
-				<legend><img src="../img/admin/tab-stats.gif" /> {l s='Sources'}</legend>
-				<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
-				{foreach from=$sources item=source}
-					<li>
-						{dateFormat date=$source['date_add'] full=true}<br />
-						<b>{l s='From'}</b>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br />
-						<b>{l s='To'}</b> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br />
-						{if $source['keywords']}<b>{l s='Keywords'}</b> {$source['keywords']}<br />{/if}<br />
-					</li>
-				{/foreach}
-				</ul>
-			</fieldset>
-			{/if}
+		<!-- Sources block -->
+		{if (sizeof($sources))}
+		<fieldset>
+			<legend><img src="../img/admin/tab-stats.gif" /> {l s='Sources'}</legend>
+			<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
+			{foreach from=$sources item=source}
+				<li>
+					{dateFormat date=$source['date_add'] full=true}<br />
+					<b>{l s='From'}</b>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br />
+					<b>{l s='To'}</b> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br />
+					{if $source['keywords']}<b>{l s='Keywords'}</b> {$source['keywords']}<br />{/if}<br />
+				</li>
+			{/foreach}
+			</ul>
+		</fieldset>
+		{/if}
 
-			<!-- Admin order hook -->
-			{hook h="displayAdminOrder" id_order=$order->id}
-		</div>
-		<!-- END Left column -->
-
-		<!-- Right column -->
-		<div style="width: 49%; float:right;">
-			<div class="button-command-prev-next">
-				<b>{l s='Orders'}</b> :
-				{if $previousOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}">{l s='< Prev'}</a>{/if}
-				{if $nextOrder}<a class="button" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}">{l s='Next >'}</a>{/if}
+		<!-- Admin order hook -->
+		{hook h="displayAdminOrder" id_order=$order->id}
+	</div>
+	
+	<div class="col-lg-6">
+		<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>
+			<legend onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><img src="../img/admin/email_edit.gif" /> {l s='New message'}</legend>
+			<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}; overflow: auto; width: 400px;">
+				<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer.'}</a>
 			</div>
-			<div class="clear"></div>
-			
-			<!-- linked orders block -->
-			{if count($order->getBrother()) > 0}
-				<fieldset>
-					<legend><img src="../img/admin/tab-orders.gif" /> {l s='Linked orders'}</legend>
-					<table class="table" width="100%;" cellspacing="0" cellpadding="0">
-						<thead>
-							<tr>
-								<th width="10%">
-									{l s='Order no. '}
-								</th>
-								<th>
-									{l s='Status'}
-								</th>
-								<th width="10%">
-									{l s='Amount'}
-								</th>
-								<th width="5%">
-								</th>
-							</tr>
-						</thead>
-						<tbody>
-							{foreach $order->getBrother() as $brother_order}
-								<tr>
-									<td>
-										<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
-									</td>
-									<td>
-										{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
-									</td>
-									<td>
-										{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
-									</td>
-									<td>
-										<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img alt="{l s='See the order'}" src="../img/admin/details.gif"></a>
-									</td>
-								</tr>
-							{/foreach}
-						</tbody>
-					</table>
-				</fieldset>
-				<br />
+			<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a><br>
+			<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
+						<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">-- {l s='Choose a standard message'} --</option>
+			{foreach from=$orderMessages item=orderMessage}
+				<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
+			{/foreach}
+						</select><br /><br />
+						<b>{l s='Display to customer?'}</b>
+						<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
+						<input type="radio" name="visibility" value="1" checked="checked" /> {l s='No'}
+						<p id="nbchars" style="display:inline;font-size:10px;color:#666;"></p><br /><br />
+				<textarea id="txt_msg" name="message" cols="50" rows="8" onKeyUp="var length = document.getElementById('txt_msg').value.length; if (length > 600) length = '600+'; document.getElementById('nbchars').innerHTML = '{l s='600 characters, max.'} (' + length + ')';">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea><br /><br />
+				<input type="hidden" name="id_order" value="{$order->id}" />
+				<input type="hidden" name="id_customer" value="{$order->id_customer}" />
+				<input type="submit" class="button" name="submitMessage" value="{l s='Send'}" />
+			</div>
+		</fieldset>
+		</form>
+
+	{if (sizeof($messages))}
+		<fieldset>
+		<legend><img src="../img/admin/email.gif" /> {l s='Messages'}</legend>
+		{foreach from=$messages item=message}
+			<div style="overflow:auto; width:400px;" {if $message['is_new_for_me']}class="new_message"{/if}>
+			{if ($message['is_new_for_me'])}
+				<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}"><img src="../img/admin/enabled.gif" alt="" /></a>
 			{/if}
-			
-			<!-- Documents block -->
-			<fieldset>
-				<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
-
-				{* Include document template *}
-				{include file='controllers/orders/_documents.tpl'}
-			</fieldset>
+			{l s='At'} <i>{dateFormat date=$message['date_add']}
+			</i> {l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
+			{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private'}</span>{/if}
+			<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
+			</div>
 			<br />
-
-			<!-- Payments block -->
-			<fieldset>
-				<legend><img src="../img/admin/money.gif" /> {l s='Payment: '}</legend>
-
-				{if (!$order->valid && sizeof($currencies) > 1)}
-				<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
-					<p class="alert alert-block">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
-					<label>{l s='Don\'t forget to update your conversion rate before making this change.'}</label>
-					<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>
-					<input type="submit" class="button" name="submitChangeCurrency" value="{l s='Change'}" />
-				</form>
-				<hr class="clear"/>
-				{/if}
-				
-				{if count($order->getOrderPayments()) > 0}
-				<p class="error" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
-					{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id}
-					{l s='paid instead of'} <span class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</span>
-					
-					{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" width="100%" cellspacing="0" cellpadding="0">
-						<colgroup>
-							<col width="15%">
-							<col width="">
-							<col width="20%">
-							<col width="10%">
-							<col width="10%">
-							<col width="1%">
-						</colgroup>
-						<thead>
-							<tr>
-								<th>{l s='Date'}</th>
-								<th>{l s='Payment method'}</th>
-								<th>{l s='Transaction ID'}</th>
-								<th>{l s='Amount'}</th>
-								<th>{l s='Invoice'}</th>
-								<th>&nbsp;</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)}
-								{else}
-									{l s='No invoice'}
-								{/if}
-								</td>
-								<td class="right">
-									<a href="#" class="open_payment_information"><img src="../img/admin/details.gif" title="{l s='See payment information'}" alt="{l s='See payment information'}" /></a>
-								</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 colspan="6" class="center">
-									<h3>{l s='No payments are available'}</h3>
-								</td>
-							</tr>
-							{/foreach}
-							<tr class="current-edit">
-								<td><input type="text" name="payment_date" class="datepicker" size="17" 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>
-									<input type="text" name="payment_amount" size="5" value="" />
-									<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>
-								</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)}</option>
-									{/foreach}
-									</select>
-								</td>
-								{/if}
-								<td><input class="button" type="submit" name="submitAddPayment" value="{l s='Add'}" /></td>
-							</tr>
-						</tbody>
-					</table>
-				</form>
-			</fieldset>
-			<br />
-
-			<!-- Shipping block -->
-			{if !$order->isVirtual()}
-				<fieldset>
-					<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
-
-					<div class="clear" style="float: left; margin-right: 10px;">
-						<span>{l s='Recycled packaging'}</span>
-						{if $order->recyclable}
-						<img src="../img/admin/enabled.gif" />
-						{else}
-						<img src="../img/admin/disabled.gif" />
-						{/if}
-					</div>
-					<div style="float: left;">
-						<span>{l s='Gift wrapping'}</span>
-						{if $order->gift}
-						<img src="../img/admin/enabled.gif" />
-						</div>
-						<div style="clear: left; margin: 0px 42px 0px 42px; padding-top: 2px;">
-							{if $order->gift_message}
-							<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message'}</b><br />{$order->gift_message|nl2br}</div>
-							{/if}
-						{else}
-						<img src="../img/admin/disabled.gif" />
-						{/if}
-					</div>
-					<div class="clear" style="margin-bottom: 10px;"></div>
-
-					{include file='controllers/orders/_shipping.tpl'}
-
-					{if $carrierModuleCall}
-						{$carrierModuleCall}
-					{/if}
-				</fieldset>
-				<br />
-
-				<!-- Return block -->
-				<fieldset>
-					<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend>
-
-					{if $order->getReturn()|count > 0}
-					<table class="table" width="100%" cellspacing="0" cellpadding="0">
-						<thead>
-							<tr>
-								<th style="width:30%">Date</th>
-								<th>Type</th>
-								<th style="width:20%">Carrier</th>
-								<th style="width:30%">Tracking number</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 style="display: inline;" 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;">
-											<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
-											<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
-										</span>
-										<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
-										<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
-									</form>
-									{/if}
-								</td>
-							</tr>
-							{/foreach}
-						</tbody>
-					</table>
-					{else}
-					{l s='No merchandise returned yet.'}
-					{/if}
-
-					{if $carrierModuleCall}
-						{$carrierModuleCall}
-					{/if}
-				</fieldset>
-			{/if}
-		</div>
-		<!-- END Right column -->
-		<div class="clear" style="margin-bottom: 10px;"></div>
+		{/foreach}
+		</fieldset>
+	{/if}
 	</div>
 
-	<div class="container-command container-command-top-spacing">
+	<div class="col-lg-12">
 		<!-- Addresses -->
 		{if !$order->isVirtual()}
-			<div style="width: 49%; float:left;">
+			<div>
 				<!-- Shipping address -->
 				<fieldset>
 					<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
@@ -539,7 +285,7 @@
 				</fieldset>
 			</div>
 		{/if}
-		<div style="width: 49%; float:right;">
+		<div>
 			<!-- Invoice address -->
 			<fieldset>
 				<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
@@ -567,9 +313,308 @@
 				{if $addresses.invoice->other}<hr />{$addresses.invoice->other}<br />{/if}
 			</fieldset>
 		</div>
-		<div class="clear" style="margin-bottom: 10px;"></div>
 	</div>
 
+	<!-- linked orders block -->
+	{if count($order->getBrother()) > 0}
+		<div class="col-lg-6">
+			<fieldset>
+				<legend><img src="../img/admin/tab-orders.gif" /> {l s='Linked orders'}</legend>
+				<table class="table" width="100%;" cellspacing="0" cellpadding="0">
+					<thead>
+						<tr>
+							<th width="10%">
+								{l s='Order no. '}
+							</th>
+							<th>
+								{l s='Status'}
+							</th>
+							<th width="10%">
+								{l s='Amount'}
+							</th>
+							<th width="5%">
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+						{foreach $order->getBrother() as $brother_order}
+							<tr>
+								<td>
+									<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
+								</td>
+								<td>
+									{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
+								</td>
+								<td>
+									{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
+								</td>
+								<td>
+									<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"><img alt="{l s='See the order'}" src="../img/admin/details.gif"></a>
+								</td>
+							</tr>
+						{/foreach}
+					</tbody>
+				</table>
+			</fieldset>
+		</div>
+	{/if}
+
+	<div class="col-lg-6">
+	<!-- Documents block -->
+		<fieldset>
+			<legend><img src="../img/admin/details.gif" /> {l s='Documents'}</legend>
+
+			{* Include document template *}
+			{include file='controllers/orders/_documents.tpl'}
+		</fieldset>
+	</div>
+
+	<div class="col-lg-6">
+		<!-- Payments block -->
+		<fieldset>
+			<legend><img src="../img/admin/money.gif" /> {l s='Payment: '}</legend>
+
+			{if (!$order->valid && sizeof($currencies) > 1)}
+			<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+				<p class="alert alert-block">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
+				<label>{l s='Don\'t forget to update your conversion rate before making this change.'}</label>
+				<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>
+				<input type="submit" class="button" name="submitChangeCurrency" value="{l s='Change'}" />
+			</form>
+			<hr class="clear"/>
+			{/if}
+			
+			{if count($order->getOrderPayments()) > 0}
+			<p class="error" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
+				{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id}
+				{l s='paid instead of'} <span class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</span>
+				
+				{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" width="100%" cellspacing="0" cellpadding="0">
+					<colgroup>
+						<col width="15%">
+						<col width="">
+						<col width="20%">
+						<col width="10%">
+						<col width="10%">
+						<col width="1%">
+					</colgroup>
+					<thead>
+						<tr>
+							<th>{l s='Date'}</th>
+							<th>{l s='Payment method'}</th>
+							<th>{l s='Transaction ID'}</th>
+							<th>{l s='Amount'}</th>
+							<th>{l s='Invoice'}</th>
+							<th>&nbsp;</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)}
+							{else}
+								{l s='No invoice'}
+							{/if}
+							</td>
+							<td class="right">
+								<a href="#" class="open_payment_information"><img src="../img/admin/details.gif" title="{l s='See payment information'}" alt="{l s='See payment information'}" /></a>
+							</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 colspan="6" class="center">
+								<h3>{l s='No payments are available'}</h3>
+							</td>
+						</tr>
+						{/foreach}
+						<tr class="current-edit">
+							<td><input type="text" name="payment_date" class="datepicker" size="17" 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>
+								<input type="text" name="payment_amount" size="5" value="" />
+								<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>
+							</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)}</option>
+								{/foreach}
+								</select>
+							</td>
+							{/if}
+							<td><input class="button" type="submit" name="submitAddPayment" value="{l s='Add'}" /></td>
+						</tr>
+					</tbody>
+				</table>
+			</form>
+		</fieldset>
+	</div>
+
+	<!-- Shipping block -->
+	{if !$order->isVirtual()}
+		<div class="col-lg-6">
+			<fieldset>
+				<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
+
+				<div class="clear" style="float: left; margin-right: 10px;">
+					<span>{l s='Recycled packaging'}</span>
+					{if $order->recyclable}
+					<img src="../img/admin/enabled.gif" />
+					{else}
+					<img src="../img/admin/disabled.gif" />
+					{/if}
+				</div>
+				<div style="float: left;">
+					<span>{l s='Gift wrapping'}</span>
+					{if $order->gift}
+					<img src="../img/admin/enabled.gif" />
+					</div>
+					<div style="clear: left; margin: 0px 42px 0px 42px; padding-top: 2px;">
+						{if $order->gift_message}
+						<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message'}</b><br />{$order->gift_message|nl2br}</div>
+						{/if}
+					{else}
+					<img src="../img/admin/disabled.gif" />
+					{/if}
+				</div>
+				<div class="clear" style="margin-bottom: 10px;"></div>
+
+				{include file='controllers/orders/_shipping.tpl'}
+
+				{if $carrierModuleCall}
+					{$carrierModuleCall}
+				{/if}
+			</fieldset>
+		</div>
+		<div class="col-lg-6">
+			<!-- Return block -->
+			<fieldset>
+				<legend><img src="../img/admin/delivery.gif" /> {l s='Merchandise returns'}</legend>
+
+				{if $order->getReturn()|count > 0}
+				<table class="table" width="100%" cellspacing="0" cellpadding="0">
+					<thead>
+						<tr>
+							<th style="width:30%">Date</th>
+							<th>Type</th>
+							<th style="width:20%">Carrier</th>
+							<th style="width:30%">Tracking number</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 style="display: inline;" 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;">
+										<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
+										<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
+									</span>
+									<a href="#" class="edit_shipping_number_link"><img src="../img/admin/edit.gif" alt="{l s='Edit'}" /></a>
+									<a href="#" class="cancel_shipping_number_link" style="display: none;"><img src="../img/admin/disabled.gif" alt="{l s='Cancel'}" /></a>
+								</form>
+								{/if}
+							</td>
+						</tr>
+						{/foreach}
+					</tbody>
+				</table>
+				{else}
+				{l s='No merchandise returned yet.'}
+				{/if}
+
+				{if $carrierModuleCall}
+					{$carrierModuleCall}
+				{/if}
+			</fieldset>
+		</div>
+	{/if}
+</div>
+
 	<form style="width: 98%" 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}" />
 		<fieldset style="width: 100%; ">
@@ -740,55 +785,6 @@
 			</div>
 		</fieldset>
 	</form>
-	<div class="clear" style="height:20px;">&nbsp;</div>
-
-	<div style="float: left">
-		<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 style="width: 400px;">
-			<legend style="cursor: pointer;" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><img src="../img/admin/email_edit.gif" /> {l s='New message'}</legend>
-			<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}; overflow: auto; width: 400px;">
-				<a href="#" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false"><b>{l s='Click here'}</b> {l s='to add a comment or send a message to the customer.'}</a>
-			</div>
-			<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}"><b>{l s='Click here'}</b> {l s='to see all messages.'}</a><br>
-			<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
-						<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">-- {l s='Choose a standard message'} --</option>
-			{foreach from=$orderMessages item=orderMessage}
-				<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
-			{/foreach}
-						</select><br /><br />
-						<b>{l s='Display to customer?'}</b>
-						<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
-						<input type="radio" name="visibility" value="1" checked="checked" /> {l s='No'}
-						<p id="nbchars" style="display:inline;font-size:10px;color:#666;"></p><br /><br />
-				<textarea id="txt_msg" name="message" cols="50" rows="8" onKeyUp="var length = document.getElementById('txt_msg').value.length; if (length > 600) length = '600+'; document.getElementById('nbchars').innerHTML = '{l s='600 characters, max.'} (' + length + ')';">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea><br /><br />
-				<input type="hidden" name="id_order" value="{$order->id}" />
-				<input type="hidden" name="id_customer" value="{$order->id_customer}" />
-				<input type="submit" class="button" name="submitMessage" value="{l s='Send'}" />
-			</div>
-		</fieldset>
-		</form>
-
-	{if (sizeof($messages))}
-		<br />
-		<fieldset style="width: 400px;">
-		<legend><img src="../img/admin/email.gif" /> {l s='Messages'}</legend>
-		{foreach from=$messages item=message}
-			<div style="overflow:auto; width:400px;" {if $message['is_new_for_me']}class="new_message"{/if}>
-			{if ($message['is_new_for_me'])}
-				<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}"><img src="../img/admin/enabled.gif" alt="" /></a>
-			{/if}
-			{l s='At'} <i>{dateFormat date=$message['date_add']}
-			</i> {l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
-			{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private'}</span>{/if}
-			<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
-			</div>
-			<br />
-		{/foreach}
-		</fieldset>
-	{/if}
-	</div>
-
 
 	<div class="clear">&nbsp;</div>
 	<br /><br /><a href="{$current_index}&token={$smarty.get.token}"><img src="../img/admin/arrow2.gif" /> {l s='Back to list'}</a><br />
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 4eee707a4..ef778158e 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -28,6 +28,7 @@ class AdminInvoicesControllerCore extends AdminController
 {
 	public function __construct()
 	{
+		$this->bootstrap = true;
 		$this->table = 'invoice';
 
 		parent::__construct();