diff --git a/admin-dev/themes/template/attributes/form.tpl b/admin-dev/themes/template/attributes/form.tpl
index 5ab708bbe..2ee73b654 100644
--- a/admin-dev/themes/template/attributes/form.tpl
+++ b/admin-dev/themes/template/attributes/form.tpl
@@ -24,13 +24,14 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {extends file="helper/form/form.tpl"}
+
 {block name=script}
-		var attributesGroups = {ldelim}{$strAttributesGroups}{rdelim};
-		$('#id_attribute_group').change(function() {
-				var val = $(this).val();
-				if (attributesGroups[val])
-					$('#colorAttributeProperties').show();
-				else
-					$('#colorAttributeProperties').hide();
-			});
+	var attributesGroups = {ldelim}{$strAttributesGroups}{rdelim};
+	$('#id_attribute_group').change(function() {
+		var val = $(this).val();
+		if (attributesGroups[val])
+			$('#colorAttributeProperties').show();
+		else
+			$('#colorAttributeProperties').hide();
+	});
 {/block}
diff --git a/admin-dev/themes/template/carriers/form.tpl b/admin-dev/themes/template/carriers/form.tpl
index 7496c634a..13fb01b44 100644
--- a/admin-dev/themes/template/carriers/form.tpl
+++ b/admin-dev/themes/template/carriers/form.tpl
@@ -23,273 +23,29 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+{extends file="helper/form/form.tpl"}
 
-{if $firstCall}
-	<script type="text/javascript">
-		var vat_number = {$vat_number};
-		var module_dir = '{$module_dir}';
-		var id_language = {$defaultFormLanguage};
-		var languages = new Array();
+{block name=script}
+	// At the loading
+	($("input[name='is_free']:checked").val() == 0) ? $('#shipping_costs_div').show('toggle'): $('#shipping_costs_div').hide();
 
-		$(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});
+	$("input[name='is_free']").live('change', function() {ldelim}
+		($("input[name='is_free']:checked").val() == 0) ? $('#shipping_costs_div').show('toggle'): $('#shipping_costs_div').hide();			
+	{rdelim});
+{/block}
 
-			{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}
-
-			// At the loading
-			($("input[name='is_free']:checked").val() == 0) ? $('#shipping_costs_div').show('toggle'): $('#shipping_costs_div').hide();
-
-			$("input[name='is_free']").live('change', function() {ldelim}
-				($("input[name='is_free']:checked").val() == 0) ? $('#shipping_costs_div').show('toggle'): $('#shipping_costs_div').hide();			
-			{rdelim});
-		{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}" />
+{block name="label"}
+	{if $input.type == 'select' && $input.name == 'id_tax_rules_group'}
+		<div id="shipping_costs_div" style="display:{if isset($fields_value.is_free) && $fields_value.is_free}none{else}block{/if}">
 	{/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 $input.name == 'id_tax_rules_group'}<div id="shipping_costs_div">{/if}
-					{if isset($input.label)}
-						{if $input.name == 'is_module' && $fields_value['is_module'] == 0}
-						{else}
-							<label>{$input.label} </label>
-						{/if}
-					{/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'}
-							{if $input.name == 'is_module'}
-								{if $fields_value['is_module'] != 0}
-									<p> - {l s='This carrier is bound to this module '} : {$fields_value['external_module_name']}</p>
-									<input type="hidden" name="is_module" value="1">
-									<input type="hidden" name="external_module_name" value="{$fields_value['external_module_name']}">
-									{if $fields_value['shipping_external'] != 0}
-										<p> - {l s='The shipping costs are calculated outside of your shop'}</p>
-										<input type="hidden" name="shipping_external" value="1">
-									{/if}
-									{if $fields_value['need_range'] != 0}
-										<p> - {l s='This carrier uses PrestaShop range to calculate shipping costs'}</p>
-										<input type="hidden" name="need_range" value="1">
-									{/if}
-								{/if}
-							{else}
-								<input type="hidden" name="{$input.name}" value="{$fields_value[$input.name]}" />
-							{/if}
-						{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>
-						{/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}
-					</div>
-					{if $input.name == 'range_behavior'}</div>{/if}
-					{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>
-		{/if}
-	</fieldset>
-</form>
-
-<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 isset($input.label)}
+		<label>{$input.label} </label>
 	{/if}
-	<br />
-{/if}
+{/block}
+
+{block name="end_field_block"}
+	{if $input.type == 'select' && $input.name == 'range_behavior'}
+		</div>
+	{/if}
+	</div>
+{/block}
diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
index b61a7226c..68cb1997d 100644
--- a/controllers/admin/AdminCarriersController.php
+++ b/controllers/admin/AdminCarriersController.php
@@ -132,6 +132,31 @@ class AdminCarriersControllerCore extends AdminController
 
 	public function initList()
 	{
+		$this->displayInformation(
+			'&nbsp;<b>'.$this->l('How to create a new carrier?').'</b>
+			<br />
+			<ul>
+			<li>'.$this->l('Click "Add new".').'<br /></li>
+				<li>'.$this->l('Fill in the fields and click "Save".').'</li>
+				<li>'.
+					$this->l('You need to decide a price range or a weight range for which the new carrier will be available.
+					Under the "Shipping" tab, click either "Price Ranges" or "Weight Ranges".').'
+				</li>
+				<li>'.$this->l('Click "Add new".').'</li>
+				<li>'.
+					$this->l('Select the name of the carrier and define the price range or the weight range.
+					For example the carrier can be made available for a weight range between 0 and 5kgs. Another carrier will have a range between 5 and 10kgs.').'
+				</li>
+				<li>'.$this->l('When you are done, click "Save".').'</li>
+				<li>'.$this->l('Click on the "Shipping" tab.').'</li>
+				<li>'.
+					$this->l('You need to choose the fees that will be applied for this carrier.
+					At the bottom on the page, in the "Fees" section, select the name of the carrier.').'
+				</li>
+				<li>'.$this->l('For each zone, enter a price. Click "Save".').'</li>
+				<li>'.$this->l('You\'re set! The new carrier will be displayed to your customers.').'</li>
+			</ul>'
+		);
 		$this->_select = 'b.*';
 		$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'carrier_lang` b ON a.id_carrier = b.id_carrier';
 		$this->_where = 'AND b.id_lang = '.$this->context->language->id;
@@ -324,7 +349,6 @@ class AdminCarriersControllerCore extends AdminController
 				),
 				array(
 					'type' => 'hidden',
-					'label' => $this->l('Module:'),
 					'name' => 'is_module'
 				),
 				array(
@@ -357,6 +381,11 @@ class AdminCarriersControllerCore extends AdminController
 			'class' => 'button'
 		);
 
+		if (!($obj = $this->loadObject(true)))
+			return;
+
+		$this->getFieldsValues($obj);
+
 		return parent::initForm();
 	}
 
@@ -503,48 +532,6 @@ class AdminCarriersControllerCore extends AdminController
 		}
 	}
 
-	public function initContent()
-	{
-		if (!($obj = $this->loadObject(true)))
-			return;
-
-		if ($this->display != 'edit' && $this->display != 'add')
-			$this->display = 'list';
-
-		$this->getFieldsValues($obj);
-
-		parent::initContent();
-
-		if ($this->display == 'list')
-		{
-			$this->displayInformation(
-				'&nbsp;<b>'.$this->l('How to create a new carrier?').'</b>
-				<br />
-				<ul>
-				<li>'.$this->l('Click "Add new".').'<br /></li>
-					<li>'.$this->l('Fill in the fields and click "Save".').'</li>
-					<li>'.
-						$this->l('You need to decide a price range or a weight range for which the new carrier will be available.
-						Under the "Shipping" tab, click either "Price Ranges" or "Weight Ranges".').'
-					</li>
-					<li>'.$this->l('Click "Add new".').'</li>
-					<li>'.
-						$this->l('Select the name of the carrier and define the price range or the weight range.
-						For example the carrier can be made available for a weight range between 0 and 5kgs. Another carrier will have a range between 5 and 10kgs.').'
-					</li>
-					<li>'.$this->l('When you are done, click "Save".').'</li>
-					<li>'.$this->l('Click on the "Shipping" tab.').'</li>
-					<li>'.
-						$this->l('You need to choose the fees that will be applied for this carrier.
-						At the bottom on the page, in the "Fees" section, select the name of the carrier.').'
-					</li>
-					<li>'.$this->l('For each zone, enter a price. Click "Save".').'</li>
-					<li>'.$this->l('You\'re set! The new carrier will be displayed to your customers.').'</li>
-				</ul>'
-			);
-		}
-	}
-
 	public function beforeDelete($object)
 	{
 		return $object->isUsed();