diff --git a/admin-dev/themes/template/countries/form.tpl b/admin-dev/themes/template/countries/form.tpl
index 50fa21b4c..b57d017d4 100644
--- a/admin-dev/themes/template/countries/form.tpl
+++ b/admin-dev/themes/template/countries/form.tpl
@@ -23,326 +23,91 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if $firstCall}
-	<script type="text/javascript" language="javascript" src="../js/jquery/jquery-fieldselection.js"></script>
-	<script type="text/javascript">
-		var vat_number = {$vat_number};
-		var module_dir = '{$module_dir}';
-		var id_language = {$defaultFormLanguage};
-		var languages = new Array();
-		var lastLayoutModified = "";
+{extends file="helper/form/form.tpl"}
 
-		$(document).ready(function() {ldelim}
-			{foreach $languages as $k => $language}
-				languages[{$k}] = {ldelim}
-					id_lang: {$language.id_lang},
-					iso_code: '{$language.iso_code}',
-					name: '{$language.name}'
-				{rdelim};
-			{/foreach}
-			displayFlags(languages, id_language, {$allowEmployeeFormLang});
-
-			{if isset($fields_value.id_state)}
-				if ($('#id_country') && $('#id_state'))
-				{ldelim}
-					ajaxStates({$fields_value.id_state});
-					$('#id_country').change(function() {ldelim}
-						ajaxStates();
-					{rdelim});
-				{rdelim}
-			{/if}
-
-			$('.availableFieldsList').css("display", "none");
-
-			$('.addPattern').click(function() {ldelim}
-				addFieldsToCursorPosition($(this).attr("id"))
-				lastLayoutModified = $("#ordered_fields").val();
-			{rdelim});
-
-			$('#ordered_fields').keyup(function() {ldelim}
-				lastLayoutModified = $(this).val();
-			{rdelim});
-
-			$('#useLastDefaultLayout').mouseover(function() {ldelim}
-				switchExplanationText("{l s='Will display back your last registered layout'}");
-			{rdelim});
-
-			$('#useDefaultLayoutSystem').mouseover(function() {ldelim}
-				switchExplanationText("{l s='Will display a default layout for this country'}");
-			{rdelim});
-
-			$('#useCurrentLastModifiedLayout').mouseover(function() {ldelim}
-				switchExplanationText("{l s='Will display back you\'re current editing layout'}");
-			{rdelim});
-
-			$('#eraseCurrentLayout').mouseover(function() {ldelim}
-				switchExplanationText("{l s='Will delete the current layout'}");
-			{rdelim});
-
-			$('#need_zip_code_on, #need_zip_code_off').change(function() {ldelim}
-				disableZipFormat();
-			{rdelim});
-
-		{rdelim});
-
-		function  switchExplanationText(text) {ldelim}
-			$("#explanationText").fadeOut("fast", function() {ldelim}
-				$(this).html(text);
-				$(this).fadeIn("fast");
-			{rdelim});
-		{rdelim}
-
-		function addFieldsToCursorPosition(pattern) {ldelim}
-			$("#ordered_fields").replaceSelection(pattern + " ");
-		{rdelim}
-
-		function displayAvailableFields(containerName) {ldelim}
-			$(".availableFieldsList").each( function () {ldelim}
-				if ($(this).attr('id') != 'availableListFieldsFor_'+containerName)
-					$(this).slideUp();
-			{rdelim});
-			$("#availableListFieldsFor_" + containerName).slideToggle();
-		{rdelim}
-
-		function resetLayout(defaultLayout, type) {ldelim}
-			if (confirm("{l s='Are you sure to apply this selection ?'}"))
-				$("#ordered_fields").val(unescape(defaultLayout.replace(/\+/g, " ")));
-		{rdelim}
-
-	</script>
-	<script type="text/javascript" src="../js/form.js"></script>
-{/if}
-
-<form action="{$current}&submitAdd{$table}=1&token={$token}" method="post" enctype="multipart/form-data">
-	{if $form_id}
-		<input type="hidden" name="id_{$table}" value="{$form_id}" />
-	{/if}
-	<fieldset>
-		{foreach $fields as $key => $field}
-			{if $key == 'legend'}
-				<legend>
-					{if isset($field.image)}<img src="{$field.image}" alt="{$field.title}" />{/if}
-					{$field.title}
-				</legend>
-			{elseif $key == 'input'}
-				{foreach $field as $input}
-					{if $input.name == 'id_state'}
-						<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
-					{/if}
-					{if isset($input.label)}
-					<label>{$input.label} </label>
-					{/if}
-					<div class="margin-form">
-						{if $input.type == 'text'}
-							{if isset($input.lang) && isset($input.attributeLang)}
-								{foreach $languages as $language}
-									<div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-										<input type="text"
-												name="{$input.name}_{$language.id_lang}"
-												value="{$fields_value[$input.name][$language.id_lang]}"
-												{if isset($input.size)}size="{$input.size}"{/if}
-												{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-												{if isset($input.class)}class="{$input.class}"{/if}
-												{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} />
-										{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-									</div>
-								{/foreach}
-								{if count($languages) > 1}
-									<div class="displayed_flag">
-										<img src="../img/l/{$defaultFormLanguage}.jpg"
-											class="pointer"
-											id="language_current_{$input.name}"
-											onclick="toggleLanguageFlags(this);" />
-									</div>
-									<div id="languages_{$input.name}" class="language_flags">
-										{l s='Choose language:'}<br /><br />
-										{foreach $languages as $language}
-												<img src="../img/l/{$language.id_lang}.jpg"
-													class="pointer"
-													alt="{$language.name}"
-													title="{$language.name}"
-													onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
-										{/foreach}
-									</div>
-								{/if}
-							{else}
-								<input type="text"
-										name="{$input.name}"
-										id="{$input.name}"
-										value="{$fields_value[$input.name]}"
-										{if isset($input.size)}size="{$input.size}"{/if}
-										{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-										{if isset($input.class)}class="{$input.class}"{/if}
-										{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} />
-								{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-							{/if}
-						{elseif $input.type == 'hidden'}
-							<input type="hidden" name="{$input.name}" value="{$fields_value[$input.name]}" />
-						{elseif $input.type == 'select'}
-							<select name="{$input.name}" id="{$input.name}" {if isset($input.multiple)}multiple="multiple" {/if}{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
-								{if isset($input.options.default)}
-									<option value="{$input.options.default.value}">{$input.options.default.label}</option>
-								{/if}
-								{if isset($input.options.optiongroup)}
-									{foreach $input.options.optiongroup.query AS $optiongroup}
-										<optgroup label="{$optiongroup[$input.options.optiongroup.label]}">
-											{foreach $optiongroup[$input.options.options.query] as $option}
-												<option value="{$option[$input.options.options.id]}"
-													{if isset($input.multiple)}
-														{foreach $fields_value[$input.name] as $field_value}
-															{if $field_value == $option[$input.options.options.id]}selected="selected"{/if}
-														{/foreach}
-													{else}
-														{if $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}
-													{/if}
-												>{$option[$input.options.options.name]|escape:'htmlall':'UTF-8'}</option>
-											{/foreach}
-										</optgroup>
-									{/foreach}
-								{else}
-									{foreach $input.options.query AS $option}
-										<option value="{$option[$input.options.id]}"
-											{if isset($input.multiple)}
-												{foreach $fields_value[$input.name] as $field_value}
-													{$field_value}
-													{if $field_value == $option[$input.options.id]}selected="selected"{/if}
-												{/foreach}
-											{else}
-												{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}
-											{/if}
-										>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option>
-									{/foreach}
-								{/if}
-							</select>
-							{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-						{elseif $input.type == 'radio'}
-							{foreach $input.values as $value}
-								<input type="radio"
-										name="{$input.name}"
-										id="{$value.id}"
-										value="{$value.value|escape:'htmlall':'UTF-8'}"
-										{if $fields_value[$input.name] == $value.value}checked="checked"{/if} />
-								<label {if isset($input.class)}class="{$input.class}"{/if} for="{$value.id}">
-								 {if isset($input.is_bool) && $input.is_bool == true}
-								 	{if $value.value == 1}
-								 		<img src="../img/admin/enabled.gif" alt="{$value.label}" title="{$value.label}" />
-								 	{else}
-								 		<img src="../img/admin/disabled.gif" alt="{$value.label}" title="{$value.label}" />
-								 	{/if}
-								 {else}
-								 	{$value.label}
-								 {/if}
-								</label>
-								{if isset($input.br) && $input.br}<br />{/if}
-							{/foreach}
-						{elseif $input.type == 'textarea'}
-							{if isset($input.lang) && isset($input.attributeLang)}
-								{foreach $languages as $language}
-									<div id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-										<textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}">{$fields_value[$input.name][$language.id_lang]}</textarea>
-									</div>
-								{/foreach}
-								{if count($languages) > 1}
-									<div class="displayed_flag">
-										<img src="../img/l/{$defaultFormLanguage}.jpg"
-											class="pointer"
-											id="language_current_{$input.name}"
-											onclick="toggleLanguageFlags(this);" />
-									</div>
-									<div id="languages_{$input.name}" class="language_flags">
-										{l s='Choose language:'}<br /><br />
-										{foreach $languages as $language}
-												<img src="../img/l/{$language.id_lang}.jpg"
-													class="pointer"
-													alt="{$language.name}"
-													title="{$language.name}"
-													onclick="changeLanguage('{$input.name}', '{$input.attributeLang}', {$language.id_lang}, '{$language.iso_code}');" />
-										{/foreach}
-									</div>
-								{/if}
-							{else}
-								<textarea name="{$input.name}" id="{$input.name}" cols="{$input.cols}" rows="{$input.rows}">{$fields_value[$input.name]}</textarea>
-							{/if}
-						{elseif $input.type == 'checkbox'}
-							{foreach $input.values.query as $value}
-								{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]}
-								<input type="checkbox" name="{$id_checkbox}" id="{$id_checkbox}" {if $fields_value[$id_checkbox]}checked="checked"{/if} />
-								<label for="{$id_checkbox}" class="t"><strong>{$value[$input.values.name]}</strong></label><br />
-							{/foreach}
-						{elseif $input.type == 'file'}
-							<input type="file" name="{$input.name}" />
-							<img src="{$fields_value[$input.name]}" />
-						{elseif $input.type == 'group'}
-							{assign var=groups value=$input.values}
-							{include file='helper/form/form_group.tpl'}
-						{elseif $input.type == 'shop' OR $input.type == 'group_shop'}
-							{include file='helper/form/form_shop.tpl'}
-						{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
-							<label>{l s='Shop association:'}</label>
-							<div class="margin-form">
-								{$asso_shop}
-							</div>
-						{elseif $input.type == 'address_layout'}
-							<div style="float:left">
-								<textarea id="ordered_fields" name="address_layout" style="width: 300px;height: 140px;">{$input.address_layout}</textarea>
-							</div>
-							<div style="float:left; margin-left:20px; width:340px;">
-								{l s='Liable fields for the address information (click to have more details):'} {$input.display_valid_fields}
-							</div>
-							<div class="clear"></div>
-							<div style="margin:10px 0 10px 0;">
-								<a id="useLastDefaultLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_address_layout}', 'lastDefault');" class="button">
-									{l s='Use the last registered layout'}</a>
-								<a id="useDefaultLayoutSystem" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_default_layout}', 'defaultSystem');" class="button">
-									{l s='Use a default layout'}</a>
-								<a id="useCurrentLastModifiedLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout(lastLayoutModified, 'currentModified')" class="button">
-									{l s='Use my current modified layout'}</a>
-								<a id="eraseCurrentLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('', 'erase');" class="button">
-									{l s='Clean layout'}</a>
-								<div style="margin-top:10px; padding-top:5px; height:10px;" id="explanationText"></div>
-							</div>
-						{/if}
-						{if isset($input.required) && $input.required} <sup>*</sup>{/if}
-						{if isset($input.p)}
-							<p class="clear">
-								{if is_array($input.p)}
-									{foreach $input.p as $p}
-										{if is_array($p)}
-											<span id="{$p.id}">{$p.text}</span><br />
-										{else}
-											{$p}<br />
-										{/if}
-									{/foreach}
-								{else}
-									{$input.p}
-								{/if}
-							</p>
-						{/if}
-						{if isset($languages)}<div class="clear"></div>{/if}
-					</div>
-					{if $input.name == 'id_state'}
-						</div>
-					{/if}
-				{/foreach}
-			{elseif $key == 'submit'}
-				<div class="margin-form">
-					<input type="submit" value="{$field.title}" name="submitAdd{$table}" {if isset($field.class)}class="{$field.class}"{/if} />
-				</div>
-			{/if}
-		{/foreach}
-		{if $required_fields}
-			<div class="small"><sup>*</sup> {l s ='Required field'}</div>
+{block name="start_field_block"}
+	<div class="margin-form">
+		{if $input.type == 'address_layout'}
+			<div style="float:left">
+				<textarea id="ordered_fields" name="address_layout" style="width: 300px;height: 140px;">{$input.address_layout}</textarea>
+			</div>
+			<div style="float:left; margin-left:20px; width:340px;">
+				{l s='Liable fields for the address information (click to have more details):'} {$input.display_valid_fields}
+			</div>
+			<div class="clear"></div>
+			<div style="margin:10px 0 10px 0;">
+				<a id="useLastDefaultLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_address_layout}', 'lastDefault');" class="button">
+					{l s='Use the last registered layout'}</a>
+				<a id="useDefaultLayoutSystem" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('{$input.encoding_default_layout}', 'defaultSystem');" class="button">
+					{l s='Use a default layout'}</a>
+				<a id="useCurrentLastModifiedLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout(lastLayoutModified, 'currentModified')" class="button">
+					{l s='Use my current modified layout'}</a>
+				<a id="eraseCurrentLayout" style="margin-left:5px;" href="javascript:void(0)" onClick="resetLayout('', 'erase');" class="button">
+					{l s='Clean layout'}</a>
+				<div style="margin-top:10px; padding-top:5px; height:10px;" id="explanationText"></div>
+			</div>
 		{/if}
-	</fieldset>
-</form>
-<script type="text/javascript">disableZipFormat();</script>
+{/block}
 
-<br /><br />
-{if $firstCall}
-	{if $back}
-		<a href="{$back}"><img src="../img/admin/arrow2.gif" />{l s='Back'}</a>
-	{else}
-		<a href="{$current}&token={$token}"><img src="../img/admin/arrow2.gif" />{l s='Back to list'}</a>
-	{/if}
-	<br />
-{/if}
+{block name=script}
+
+	$(document).ready(function() {
+
+		$('.availableFieldsList').css("display", "none");
+
+		$('.addPattern').click(function() {
+			addFieldsToCursorPosition($(this).attr("id"))
+			lastLayoutModified = $("#ordered_fields").val();
+		});
+
+		$('#ordered_fields').keyup(function() {
+			lastLayoutModified = $(this).val();
+		});
+
+		$('#useLastDefaultLayout').mouseover(function() {
+			switchExplanationText("{l s='Will display back your last registered layout'}");
+		});
+
+		$('#useDefaultLayoutSystem').mouseover(function() {
+			switchExplanationText("{l s='Will display a default layout for this country'}");
+		});
+
+		$('#useCurrentLastModifiedLayout').mouseover(function() {
+			switchExplanationText("{l s='Will display back you\'re current editing layout'}");
+		});
+
+		$('#eraseCurrentLayout').mouseover(function() {
+			switchExplanationText("{l s='Will delete the current layout'}");
+		});
+
+		$('#need_zip_code_on, #need_zip_code_off').change(function() {
+			disableZipFormat();
+		});
+
+	});
+
+	function switchExplanationText(text) {
+		$("#explanationText").fadeOut("fast", function() {
+			$(this).html(text);
+			$(this).fadeIn("fast");
+		});
+	}
+
+	function addFieldsToCursorPosition(pattern) {
+		$("#ordered_fields").replaceSelection(pattern + " ");
+	}
+
+	function displayAvailableFields(containerName) {
+		$(".availableFieldsList").each( function () {
+			if ($(this).attr('id') != 'availableListFieldsFor_'+containerName)
+			$(this).slideUp();
+		});
+		$("#availableListFieldsFor_" + containerName).slideToggle();
+	}
+
+	function resetLayout(defaultLayout, type) {
+		if (confirm("{l s='Are you sure to apply this selection ?'}"))
+		$("#ordered_fields").val(unescape(defaultLayout.replace(/\+/g, " ")));
+	}
+
+{/block}
diff --git a/admin-dev/themes/template/helper/form/form.tpl b/admin-dev/themes/template/helper/form/form.tpl
index bd2d1caa3..e665fbf4a 100644
--- a/admin-dev/themes/template/helper/form/form.tpl
+++ b/admin-dev/themes/template/helper/form/form.tpl
@@ -59,24 +59,27 @@
 				});
 
 		});
-	{block name="script"}
-	{/block}
+	{block name="script"}{/block}
 	</script>
 	<script type="text/javascript" src="../js/form.js"></script>
 {/if}
+
 <div class="toolbar-placeholder">
-<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
-{if $show_toolbar}
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
-	<div class="pageTitle">
-	<h3>{block name=pageTitle}
-		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
-		{/block}</h3>
+	<div class="toolbarBox {if $toolbar_fix}toolbarHead{/if}">
+		{if $show_toolbar}
+			{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
+			<div class="pageTitle">
+			<h3>
+				{block name=pageTitle}
+					<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+				{/block}
+			</h3>
+			</div>
+		{/if}
+		<div class="leadin">{block name="leadin"}{/block}</div>
 	</div>
-{/if}
-	<div class="leadin">{block name="leadin"}{/block}</div>
-</div>
 </div>
+
 {if isset($fields.title)}<h2>{$fields.title}</h2>{/if}
 <form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
 	{if $form_id}