diff --git a/install-new/classes/xmlLoader.php b/install-new/classes/xmlLoader.php
index 1173e9cee..3da97159a 100644
--- a/install-new/classes/xmlLoader.php
+++ b/install-new/classes/xmlLoader.php
@@ -692,6 +692,9 @@ class InstallXmlLoader
 		if ($xml->fields['sql'])
 			$info['config']['sql'] = (string)$xml->fields['sql'];
 
+		if ($xml->fields['ordersql'])
+			$info['config']['ordersql'] = (string)$xml->fields['ordersql'];
+
 		if ($xml->fields['image'])
 			$info['config']['image'] = (string)$xml->fields['image'];
 
@@ -737,19 +740,18 @@ class InstallXmlLoader
 		unset($xml->fields);
 
 		// Fill <fields> attributes (config)
-		$xml->addChild('fields');
+		$xml_fields = $xml->addChild('fields');
 		foreach ($config as $k => $v)
 			if ($v)
-				$xml->fields[$k] = $v;
+				$xml_fields[$k] = $v;
 
 		// Create list of fields
 		foreach ($fields as $column => $info)
 		{
-			$field = $xml->fields->addChild('field');
+			$field = $xml_fields->addChild('field');
 			$field['name'] = $column;
 			if (isset($info['relation']))
 				$field['relation'] = $info['relation'];
-
 		}
 
 		$this->writeNiceAndSweetXML($xml, $this->data_path.$entity.'.xml');
diff --git a/install-new/data/xml/access.xml b/install-new/data/xml/access.xml
index 05fff079c..a2eff04ba 100644
--- a/install-new/data/xml/access.xml
+++ b/install-new/data/xml/access.xml
@@ -34,9 +34,9 @@
     <access id="access_1_23" id_profile="SuperAdmin" id_tab="Database" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_24" id_profile="SuperAdmin" id_tab="E-mail" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_26" id_profile="SuperAdmin" id_tab="Images" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_27" id_profile="SuperAdmin" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_27" id_profile="SuperAdmin" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_28" id_profile="SuperAdmin" id_tab="Contacts" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_29" id_profile="SuperAdmin" id_tab="tab_29" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_29" id_profile="SuperAdmin" id_tab="Employees" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_30" id_profile="SuperAdmin" id_tab="Profiles" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_31" id_profile="SuperAdmin" id_tab="Permissions" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_32" id_profile="SuperAdmin" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
@@ -45,7 +45,7 @@
     <access id="access_1_35" id_profile="SuperAdmin" id_tab="Tabs" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_36" id_profile="SuperAdmin" id_tab="Features" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_37" id_profile="SuperAdmin" id_tab="Quick_Access" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_38" id_profile="SuperAdmin" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_38" id_profile="SuperAdmin" id_tab="Themes_1" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_39" id_profile="SuperAdmin" id_tab="Contact_Information" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_40" id_profile="SuperAdmin" id_tab="Keyword_Typos" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_41" id_profile="SuperAdmin" id_tab="CSV_Import" view="1" add="1" edit="1" delete="1"/>
@@ -80,7 +80,7 @@
     <access id="access_1_80" id_profile="SuperAdmin" id_tab="Modules_Themes_Catalog" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_81" id_profile="SuperAdmin" id_tab="My_Account" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_82" id_profile="SuperAdmin" id_tab="Stores" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_83" id_profile="SuperAdmin" id_tab="Themes_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_83" id_profile="SuperAdmin" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_84" id_profile="SuperAdmin" id_tab="Geolocation" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_85" id_profile="SuperAdmin" id_tab="Tax_Rules" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_86" id_profile="SuperAdmin" id_tab="Logs" view="1" add="1" edit="1" delete="1"/>
@@ -90,9 +90,9 @@
     <access id="access_1_90" id_profile="SuperAdmin" id_tab="Shop_Urls" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_91" id_profile="SuperAdmin" id_tab="Genders" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_92" id_profile="SuperAdmin" id_tab="SQL_Manager" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_93" id_profile="SuperAdmin" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_93" id_profile="SuperAdmin" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_94" id_profile="SuperAdmin" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_1_95" id_profile="SuperAdmin" id_tab="tab_95" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_1_95" id_profile="SuperAdmin" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_96" id_profile="SuperAdmin" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_97" id_profile="SuperAdmin" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_1_98" id_profile="SuperAdmin" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
diff --git a/install-new/data/xml/configuration.xml b/install-new/data/xml/configuration.xml
index f28bd74c8..b60ddd987 100644
--- a/install-new/data/xml/configuration.xml
+++ b/install-new/data/xml/configuration.xml
@@ -192,13 +192,13 @@
       <value>0</value>
     </configuration>
     <configuration id="PS_1_3_UPDATE_DATE" name="PS_1_3_UPDATE_DATE">
-      <value>2011-12-22 23:15:16</value>
+      <value>2011-12-22 23:47:41</value>
     </configuration>
     <configuration id="PS_PRICE_ROUND_MODE" name="PS_PRICE_ROUND_MODE">
       <value>2</value>
     </configuration>
     <configuration id="PS_1_3_2_UPDATE_DATE" name="PS_1_3_2_UPDATE_DATE">
-      <value>2011-12-22 23:15:16</value>
+      <value>2011-12-22 23:47:41</value>
     </configuration>
     <configuration id="PS_CONDITIONS_CMS_ID" name="PS_CONDITIONS_CMS_ID">
       <value>3</value>
@@ -342,7 +342,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_IMG_UPDATE_TIME" name="PS_IMG_UPDATE_TIME">
-      <value>1324592116</value>
+      <value>1324594061</value>
     </configuration>
     <configuration id="PS_BACKUP_DROP_TABLE" name="PS_BACKUP_DROP_TABLE">
       <value>1</value>
diff --git a/install-new/data/xml/tab.xml b/install-new/data/xml/tab.xml
index 6bc893d4f..bc8973379 100644
--- a/install-new/data/xml/tab.xml
+++ b/install-new/data/xml/tab.xml
@@ -1,11 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_tab>
-  <fields id="name" class="Tab" image="t">
+  <fields id="name" class="Tab" ordersql="a.id_parent, a.position" image="t">
     <field name="id_parent" relation="tab"/>
     <field name="class_name"/>
     <field name="active"/>
   </fields>
   <entities>
+    <tab id="Home" id_parent="-1" active="1">
+      <class_name>AdminHome</class_name>
+    </tab>
+    <tab id="tab_107" id_parent="-1" active="1">
+      <class_name>AdminLogin</class_name>
+    </tab>
+    <tab id="CMS_pages" id_parent="-1" active="1">
+      <class_name>AdminCms</class_name>
+    </tab>
+    <tab id="CMS_categories" id_parent="-1" active="1">
+      <class_name>AdminCmsCategories</class_name>
+    </tab>
+    <tab id="Combinations_generator" id_parent="-1" active="1">
+      <class_name>AdminAttributeGenerator</class_name>
+    </tab>
+    <tab id="Search" id_parent="-1" active="1">
+      <class_name>AdminSearch</class_name>
+    </tab>
     <tab id="Catalog" id_parent="" active="1">
       <class_name>AdminCatalog</class_name>
     </tab>
@@ -27,26 +45,92 @@
     <tab id="Modules" id_parent="" active="1">
       <class_name>AdminModules</class_name>
     </tab>
+    <tab id="Employees" id_parent="" active="1">
+      <class_name>AdminEmployees</class_name>
+    </tab>
     <tab id="Preferences" id_parent="" active="1">
       <class_name>AdminPreferences</class_name>
     </tab>
     <tab id="Tools" id_parent="" active="1">
       <class_name>AdminTools</class_name>
     </tab>
+    <tab id="Shops" id_parent="" active="1">
+      <class_name>AdminShop</class_name>
+    </tab>
+    <tab id="Stock" id_parent="" active="1">
+      <class_name>AdminStock</class_name>
+    </tab>
+    <tab id="Accounting" id_parent="" active="1">
+      <class_name>AdminAccounting</class_name>
+    </tab>
+    <tab id="Products" id_parent="Catalog" active="1">
+      <class_name>AdminProducts</class_name>
+    </tab>
+    <tab id="Categories" id_parent="Catalog" active="1">
+      <class_name>AdminCategories</class_name>
+    </tab>
+    <tab id="Monitoring" id_parent="Catalog" active="1">
+      <class_name>AdminTracking</class_name>
+    </tab>
     <tab id="Manufacturers" id_parent="Catalog" active="1">
       <class_name>AdminManufacturers</class_name>
     </tab>
+    <tab id="Suppliers" id_parent="Catalog" active="1">
+      <class_name>AdminSuppliers</class_name>
+    </tab>
     <tab id="Attributes_and_Groups" id_parent="Catalog" active="1">
       <class_name>AdminAttributesGroups</class_name>
     </tab>
+    <tab id="Features" id_parent="Catalog" active="1">
+      <class_name>AdminFeatures</class_name>
+    </tab>
+    <tab id="Image_Mapping" id_parent="Catalog" active="1">
+      <class_name>AdminScenes</class_name>
+    </tab>
+    <tab id="Tags" id_parent="Catalog" active="1">
+      <class_name>AdminTags</class_name>
+    </tab>
+    <tab id="Attachments" id_parent="Catalog" active="1">
+      <class_name>AdminAttachments</class_name>
+    </tab>
+    <tab id="Catalog_price_rules" id_parent="Catalog" active="1">
+      <class_name>AdminSpecificPriceRule</class_name>
+    </tab>
     <tab id="Addresses" id_parent="Customers" active="1">
       <class_name>AdminAddresses</class_name>
     </tab>
+    <tab id="Groups" id_parent="Customers" active="1">
+      <class_name>AdminGroups</class_name>
+    </tab>
+    <tab id="Shopping_Carts" id_parent="Customers" active="1">
+      <class_name>AdminCarts</class_name>
+    </tab>
+    <tab id="Genders" id_parent="Customers" active="1">
+      <class_name>AdminGenders</class_name>
+    </tab>
+    <tab id="Outstanding" id_parent="Customers" active="0">
+      <class_name>AdminOutstanding</class_name>
+    </tab>
+    <tab id="Invoices" id_parent="Orders" active="1">
+      <class_name>AdminInvoices</class_name>
+    </tab>
+    <tab id="Delivery_Slips" id_parent="Orders" active="1">
+      <class_name>AdminDeliverySlip</class_name>
+    </tab>
+    <tab id="Merchandise_Returns" id_parent="Orders" active="1">
+      <class_name>AdminReturn</class_name>
+    </tab>
+    <tab id="Credit_Slips" id_parent="Orders" active="1">
+      <class_name>AdminSlip</class_name>
+    </tab>
     <tab id="Statuses" id_parent="Orders" active="1">
       <class_name>AdminStatuses</class_name>
     </tab>
-    <tab id="Cart_Rules" id_parent="Payment" active="1">
-      <class_name>AdminCartRules</class_name>
+    <tab id="Order_Messages" id_parent="Orders" active="1">
+      <class_name>AdminOrderMessage</class_name>
+    </tab>
+    <tab id="PDF" id_parent="Orders" active="1">
+      <class_name>AdminPdf</class_name>
     </tab>
     <tab id="Currencies" id_parent="Payment" active="1">
       <class_name>AdminCurrencies</class_name>
@@ -54,9 +138,18 @@
     <tab id="Taxes" id_parent="Payment" active="1">
       <class_name>AdminTaxes</class_name>
     </tab>
+    <tab id="Tax_Rules" id_parent="Payment" active="1">
+      <class_name>AdminTaxRulesGroup</class_name>
+    </tab>
+    <tab id="Cart_Rules" id_parent="Payment" active="1">
+      <class_name>AdminCartRules</class_name>
+    </tab>
     <tab id="Carriers" id_parent="Shipping" active="1">
       <class_name>AdminCarriers</class_name>
     </tab>
+    <tab id="States" id_parent="Shipping" active="1">
+      <class_name>AdminStates</class_name>
+    </tab>
     <tab id="Countries" id_parent="Shipping" active="1">
       <class_name>AdminCountries</class_name>
     </tab>
@@ -69,173 +162,113 @@
     <tab id="Weight_Ranges" id_parent="Shipping" active="1">
       <class_name>AdminRangeWeight</class_name>
     </tab>
-    <tab id="Positions" id_parent="Modules" active="1">
-      <class_name>AdminModulesPositions</class_name>
-    </tab>
-    <tab id="Database" id_parent="Preferences" active="1">
-      <class_name>AdminDb</class_name>
-    </tab>
-    <tab id="E-mail" id_parent="Preferences" active="1">
-      <class_name>AdminEmails</class_name>
-    </tab>
-    <tab id="Images" id_parent="Preferences" active="1">
-      <class_name>AdminImages</class_name>
-    </tab>
-    <tab id="Products" id_parent="Preferences" active="1">
-      <class_name>AdminPPreferences</class_name>
-    </tab>
-    <tab id="Contacts" id_parent="tab_29" active="1">
-      <class_name>AdminContacts</class_name>
-    </tab>
-    <tab id="tab_29" id_parent="" active="1">
-      <class_name>AdminEmployees</class_name>
-    </tab>
-    <tab id="Profiles" id_parent="tab_29" active="1">
-      <class_name>AdminProfiles</class_name>
-    </tab>
-    <tab id="Permissions" id_parent="tab_29" active="1">
-      <class_name>AdminAccess</class_name>
-    </tab>
-    <tab id="Languages" id_parent="Tools" active="1">
-      <class_name>AdminLanguages</class_name>
-    </tab>
-    <tab id="Translations" id_parent="Tools" active="1">
-      <class_name>AdminTranslations</class_name>
-    </tab>
-    <tab id="Suppliers" id_parent="Catalog" active="1">
-      <class_name>AdminSuppliers</class_name>
-    </tab>
-    <tab id="Tabs" id_parent="tab_29" active="1">
-      <class_name>AdminTabs</class_name>
-    </tab>
-    <tab id="Features" id_parent="Catalog" active="1">
-      <class_name>AdminFeatures</class_name>
-    </tab>
-    <tab id="Quick_Access" id_parent="Tools" active="1">
-      <class_name>AdminQuickAccesses</class_name>
-    </tab>
-    <tab id="Themes" id_parent="Preferences" active="1">
-      <class_name>AdminThemes</class_name>
-    </tab>
-    <tab id="Contact_Information" id_parent="Preferences" active="1">
-      <class_name>AdminContact</class_name>
-    </tab>
-    <tab id="Keyword_Typos" id_parent="Preferences" active="1">
-      <class_name>AdminAliases</class_name>
-    </tab>
-    <tab id="CSV_Import" id_parent="Tools" active="1">
-      <class_name>AdminImport</class_name>
-    </tab>
-    <tab id="Invoices" id_parent="Orders" active="1">
-      <class_name>AdminInvoices</class_name>
-    </tab>
-    <tab id="Search" id_parent="-1" active="1">
-      <class_name>AdminSearch</class_name>
-    </tab>
-    <tab id="Localization" id_parent="Preferences" active="1">
-      <class_name>AdminLocalization</class_name>
-    </tab>
-    <tab id="States" id_parent="Shipping" active="1">
-      <class_name>AdminStates</class_name>
-    </tab>
-    <tab id="Merchandise_Returns" id_parent="Orders" active="1">
-      <class_name>AdminReturn</class_name>
-    </tab>
-    <tab id="PDF" id_parent="Orders" active="1">
-      <class_name>AdminPdf</class_name>
-    </tab>
-    <tab id="Credit_Slips" id_parent="Orders" active="1">
-      <class_name>AdminSlip</class_name>
-    </tab>
-    <tab id="Subdomains" id_parent="Tools" active="1">
-      <class_name>AdminSubDomains</class_name>
-    </tab>
-    <tab id="DB_Backup" id_parent="Tools" active="1">
-      <class_name>AdminBackup</class_name>
-    </tab>
-    <tab id="Order_Messages" id_parent="Orders" active="1">
-      <class_name>AdminOrderMessage</class_name>
-    </tab>
-    <tab id="Delivery_Slips" id_parent="Orders" active="1">
-      <class_name>AdminDeliverySlip</class_name>
-    </tab>
-    <tab id="SEO_URLs" id_parent="Preferences" active="1">
-      <class_name>AdminMeta</class_name>
-    </tab>
-    <tab id="CMS" id_parent="Tools" active="1">
-      <class_name>AdminCmsContent</class_name>
-    </tab>
-    <tab id="Image_Mapping" id_parent="Catalog" active="1">
-      <class_name>AdminScenes</class_name>
-    </tab>
-    <tab id="Monitoring" id_parent="Catalog" active="1">
-      <class_name>AdminTracking</class_name>
-    </tab>
     <tab id="Search_Engines" id_parent="Stats" active="1">
       <class_name>AdminSearchEngines</class_name>
     </tab>
     <tab id="Referrers" id_parent="Stats" active="1">
       <class_name>AdminReferrers</class_name>
     </tab>
-    <tab id="Groups" id_parent="Customers" active="1">
-      <class_name>AdminGroups</class_name>
-    </tab>
-    <tab id="Generators" id_parent="Tools" active="1">
-      <class_name>AdminGenerator</class_name>
-    </tab>
-    <tab id="Shopping_Carts" id_parent="Customers" active="1">
-      <class_name>AdminCarts</class_name>
-    </tab>
-    <tab id="Tags" id_parent="Catalog" active="1">
-      <class_name>AdminTags</class_name>
-    </tab>
-    <tab id="Search_1" id_parent="Preferences" active="1">
-      <class_name>AdminSearchConf</class_name>
-    </tab>
-    <tab id="Attachments" id_parent="Catalog" active="1">
-      <class_name>AdminAttachments</class_name>
-    </tab>
-    <tab id="Configuration_Information" id_parent="Tools" active="1">
-      <class_name>AdminInformation</class_name>
-    </tab>
-    <tab id="Performance" id_parent="Preferences" active="1">
-      <class_name>AdminPerformance</class_name>
-    </tab>
-    <tab id="Customer_Service" id_parent="tab_29" active="1">
-      <class_name>AdminCustomerThreads</class_name>
-    </tab>
-    <tab id="Webservice" id_parent="Tools" active="1">
-      <class_name>AdminWebservice</class_name>
-    </tab>
-    <tab id="Stock_Movement" id_parent="tab_95" active="1">
-      <class_name>AdminStockMvt</class_name>
-    </tab>
     <tab id="Modules_Themes_Catalog" id_parent="Modules" active="1">
       <class_name>AdminAddonsCatalog</class_name>
     </tab>
     <tab id="My_Account" id_parent="Modules" active="1">
       <class_name>AdminAddonsMyAccount</class_name>
     </tab>
-    <tab id="Stores" id_parent="Tools" active="1">
-      <class_name>AdminStores</class_name>
-    </tab>
-    <tab id="Themes_1" id_parent="Modules" active="1">
+    <tab id="Themes" id_parent="Modules" active="1">
       <class_name>AdminThemes</class_name>
     </tab>
+    <tab id="Positions" id_parent="Modules" active="1">
+      <class_name>AdminModulesPositions</class_name>
+    </tab>
+    <tab id="Contact_Information" id_parent="Preferences" active="1">
+      <class_name>AdminContact</class_name>
+    </tab>
+    <tab id="Themes_1" id_parent="Preferences" active="1">
+      <class_name>AdminThemes</class_name>
+    </tab>
+    <tab id="SEO_URLs" id_parent="Preferences" active="1">
+      <class_name>AdminMeta</class_name>
+    </tab>
+    <tab id="Products_1" id_parent="Preferences" active="1">
+      <class_name>AdminPPreferences</class_name>
+    </tab>
+    <tab id="Keyword_Typos" id_parent="Preferences" active="1">
+      <class_name>AdminAliases</class_name>
+    </tab>
+    <tab id="E-mail" id_parent="Preferences" active="1">
+      <class_name>AdminEmails</class_name>
+    </tab>
+    <tab id="Images" id_parent="Preferences" active="1">
+      <class_name>AdminImages</class_name>
+    </tab>
+    <tab id="Database" id_parent="Preferences" active="1">
+      <class_name>AdminDb</class_name>
+    </tab>
+    <tab id="Localization" id_parent="Preferences" active="1">
+      <class_name>AdminLocalization</class_name>
+    </tab>
+    <tab id="Search_1" id_parent="Preferences" active="1">
+      <class_name>AdminSearchConf</class_name>
+    </tab>
+    <tab id="Performance" id_parent="Preferences" active="1">
+      <class_name>AdminPerformance</class_name>
+    </tab>
     <tab id="Geolocation" id_parent="Preferences" active="1">
       <class_name>AdminGeolocation</class_name>
     </tab>
-    <tab id="Tax_Rules" id_parent="Payment" active="1">
-      <class_name>AdminTaxRulesGroup</class_name>
+    <tab id="Languages" id_parent="Tools" active="1">
+      <class_name>AdminLanguages</class_name>
+    </tab>
+    <tab id="Translations" id_parent="Tools" active="1">
+      <class_name>AdminTranslations</class_name>
+    </tab>
+    <tab id="Quick_Access" id_parent="Tools" active="1">
+      <class_name>AdminQuickAccesses</class_name>
+    </tab>
+    <tab id="Configuration_Information" id_parent="Tools" active="1">
+      <class_name>AdminInformation</class_name>
+    </tab>
+    <tab id="CSV_Import" id_parent="Tools" active="1">
+      <class_name>AdminImport</class_name>
+    </tab>
+    <tab id="Subdomains" id_parent="Tools" active="1">
+      <class_name>AdminSubDomains</class_name>
+    </tab>
+    <tab id="DB_Backup" id_parent="Tools" active="1">
+      <class_name>AdminBackup</class_name>
+    </tab>
+    <tab id="CMS" id_parent="Tools" active="1">
+      <class_name>AdminCmsContent</class_name>
+    </tab>
+    <tab id="Generators" id_parent="Tools" active="1">
+      <class_name>AdminGenerator</class_name>
+    </tab>
+    <tab id="Stores" id_parent="Tools" active="1">
+      <class_name>AdminStores</class_name>
+    </tab>
+    <tab id="Webservice" id_parent="Tools" active="1">
+      <class_name>AdminWebservice</class_name>
     </tab>
     <tab id="Logs" id_parent="Tools" active="1">
       <class_name>AdminLogs</class_name>
     </tab>
-    <tab id="Home" id_parent="-1" active="1">
-      <class_name>AdminHome</class_name>
+    <tab id="SQL_Manager" id_parent="Tools" active="1">
+      <class_name>AdminRequestSql</class_name>
     </tab>
-    <tab id="Shops" id_parent="" active="1">
-      <class_name>AdminShop</class_name>
+    <tab id="Profiles" id_parent="Employees" active="1">
+      <class_name>AdminProfiles</class_name>
+    </tab>
+    <tab id="Permissions" id_parent="Employees" active="1">
+      <class_name>AdminAccess</class_name>
+    </tab>
+    <tab id="Contacts" id_parent="Employees" active="1">
+      <class_name>AdminContacts</class_name>
+    </tab>
+    <tab id="Tabs" id_parent="Employees" active="1">
+      <class_name>AdminTabs</class_name>
+    </tab>
+    <tab id="Customer_Service" id_parent="Employees" active="1">
+      <class_name>AdminCustomerThreads</class_name>
     </tab>
     <tab id="Group_Shops" id_parent="Shops" active="1">
       <class_name>AdminGroupShop</class_name>
@@ -243,41 +276,26 @@
     <tab id="Shop_Urls" id_parent="Shops" active="1">
       <class_name>AdminShopUrl</class_name>
     </tab>
-    <tab id="Genders" id_parent="Customers" active="1">
-      <class_name>AdminGenders</class_name>
-    </tab>
-    <tab id="SQL_Manager" id_parent="Tools" active="1">
-      <class_name>AdminRequestSql</class_name>
-    </tab>
-    <tab id="Products_1" id_parent="Catalog" active="1">
-      <class_name>AdminProducts</class_name>
-    </tab>
-    <tab id="Categories" id_parent="Catalog" active="1">
-      <class_name>AdminCategories</class_name>
-    </tab>
-    <tab id="tab_95" id_parent="" active="1">
-      <class_name>AdminStock</class_name>
-    </tab>
-    <tab id="Warehouses" id_parent="tab_95" active="1">
+    <tab id="Warehouses" id_parent="Stock" active="1">
       <class_name>AdminWarehouses</class_name>
     </tab>
-    <tab id="Stock_Management" id_parent="tab_95" active="1">
+    <tab id="Stock_Management" id_parent="Stock" active="1">
       <class_name>AdminStockManagement</class_name>
     </tab>
-    <tab id="Stock_instant_state" id_parent="tab_95" active="1">
+    <tab id="Stock_Movement" id_parent="Stock" active="1">
+      <class_name>AdminStockMvt</class_name>
+    </tab>
+    <tab id="Stock_instant_state" id_parent="Stock" active="1">
       <class_name>AdminStockInstantState</class_name>
     </tab>
-    <tab id="Stock_cover" id_parent="tab_95" active="1">
+    <tab id="Stock_cover" id_parent="Stock" active="1">
       <class_name>AdminStockCover</class_name>
     </tab>
-    <tab id="Supply_orders" id_parent="tab_95" active="1">
+    <tab id="Supply_orders" id_parent="Stock" active="1">
       <class_name>AdminSupplyOrders</class_name>
     </tab>
-    <tab id="Combinations_generator" id_parent="-1" active="1">
-      <class_name>AdminAttributeGenerator</class_name>
-    </tab>
-    <tab id="Accounting" id_parent="" active="1">
-      <class_name>AdminAccounting</class_name>
+    <tab id="Configuration" id_parent="Stock" active="1">
+      <class_name>AdminStockConfiguration</class_name>
     </tab>
     <tab id="Account_Number_Management" id_parent="Accounting" active="1">
       <class_name>AdminAccountingManagement</class_name>
@@ -285,23 +303,5 @@
     <tab id="Export" id_parent="Accounting" active="1">
       <class_name>AdminAccountingExport</class_name>
     </tab>
-    <tab id="CMS_categories" id_parent="-1" active="1">
-      <class_name>AdminCmsCategories</class_name>
-    </tab>
-    <tab id="CMS_pages" id_parent="-1" active="1">
-      <class_name>AdminCms</class_name>
-    </tab>
-    <tab id="tab_107" id_parent="-1" active="1">
-      <class_name>AdminLogin</class_name>
-    </tab>
-    <tab id="Configuration" id_parent="tab_95" active="1">
-      <class_name>AdminStockConfiguration</class_name>
-    </tab>
-    <tab id="Catalog_price_rules" id_parent="Catalog" active="1">
-      <class_name>AdminSpecificPriceRule</class_name>
-    </tab>
-    <tab id="Outstanding" id_parent="Customers" active="0">
-      <class_name>AdminOutstanding</class_name>
-    </tab>
   </entities>
 </entity_tab>
diff --git a/install-new/fixtures/apple/data/access.xml b/install-new/fixtures/apple/data/access.xml
index 18e22cd9c..5d583acba 100644
--- a/install-new/fixtures/apple/data/access.xml
+++ b/install-new/fixtures/apple/data/access.xml
@@ -34,9 +34,9 @@
     <access id="access_2_23" id_profile="Administrator" id_tab="Database" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_24" id_profile="Administrator" id_tab="E-mail" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_26" id_profile="Administrator" id_tab="Images" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_27" id_profile="Administrator" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_27" id_profile="Administrator" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_28" id_profile="Administrator" id_tab="Contacts" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_29" id_profile="Administrator" id_tab="tab_29" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_29" id_profile="Administrator" id_tab="Employees" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_30" id_profile="Administrator" id_tab="Profiles" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_31" id_profile="Administrator" id_tab="Permissions" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_32" id_profile="Administrator" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
@@ -45,7 +45,7 @@
     <access id="access_2_35" id_profile="Administrator" id_tab="Tabs" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_36" id_profile="Administrator" id_tab="Features" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_37" id_profile="Administrator" id_tab="Quick_Access" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_38" id_profile="Administrator" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_38" id_profile="Administrator" id_tab="Themes_1" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_39" id_profile="Administrator" id_tab="Contact_Information" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_40" id_profile="Administrator" id_tab="Keyword_Typos" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_41" id_profile="Administrator" id_tab="CSV_Import" view="1" add="1" edit="1" delete="1"/>
@@ -80,7 +80,7 @@
     <access id="access_2_80" id_profile="Administrator" id_tab="Modules_Themes_Catalog" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_81" id_profile="Administrator" id_tab="My_Account" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_82" id_profile="Administrator" id_tab="Stores" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_83" id_profile="Administrator" id_tab="Themes_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_83" id_profile="Administrator" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_84" id_profile="Administrator" id_tab="Geolocation" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_85" id_profile="Administrator" id_tab="Tax_Rules" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_86" id_profile="Administrator" id_tab="Logs" view="1" add="1" edit="1" delete="1"/>
@@ -90,9 +90,9 @@
     <access id="access_2_90" id_profile="Administrator" id_tab="Shop_Urls" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_91" id_profile="Administrator" id_tab="Genders" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_92" id_profile="Administrator" id_tab="SQL_Manager" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_93" id_profile="Administrator" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_93" id_profile="Administrator" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_94" id_profile="Administrator" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_2_95" id_profile="Administrator" id_tab="tab_95" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_2_95" id_profile="Administrator" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_96" id_profile="Administrator" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_97" id_profile="Administrator" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_2_98" id_profile="Administrator" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
@@ -133,9 +133,9 @@
     <access id="access_3_23" id_profile="Logistician" id_tab="Database" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_24" id_profile="Logistician" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_26" id_profile="Logistician" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_27" id_profile="Logistician" id_tab="Products" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_27" id_profile="Logistician" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_28" id_profile="Logistician" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_29" id_profile="Logistician" id_tab="tab_29" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_29" id_profile="Logistician" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_30" id_profile="Logistician" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_31" id_profile="Logistician" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_32" id_profile="Logistician" id_tab="Languages" view="0" add="0" edit="0" delete="0"/>
@@ -144,7 +144,7 @@
     <access id="access_3_35" id_profile="Logistician" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_36" id_profile="Logistician" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_37" id_profile="Logistician" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_38" id_profile="Logistician" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_38" id_profile="Logistician" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_39" id_profile="Logistician" id_tab="Contact_Information" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_40" id_profile="Logistician" id_tab="Keyword_Typos" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_41" id_profile="Logistician" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
@@ -181,7 +181,7 @@
     <access id="access_3_80" id_profile="Logistician" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_81" id_profile="Logistician" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_82" id_profile="Logistician" id_tab="Stores" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_83" id_profile="Logistician" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_3_83" id_profile="Logistician" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_84" id_profile="Logistician" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_85" id_profile="Logistician" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_86" id_profile="Logistician" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
@@ -190,9 +190,9 @@
     <access id="access_3_90" id_profile="Logistician" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_91" id_profile="Logistician" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
     <access id="access_3_92" id_profile="Logistician" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_3_93" id_profile="Logistician" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_93" id_profile="Logistician" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_94" id_profile="Logistician" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_3_95" id_profile="Logistician" id_tab="tab_95" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_3_95" id_profile="Logistician" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_96" id_profile="Logistician" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_97" id_profile="Logistician" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
     <access id="access_3_98" id_profile="Logistician" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
@@ -230,9 +230,9 @@
     <access id="access_4_23" id_profile="Translator" id_tab="Database" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_24" id_profile="Translator" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_26" id_profile="Translator" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_27" id_profile="Translator" id_tab="Products" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_27" id_profile="Translator" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_28" id_profile="Translator" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_29" id_profile="Translator" id_tab="tab_29" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_29" id_profile="Translator" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_30" id_profile="Translator" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_31" id_profile="Translator" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_32" id_profile="Translator" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
@@ -241,7 +241,7 @@
     <access id="access_4_35" id_profile="Translator" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_36" id_profile="Translator" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_37" id_profile="Translator" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_38" id_profile="Translator" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_38" id_profile="Translator" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_39" id_profile="Translator" id_tab="Contact_Information" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_40" id_profile="Translator" id_tab="Keyword_Typos" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_41" id_profile="Translator" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
@@ -278,7 +278,7 @@
     <access id="access_4_80" id_profile="Translator" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_81" id_profile="Translator" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_82" id_profile="Translator" id_tab="Stores" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_83" id_profile="Translator" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_83" id_profile="Translator" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_84" id_profile="Translator" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_85" id_profile="Translator" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_86" id_profile="Translator" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
@@ -288,9 +288,9 @@
     <access id="access_4_90" id_profile="Translator" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_91" id_profile="Translator" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_92" id_profile="Translator" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_4_93" id_profile="Translator" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_4_93" id_profile="Translator" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
     <access id="access_4_94" id_profile="Translator" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_4_95" id_profile="Translator" id_tab="tab_95" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_4_95" id_profile="Translator" id_tab="Stock" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_96" id_profile="Translator" id_tab="Warehouses" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_97" id_profile="Translator" id_tab="Stock_Management" view="0" add="0" edit="0" delete="0"/>
     <access id="access_4_98" id_profile="Translator" id_tab="Stock_instant_state" view="0" add="0" edit="0" delete="0"/>
@@ -328,9 +328,9 @@
     <access id="access_5_23" id_profile="Salesman" id_tab="Database" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_24" id_profile="Salesman" id_tab="E-mail" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_26" id_profile="Salesman" id_tab="Images" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_27" id_profile="Salesman" id_tab="Products" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_27" id_profile="Salesman" id_tab="Products_1" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_28" id_profile="Salesman" id_tab="Contacts" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_29" id_profile="Salesman" id_tab="tab_29" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_29" id_profile="Salesman" id_tab="Employees" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_30" id_profile="Salesman" id_tab="Profiles" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_31" id_profile="Salesman" id_tab="Permissions" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_32" id_profile="Salesman" id_tab="Languages" view="0" add="0" edit="0" delete="0"/>
@@ -339,7 +339,7 @@
     <access id="access_5_35" id_profile="Salesman" id_tab="Tabs" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_36" id_profile="Salesman" id_tab="Features" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_37" id_profile="Salesman" id_tab="Quick_Access" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_38" id_profile="Salesman" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_38" id_profile="Salesman" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_39" id_profile="Salesman" id_tab="Contact_Information" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_40" id_profile="Salesman" id_tab="Keyword_Typos" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_41" id_profile="Salesman" id_tab="CSV_Import" view="0" add="0" edit="0" delete="0"/>
@@ -376,7 +376,7 @@
     <access id="access_5_80" id_profile="Salesman" id_tab="Modules_Themes_Catalog" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_81" id_profile="Salesman" id_tab="My_Account" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_82" id_profile="Salesman" id_tab="Stores" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_83" id_profile="Salesman" id_tab="Themes_1" view="0" add="0" edit="0" delete="0"/>
+    <access id="access_5_83" id_profile="Salesman" id_tab="Themes" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_84" id_profile="Salesman" id_tab="Geolocation" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_85" id_profile="Salesman" id_tab="Tax_Rules" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_86" id_profile="Salesman" id_tab="Logs" view="0" add="0" edit="0" delete="0"/>
@@ -386,9 +386,9 @@
     <access id="access_5_90" id_profile="Salesman" id_tab="Shop_Urls" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_91" id_profile="Salesman" id_tab="Genders" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_92" id_profile="Salesman" id_tab="SQL_Manager" view="0" add="0" edit="0" delete="0"/>
-    <access id="access_5_93" id_profile="Salesman" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
+    <access id="access_5_93" id_profile="Salesman" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
     <access id="access_5_94" id_profile="Salesman" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
-    <access id="access_5_95" id_profile="Salesman" id_tab="tab_95" view="1" add="0" edit="0" delete="0"/>
+    <access id="access_5_95" id_profile="Salesman" id_tab="Stock" view="1" add="0" edit="0" delete="0"/>
     <access id="access_5_96" id_profile="Salesman" id_tab="Warehouses" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_97" id_profile="Salesman" id_tab="Stock_Management" view="0" add="0" edit="0" delete="0"/>
     <access id="access_5_98" id_profile="Salesman" id_tab="Stock_instant_state" view="0" add="0" edit="0" delete="0"/>
diff --git a/install-new/fixtures/apple/data/customer.xml b/install-new/fixtures/apple/data/customer.xml
index 7dd2fac6e..2f064dcac 100644
--- a/install-new/fixtures/apple/data/customer.xml
+++ b/install-new/fixtures/apple/data/customer.xml
@@ -19,7 +19,7 @@
     <field name="is_guest"/>
   </fields>
   <entities>
-    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="658a35eef9191d3c8e4d255d2204de60" last_passwd_gen="2011-12-22 23:15:16" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
+    <customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="3b804a99e990bdc8d8788f72a1ff355b" last_passwd_gen="2011-12-22 23:47:41" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
       <email>pub@prestashop.com</email>
       <note/>
     </customer>
diff --git a/install-new/langs/de/data/tab.xml b/install-new/langs/de/data/tab.xml
index 645f5b176..602d90453 100644
--- a/install-new/langs/de/data/tab.xml
+++ b/install-new/langs/de/data/tab.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
 <entity_tab>
+  <tab id="Home" name="Home"/>
+  <tab id="tab_107" name=""/>
+  <tab id="CMS_pages" name="CMS pages"/>
+  <tab id="CMS_categories" name="CMS categories"/>
+  <tab id="Combinations_generator" name="Combinations generator"/>
+  <tab id="Search" name="Suche"/>
   <tab id="Catalog" name="Katalog"/>
   <tab id="Customers" name="Kunden"/>
   <tab id="Orders" name="Bestellungen"/>
@@ -7,96 +13,90 @@
   <tab id="Shipping" name="Versandkosten"/>
   <tab id="Stats" name="Statistik"/>
   <tab id="Modules" name="Module"/>
+  <tab id="Employees" name="Mitarbeiter"/>
   <tab id="Preferences" name="Voreinstellungen"/>
   <tab id="Tools" name="Tools"/>
+  <tab id="Shops" name="Shops"/>
+  <tab id="Stock" name="Stock"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Products" name="Products"/>
+  <tab id="Categories" name="Categories"/>
+  <tab id="Monitoring" name="Tracking"/>
   <tab id="Manufacturers" name="Hersteller"/>
+  <tab id="Suppliers" name="Zulieferer"/>
   <tab id="Attributes_and_Groups" name="Attribute und Gruppen"/>
+  <tab id="Features" name="Funktionen"/>
+  <tab id="Image_Mapping" name="Image Mapping"/>
+  <tab id="Tags" name="Tags"/>
+  <tab id="Attachments" name="Anh&#xE4;nge"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
   <tab id="Addresses" name="Adressen"/>
+  <tab id="Groups" name="Gruppen"/>
+  <tab id="Shopping_Carts" name="Warenk&#xF6;rbe"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Invoices" name="Rechnungen"/>
+  <tab id="Delivery_Slips" name="Lieferscheine"/>
+  <tab id="Merchandise_Returns" name="Warenr&#xFC;cksendungen"/>
+  <tab id="Credit_Slips" name="Gutscheine"/>
   <tab id="Statuses" name="Status"/>
-  <tab id="Cart_Rules" name="Gutscheine"/>
+  <tab id="Order_Messages" name="Bestellnachrichten"/>
+  <tab id="PDF" name="PDF"/>
   <tab id="Currencies" name="W&#xE4;hrungen"/>
   <tab id="Taxes" name="Steuern"/>
+  <tab id="Tax_Rules" name="Steuerregeln"/>
+  <tab id="Cart_Rules" name="Gutscheine"/>
   <tab id="Carriers" name="Versanddienst"/>
+  <tab id="States" name="Staaten"/>
   <tab id="Countries" name="L&#xE4;nder"/>
   <tab id="Zones" name="Zonen"/>
   <tab id="Price_Ranges" name="Preisspanne"/>
   <tab id="Weight_Ranges" name="Gewichtsklassen"/>
-  <tab id="Positions" name="Positionen"/>
-  <tab id="Database" name="Datenbank"/>
-  <tab id="E-mail" name="E-Mail"/>
-  <tab id="Images" name="Bild"/>
-  <tab id="Products" name="Produkte"/>
-  <tab id="Contacts" name="Kontakte"/>
-  <tab id="tab_29" name="Mitarbeiter"/>
-  <tab id="Profiles" name="Profile"/>
-  <tab id="Permissions" name="Berechtigungen"/>
-  <tab id="Languages" name="Sprachen"/>
-  <tab id="Translations" name="&#xDC;bersetzungen"/>
-  <tab id="Suppliers" name="Zulieferer"/>
-  <tab id="Tabs" name="Tabs"/>
-  <tab id="Features" name="Funktionen"/>
-  <tab id="Quick_Access" name="Schnellzugriff"/>
-  <tab id="Themes" name="Themen"/>
-  <tab id="Contact_Information" name="Kontaktinformation"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="CSV_Import" name="Import"/>
-  <tab id="Invoices" name="Rechnungen"/>
-  <tab id="Search" name="Suche"/>
-  <tab id="Localization" name="Lokalisierung"/>
-  <tab id="States" name="Staaten"/>
-  <tab id="Merchandise_Returns" name="Warenr&#xFC;cksendungen"/>
-  <tab id="PDF" name="PDF"/>
-  <tab id="Credit_Slips" name="Gutscheine"/>
-  <tab id="Subdomains" name="Subdomains"/>
-  <tab id="DB_Backup" name="DB-Backup"/>
-  <tab id="Order_Messages" name="Bestellnachrichten"/>
-  <tab id="Delivery_Slips" name="Lieferscheine"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Image_Mapping" name="Image Mapping"/>
-  <tab id="Monitoring" name="Tracking"/>
   <tab id="Search_Engines" name="Suchmaschinen"/>
   <tab id="Referrers" name="Referrer"/>
-  <tab id="Groups" name="Gruppen"/>
-  <tab id="Generators" name="Generatoren"/>
-  <tab id="Shopping_Carts" name="Warenk&#xF6;rbe"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Search_1" name="Suche"/>
-  <tab id="Attachments" name="Anh&#xE4;nge"/>
-  <tab id="Configuration_Information" name="Konfigurationsinformationen"/>
-  <tab id="Performance" name="Leistung"/>
-  <tab id="Customer_Service" name="Kundenservice"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Stock_Movement" name="Lagerbewegungen"/>
   <tab id="Modules_Themes_Catalog" name="Module und Themenkatalog"/>
   <tab id="My_Account" name="Mein Konto"/>
-  <tab id="Stores" name="Shops"/>
+  <tab id="Themes" name="Themen"/>
+  <tab id="Positions" name="Positionen"/>
+  <tab id="Contact_Information" name="Kontaktinformation"/>
   <tab id="Themes_1" name="Themen"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Products_1" name="Produkte"/>
+  <tab id="Keyword_Typos" name="Alias"/>
+  <tab id="E-mail" name="E-Mail"/>
+  <tab id="Images" name="Bild"/>
+  <tab id="Database" name="Datenbank"/>
+  <tab id="Localization" name="Lokalisierung"/>
+  <tab id="Search_1" name="Suche"/>
+  <tab id="Performance" name="Leistung"/>
   <tab id="Geolocation" name="Geotargeting"/>
-  <tab id="Tax_Rules" name="Steuerregeln"/>
+  <tab id="Languages" name="Sprachen"/>
+  <tab id="Translations" name="&#xDC;bersetzungen"/>
+  <tab id="Quick_Access" name="Schnellzugriff"/>
+  <tab id="Configuration_Information" name="Konfigurationsinformationen"/>
+  <tab id="CSV_Import" name="Import"/>
+  <tab id="Subdomains" name="Subdomains"/>
+  <tab id="DB_Backup" name="DB-Backup"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Generators" name="Generatoren"/>
+  <tab id="Stores" name="Shops"/>
+  <tab id="Webservice" name="Webservice"/>
   <tab id="Logs" name="Log"/>
-  <tab id="Home" name="Home"/>
-  <tab id="Shops" name="Shops"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Profiles" name="Profile"/>
+  <tab id="Permissions" name="Berechtigungen"/>
+  <tab id="Contacts" name="Kontakte"/>
+  <tab id="Tabs" name="Tabs"/>
+  <tab id="Customer_Service" name="Kundenservice"/>
   <tab id="Group_Shops" name="Group Shops"/>
   <tab id="Shop_Urls" name="Shop Urls"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Products_1" name="Products"/>
-  <tab id="Categories" name="Categories"/>
-  <tab id="tab_95" name="Stock"/>
   <tab id="Warehouses" name="Warehouses"/>
   <tab id="Stock_Management" name="Stock Management"/>
+  <tab id="Stock_Movement" name="Lagerbewegungen"/>
   <tab id="Stock_instant_state" name="Stock instant state"/>
   <tab id="Stock_cover" name="Stock cover"/>
   <tab id="Supply_orders" name="Supply orders"/>
-  <tab id="Combinations_generator" name="Combinations generator"/>
-  <tab id="Accounting" name="Accounting"/>
+  <tab id="Configuration" name="Configuration"/>
   <tab id="Account_Number_Management" name="Account Number Management"/>
   <tab id="Export" name="Export"/>
-  <tab id="CMS_categories" name="CMS categories"/>
-  <tab id="CMS_pages" name="CMS pages"/>
-  <tab id="tab_107" name=""/>
-  <tab id="Configuration" name="Configuration"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Outstanding" name="Outstanding"/>
 </entity_tab>
diff --git a/install-new/langs/en/data/tab.xml b/install-new/langs/en/data/tab.xml
index 1057e2d25..269a9c039 100644
--- a/install-new/langs/en/data/tab.xml
+++ b/install-new/langs/en/data/tab.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
 <entity_tab>
+  <tab id="Home" name="Home"/>
+  <tab id="tab_107" name=""/>
+  <tab id="CMS_pages" name="CMS pages"/>
+  <tab id="CMS_categories" name="CMS categories"/>
+  <tab id="Combinations_generator" name="Combinations generator"/>
+  <tab id="Search" name="Search"/>
   <tab id="Catalog" name="Catalog"/>
   <tab id="Customers" name="Customers"/>
   <tab id="Orders" name="Orders"/>
@@ -7,96 +13,90 @@
   <tab id="Shipping" name="Shipping"/>
   <tab id="Stats" name="Stats"/>
   <tab id="Modules" name="Modules"/>
+  <tab id="Employees" name="Employees"/>
   <tab id="Preferences" name="Preferences"/>
   <tab id="Tools" name="Tools"/>
+  <tab id="Shops" name="Shops"/>
+  <tab id="Stock" name="Stock"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Products" name="Products"/>
+  <tab id="Categories" name="Categories"/>
+  <tab id="Monitoring" name="Monitoring"/>
   <tab id="Manufacturers" name="Manufacturers"/>
+  <tab id="Suppliers" name="Suppliers"/>
   <tab id="Attributes_and_Groups" name="Attributes and Groups"/>
+  <tab id="Features" name="Features"/>
+  <tab id="Image_Mapping" name="Image Mapping"/>
+  <tab id="Tags" name="Tags"/>
+  <tab id="Attachments" name="Attachments"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
   <tab id="Addresses" name="Addresses"/>
+  <tab id="Groups" name="Groups"/>
+  <tab id="Shopping_Carts" name="Shopping Carts"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Invoices" name="Invoices"/>
+  <tab id="Delivery_Slips" name="Delivery Slips"/>
+  <tab id="Merchandise_Returns" name="Merchandise Returns"/>
+  <tab id="Credit_Slips" name="Credit Slips"/>
   <tab id="Statuses" name="Statuses"/>
-  <tab id="Cart_Rules" name="Cart Rules"/>
+  <tab id="Order_Messages" name="Order Messages"/>
+  <tab id="PDF" name="PDF"/>
   <tab id="Currencies" name="Currencies"/>
   <tab id="Taxes" name="Taxes"/>
+  <tab id="Tax_Rules" name="Tax Rules"/>
+  <tab id="Cart_Rules" name="Cart Rules"/>
   <tab id="Carriers" name="Carriers"/>
+  <tab id="States" name="States"/>
   <tab id="Countries" name="Countries"/>
   <tab id="Zones" name="Zones"/>
   <tab id="Price_Ranges" name="Price Ranges"/>
   <tab id="Weight_Ranges" name="Weight Ranges"/>
-  <tab id="Positions" name="Positions"/>
-  <tab id="Database" name="Database"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Images" name="Images"/>
-  <tab id="Products" name="Products"/>
-  <tab id="Contacts" name="Contacts"/>
-  <tab id="tab_29" name="Employees"/>
-  <tab id="Profiles" name="Profiles"/>
-  <tab id="Permissions" name="Permissions"/>
-  <tab id="Languages" name="Languages"/>
-  <tab id="Translations" name="Translations"/>
-  <tab id="Suppliers" name="Suppliers"/>
-  <tab id="Tabs" name="Tabs"/>
-  <tab id="Features" name="Features"/>
-  <tab id="Quick_Access" name="Quick Access"/>
-  <tab id="Themes" name="Themes"/>
-  <tab id="Contact_Information" name="Contact Information"/>
-  <tab id="Keyword_Typos" name="Keyword Typos"/>
-  <tab id="CSV_Import" name="CSV Import"/>
-  <tab id="Invoices" name="Invoices"/>
-  <tab id="Search" name="Search"/>
-  <tab id="Localization" name="Localization"/>
-  <tab id="States" name="States"/>
-  <tab id="Merchandise_Returns" name="Merchandise Returns"/>
-  <tab id="PDF" name="PDF"/>
-  <tab id="Credit_Slips" name="Credit Slips"/>
-  <tab id="Subdomains" name="Subdomains"/>
-  <tab id="DB_Backup" name="DB Backup"/>
-  <tab id="Order_Messages" name="Order Messages"/>
-  <tab id="Delivery_Slips" name="Delivery Slips"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Image_Mapping" name="Image Mapping"/>
-  <tab id="Monitoring" name="Monitoring"/>
   <tab id="Search_Engines" name="Search Engines"/>
   <tab id="Referrers" name="Referrers"/>
-  <tab id="Groups" name="Groups"/>
-  <tab id="Generators" name="Generators"/>
-  <tab id="Shopping_Carts" name="Shopping Carts"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Search_1" name="Search"/>
-  <tab id="Attachments" name="Attachments"/>
-  <tab id="Configuration_Information" name="Configuration Information"/>
-  <tab id="Performance" name="Performance"/>
-  <tab id="Customer_Service" name="Customer Service"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Stock_Movement" name="Stock Movement"/>
   <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
   <tab id="My_Account" name="My Account"/>
-  <tab id="Stores" name="Stores"/>
+  <tab id="Themes" name="Themes"/>
+  <tab id="Positions" name="Positions"/>
+  <tab id="Contact_Information" name="Contact Information"/>
   <tab id="Themes_1" name="Themes"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Products_1" name="Products"/>
+  <tab id="Keyword_Typos" name="Keyword Typos"/>
+  <tab id="E-mail" name="E-mail"/>
+  <tab id="Images" name="Images"/>
+  <tab id="Database" name="Database"/>
+  <tab id="Localization" name="Localization"/>
+  <tab id="Search_1" name="Search"/>
+  <tab id="Performance" name="Performance"/>
   <tab id="Geolocation" name="Geolocation"/>
-  <tab id="Tax_Rules" name="Tax Rules"/>
+  <tab id="Languages" name="Languages"/>
+  <tab id="Translations" name="Translations"/>
+  <tab id="Quick_Access" name="Quick Access"/>
+  <tab id="Configuration_Information" name="Configuration Information"/>
+  <tab id="CSV_Import" name="CSV Import"/>
+  <tab id="Subdomains" name="Subdomains"/>
+  <tab id="DB_Backup" name="DB Backup"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Generators" name="Generators"/>
+  <tab id="Stores" name="Stores"/>
+  <tab id="Webservice" name="Webservice"/>
   <tab id="Logs" name="Logs"/>
-  <tab id="Home" name="Home"/>
-  <tab id="Shops" name="Shops"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Profiles" name="Profiles"/>
+  <tab id="Permissions" name="Permissions"/>
+  <tab id="Contacts" name="Contacts"/>
+  <tab id="Tabs" name="Tabs"/>
+  <tab id="Customer_Service" name="Customer Service"/>
   <tab id="Group_Shops" name="Group Shops"/>
   <tab id="Shop_Urls" name="Shop Urls"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Products_1" name="Products"/>
-  <tab id="Categories" name="Categories"/>
-  <tab id="tab_95" name="Stock"/>
   <tab id="Warehouses" name="Warehouses"/>
   <tab id="Stock_Management" name="Stock Management"/>
+  <tab id="Stock_Movement" name="Stock Movement"/>
   <tab id="Stock_instant_state" name="Stock instant state"/>
   <tab id="Stock_cover" name="Stock cover"/>
   <tab id="Supply_orders" name="Supply orders"/>
-  <tab id="Combinations_generator" name="Combinations generator"/>
-  <tab id="Accounting" name="Accounting"/>
+  <tab id="Configuration" name="Configuration"/>
   <tab id="Account_Number_Management" name="Account Number Management"/>
   <tab id="Export" name="Export"/>
-  <tab id="CMS_categories" name="CMS categories"/>
-  <tab id="CMS_pages" name="CMS pages"/>
-  <tab id="tab_107" name=""/>
-  <tab id="Configuration" name="Configuration"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Outstanding" name="Outstanding"/>
 </entity_tab>
diff --git a/install-new/langs/es/data/tab.xml b/install-new/langs/es/data/tab.xml
index 9b3828ece..4ea9c64c1 100644
--- a/install-new/langs/es/data/tab.xml
+++ b/install-new/langs/es/data/tab.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
 <entity_tab>
+  <tab id="Home" name="Home"/>
+  <tab id="tab_107" name=""/>
+  <tab id="CMS_pages" name="CMS pages"/>
+  <tab id="CMS_categories" name="CMS categories"/>
+  <tab id="Combinations_generator" name="Combinations generator"/>
+  <tab id="Search" name="B&#xFA;squeda"/>
   <tab id="Catalog" name="Cat&#xE1;logo"/>
   <tab id="Customers" name="Clientes"/>
   <tab id="Orders" name="Pedidos"/>
@@ -7,96 +13,90 @@
   <tab id="Shipping" name="Transporte"/>
   <tab id="Stats" name="Estad&#xED;sticas"/>
   <tab id="Modules" name="M&#xF3;dulos"/>
+  <tab id="Employees" name="Empleados"/>
   <tab id="Preferences" name="Preferencias"/>
   <tab id="Tools" name="Herramientas"/>
+  <tab id="Shops" name="Shops"/>
+  <tab id="Stock" name="Stock"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Products" name="Products"/>
+  <tab id="Categories" name="Categories"/>
+  <tab id="Monitoring" name="Rastreo"/>
   <tab id="Manufacturers" name="Fabricantes"/>
+  <tab id="Suppliers" name="Proveedores"/>
   <tab id="Attributes_and_Groups" name="Atributos y grupos"/>
+  <tab id="Features" name="Caracter&#xED;sticas"/>
+  <tab id="Image_Mapping" name="Mapeo de la imagen"/>
+  <tab id="Tags" name="Etiquetas"/>
+  <tab id="Attachments" name="Adjuntos"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
   <tab id="Addresses" name="Direcciones"/>
+  <tab id="Groups" name="Grupos"/>
+  <tab id="Shopping_Carts" name="Carritos"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Invoices" name="Facturas"/>
+  <tab id="Delivery_Slips" name="Albaranes de entrega"/>
+  <tab id="Merchandise_Returns" name="Devoluci&#xF3;n productos"/>
+  <tab id="Credit_Slips" name="Vales"/>
   <tab id="Statuses" name="Estados"/>
-  <tab id="Cart_Rules" name="Vales de descuento"/>
+  <tab id="Order_Messages" name="Mensajes de Orden"/>
+  <tab id="PDF" name="PDF"/>
   <tab id="Currencies" name="Divisas"/>
   <tab id="Taxes" name="Impuestos"/>
+  <tab id="Tax_Rules" name="Reglas de Impuestos"/>
+  <tab id="Cart_Rules" name="Vales de descuento"/>
   <tab id="Carriers" name="Transportistas"/>
+  <tab id="States" name="Estados"/>
   <tab id="Countries" name="Pa&#xED;ses"/>
   <tab id="Zones" name="Zonas"/>
   <tab id="Price_Ranges" name="Franja de precios"/>
   <tab id="Weight_Ranges" name="Franja de pesos"/>
-  <tab id="Positions" name="Posiciones"/>
-  <tab id="Database" name="Base de datos"/>
-  <tab id="E-mail" name="Emails"/>
-  <tab id="Images" name="Im&#xE1;genes"/>
-  <tab id="Products" name="Productos"/>
-  <tab id="Contacts" name="Contactos"/>
-  <tab id="tab_29" name="Empleados"/>
-  <tab id="Profiles" name="Perfiles"/>
-  <tab id="Permissions" name="Permisos"/>
-  <tab id="Languages" name="Idiomas"/>
-  <tab id="Translations" name="Traducciones"/>
-  <tab id="Suppliers" name="Proveedores"/>
-  <tab id="Tabs" name="Pesta&#xF1;as"/>
-  <tab id="Features" name="Caracter&#xED;sticas"/>
-  <tab id="Quick_Access" name="Acceso r&#xE1;pido"/>
-  <tab id="Themes" name="Temas"/>
-  <tab id="Contact_Information" name="Datos"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="CSV_Import" name="Importar"/>
-  <tab id="Invoices" name="Facturas"/>
-  <tab id="Search" name="B&#xFA;squeda"/>
-  <tab id="Localization" name="Ubicaci&#xF3;n"/>
-  <tab id="States" name="Estados"/>
-  <tab id="Merchandise_Returns" name="Devoluci&#xF3;n productos"/>
-  <tab id="PDF" name="PDF"/>
-  <tab id="Credit_Slips" name="Vales"/>
-  <tab id="Subdomains" name="Subcampos"/>
-  <tab id="DB_Backup" name="Copia de seguridad"/>
-  <tab id="Order_Messages" name="Mensajes de Orden"/>
-  <tab id="Delivery_Slips" name="Albaranes de entrega"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Image_Mapping" name="Mapeo de la imagen"/>
-  <tab id="Monitoring" name="Rastreo"/>
   <tab id="Search_Engines" name="Motores de b&#xFA;squeda"/>
   <tab id="Referrers" name="Referido"/>
-  <tab id="Groups" name="Grupos"/>
-  <tab id="Generators" name="Generadores"/>
-  <tab id="Shopping_Carts" name="Carritos"/>
-  <tab id="Tags" name="Etiquetas"/>
-  <tab id="Search_1" name="B&#xFA;squeda"/>
-  <tab id="Attachments" name="Adjuntos"/>
-  <tab id="Configuration_Information" name="Informaciones"/>
-  <tab id="Performance" name="Rendimiento"/>
-  <tab id="Customer_Service" name="Servicio al cliente"/>
-  <tab id="Webservice" name="Web service"/>
-  <tab id="Stock_Movement" name="Movimiento de Stock"/>
   <tab id="Modules_Themes_Catalog" name="Modules &amp; Themes Catalog"/>
   <tab id="My_Account" name="My Account"/>
-  <tab id="Stores" name="Tiendas"/>
+  <tab id="Themes" name="Temas"/>
+  <tab id="Positions" name="Posiciones"/>
+  <tab id="Contact_Information" name="Datos"/>
   <tab id="Themes_1" name="Temas"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Products_1" name="Productos"/>
+  <tab id="Keyword_Typos" name="Alias"/>
+  <tab id="E-mail" name="Emails"/>
+  <tab id="Images" name="Im&#xE1;genes"/>
+  <tab id="Database" name="Base de datos"/>
+  <tab id="Localization" name="Ubicaci&#xF3;n"/>
+  <tab id="Search_1" name="B&#xFA;squeda"/>
+  <tab id="Performance" name="Rendimiento"/>
   <tab id="Geolocation" name="Geolocalizaci&#xF3;n"/>
-  <tab id="Tax_Rules" name="Reglas de Impuestos"/>
+  <tab id="Languages" name="Idiomas"/>
+  <tab id="Translations" name="Traducciones"/>
+  <tab id="Quick_Access" name="Acceso r&#xE1;pido"/>
+  <tab id="Configuration_Information" name="Informaciones"/>
+  <tab id="CSV_Import" name="Importar"/>
+  <tab id="Subdomains" name="Subcampos"/>
+  <tab id="DB_Backup" name="Copia de seguridad"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Generators" name="Generadores"/>
+  <tab id="Stores" name="Tiendas"/>
+  <tab id="Webservice" name="Web service"/>
   <tab id="Logs" name="Log"/>
-  <tab id="Home" name="Home"/>
-  <tab id="Shops" name="Shops"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Profiles" name="Perfiles"/>
+  <tab id="Permissions" name="Permisos"/>
+  <tab id="Contacts" name="Contactos"/>
+  <tab id="Tabs" name="Pesta&#xF1;as"/>
+  <tab id="Customer_Service" name="Servicio al cliente"/>
   <tab id="Group_Shops" name="Group Shops"/>
   <tab id="Shop_Urls" name="Shop Urls"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Products_1" name="Products"/>
-  <tab id="Categories" name="Categories"/>
-  <tab id="tab_95" name="Stock"/>
   <tab id="Warehouses" name="Warehouses"/>
   <tab id="Stock_Management" name="Stock Management"/>
+  <tab id="Stock_Movement" name="Movimiento de Stock"/>
   <tab id="Stock_instant_state" name="Stock instant state"/>
   <tab id="Stock_cover" name="Stock cover"/>
   <tab id="Supply_orders" name="Supply orders"/>
-  <tab id="Combinations_generator" name="Combinations generator"/>
-  <tab id="Accounting" name="Accounting"/>
+  <tab id="Configuration" name="Configuration"/>
   <tab id="Account_Number_Management" name="Account Number Management"/>
   <tab id="Export" name="Export"/>
-  <tab id="CMS_categories" name="CMS categories"/>
-  <tab id="CMS_pages" name="CMS pages"/>
-  <tab id="tab_107" name=""/>
-  <tab id="Configuration" name="Configuration"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Outstanding" name="Outstanding"/>
 </entity_tab>
diff --git a/install-new/langs/fr/data/tab.xml b/install-new/langs/fr/data/tab.xml
index 1be78fadd..24eaf3c8a 100644
--- a/install-new/langs/fr/data/tab.xml
+++ b/install-new/langs/fr/data/tab.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
 <entity_tab>
+  <tab id="Home" name="Accueil"/>
+  <tab id="tab_107" name=""/>
+  <tab id="CMS_pages" name="Pages CMS"/>
+  <tab id="CMS_categories" name="Cat&#xE9;gories CMS"/>
+  <tab id="Combinations_generator" name="G&#xE9;n&#xE9;rateur de d&#xE9;clinaisons"/>
+  <tab id="Search" name="Recherche"/>
   <tab id="Catalog" name="Catalogue"/>
   <tab id="Customers" name="Clients"/>
   <tab id="Orders" name="Commandes"/>
@@ -7,96 +13,90 @@
   <tab id="Shipping" name="Transport"/>
   <tab id="Stats" name="Stats"/>
   <tab id="Modules" name="Modules"/>
+  <tab id="Employees" name="Employ&#xE9;s"/>
   <tab id="Preferences" name="Pr&#xE9;f&#xE9;rences"/>
   <tab id="Tools" name="Outils"/>
+  <tab id="Shops" name="Boutiques"/>
+  <tab id="Stock" name="Stock"/>
+  <tab id="Accounting" name="Comptabilit&#xE9;"/>
+  <tab id="Products" name="Produits"/>
+  <tab id="Categories" name="Cat&#xE9;gories"/>
+  <tab id="Monitoring" name="Suivi"/>
   <tab id="Manufacturers" name="Marques"/>
+  <tab id="Suppliers" name="Fournisseurs"/>
   <tab id="Attributes_and_Groups" name="Attributs et groupes"/>
+  <tab id="Features" name="Caract&#xE9;ristiques"/>
+  <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
+  <tab id="Tags" name="Tags"/>
+  <tab id="Attachments" name="Documents joints"/>
+  <tab id="Catalog_price_rules" name="R&#xE8;gles de prix catalogue"/>
   <tab id="Addresses" name="Adresses"/>
+  <tab id="Groups" name="Groupes"/>
+  <tab id="Shopping_Carts" name="Paniers"/>
+  <tab id="Genders" name="Genres"/>
+  <tab id="Outstanding" name="Encours"/>
+  <tab id="Invoices" name="Factures"/>
+  <tab id="Delivery_Slips" name="Bons de livraison"/>
+  <tab id="Merchandise_Returns" name="Retours produits"/>
+  <tab id="Credit_Slips" name="Avoirs"/>
   <tab id="Statuses" name="Statuts"/>
-  <tab id="Cart_Rules" name="R&#xE8;gles paniers"/>
+  <tab id="Order_Messages" name="Messages pr&#xE9;d&#xE9;finis"/>
+  <tab id="PDF" name="PDF"/>
   <tab id="Currencies" name="Devises"/>
   <tab id="Taxes" name="Taxes"/>
+  <tab id="Tax_Rules" name="R&#xE8;gles de taxes"/>
+  <tab id="Cart_Rules" name="R&#xE8;gles paniers"/>
   <tab id="Carriers" name="Transporteurs"/>
+  <tab id="States" name="Etats"/>
   <tab id="Countries" name="Pays"/>
   <tab id="Zones" name="Zones"/>
   <tab id="Price_Ranges" name="Tranches de prix"/>
   <tab id="Weight_Ranges" name="Tranches de poids"/>
-  <tab id="Positions" name="Positions"/>
-  <tab id="Database" name="Base de donn&#xE9;es"/>
-  <tab id="E-mail" name="Emails"/>
-  <tab id="Images" name="Images"/>
-  <tab id="Products" name="Produits"/>
-  <tab id="Contacts" name="Contacts"/>
-  <tab id="tab_29" name="Employ&#xE9;s"/>
-  <tab id="Profiles" name="Profils"/>
-  <tab id="Permissions" name="Permissions"/>
-  <tab id="Languages" name="Langues"/>
-  <tab id="Translations" name="Traductions"/>
-  <tab id="Suppliers" name="Fournisseurs"/>
-  <tab id="Tabs" name="Onglets"/>
-  <tab id="Features" name="Caract&#xE9;ristiques"/>
-  <tab id="Quick_Access" name="Acc&#xE8;s rapide"/>
-  <tab id="Themes" name="Th&#xE8;mes"/>
-  <tab id="Contact_Information" name="Coordonn&#xE9;es"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="CSV_Import" name="Import"/>
-  <tab id="Invoices" name="Factures"/>
-  <tab id="Search" name="Recherche"/>
-  <tab id="Localization" name="Localisation"/>
-  <tab id="States" name="Etats"/>
-  <tab id="Merchandise_Returns" name="Retours produits"/>
-  <tab id="PDF" name="PDF"/>
-  <tab id="Credit_Slips" name="Avoirs"/>
-  <tab id="Subdomains" name="Sous domaines"/>
-  <tab id="DB_Backup" name="Sauvegarde BDD"/>
-  <tab id="Order_Messages" name="Messages pr&#xE9;d&#xE9;finis"/>
-  <tab id="Delivery_Slips" name="Bons de livraison"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Image_Mapping" name="Sc&#xE8;nes"/>
-  <tab id="Monitoring" name="Suivi"/>
   <tab id="Search_Engines" name="Moteurs de recherche"/>
   <tab id="Referrers" name="Sites affluents"/>
-  <tab id="Groups" name="Groupes"/>
-  <tab id="Generators" name="G&#xE9;n&#xE9;rateurs"/>
-  <tab id="Shopping_Carts" name="Paniers"/>
-  <tab id="Tags" name="Tags"/>
-  <tab id="Search_1" name="Recherche"/>
-  <tab id="Attachments" name="Documents joints"/>
-  <tab id="Configuration_Information" name="Informations"/>
-  <tab id="Performance" name="Performances"/>
-  <tab id="Customer_Service" name="SAV"/>
-  <tab id="Webservice" name="Service web"/>
-  <tab id="Stock_Movement" name="Mouvements de Stock"/>
   <tab id="Modules_Themes_Catalog" name="Catalogue de modules et th&#xE8;mes"/>
   <tab id="My_Account" name="Mon compte"/>
-  <tab id="Stores" name="Magasins"/>
+  <tab id="Themes" name="Th&#xE8;mes"/>
+  <tab id="Positions" name="Positions"/>
+  <tab id="Contact_Information" name="Coordonn&#xE9;es"/>
   <tab id="Themes_1" name="Th&#xE8;mes"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Products_1" name="Produits"/>
+  <tab id="Keyword_Typos" name="Alias"/>
+  <tab id="E-mail" name="Emails"/>
+  <tab id="Images" name="Images"/>
+  <tab id="Database" name="Base de donn&#xE9;es"/>
+  <tab id="Localization" name="Localisation"/>
+  <tab id="Search_1" name="Recherche"/>
+  <tab id="Performance" name="Performances"/>
   <tab id="Geolocation" name="G&#xE9;olocalisation"/>
-  <tab id="Tax_Rules" name="R&#xE8;gles de taxes"/>
+  <tab id="Languages" name="Langues"/>
+  <tab id="Translations" name="Traductions"/>
+  <tab id="Quick_Access" name="Acc&#xE8;s rapide"/>
+  <tab id="Configuration_Information" name="Informations"/>
+  <tab id="CSV_Import" name="Import"/>
+  <tab id="Subdomains" name="Sous domaines"/>
+  <tab id="DB_Backup" name="Sauvegarde BDD"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Generators" name="G&#xE9;n&#xE9;rateurs"/>
+  <tab id="Stores" name="Magasins"/>
+  <tab id="Webservice" name="Service web"/>
   <tab id="Logs" name="Log"/>
-  <tab id="Home" name="Accueil"/>
-  <tab id="Shops" name="Boutiques"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Profiles" name="Profils"/>
+  <tab id="Permissions" name="Permissions"/>
+  <tab id="Contacts" name="Contacts"/>
+  <tab id="Tabs" name="Onglets"/>
+  <tab id="Customer_Service" name="SAV"/>
   <tab id="Group_Shops" name="Groupes de boutique"/>
   <tab id="Shop_Urls" name="URLs de boutique"/>
-  <tab id="Genders" name="Genres"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Products_1" name="Produits"/>
-  <tab id="Categories" name="Cat&#xE9;gories"/>
-  <tab id="tab_95" name="Stock"/>
   <tab id="Warehouses" name="Entrep&#xF4;ts"/>
   <tab id="Stock_Management" name="Gestion du stock"/>
+  <tab id="Stock_Movement" name="Mouvements de Stock"/>
   <tab id="Stock_instant_state" name="Etat instantan&#xE9; du stock"/>
   <tab id="Stock_cover" name="Couverture du stock"/>
   <tab id="Supply_orders" name="Commandes fournisseurs"/>
-  <tab id="Combinations_generator" name="G&#xE9;n&#xE9;rateur de d&#xE9;clinaisons"/>
-  <tab id="Accounting" name="Comptabilit&#xE9;"/>
+  <tab id="Configuration" name="Configuration"/>
   <tab id="Account_Number_Management" name="Gestion des num&#xE9;ros de comptes"/>
   <tab id="Export" name="Export"/>
-  <tab id="CMS_categories" name="Cat&#xE9;gories CMS"/>
-  <tab id="CMS_pages" name="Pages CMS"/>
-  <tab id="tab_107" name=""/>
-  <tab id="Configuration" name="Configuration"/>
-  <tab id="Catalog_price_rules" name="R&#xE8;gles de prix catalogue"/>
-  <tab id="Outstanding" name="Encours"/>
 </entity_tab>
diff --git a/install-new/langs/it/data/tab.xml b/install-new/langs/it/data/tab.xml
index 8eb180be7..6e294156f 100644
--- a/install-new/langs/it/data/tab.xml
+++ b/install-new/langs/it/data/tab.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0"?>
 <entity_tab>
+  <tab id="Home" name="Home"/>
+  <tab id="tab_107" name=""/>
+  <tab id="CMS_pages" name="CMS pages"/>
+  <tab id="CMS_categories" name="CMS categories"/>
+  <tab id="Combinations_generator" name="Combinations generator"/>
+  <tab id="Search" name="Cerca"/>
   <tab id="Catalog" name="Catalogo"/>
   <tab id="Customers" name="Clienti"/>
   <tab id="Orders" name="Ordini"/>
@@ -7,96 +13,90 @@
   <tab id="Shipping" name="Spedizione"/>
   <tab id="Stats" name="Stat"/>
   <tab id="Modules" name="Moduli"/>
+  <tab id="Employees" name="Impiegati"/>
   <tab id="Preferences" name="Preferenze"/>
   <tab id="Tools" name="Strumenti"/>
+  <tab id="Shops" name="Shops"/>
+  <tab id="Stock" name="Stock"/>
+  <tab id="Accounting" name="Accounting"/>
+  <tab id="Products" name="Products"/>
+  <tab id="Categories" name="Categories"/>
+  <tab id="Monitoring" name="Rintracciare"/>
   <tab id="Manufacturers" name="Produttori"/>
+  <tab id="Suppliers" name="Fornitori"/>
   <tab id="Attributes_and_Groups" name="Attributi e Gruppi"/>
+  <tab id="Features" name="Caratteristiche"/>
+  <tab id="Image_Mapping" name="Mappatura immagine"/>
+  <tab id="Tags" name="Tag"/>
+  <tab id="Attachments" name="Allegati"/>
+  <tab id="Catalog_price_rules" name="Catalog price rules"/>
   <tab id="Addresses" name="Indirizzi"/>
+  <tab id="Groups" name="Gruppi"/>
+  <tab id="Shopping_Carts" name="Carrelli shopping"/>
+  <tab id="Genders" name="Genders"/>
+  <tab id="Outstanding" name="Outstanding"/>
+  <tab id="Invoices" name="Fatture"/>
+  <tab id="Delivery_Slips" name="Note di consegna"/>
+  <tab id="Merchandise_Returns" name="Resi merci"/>
+  <tab id="Credit_Slips" name="Note di credito"/>
   <tab id="Statuses" name="Status"/>
-  <tab id="Cart_Rules" name="Voucher"/>
+  <tab id="Order_Messages" name="Messaggi ordine"/>
+  <tab id="PDF" name="PDF"/>
   <tab id="Currencies" name="Valute"/>
   <tab id="Taxes" name="Tasse"/>
+  <tab id="Tax_Rules" name="Regimi fiscali"/>
+  <tab id="Cart_Rules" name="Voucher"/>
   <tab id="Carriers" name="Corrieri"/>
+  <tab id="States" name="Stati"/>
   <tab id="Countries" name="Nazioni"/>
   <tab id="Zones" name="Zone"/>
   <tab id="Price_Ranges" name="Fasce di prezzo"/>
   <tab id="Weight_Ranges" name="Fasce di peso"/>
-  <tab id="Positions" name="Posizioni"/>
-  <tab id="Database" name="Database"/>
-  <tab id="E-mail" name="E-mail"/>
-  <tab id="Images" name="Immagine"/>
-  <tab id="Products" name="Prodotti"/>
-  <tab id="Contacts" name="Contatti"/>
-  <tab id="tab_29" name="Impiegati"/>
-  <tab id="Profiles" name="Profili"/>
-  <tab id="Permissions" name="Permessi"/>
-  <tab id="Languages" name="Lingue"/>
-  <tab id="Translations" name="Traduzioni"/>
-  <tab id="Suppliers" name="Fornitori"/>
-  <tab id="Tabs" name="Tab"/>
-  <tab id="Features" name="Caratteristiche"/>
-  <tab id="Quick_Access" name="Accesso rapido"/>
-  <tab id="Themes" name="Temi"/>
-  <tab id="Contact_Information" name="Informazioni di contatto"/>
-  <tab id="Keyword_Typos" name="Alias"/>
-  <tab id="CSV_Import" name="Importa"/>
-  <tab id="Invoices" name="Fatture"/>
-  <tab id="Search" name="Cerca"/>
-  <tab id="Localization" name="Localizzazione"/>
-  <tab id="States" name="Stati"/>
-  <tab id="Merchandise_Returns" name="Resi merci"/>
-  <tab id="PDF" name="PDF"/>
-  <tab id="Credit_Slips" name="Note di credito"/>
-  <tab id="Subdomains" name="Sottodomini"/>
-  <tab id="DB_Backup" name="DB backup"/>
-  <tab id="Order_Messages" name="Messaggi ordine"/>
-  <tab id="Delivery_Slips" name="Note di consegna"/>
-  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
-  <tab id="CMS" name="CMS"/>
-  <tab id="Image_Mapping" name="Mappatura immagine"/>
-  <tab id="Monitoring" name="Rintracciare"/>
   <tab id="Search_Engines" name="Motori di ricerca"/>
   <tab id="Referrers" name="Referenti"/>
-  <tab id="Groups" name="Gruppi"/>
-  <tab id="Generators" name="Generatori"/>
-  <tab id="Shopping_Carts" name="Carrelli shopping"/>
-  <tab id="Tags" name="Tag"/>
-  <tab id="Search_1" name="Cerca"/>
-  <tab id="Attachments" name="Allegati"/>
-  <tab id="Configuration_Information" name="Informazioni di configurazione"/>
-  <tab id="Performance" name="Performance"/>
-  <tab id="Customer_Service" name="Servizio clienti"/>
-  <tab id="Webservice" name="Webservice"/>
-  <tab id="Stock_Movement" name="Movimenti magazzino"/>
   <tab id="Modules_Themes_Catalog" name="Moduli &amp; Temi catalogo"/>
   <tab id="My_Account" name="Il mio Account"/>
-  <tab id="Stores" name="Negozi"/>
+  <tab id="Themes" name="Temi"/>
+  <tab id="Positions" name="Posizioni"/>
+  <tab id="Contact_Information" name="Informazioni di contatto"/>
   <tab id="Themes_1" name="Temi"/>
+  <tab id="SEO_URLs" name="SEO &amp; URLs"/>
+  <tab id="Products_1" name="Prodotti"/>
+  <tab id="Keyword_Typos" name="Alias"/>
+  <tab id="E-mail" name="E-mail"/>
+  <tab id="Images" name="Immagine"/>
+  <tab id="Database" name="Database"/>
+  <tab id="Localization" name="Localizzazione"/>
+  <tab id="Search_1" name="Cerca"/>
+  <tab id="Performance" name="Performance"/>
   <tab id="Geolocation" name="Geolocalizzazione"/>
-  <tab id="Tax_Rules" name="Regimi fiscali"/>
+  <tab id="Languages" name="Lingue"/>
+  <tab id="Translations" name="Traduzioni"/>
+  <tab id="Quick_Access" name="Accesso rapido"/>
+  <tab id="Configuration_Information" name="Informazioni di configurazione"/>
+  <tab id="CSV_Import" name="Importa"/>
+  <tab id="Subdomains" name="Sottodomini"/>
+  <tab id="DB_Backup" name="DB backup"/>
+  <tab id="CMS" name="CMS"/>
+  <tab id="Generators" name="Generatori"/>
+  <tab id="Stores" name="Negozi"/>
+  <tab id="Webservice" name="Webservice"/>
   <tab id="Logs" name="Log"/>
-  <tab id="Home" name="Home"/>
-  <tab id="Shops" name="Shops"/>
+  <tab id="SQL_Manager" name="SQL Manager"/>
+  <tab id="Profiles" name="Profili"/>
+  <tab id="Permissions" name="Permessi"/>
+  <tab id="Contacts" name="Contatti"/>
+  <tab id="Tabs" name="Tab"/>
+  <tab id="Customer_Service" name="Servizio clienti"/>
   <tab id="Group_Shops" name="Group Shops"/>
   <tab id="Shop_Urls" name="Shop Urls"/>
-  <tab id="Genders" name="Genders"/>
-  <tab id="SQL_Manager" name="SQL Manager"/>
-  <tab id="Products_1" name="Products"/>
-  <tab id="Categories" name="Categories"/>
-  <tab id="tab_95" name="Stock"/>
   <tab id="Warehouses" name="Warehouses"/>
   <tab id="Stock_Management" name="Stock Management"/>
+  <tab id="Stock_Movement" name="Movimenti magazzino"/>
   <tab id="Stock_instant_state" name="Stock instant state"/>
   <tab id="Stock_cover" name="Stock cover"/>
   <tab id="Supply_orders" name="Supply orders"/>
-  <tab id="Combinations_generator" name="Combinations generator"/>
-  <tab id="Accounting" name="Accounting"/>
+  <tab id="Configuration" name="Configuration"/>
   <tab id="Account_Number_Management" name="Account Number Management"/>
   <tab id="Export" name="Export"/>
-  <tab id="CMS_categories" name="CMS categories"/>
-  <tab id="CMS_pages" name="CMS pages"/>
-  <tab id="tab_107" name=""/>
-  <tab id="Configuration" name="Configuration"/>
-  <tab id="Catalog_price_rules" name="Catalog price rules"/>
-  <tab id="Outstanding" name="Outstanding"/>
 </entity_tab>