diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
index e91982c17..40105c96e 100644
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
@@ -29,45 +29,44 @@
 	{if $input.type == "select_template"}
 		<div id="tpl" style="display:{if isset($fields_value.send_email) && $fields_value.send_email}block{else}none{/if}">
 	{/if}
-	{if isset($input.label)}
-		<label>{$input.label} </label>
+	{$smarty.block.parent}
+{/block}
+
+{block name="input_block"}
+	{if $input.type == "select_template"}
+		<div class="translatable">
+			{foreach $languages as $language}
+				<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
+					<select name="{$input.name}_{$language.id_lang}"
+							id="{$input.name}_select_{$language.id_lang}"
+							{if isset($input.multiple)}multiple="multiple" {/if}
+							{if isset($input.size)}size="{$input.size}"{/if}
+							{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
+						{foreach $input.options.query AS $option}
+							<option value="{$option[$input.options.id]}"
+								{if isset($input.multiple)}
+									{foreach $fields_value[$input.name] as $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}
+					</select>
+					{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
+					<img onclick="viewTemplates('#template_select_{$language.id_lang}', '../mails/{$language.iso_code}/', '.html');"
+						src="../img/t/AdminFeatures.gif" class="pointer" alt="{l s='Preview'}" title="{l s='Preview'}" />
+				</div>
+			{/foreach}
+		</div>
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 
-{block name="start_field_block"}
-	<div class="margin-form">
-		{if $input.type == "select_template"}
-			<div class="translatable">
-				{foreach $languages as $language}
-					<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;">
-						<select name="{$input.name}_{$language.id_lang}"
-								id="{$input.name}_select_{$language.id_lang}"
-								{if isset($input.multiple)}multiple="multiple" {/if}
-								{if isset($input.size)}size="{$input.size}"{/if}
-								{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
-							{foreach $input.options.query AS $option}
-								<option value="{$option[$input.options.id]}"
-									{if isset($input.multiple)}
-										{foreach $fields_value[$input.name] as $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}
-						</select>
-						{if isset($input.hint)}<span class="hint" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
-						<img onclick="viewTemplates('#template_select_{$language.id_lang}', '../mails/{$language.iso_code}/', '.html');"
-							src="../img/t/AdminFeatures.gif" class="pointer" alt="{l s='Preview'}" title="{l s='Preview'}" />
-					</div>
-				{/foreach}
-			</div>
-		{/if}
-{/block}
-
-{block name="end_field_block"}
-	</div>
+{block name="field_block"}
+	{$smarty.block.parent}
 	{if $input.type == "select_template"}
 		</div>
 	{/if}
diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
index 3ec141b8b..f9ebd27fa 100644
--- a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
@@ -26,17 +26,14 @@
 {extends file="helpers/form/form.tpl"}
 
 {block name=script}
-
 	$(document).ready(function() {
 		$('#latitude, #longitude').keyup(function() {
 			$(this).val($(this).val().replace(/,/g, '.'));
 		});
 	});
-
 {/block}
 
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input_block"}
 	{if $input.type == 'latitude'}
 		<input type="text"
 			{if isset($input.size)}size="{$input.size}"{/if}
@@ -50,6 +47,8 @@
 			name="longitude"
 			id="longitude"
 			value="{$fields_value['longitude']|htmlentities}" />
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
 
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 08f14cde5..033fc8556 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -324,8 +324,8 @@
 								{elseif $input.type == 'free'}
 									{$fields_value[$input.name]}
 								{/if}
-								{/block}
 								{if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if}
+								{/block}
 								{block name="description_block"}
 									{if isset($input.desc)}
 										<p class="preference_description">
@@ -344,14 +344,14 @@
 									{/if}
 								{/block}
 								{if isset($input.lang) && isset($languages)}<div class="clear"></div>{/if}
-							{block name="end_field_block"}
-								</div>
-								<div class="clear"></div>
+								{block name="end_field_block"}
+									</div>
+									<div class="clear"></div>
+								{/block}
 							{/block}
 							{if $input.name == 'id_state'}
 								</div>
 							{/if}
-						{/block}
 						{/if}
 					{/foreach}
 					{hook h='displayAdminForm'}