diff --git a/admin-dev/themes/template/helper/form/form.tpl b/admin-dev/themes/template/helper/form/form.tpl
index e665fbf4a..e24b659e6 100644
--- a/admin-dev/themes/template/helper/form/form.tpl
+++ b/admin-dev/themes/template/helper/form/form.tpl
@@ -319,6 +319,7 @@
 						{if isset($field.class)}class="{$field.class}"{/if} />
 				</div>
 			{/if}
+			{block name="other_input"}{/block}
 		{/foreach}
 		{if $required_fields}
 			<div class="small"><sup>*</sup> {l s ='Required field'}</div>
diff --git a/admin-dev/themes/template/stores/form.tpl b/admin-dev/themes/template/stores/form.tpl
index 8ca20e966..c51982ff0 100644
--- a/admin-dev/themes/template/stores/form.tpl
+++ b/admin-dev/themes/template/stores/form.tpl
@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -23,274 +23,73 @@
 *  @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}
 
-		$(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});
+	$(document).ready(function() {
+		$('#latitude, #longitude').keyup(function() {
+			$(this).val($(this).val().replace(/,/g, '.'));
+		});
+	});
 
-			{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}
+{/block}
 
-			$('#latitude, #longitude').keyup(function() {ldelim}
-				$(this).val($(this).val().replace(/,/g, '.'));
-			{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="start_field_block"}
+	<div class="margin-form">
+	{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]}" /> /
+		<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']}" />
 	{/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>
-				<div style="padding-right: 40px; border-right: 1px solid #E0D0B1; float: left;">
-			{elseif $key == 'input'}
-				{foreach $field as $input}
-					{if $input.name == 'id_state'}
-						<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
-					{/if}
-					<label>{$input.label} </label>
-					<div class="margin-form">
-						{if $input.type == 'text'}
-							{if $input.name == '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]}" /> /
-								<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']}" />
-							{else}
-								{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}
-							{/if}
-						{elseif $input.type == 'select'}
-							<select name="{$input.name}" id="{$input.name}" {if isset($input.onchange)}onchange="{$input.onchange}"{/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 $fields_value[$input.name] == $option[$input.options.options.id]}selected="selected"{/if}>{$option[$input.options.options.name]|escape:'htmlall':'UTF-8'}</option>
-											{/foreach}
-										</optgroup>
-									{/foreach}
-								{else}
-									{foreach $input.options.query AS $option}
-										{$fields_value[$input.name]|@p}
-										<option value="{$option[$input.options.id]}" 
-												{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option>
-									{/foreach}
-								{/if}
-							</select>
-						{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>
-							{/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'}
-							
-						{elseif $input.type == 'file'}
-							<input type="file" name="{$input.name}" />
-							<img src="{$fields_value[$input.name]}" />
-						{/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 $input.name == 'active'}
-						</div>
-							{/if}
-						{/if}
-						{if isset($languages)}<div class="clear"></div>{/if}
-					</div>
-					{if $input.name == 'id_state'}
-						</div>
-					{/if}
-				{/foreach}
-			{elseif $key == 'rightCols'}
-			<div style="padding-left: 40px; float: left;">
-				{foreach $field as $input}
-					{if $input.type == 'file'}
-						<label style="text-align: left; width: inherit;">{$input.label} </label>
-						<div class="margin-form" style="padding: 0; display: inline;">
-							<input type="file" name="{$input.name}" />
-							<p class="clear">{$input.p}</p>
-							{if isset($fields_value.image) && $fields_value.image}
-								<div id="image" style="width:370px;">
-									{$fields_value.image}
-									<p align="center">{l s='File size'} {$fields_value.size}kb</p>
-									<a href="{$current}&id_store={$form_id}&token={$token}&deleteImage=1">
-										<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
-									</a>
-								</div>
-							{/if}
-						</div>
-					{/if}
-					<table cellpadding="2" cellspacing="2" style="padding: 10px; margin-top: 15px; border: 1px solid #BBB;">
-						<tr>
-							<th colspan="2">{l s='Hours:'}</th>
-						</tr>
-						<tr>
-							<td>&nbsp;</td>
-							<td style="font-size: 0.85em;">{l s='Sample: 10:00AM - 9:30PM'}</td>
-						</tr>
+{/block}
 
-						{foreach $fields_value.days as $k => $value}
-							<tr style="color: #7F7F7F; font-size: 0.85em;">
-								<td>{$value}</td>
-								<td><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]}{/if}" /><br /></td>
-							</tr>
-						{/foreach}
-					</table>
-				<div class="clear"></div>
-				{/foreach}
-			</div>
-			{elseif $key == 'submit'}
-				<div class="clear"></div>
-				<div class="margin-form">
-					<input type="submit" value="{$field.title}" name="submitAdd{$table}" {if isset($field.class)}class="{$field.class}"{/if} />
+{block name="other_input"}
+	{if $key == 'rightCols'}
+		{foreach $field as $input}
+			{if $input.type == 'file'}
+				<label style="text-align: left; width: inherit;">{$input.label} </label>
+				<div class="margin-form" style="padding: 0; display: inline;">
+					<input type="file" name="{$input.name}" />
+					<p class="clear">{$input.p}</p>
+					{if isset($fields_value.image) && $fields_value.image}
+						<div id="image" style="width:370px;">
+							{$fields_value.image}
+							<p align="center">{l s='File size'} {$fields_value.size}kb</p>
+							<a href="{$current}&id_store={$form_id}&token={$token}&deleteImage=1">
+								<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
+							</a>
+						</div>
+					{/if}
 				</div>
 			{/if}
-		{/foreach}
-		{if $required_fields}
-			<div class="small"><sup>*</sup> {l s ='Required field'}</div>
-		{/if}
-	</fieldset>
-</form>
+			<table cellpadding="2" cellspacing="2" style="padding: 10px; margin-top: 15px; border: 1px solid #BBB;">
+				<tr>
+					<th colspan="2">{l s='Hours:'}</th>
+				</tr>
+				<tr>
+					<td>&nbsp;</td>
+					<td style="font-size: 0.85em;">{l s='Sample: 10:00AM - 9:30PM'}</td>
+				</tr>
 
-<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>
+				{foreach $fields_value.days as $k => $value}
+					<tr style="color: #7F7F7F; font-size: 0.85em;">
+						<td>{$value}</td>
+						<td><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]}{/if}" /><br /></td>
+					</tr>
+				{/foreach}
+			</table>
+		<div class="clear"></div>
+		{/foreach}
 	{/if}
-	<br />
-{/if}
\ No newline at end of file
+{/block}
+
diff --git a/admin-dev/themes/template/stores/options.tpl b/admin-dev/themes/template/stores/options.tpl
deleted file mode 100644
index 791ef8ba2..000000000
--- a/admin-dev/themes/template/stores/options.tpl
+++ /dev/null
@@ -1,159 +0,0 @@
-{*
-* 2007-2011 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Academic Free License (AFL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/afl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 9369 $
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-<br />
-
-<form action="{$current}&submitOptions{$table}=1&token={$token}" method="post" enctype="multipart/form-data">
-{foreach $option_list AS $category => $categoryData}
-	{if isset($categoryData['top'])}{$categoryData['top']}{/if}
-	<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if}>
-	{* Options category title *}
-	<legend>
-		<img src="{$categoryData['image']}"/>
-		{if isset($categoryData['title'])}{$categoryData['title']}{else}{l s='Options'}{/if}
-	</legend>
-
-	{* Category description *}
-	{if (isset($categoryData['description']) && $categoryData['description'])}
-		<div class="optionsDescription">{$categoryData['description']}</div>
-	{/if}
-
-	{foreach $categoryData['fields'] AS $key => $field}
-		<div style="clear: both; padding-top:15px;" id="conf_id_{$key}" {if $field['is_invisible']} class="isInvisible"{/if}>
-		{if $field['title']}
-			<label class="conf_title">
-			{if (isset($field['required']) && $field['required'])}
-				<sup>*</sup>
-			{/if}
-			{$field['title']}</label>
-		{/if}
-		<div class="margin-form">
-		
-		{if $field['type'] == 'select'}
-			<select name="{$key}"{if isset($field['js'])} onchange="{$field['js']}"{/if} id="{$key}">
-				{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>
-		{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['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['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'] && $field['thumb']['pos'] == 'before'}
-				<img src="{$field['thumb']['file']}" alt="{$field['title']}" title="{$field['title']}" /><br />
-			{/if}
-			<input type="file" name="{$key}" />
-	{*	{elseif $field['type'] == 'image'}	
-			<table cellspacing="0" cellpadding="0">
-			<tr>
-			$i = 0;
-			foreach ($field['list'] as $theme)
-			{
-				<td class="center" style="width: 180px; padding:0px 20px 20px 0px;">
-					<input type="radio" name="{$key}" id="{$key}_{$theme['name']}_on" style="vertical-align: text-bottom;" value="{$theme['name']}"'.(_THEME_NAME_ == $theme['name'] ? 'checked="checked"' : '').' />';
-					echo '<label class="t" for="{$key}_'.$theme['name'].'_on"> '.Tools::strtolower($theme['name']).'</label>';
-					echo '<br />';
-					echo '<label class="t" for="{$key}_'.$theme['name'].'_on">';
-						echo '<img src="../themes/'.$theme['name'].'/preview.jpg" alt="'.Tools::strtolower($theme['name']).'">';
-					echo '</label>';
-				echo '</td>';
-				if (isset($field['max']) && ($i +1 ) % $field['max'] == 0)
-					echo '</tr><tr>';
-				$i++;
-			}
-			echo '</tr>';
-			echo '</table>';
-	*}
-		{elseif $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}" />
-				</div>
-			{/foreach}
-			{$field['flags']}
-		{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}
-			{$field['flags']}
-			<br style="clear:both">			
-			
-			
-		{/if}
-		{if isset($field['method'])}$field['method']{/if}
-
-		{if ($field['multishop_default'])}
-			<div class="preference_default_multishop">
-				<label>
-					<input type="checkbox" name="configUseDefault['{$key}']" value="1" {if $field['is_disabled']} checked="checked"{/if} onclick="checkMultishopDefaultValue(this, '{$key}')" /> {l s='Use default value'}
-				</label>
-			</div>
-		{/if}
-		{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
-		{if $field['is_invisible']}<p class="multishop_warning">{l s='You can\'t change the value of this configuration field in this shop context'}</p>{/if}
-		</div></div>
-	{/foreach}
-	
-	<div align="center" style="margin-top: 20px;">
-		<input type="submit" value="{l s='   Save   '}" name="submit{$category|ucfirst}{$table}" class="button" />
-	</div>
-	{if $field['required']}
-		<div class="small"><sup>*</sup> {l s='Required field'}</div>
-	{/if}
-	</fieldset><br />
-	{if isset($categoryData['bottom'])}{$categoryData['bottom']}{/if}
-{/foreach}
-</form><br />
-<p>
-	<img src="../img/admin/asterisk.gif" class="middle" />
-	{l s='You can also replace the icon representing your store in Google Maps. Go to the Preferences tab, and then the Appearance subtab.'}
-</p>
diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php
index 69c0ed5da..dc5be3a5c 100644
--- a/controllers/admin/AdminStoresController.php
+++ b/controllers/admin/AdminStoresController.php
@@ -32,8 +32,6 @@ class AdminStoresControllerCore extends AdminController
 	 	$this->table = 'store';
 		$this->className = 'Store';
 	 	$this->lang = false;
-		$this->addRowAction('edit');
-		$this->addRowAction('delete');
 		$this->requiredDatabase = true;
 
 		$this->context = Context::getContext();
@@ -41,8 +39,6 @@ class AdminStoresControllerCore extends AdminController
 		if (!Tools::getValue('realedit'))
 			$this->deleted = false;
 
-	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
-
 		$this->fieldImageSettings = array(
 			'name' => 'image',
 			'dir' => 'st'
@@ -118,6 +114,11 @@ class AdminStoresControllerCore extends AdminController
 
 	public function initList()
 	{
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
+	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
+
 		$this->_select = 'cl.`name` country, st.`name` state';
 		$this->_join = '
 			LEFT JOIN `'._DB_PREFIX_.'country_lang` cl
@@ -155,7 +156,7 @@ class AdminStoresControllerCore extends AdminController
 				),
 				array(
 					'type' => 'text',
-					'label' => $this->l('Address:'),
+					'label' => $this->l('Address (2):'),
 					'name' => 'address2',
 					'size' => 33
 				),
@@ -195,7 +196,7 @@ class AdminStoresControllerCore extends AdminController
 					)
 				),
 				array(
-					'type' => 'text',
+					'type' => 'latitude',
 					'label' => $this->l('Latitude / Longitude:'),
 					'name' => 'latitude',
 					'required' => true,