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 6d1f2cedf..fd0cf862f 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
@@ -34,18 +34,22 @@
 
 {block name="input"}
 	{if $input.type == 'latitude'}
-		<input type="text"
-			{if isset($input.size)}size="{$input.size}"{/if}
-			{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-			name="latitude"
-			id="latitude"
-			value="{$fields_value[$input.name]|escape:'htmlall'}" /> /
-		<input type="text"
-			{if isset($input.size)}size="{$input.size}"{/if}
-			{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
-			name="longitude"
-			id="longitude"
-			value="{$fields_value['longitude']|escape:'htmlall'}" />
+	<div class="row">
+		<div class="col-lg-2">
+			<input type="text"
+				{if isset($input.size)}size="{$input.size}"{/if}
+				{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
+				name="latitude"
+				id="latitude"
+				value="{$fields_value[$input.name]|escape:'htmlall'}" /> /
+			<input type="text"
+				{if isset($input.size)}size="{$input.size}"{/if}
+				{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
+				name="longitude"
+				id="longitude"
+				value="{$fields_value['longitude']|escape:'htmlall'}" />
+		</div>
+	</div>
 	{else}
 		{$smarty.block.parent}
 	{/if}
@@ -59,7 +63,7 @@
 					<label class="control-label col-lg-3">{$input.label} </label>
 					<div class="col-lg-6">
 						<input type="file" name="{$input.name}" />
-						<p>{$input.desc}</p>
+						{if isset($input.desc)}<p>{$input.desc}</p>{/if}
 						{if isset($fields_value.image) && $fields_value.image}
 							<div id="image">
 								{$fields_value.image}
diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
index bac61db89..697adf6a5 100644
--- a/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
@@ -37,13 +37,13 @@
 	{
 	    if (html == 'false')
 	    {
-		$("#conf_id_PS_SHOP_STATE_ID").fadeOut();
+		$("#conf_id_PS_SHOP_STATE_ID").parent().fadeOut();
 		$('#PS_SHOP_STATE_ID option[value=0]').attr("selected", "selected");
 	    }
 	    else
 	    {
 		$("#PS_SHOP_STATE_ID").html(html);
-		$("#conf_id_PS_SHOP_STATE_ID").fadeIn();
+		$("#conf_id_PS_SHOP_STATE_ID").parent().fadeIn();
 		$('#PS_SHOP_STATE_ID option[value=' + id_state_selected + ']').attr("selected", "selected");
 	    }
 	}
@@ -52,13 +52,13 @@
 
 $(document).ready(function(){
     {if isset($categoryData.fields.PS_SHOP_STATE_ID.value)}
-    if ($('#PS_SHOP_COUNTRY_ID') && $('#PS_SHOP_STATE_ID'))
-    {
-	ajaxStoreStates({$categoryData.fields.PS_SHOP_STATE_ID.value});
-	$('#PS_SHOP_COUNTRY_ID').change(function() {
-	    ajaxStoreStates();
-	});
-    }
+	    if ($('#PS_SHOP_COUNTRY_ID') && $('#PS_SHOP_STATE_ID'))
+	    {
+			ajaxStoreStates({$categoryData.fields.PS_SHOP_STATE_ID.value});
+			$('#PS_SHOP_COUNTRY_ID').change(function() {
+			    ajaxStoreStates();
+			});
+	    }
     {/if}
 });
 </script>
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index fc412b6f8..a4a7d8c37 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -48,13 +48,10 @@
 					<div class="alert alert-info">{$field}</div>
 				{elseif $key == 'input'}
 					{foreach $field as $input}
-						<div class="row {if $input.type == 'hidden'}hide{/if}">
+						<div class="row {if $input.type == 'hidden'}hide{/if}" {if $input.name == 'id_state'}id="contains_states"{if !$contains_states}style="display:none;"{/if}{/if}>
 						{if $input.type == 'hidden'}
 							<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
 						{else}
-							{if $input.name == 'id_state'}
-								<div id="contains_states" {if !$contains_states}style="display:none;"{/if}>
-							{/if}
 							{block name="label"}
 								{if isset($input.label)}
 									<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
@@ -524,9 +521,6 @@
 								{/block}
 								</div>
 							{/block}{* end block field *}
-							{if $input.name == 'id_state'}
-								</div>
-							{/if}
 						{/if}
 						</div>
 					{/foreach}