diff --git a/admin-dev/tabs/AdminZones.php b/admin-dev/tabs/AdminZones.php
deleted file mode 100644
index 4fa3ad8ba..000000000
--- a/admin-dev/tabs/AdminZones.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 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/osl-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: 7300 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-include_once(dirname(__FILE__).'/../../classes/AdminTab.php');
-
-class AdminZones extends AdminTab
-{
-	public function __construct()
-	{
-	 	$this->table = 'zone';
-	 	$this->className = 'Zone';
-	 	$this->lang = false;
-	 	$this->edit = true;
-	 	$this->delete = true;
-
-		$this->fieldsDisplay = array(
-		'id_zone' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
-		'name' => array('title' => $this->l('Zone'), 'width' => 150),
-		'active' => array('title' => $this->l('Enabled'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
-		);
-
-		parent::__construct();
-	}
-
-	public function displayForm($isMainTab = true)
-	{
-		parent::displayForm();
-
-		if (!($obj = $this->loadObject(true)))
-			return;
-		echo '
-		<form action="'.self::$currentIndex.'&submitAdd'.$this->table.'=1&token='.$this->token.'" method="post">
-		'.($obj->id ? '<input type="hidden" name="id_'.$this->table.'" value="'.$obj->id.'" />' : '').'
-			<fieldset><legend><img src="../img/admin/world.gif" />'.$this->l('Zones').'</legend>
-				<label>'.$this->l('Name').'</label>
-				<div class="margin-form">
-					<input type="text" size="33" name="name" value="'.htmlentities(Tools::getValue('name', $obj->name), ENT_COMPAT, 'UTF-8').'" /> <sup>*</sup>
-					<span class="hint" name="help_box">'.$this->l('Allowed characters: letters, spaces and').' (-)<span class="hint-pointer">&nbsp;</span></span>
-					<p class="clear">'.$this->l('Zone name, e.g., Africa, West Coast, Neighboring Countries').'</p>
-				</div>
-				<label>'.$this->l('Status:').' </label>
-				<div class="margin-form">
-					<input type="radio" name="active" id="active_on" value="1" '.((!$obj->id OR Tools::getValue('active', $obj->active)) ? 'checked="checked" ' : '').'/>
-					<label class="t" for="active_on"> <img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" /></label>
-					<input type="radio" name="active" id="active_off" value="0" '.((!Tools::getValue('active', $obj->active) AND $obj->id) ? 'checked="checked" ' : '').'/>
-					<label class="t" for="active_off"> <img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" /></label>
-					<p>'.$this->l('Allow or disallow shipping to this zone').'</p>
-				</div>';
-		if (Shop::isFeatureActive())
-		{
-			echo '<label>'.$this->l('GroupShop association:').'</label><div class="margin-form">';
-			$this->displayAssoShop('group_shop');
-			echo '</div>';
-		}
-		echo '
-				<div class="margin-form">
-					<input type="submit" value="'.$this->l('   Save   ').'" name="submitAdd'.$this->table.'" class="button" />
-				</div>
-				<div class="small"><sup>*</sup> '.$this->l('Required field').'</div>
-			</fieldset>
-		</form>';
-	}
-}
-
-
diff --git a/controllers/admin/AdminZonesController.php b/controllers/admin/AdminZonesController.php
new file mode 100644
index 000000000..f0334b261
--- /dev/null
+++ b/controllers/admin/AdminZonesController.php
@@ -0,0 +1,95 @@
+<?php
+/*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 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/osl-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: 7300 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+class AdminZonesControllerCore extends AdminController
+{
+	public function __construct()
+	{
+	 	$this->table = 'zone';
+	 	$this->className = 'Zone';
+	 	$this->lang = false;
+
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
+
+		$this->fieldsDisplay = array(
+		'id_zone' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
+		'name' => array('title' => $this->l('Zone'), 'width' => 'auto'),
+		'active' => array('title' => $this->l('Enabled'), 'width' => '70', 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
+		);
+
+		$this->fields_form = array(
+			'legend' => array(
+				'title' => $this->l('Zones'),
+				'image' => '../img/admin/world.gif'
+			),
+			'input' => array(
+				array(
+					'type' => 'text',
+					'label' => $this->l('Name'),
+					'name' => 'name',
+					'size' => 33,
+					'required' => true,
+					'p' => $this->l('Zone name, e.g., Africa, West Coast, Neighboring Countries'),
+				),
+				array(
+					'type' => 'radio',
+					'label' => $this->l('Status:'),
+					'name' => 'active',
+					'required' => false,
+					'class' => 't',
+					'is_bool' => true,
+					'values' => array(
+						array(
+							'id' => 'active_on',
+							'value' => 1,
+							'label' => $this->l('Enabled')
+						),
+						array(
+							'id' => 'active_off',
+							'value' => 0,
+							'label' => $this->l('Disabled')
+						)
+					),
+					'p' => $this->l('Allow or disallow shipping to this zone')
+				),
+				array(
+					'type' => 'asso_shop',
+					'name' => ''
+				)
+			),
+			'submit' => array(
+				'title' => $this->l('   Save   '),
+				'class' => 'button'
+			)
+		);
+		parent::__construct();
+	}
+}
+
+