diff --git a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
index 76c370a5f..0728a007b 100644
--- a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
@@ -25,7 +25,7 @@
 *}
 
 {extends file="helpers/options/options.tpl"}
-{block name="start_field_block"}
+{block name="field"}
 	{if $field['type'] == 'checkbox_table'}
 		<div class="margin-form" style="float: left; padding-left: 0; width: 317px; margin-top: 6px; height: 300px; overflow-y: auto;">
 			<table class="table" cellspacing="0">
@@ -44,18 +44,18 @@
 					{/foreach}
 				</tbody>
 			</table>
-	{elseif $field['type'] == 'textarea_newlines'}
-		<div class="margin-form">
-			<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
+		</div>
+		<div class="clear"></div>
+		<br />
 	{else}
-		<div class="margin-form">
+		{$smarty.block.parent}
 	{/if}
 {/block}
 
-{block name="end_field_block"}
-	{if $field['type'] == 'checkbox_table'}
-		<div class="clear"></div>
-		<br />
+{block name="input"}
+	{if $field['type'] == 'textarea_newlines'}
+		<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
+	{else}
+		{$smarty.block.parent}
 	{/if}
-	</div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
index 101ef3a3b..6a15f2710 100644
--- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
@@ -25,13 +25,12 @@
 *}
 
 {extends file="helpers/options/options.tpl"}
-{block name="start_field_block"}
+{block name="input"}
 	{if $field['type'] == 'maintenance_ip'}
-		<div class="margin-form">
-			{$field['script_ip']}
-			<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'|htmlentities}" />
-			{$field['link_remove_ip']}
+		{$field['script_ip']}
+		<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'|htmlentities}" />
+		{$field['link_remove_ip']}
 	{else}
-		<div class="margin-form">
+		{$smarty.block.parent}
 	{/if}
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl
index b34b1544c..bb4154ff2 100644
--- a/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl
@@ -25,8 +25,7 @@
 *}
 
 {extends file="helpers/options/options.tpl"}
-{block name="start_field_block"}
-	<div class="margin-form">
+{block name="input"}
 	{if $field['type'] == 'rewriting_settings'}
 		{if $field['mod_rewrite']}
 			<label class="t" for="{$key}_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
@@ -39,5 +38,7 @@
 			<span class="warning_mod_rewrite" style="display:block;height:15px">{l s='URL rewriting (mod_rewrite) is not active on your server. If you want to use Friendly URL you have to active this mod.'}</span>
 			<div class="clear"></div>
 		{/if}
+	{else}
+		{$smarty.block.parent}
 	{/if}
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl
index 74c3a5217..246fe4392 100644
--- a/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/preferences/helpers/options/options.tpl
@@ -25,18 +25,10 @@
 *}
 
 {extends file="helpers/options/options.tpl"}
-{block name="start_field_block"}
+{block name="input"}
 	{if $field['type'] == 'disabled'}
-		<div class="margin-form">
-			{$field['disabled']}
+		{$field['disabled']}
 	{else}
-		<div class="margin-form">
+		{$smarty.block.parent}
 	{/if}
 {/block}
-
-{block name="end_field_block"}
-	{if $field['type'] == 'checkbox_table'}
-		<div class="clear"></div>
-		<br />
-	{/if}
-{/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 6f5738f45..77008b3e5 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -323,7 +323,7 @@
 									{$fields_value[$input.name]}
 								{/if}
 								{if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if}
-								{/block}
+								{/block}{* end block input *}
 								{block name="description_block"}
 									{if isset($input.desc)}
 										<p class="preference_description">
@@ -344,7 +344,7 @@
 								{if isset($input.lang) && isset($languages)}<div class="clear"></div>{/if}
 								</div>
 								<div class="clear"></div>
-							{/block}
+							{/block}{* end block field *}
 							{if $input.name == 'id_state'}
 								</div>
 							{/if}
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index ff8445c6b..83ed6e399 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -72,111 +72,117 @@
 		{/if}
 
 		{foreach $categoryData['fields'] AS $key => $field}
-
-			{block name="field"}
 				{if $field['type'] == 'hidden'}
 					<input type="hidden" name="{$key}" value="{$field['value']}" />
 				{else}
 					<div style="clear: both; padding-top:15px;" id="conf_id_{$key}" {if $field['is_invisible']} class="isInvisible"{/if}>
-					{if isset($field['title'])}
-						<label class="conf_title">
-						{$field['title']}</label>
-					{/if}
-					{block name="start_field_block"}
-						<div class="margin-form">
+					{block name="label"}
+						{if isset($field['title'])}
+							<label class="conf_title">
+							{$field['title']}</label>
+						{/if}
 					{/block}
-					{if $field['type'] == 'select'}
-						{if $field['list']}
-							<select name="{$key}"{if isset($field['js'])} onchange="{$field['js']}"{/if} id="{$key}" {if isset($field['size'])} size="{$field['size']}"{/if}>
-								{foreach $field['list'] AS $k => $option}
-									<option value="{$option[$field['identifier']]}"{if $field['value'] == $option[$field['identifier']]} selected="selected"{/if}>{$option['name']}</option>
-								{/foreach}
-							</select>
-						{else if isset($input.empty_message)}
-							{$input.empty_message}
-						{/if}
-					{elseif $field['type'] == 'bool'}
-						<label class="t" for="{$key}_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
-						<input type="radio" name="{$key}" id="{$key}_on" value="1" {if $field['value']} checked="checked"{/if}{if isset($field['js']['on'])} {$field['js']['on']}{/if}/>
-						<label class="t" for="{$key}_on"> {l s='Yes'}</label>
-						<label class="t" for="{$key}_off"><img src="../img/admin/disabled.gif" alt="{l s='No'}" title="{l s='No'}" style="margin-left: 10px;" /></label>
-						<input type="radio" name="{$key}" id="{$key}_off" value="0" {if !$field['value']} checked="checked"{/if}{if isset($field['js']['off'])} {$field['js']['off']}{/if}/>
-						<label class="t" for="{$key}_off"> {l s='No'}</label>
-					{elseif $field['type'] == 'radio'}
-						{foreach $field['choices'] AS $k => $v}
-							<input type="radio" name="{$key}" id="{$key}_{$k}" value="{$k}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
-							<label class="t" for="{$key}_{$k}"> {$v}</label><br />
-						{/foreach}
-						<br />
-					{*{elseif $field['type'] == 'checkbox'}
-						{foreach $field['choices'] AS $k => $v}
-							<input type="checkbox" name="{$key}" id="{$key}{$k}_on" value="{$k|intval}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
-							<label class="t" for="{$key}{$k}_on"> {$v}</label><br />
-						{/foreach}
-						<br />
-					*}
-					{elseif $field['type'] == 'text'}
-						<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
-						{if isset($field['suffix'])}&nbsp;{$field['suffix']|strval}{/if}
-					{elseif $field['type'] == 'password'}
-						<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if} />
-						{if isset($field['suffix'])}&nbsp;{$field['suffix']|strval}{/if}
-					{elseif $field['type'] == 'textarea'}
-						<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|escape:'htmlall':'UTF-8'}</textarea>
-					{elseif $field['type'] == 'file'}
-						{if isset($field['thumb']) && $field['thumb']}
-							<img src="{$field['thumb']}" alt="{$field['title']}" title="{$field['title']}" /><br />
-						{/if}
-						<input type="file" name="{$key}" />
-					{elseif $field['type'] == 'price'}
-						{$currency_left_sign}<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />{$currency_right_sign} {l s='(tax excl.)'}
-					{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'}
-						{if $field['type'] == 'textLang'}
-							{foreach $field['languages'] AS $id_lang => $value}
-								<div id="{$key}_{$id_lang}" style="margin-bottom:8px; display: {if $id_lang == $current_id_lang}block{else}none{/if}; float: left; vertical-align: top;">
-									<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}_{$id_lang}" value="{$value|htmlentities}" />
-								</div>
-							{/foreach}
-						{elseif $field['type'] == 'textareaLang'}
-							{foreach $field['languages'] AS $id_lang => $value}
-								<div id="{$key}_{$id_lang}" style="display: {if $id_lang == $current_id_lang}block{else}none{/if}; float: left;">
-									<textarea rows="{$field['rows']}" cols="{$field['cols']|intval}"  name="{$key}_{$id_lang}">{$value|replace:'\r\n':"\n"}</textarea>
-								</div>
-							{/foreach}
-						{elseif $field['type'] == 'selectLang'}
-							{foreach $languages as $language}
-							<div id="{$key}_{$language.id_lang}" style="margin-bottom:8px; display: {if $language.id_lang == $current_id_lang}block{else}none{/if}; float: left; vertical-align: top;">
-								<select name="{$key}_{$language.iso_code|upper}">
-									{foreach $field['list'] AS $k => $v}
-										<option value="{if isset($v.cast)}{$v.cast[$v[$field.identifier]]}{else}{$v[$field.identifier]}{/if}"
-											{if $field['value'][$language.id_lang] == $v['name']} selected="selected"{/if}>
-											{$v['name']}
-										</option>
+					{block name="field"}
+						<div class="margin-form">
+					{block name="input"}
+						{if $field['type'] == 'select'}
+							{if $field['list']}
+								<select name="{$key}"{if isset($field['js'])} onchange="{$field['js']}"{/if} id="{$key}" {if isset($field['size'])} size="{$field['size']}"{/if}>
+									{foreach $field['list'] AS $k => $option}
+										<option value="{$option[$field['identifier']]}"{if $field['value'] == $option[$field['identifier']]} selected="selected"{/if}>{$option['name']}</option>
 									{/foreach}
 								</select>
-							</div>
+							{else if isset($input.empty_message)}
+								{$input.empty_message}
+							{/if}
+						{elseif $field['type'] == 'bool'}
+							<label class="t" for="{$key}_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
+							<input type="radio" name="{$key}" id="{$key}_on" value="1" {if $field['value']} checked="checked"{/if}{if isset($field['js']['on'])} {$field['js']['on']}{/if}/>
+							<label class="t" for="{$key}_on"> {l s='Yes'}</label>
+							<label class="t" for="{$key}_off"><img src="../img/admin/disabled.gif" alt="{l s='No'}" title="{l s='No'}" style="margin-left: 10px;" /></label>
+							<input type="radio" name="{$key}" id="{$key}_off" value="0" {if !$field['value']} checked="checked"{/if}{if isset($field['js']['off'])} {$field['js']['off']}{/if}/>
+							<label class="t" for="{$key}_off"> {l s='No'}</label>
+						{elseif $field['type'] == 'radio'}
+							{foreach $field['choices'] AS $k => $v}
+								<input type="radio" name="{$key}" id="{$key}_{$k}" value="{$k}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
+								<label class="t" for="{$key}_{$k}"> {$v}</label><br />
 							{/foreach}
-						{/if}
-						{if count($languages) > 1}
-							<div class="displayed_flag">
-								<img src="../img/l/{$current_id_lang}.jpg"
-									class="pointer"
-									id="language_current_{$key}"
-									onclick="toggleLanguageFlags(this);" />
-							</div>
-							<div id="languages_{$key}" 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('{$key}', '{if isset($custom_key)}{$custom_key}{else}{$key}{/if}', {$language.id_lang}, '{$language.iso_code}');" />
+							<br />
+						{*{elseif $field['type'] == 'checkbox'}
+							{foreach $field['choices'] AS $k => $v}
+								<input type="checkbox" name="{$key}" id="{$key}{$k}_on" value="{$k|intval}"{if $k == $field['value']} checked="checked"{/if}{if isset($field['js'][$k])} {$field['js'][$k]}{/if}/>
+								<label class="t" for="{$key}{$k}_on"> {$v}</label><br />
+							{/foreach}
+							<br />
+						*}
+						{elseif $field['type'] == 'text'}
+							<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
+							{if isset($field['suffix'])}&nbsp;{$field['suffix']|strval}{/if}
+						{elseif $field['type'] == 'password'}
+							<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if} />
+							{if isset($field['suffix'])}&nbsp;{$field['suffix']|strval}{/if}
+						{elseif $field['type'] == 'textarea'}
+							<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|escape:'htmlall':'UTF-8'}</textarea>
+						{elseif $field['type'] == 'file'}
+							{if isset($field['thumb']) && $field['thumb']}
+								<img src="{$field['thumb']}" alt="{$field['title']}" title="{$field['title']}" /><br />
+							{/if}
+							<input type="file" name="{$key}" />
+						{elseif $field['type'] == 'price'}
+							{$currency_left_sign}<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />{$currency_right_sign} {l s='(tax excl.)'}
+						{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'}
+							{if $field['type'] == 'textLang'}
+								{foreach $field['languages'] AS $id_lang => $value}
+									<div id="{$key}_{$id_lang}" style="margin-bottom:8px; display: {if $id_lang == $current_id_lang}block{else}none{/if}; float: left; vertical-align: top;">
+										<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}_{$id_lang}" value="{$value|htmlentities}" />
+									</div>
 								{/foreach}
-							</div>
+							{elseif $field['type'] == 'textareaLang'}
+								{foreach $field['languages'] AS $id_lang => $value}
+									<div id="{$key}_{$id_lang}" style="display: {if $id_lang == $current_id_lang}block{else}none{/if}; float: left;">
+										<textarea rows="{$field['rows']}" cols="{$field['cols']|intval}"  name="{$key}_{$id_lang}">{$value|replace:'\r\n':"\n"}</textarea>
+									</div>
+								{/foreach}
+							{elseif $field['type'] == 'selectLang'}
+								{foreach $languages as $language}
+								<div id="{$key}_{$language.id_lang}" style="margin-bottom:8px; display: {if $language.id_lang == $current_id_lang}block{else}none{/if}; float: left; vertical-align: top;">
+									<select name="{$key}_{$language.iso_code|upper}">
+										{foreach $field['list'] AS $k => $v}
+											<option value="{if isset($v.cast)}{$v.cast[$v[$field.identifier]]}{else}{$v[$field.identifier]}{/if}"
+												{if $field['value'][$language.id_lang] == $v['name']} selected="selected"{/if}>
+												{$v['name']}
+											</option>
+										{/foreach}
+									</select>
+								</div>
+								{/foreach}
+							{/if}
+							{if count($languages) > 1}
+								<div class="displayed_flag">
+									<img src="../img/l/{$current_id_lang}.jpg"
+										class="pointer"
+										id="language_current_{$key}"
+										onclick="toggleLanguageFlags(this);" />
+								</div>
+								<div id="languages_{$key}" 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('{$key}', '{if isset($custom_key)}{$custom_key}{else}{$key}{/if}', {$language.id_lang}, '{$language.iso_code}');" />
+									{/foreach}
+								</div>
+							{/if}
+							<br style="clear:both">
 						{/if}
-						<br style="clear:both">
-					{/if}
+
+						{if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}
+							<sup>*</sup>
+						{/if}
+						{if isset($field['hint'])}<span class="hint" name="help_box">{$field['hint']}<span class="hint-pointer">&nbsp;</span></span>{/if}
+					{/block}{* end block input *}
 					{if ($field['multishop_default'])}
 						<div class="preference_default_multishop">
 							<label>
@@ -184,19 +190,13 @@
 							</label>
 						</div>
 					{/if}
-					{if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}
-						<sup>*</sup>
-					{/if}
-					{if isset($field['hint'])}<span class="hint" name="help_box">{$field['hint']}<span class="hint-pointer">&nbsp;</span></span>{/if}
 					{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
 					{if $field['is_invisible']}<p class="warn">{l s='You can\'t change the value of this configuration field in this shop context'}</p>{/if}
 					</div>
-					{block name="end_field_block"}
-						</div>
-						<div class="clear"></div>
-					{/block}
-				{/if}
-			{/block}
+					</div>
+					<div class="clear"></div>
+				{/block}{* end block field *}
+			{/if}
 		{/foreach}
 		{if isset($categoryData['submit'])}
 			<div class="margin-form">