diff --git a/admin-dev/themes/template/layout-ajax.tpl b/admin-dev/themes/template/layout-ajax.tpl
new file mode 100644
index 000000000..2834add9b
--- /dev/null
+++ b/admin-dev/themes/template/layout-ajax.tpl
@@ -0,0 +1,88 @@
+{*
+* 2007-2011 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-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+{if isset($conf)}
+	<div class="conf">
+		<img src="../img/admin/ok2.png" alt="" />{$conf}
+	</div>
+{/if}
+
+{if count($errors)} {* @todo what is ??? AND $this->_includeContainer *}
+	<div class="error">
+		<span style="float:right"><a id="hideError" href=""><img alt="X" src="../img/admin/close.png" /></a></span><img src="../img/admin/error2.png" />
+		{if count($errors) == 1}
+			{$errors[0]}
+		{else}
+			{$errors|count} {l s='errors'}
+			<br/>
+			<ol>
+				{foreach $errors AS $error}
+					<li>{$error}</li>
+				{/foreach}
+			</ol>
+		{/if}
+	</div>
+{/if}
+
+{if isset($informations) && count($informations) && $informations}
+	<div class="hint clear" style="display:block;">
+		{foreach $informations as $info}
+			{$info}<br />
+		{/foreach}
+	</div><br />
+{/if}
+
+{if isset($confirmations) && count($confirmations) && $confirmations}
+	<div class="conf" style="display:block;">
+		{foreach $confirmations as $conf}
+			{$conf}<br />
+		{/foreach}
+	</div><br />
+{/if}
+
+{if count($warnings)}
+	<div class="warn">
+		<span style="float:right">
+			<a id="hideWarn" href=""><img alt="X" src="../img/admin/close.png" /></a>
+		</span>
+		<img src="../img/admin/warn2.png" />
+		{if count($warnings) > 1}
+			{l s='There are'} {count($warnings)} {l s='warnings'}
+		{else}
+			{l s='There is'} {count($warnings)} {l s='warning'}
+		{/if}
+		<span style="margin-left:20px;" id="labelSeeMore">
+			<a id="linkSeeMore" href="#" style="text-decoration:underline">{l s='Click here to see more'}</a>
+			<a id="linkHide" href="#" style="text-decoration:underline;display:none">{l s='Hide warning'}</a>
+		</span>
+		<ul style="display:none;" id="seeMore">
+		{foreach $warnings as $warning}
+			<li>{$warning}</li>
+		{/foreach}
+		</ul>
+	</div>
+{/if}
+
+{$content}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index d8fd8a279..3685cdf52 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -956,7 +956,8 @@ class AdminControllerCore extends Controller
 
 	public function displayAjax()
 	{
-		echo $this->content;
+		$this->layout = 'layout-ajax.tpl';
+		return $this->display();
 	}
 
 	public function display()
@@ -984,21 +985,18 @@ class AdminControllerCore extends Controller
 			$page = $this->context->smarty->fetch($tpl);
 		else
 			$page = $this->context->smarty->fetch($this->template);
-		if ($this->content_only)
-			echo $page;
-		else
-		{
-			if ($conf = Tools::getValue('conf'))
-				$this->context->smarty->assign('conf', $this->_conf[(int)$conf]);
 
-			$this->context->smarty->assign('errors', $this->_errors);
-			$this->context->smarty->assign('warnings', $this->warnings);
-			$this->context->smarty->assign('informations', $this->informations);
-			$this->context->smarty->assign('confirmations', $this->confirmations);
-			// page & layout if content_only = 1
-			$this->context->smarty->assign('page', $page);
-			$this->context->smarty->display($this->layout);
-		}
+
+		if ($conf = Tools::getValue('conf'))
+			$this->context->smarty->assign('conf', $this->_conf[(int)$conf]);
+
+		$this->context->smarty->assign('errors', $this->_errors);
+		$this->context->smarty->assign('warnings', $this->warnings);
+		$this->context->smarty->assign('informations', $this->informations);
+		$this->context->smarty->assign('confirmations', $this->confirmations);
+
+		$this->context->smarty->assign('page', $page);
+		$this->context->smarty->display($this->layout);
 	}
 
 	/**