diff --git a/admin-dev/themes/template/geolocation/content.tpl b/admin-dev/themes/template/geolocation/content.tpl
deleted file mode 100644
index df2e863e7..000000000
--- a/admin-dev/themes/template/geolocation/content.tpl
+++ /dev/null
@@ -1,28 +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$
-*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*}
-
-<h2>{l s='Geolocation'}</h2>
-{$content}
\ No newline at end of file
diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php
index d9d822886..6d5cf8c8a 100755
--- a/controllers/admin/AdminGeolocationController.php
+++ b/controllers/admin/AdminGeolocationController.php
@@ -37,7 +37,13 @@ class AdminGeolocationControllerCore extends AdminController
 				'icon' =>	'world',
 				'class' =>	'width3',
 				'fields' =>	array(
-		 			'PS_GEOLOCATION_ENABLED' => array('title' => $this->l('Geolocation by IP:'), 'desc' => $this->l('This option allows you, among other things, to restrict access to your shop for many countries. See below.'), 'validation' => 'isUnsignedId', 'cast' => 'intval', 'type' => 'bool'),
+		 			'PS_GEOLOCATION_ENABLED' => array(
+		 				'title' => $this->l('Geolocation by IP:'),
+		 				'desc' => $this->l('This option allows you, among other things, to restrict access to your shop for many countries. See below.'),
+		 				'validation' => 'isUnsignedId',
+		 				'cast' => 'intval',
+		 				'type' => 'bool'
+					),
 				),
 				'submit' => array(),
 			),
@@ -88,7 +94,7 @@ class AdminGeolocationControllerCore extends AdminController
 	{
 		if (Tools::isSubmit('submitGeolocationConfiguration'))
 		{
-			if ($this->_isGeoLiteCityAvailable())
+			if ($this->isGeoLiteCityAvailable())
 			{
 				Configuration::updateValue('PS_GEOLOCATION_ENABLED', intval(Tools::getValue('PS_GEOLOCATION_ENABLED')));
 				Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
@@ -99,11 +105,14 @@ class AdminGeolocationControllerCore extends AdminController
 
 		if (Tools::isSubmit('submitGeolocationCountries'))
 		{
-			if (!is_array(Tools::getValue('countries')) OR !sizeof(Tools::getValue('countries')))
+			if (!is_array(Tools::getValue('countries')) || !count(Tools::getValue('countries')))
 				$this->_errors[] = Tools::displayError('Country selection is invalid');
 			else
 			{
-				Configuration::updateValue('PS_GEOLOCATION_BEHAVIOR', (!(int)(Tools::getValue('PS_GEOLOCATION_BEHAVIOR')) ? _PS_GEOLOCATION_NO_CATALOG_ : _PS_GEOLOCATION_NO_ORDER_));
+				Configuration::updateValue(
+					'PS_GEOLOCATION_BEHAVIOR',
+					(!(int)Tools::getValue('PS_GEOLOCATION_BEHAVIOR') ? _PS_GEOLOCATION_NO_CATALOG_ : _PS_GEOLOCATION_NO_ORDER_)
+				);
 				Configuration::updateValue('PS_GEOLOCATION_NA_BEHAVIOR', (int)Tools::getValue('PS_GEOLOCATION_NA_BEHAVIOR'));
 				Configuration::updateValue('PS_ALLOWED_COUNTRIES', implode(';', Tools::getValue('countries')));
 				Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
@@ -116,7 +125,10 @@ class AdminGeolocationControllerCore extends AdminController
 				$this->_errors[] = Tools::displayError('Invalid whitelist');
 			else
 			{
-				Configuration::updateValue('PS_GEOLOCATION_WHITELIST', str_replace("\n", ';', str_replace("\r", '', Tools::getValue('PS_GEOLOCATION_WHITELIST'))));
+				Configuration::updateValue(
+					'PS_GEOLOCATION_WHITELIST',
+					str_replace("\n", ';', str_replace("\r", '', Tools::getValue('PS_GEOLOCATION_WHITELIST')))
+				);
 				Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
 			}
 		}
@@ -124,19 +136,24 @@ class AdminGeolocationControllerCore extends AdminController
 		return parent::postProcess();
 	}
 
+	public function initOptions()
+	{
+		$this->tpl_option_vars = array('allowed_countries' => explode(';', Configuration::get('PS_ALLOWED_COUNTRIES')));
+
+		return parent::initOptions();
+	}
+
 	public function initContent()
 	{
-		if (!$this->_isGeoLiteCityAvailable())
-			$this->displayWarning($this->l('In order to use Geolocation, please download').' <a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">'.$this->l('this file').'</a> '.$this->l('and decompress it into tools/geoip/ directory'));
+		if (!$this->isGeoLiteCityAvailable())
+			$this->displayWarning($this->l('In order to use Geolocation, please download').' 
+				<a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">'.$this->l('this file').'</a> '.
+				$this->l('and decompress it into tools/geoip/ directory'));
 
-		$this->context->smarty->assign(array(
-			'allowed_countries' => explode(';', Configuration::get('PS_ALLOWED_COUNTRIES')),
-			'url_countries' => self::$currentIndex.'&token='.Tools::getValue('token'),
-		));
 		parent::initContent();
 	}
 
-	private function _isGeoLiteCityAvailable()
+	private function isGeoLiteCityAvailable()
 	{
 		if (file_exists(_PS_GEOIP_DIR_.'GeoLiteCity.dat'))
 			return true;