diff --git a/debian/changelog b/debian/changelog
index abcb1250..6024da4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 hedera-web (1.245-deb8) stable; urgency=low
+=======
+hedera-web (1.324-deb8) stable; urgency=low
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 
   * Initial Release.
 
diff --git a/debian/conf/config.php b/debian/conf/config.php
index b59b22a8..1ee3ec59 100755
--- a/debian/conf/config.php
+++ b/debian/conf/config.php
@@ -1,6 +1,17 @@
 <?php
 /**
  * Configuration file. Be careful to respect the PHP syntax.
+ *
+ * Do not modify this file! Instead, copy it to config.my.php and make your
+ * your changes there.
+ * 
+ * Also, you can use a different config file depending on the virtual host. To
+ * do it, you have to create another configuration file and rename it to
+ * config.[subdomain].php. If no configutation file is found for a certain 
+ * domain, the main file will be used. Ej:
+ *
+ *  - http://www.mydomain.org -> config.www.php
+ *  - http://test.mydomain.org -> config.test.php
  **/
 $conf = [
 
@@ -9,16 +20,12 @@ $conf = [
  **/
 'db' => [
 	 'host'   => 'db.verdnatura.es'
+	,'port'   => 3306
 	,'schema' => 'hedera-web'
 	,'user'   => 'hedera-web'
 	,'pass'   => 'base64pass'
 ]
 
-/**
- * The default language.
- **/
-,'defaultLang' => 'es'
-
 ];
 
 ?>
diff --git a/debian/control b/debian/control
index 94a0fe73..a5e5a93b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: git://www.verdnatura.es/var/git/hedera-web
 
 Package: hedera-web
 Architecture: all
-Depends: apache2, php5-mysql, php-vn-web
+Depends: apache2, php5-mysql, php5-mcrypt, php-vn-web
 Suggests: php-text-captcha, php5-imap, vn-image, tinymce
 Section: misc
 Priority: optional
diff --git a/lib/vn/hedera/init.php b/lib/vn/hedera/init.php
index cddca06c..7706960c 100644
--- a/lib/vn/hedera/init.php
+++ b/lib/vn/hedera/init.php
@@ -8,7 +8,7 @@ if (!defined (__NAMESPACE__.'\_DEVELOPER_MODE'))
 	define (__NAMESPACE__.'\_LOG_DIR', '/var/log');
 }
 
-require_once (_CONFIG_DIR .'/config.php');
+$conf = NULL;
 
 ini_set ('log_errors', TRUE);
 ini_set ('error_log', 'syslog');
diff --git a/lib/vn/hedera/js.php b/lib/vn/hedera/js.php
index adcd2fc3..df3d5963 100755
--- a/lib/vn/hedera/js.php
+++ b/lib/vn/hedera/js.php
@@ -10,7 +10,7 @@ class Js
 
 	static function includeFile ($fileName)
 	{
-		echo '<script type="text/javascript" src="'.$fileName.'?'. Web::getVersion () .'"></script>'."\n\t";
+		echo '<script type="text/javascript" src="'.$fileName.'?'. Web::getVersion () .'"></script>'."\n\t\t";
 	}
 
 	static function includeLib ($libName)
@@ -28,7 +28,7 @@ class Js
 
 	static function includeCss ($fileName)
 	{
-		echo '<link rel="stylesheet" type="text/css" href="'.$fileName.'?'. Web::getVersion () .'"/>'."\n\t";
+		echo '<link rel="stylesheet" type="text/css" href="'.$fileName.'?'. Web::getVersion () .'"/>'."\n\t\t";
 	}
 	
 	static function isMobile ()
diff --git a/lib/vn/hedera/web.php b/lib/vn/hedera/web.php
index 9b5b72b2..235d34e7 100755
--- a/lib/vn/hedera/web.php
+++ b/lib/vn/hedera/web.php
@@ -16,12 +16,13 @@ class Web
 {
 	static $sysConn = NULL;
 	static $conn = NULL;
+	static $confIncluded = FALSE;
 
 	/**
 	 * Initializes the Hedera web library.
 	 **/
 	static function init ()
-	{
+	{	
 		if (self::isHttps ())
 			ini_set ('session.cookie_secure', TRUE);
 	
@@ -83,6 +84,8 @@ class Web
 	{
 		global $conf;
 
+		self::includeConf ();
+
 		if (self::$sysConn)
 			return;
 	
@@ -109,16 +112,49 @@ class Web
 		return (int) filectime (__FILE__);
 	}
 
+	/**
+	 * Includes the configuration file.
+	 **/
+	static function includeConf ()
+	{
+		global $conf;
+
+		if (self::$confIncluded)
+			return;
+
+		$customFile = _CONFIG_DIR .'/config.my.php';
+
+		if (!empty ($_SERVER['SERVER_NAME'])
+		&& preg_match ('/^[\w\-\.]+$/', $_SERVER['SERVER_NAME']))
+		{
+			$hostSplit = explode ('.', $_SERVER['SERVER_NAME']);
+			$hostFile = _CONFIG_DIR .'/config.'. $hostSplit[0] .'.php';
+		}
+
+		if (isset ($hostFile) && file_exists ($hostFile))
+			$confFile = $hostFile;
+		elseif (file_exists ($customFile))
+			$confFile = $customFile;
+		else
+			$confFile = _CONFIG_DIR .'/config.php';
+			
+		require ($confFile);
+		self::$confIncluded = TRUE;
+	}
+
 	static function login ()
 	{
 		global $conf;
+
+		self::includeConf ();
 	
 		$wasLoged = Auth::isLogged ();
 		$useCookies = TRUE;
 		$success = TRUE;
 		
-		if (isset ($_GET['guest']))
+		if (isset ($_POST['guest']))
 		{
+			self::sysInit ();
 			$row = self::$sysConn->getRow (
 				'SELECT guest_user, guest_pass FROM config');
 
@@ -130,9 +166,9 @@ class Web
 			}
 		}
 
-		try {
-			Auth::getCredentials ();
+		Auth::getCredentials ();
 
+		try {
 			self::$conn = new Conn ();
 			self::$conn->open (
 				 $conf['db']['host']
@@ -141,20 +177,20 @@ class Web
 				,$conf['db']['schema']
 				,$conf['db']['port']
 			);
-			self::$conn->query ('CALL user_session_start (#)',
-				[session_id ()]);
+			self::$conn->query ('CALL user_session_start (#)', [session_id ()]);
+			self::$conn->query ('SET @lang = #', [\Vn\Lib\Locale::get ()]);
 
-			Auth::login ($useCookies);
+			Auth::login (TRUE, $useCookies);
 		}
 		catch (\Exception $e)
 		{
 			self::$conn = NULL;
-			$success = FALSE;
+			Auth::login (FALSE);
 		}
 
 		// Registering the user access
 
-		if ($success && !$wasLoged)
+		if (!$wasLoged)
 			unset ($_SESSION['visitUser']);
 
 		if (isset ($_SESSION['access'])
@@ -170,12 +206,10 @@ class Web
 					,session_id ()
 				]
 			);
-		
+	
 			if (!isset ($_SESSION['visitUnknown']) && !$success)
 				$_SESSION['visitUnknown'] = $_SESSION['visitUser'];
 		}
-
-		return $success;
 	}
 
 	static function deinit ()
diff --git a/lib/vn/tpv/tpv.php b/lib/vn/tpv/tpv.php
index 7f29a495..40564149 100755
--- a/lib/vn/tpv/tpv.php
+++ b/lib/vn/tpv/tpv.php
@@ -18,6 +18,8 @@ class Tpv
 	static function init ()
 	{
 		global $conf;
+		
+		require (Hedera\_CONFIG_DIR .'/config.my.php');
 
 		openlog ('hedera-web', LOG_ODELAY, LOG_LOCAL0);
 
@@ -27,6 +29,7 @@ class Tpv
 			,$conf['db']['user']
 			,base64_decode ($conf['db']['pass'])
 			,$conf['db']['schema']
+			,$conf['db']['port']
 		);
 	}
 
@@ -81,7 +84,7 @@ class Tpv
 				$params = [];
 				$body = imap_fetchbody ($imap, $msg, '1');
 				$strings = explode (';', $body);
-		
+
 				foreach ($strings as $string)
 				{
 					$x = explode (':', $string);
@@ -98,18 +101,18 @@ class Tpv
 					$folder = $imapConf['success_folder'];
 				else
 					$folder = $imapConf['error_folder'];				
-		
+	
 				$folder = sprintf ('INBOX.%s', $folder);
 
 				if (!imap_mail_move ($imap, $msg, $folder))
-					error_log ('TPV: IMAP: Can\'t move message to %s: %s'
+					trigger_error (sprintf ('TPV: IMAP: Can\'t move message to %s: %s'
 						,$folder
 						,imap_last_error ()
-					);
+					), E_USER_WARNING);
 			}
 	
 			if ($inbox && ($count = count ($inbox)) > 0)
-				error_log ('TPV: %d mails processed.', $count);
+				trigger_error (sprintf ('TPV: %d mails processed.', $count));
 
 			imap_expunge ($imap);
 	
@@ -138,13 +141,13 @@ class Tpv
 					$deleted += count ($messages);
 				}
 		
-				error_log ('TPV: Cleaner: %d mails deleted.', $deleted);
+				trigger_error (sprintf ('TPV: Cleaner: %d mails deleted.', $deleted));
 			}
 
 			imap_close ($imap);
 		}
 		else
-			error_log ('TPV: IMAP: %s', imap_last_error ());
+			trigger_error (sprintf ('TPV: IMAP: %s', imap_last_error ()), E_USER_ERROR);
 
 		self::deinit ();
 	}
@@ -183,36 +186,73 @@ class Tpv
 		&& isset ($params['Ds_Order'])
 		&& isset ($params['Ds_MerchantCode'])
 		&& isset ($params['Ds_Currency'])
-		&& isset ($params['Ds_Response'])
-		&& isset ($params['Ds_Signature']))
+		&& isset ($params['Ds_Response']))
 		{
 			if (isset ($params['Ds_ErrorCode']))
 				$error = $params['Ds_ErrorCode'];
 			else
 				$error = NULL;
 
-			try {
+			try {			
 				return self::$conn->query (
-					'CALL transaction_confirm_with_check (#, #, #, #, #, #, #)',
+					'CALL transaction_confirm (#, #, #, #, #, #)',
 					[
 						 $params['Ds_Amount']
 						,$params['Ds_Order']
 						,$params['Ds_MerchantCode']
 						,$params['Ds_Currency']
 						,$params['Ds_Response']
-						,$params['Ds_Signature']
 						,$error
 					]
 				);
 			}
 			catch (\Exception $e)
 			{
-				error_log ("TPV: DB: %s", $e->getMessage ()); 
+				trigger_error (sprintf ("TPV: DB: %s", $e->getMessage ()), E_USER_WARNING); 
 			}
 		}
 		
 		return FALSE;
 	}
+	
+	static function transactionStart ($conn, $amount, $urlOk, $urlKo, $companyId, &$url, &$signature)
+	{
+		$row = $conn->getRow ('CALL transaction_start_sha256 (#, #)',
+			[$amount, $companyId]);
+		
+		if (!isset($row))
+			throw new Exception ('Transaction error');
+			
+		$transactionId = str_pad ($row['transaction_id'], 12, '0', STR_PAD_LEFT);
+		$urlOk = empty ($urlOk) ? '' : sprintf ($urlOk, $transactionId);
+		$urlKo = empty ($urlKo) ? '' : sprintf ($urlKo, $transactionId);
+		$merchantUrl = $row['merchant_url'] ? $row['merchant_url'] : '';
+		
+		$params = [
+			 'Ds_Merchant_Amount'            => $amount
+			,'Ds_Merchant_Order'             => $transactionId
+			,'Ds_Merchant_MerchantCode'      => $row['merchant']
+			,'Ds_Merchant_Currency'          => $row['currency']
+			,'Ds_Merchant_TransactionType'   => $row['transaction_type']
+			,'Ds_Merchant_Terminal'          => $row['terminal']
+			,'Ds_Merchant_MerchantURL'       => $merchantUrl
+			,'Ds_Merchant_UrlOK'             => $urlOk
+			,'Ds_Merchant_UrlKO'             => $urlKo
+		];
+		
+		$encodedParams = base64_encode (json_encode ($params));
+		
+		$key = base64_decode ($row['secret_key']);
+		
+		$bytes = array (0, 0, 0, 0, 0, 0, 0, 0);
+		$iv = implode (array_map ("chr", $bytes));
+		$key = mcrypt_encrypt (MCRYPT_3DES, $key, $transactionId, MCRYPT_MODE_CBC, $iv);
+		
+		$signature = base64_encode (hash_hmac ('sha256', $encodedParams, $key, TRUE));
+		$url = $row['url'];
+		
+		return $encodedParams;
+	}
 
 	/**
 	 * Tests the confirmation process. The corresponding record
diff --git a/php-test b/php-test
new file mode 100755
index 00000000..4900d9db
--- /dev/null
+++ b/php-test
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php -d auto_prepend_file=configure.php "$@"
diff --git a/web/forms/account/address-list/address-list.js b/web/forms/account/address-list/address-list.js
index 7e602c3f..57141a56 100755
--- a/web/forms/account/address-list/address-list.js
+++ b/web/forms/account/address-list/address-list.js
@@ -1,7 +1,7 @@
 
 Vn.AddressList = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
diff --git a/web/forms/account/address-list/style.css b/web/forms/account/address-list/style.css
index c3fba906..8bd9a259 100755
--- a/web/forms/account/address-list/style.css
+++ b/web/forms/account/address-list/style.css
@@ -5,7 +5,7 @@
 }
 .address-list .box
 {
-	max-width: 40em;
+	max-width: 30em;
 }
 .address-list .form
 {
@@ -15,19 +15,34 @@
 }
 .address
 {
-	color: #555;
-	padding: .5em;
-}
-.address p.consignee
-{
-	font-weight: bold;
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
 }
 .address p
 {
-	font-size: 1.4em;
 	margin: 0.2em 0;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+.address p.important
+{
+	font-size: 1.2em;
 }
 .address .actions
 {
-	text-align: right;
+	float: right;
+}
+.address .actions > .htk-button
+{
+	margin: 0;
+}
+.address .actions > *
+{
+	display: inline-block;
+	vertical-align: middle;
+}
+.address .actions > input
+{
+	margin: .6em;
 }
diff --git a/web/forms/account/address-list/ui.xml b/web/forms/account/address-list/ui.xml
index 033c2c0a..1fed18e4 100755
--- a/web/forms/account/address-list/ui.xml
+++ b/web/forms/account/address-list/ui.xml
@@ -1,76 +1,75 @@
 <vn>
 <vn-group>
 	<db-form id="user-form">
-		<db-model id="user-model" updatable="true">
-			SELECT user_id, default_address
-				FROM customer_view c
+		<db-model property="model" id="user-model" updatable="true">
+			<custom>
+				SELECT user_id, default_address
+					FROM customer_view c
+			</custom>
 		</db-model>
 	</db-form>
 	<db-model id="addresses" updatable="true">
-		SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
-			FROM address_view a
-			LEFT JOIN vn2008.province p ON a.province_id = p.province_id
-			JOIN vn2008.Paises c ON c.Id = p.Paises_Id
-				WHERE active != FALSE
+		<custom>
+			SELECT a.id, a.consignee, p.name province, a.zip_code,
+			a.city, a.name, a.active, c.Pais country
+				FROM address_view a
+				LEFT JOIN vn2008.province p ON a.province_id = p.province_id
+				JOIN vn2008.Paises c ON c.Id = p.Paises_Id
+					WHERE active != FALSE
+		</custom>
 	</db-model>
 </vn-group>
+<div id="title">
+	<h1><t>Addresses</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/add.svg"
+		tip="_AddAddress"
+		on-click="onAddAddressClick"
+		showText="true"/>
+</div>
 <div id="form" class="address-list">
 	<div class="box">
-		<div class="header">
-			<h1><t>Addresses</t></h1>
-			<div class="action-bar">
-				<button on-click="onReturnClick">
-					<img src="image/dark/go-previous.svg" alt=""/>
-					<t>Return</t>
-				</button>
-				<button on-click="onAddAddressClick">
-					<img src="image/dark/add.svg" alt=""/>
-					<t>AddAddress</t>
-				</button>
+		<htk-radio-group
+			id="default-address"
+			column="default_address"
+			form="user-form"/>
+		<htk-repeater model="addresses" form-id="iter">
+			<custom>
+			<div class="address">
+				<div class="actions">
+					<htk-radio
+						form="iter"
+						column="id"
+						radio-group="default-address"
+						tip="_SetAsDefault"/>
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_RemoveAddress"
+						image="image/delete.svg"
+						on-click="onRemoveAddressClick"/>
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_EditAddress"
+						image="image/edit.svg"
+						on-click="onEditAddressClick"/>
+				</div>
+				<p class="important">
+					<htk-text form="iter" column="consignee"/>
+				</p>
+				<p>
+					<htk-text form="iter" column="name"/>
+				</p>
+				<p>
+					<htk-text form="iter" column="zip_code"/>, 
+					<htk-text form="iter" column="city"/>
+				</p>
 			</div>
-			<div class="clear"/>
-		</div>
-		<div class="form">
-			<htk-radio-group
-				id="default-address"
-				column="default_address"
-				form="user-form"/>
-			<htk-repeater model="addresses" form-id="iter">
-				<template>
-					<div class="address">
-						<p class="consignee">
-							<htk-text form="iter" column="consignee"/>
-						</p>
-						<p>
-							<htk-text form="iter" column="name"/>
-						</p>
-						<p>
-							<htk-text form="iter" column="zip_code"/>, 
-							<htk-text form="iter" column="city"/>
-						</p>
-						<div class="actions">
-							<htk-radio
-								form="iter"
-								column="id"
-								radio-group="default-address"
-								tip="_SetAsDefault"/>
-							<htk-button
-								form="iter"
-								column="id"
-								tip="_RemoveAddress"
-								image="image/delete.svg"
-								on-click="onRemoveAddressClick"/>
-							<htk-button
-								form="iter"
-								column="id"
-								tip="_EditAddress"
-								image="image/edit.svg"
-								on-click="onEditAddressClick"/>
-						</div>
-					</div>
-				</template>
-			</htk-repeater>
-		</div>
+			</custom>
+		</htk-repeater>
 	</div>
 </div>
 </vn>
diff --git a/web/forms/account/address/address.js b/web/forms/account/address/address.js
index c9ad6d9e..aca0a781 100755
--- a/web/forms/account/address/address.js
+++ b/web/forms/account/address/address.js
@@ -1,7 +1,7 @@
 
 Vn.Address = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
diff --git a/web/forms/account/address/style.css b/web/forms/account/address/style.css
index f26a2151..6b4daad6 100755
--- a/web/forms/account/address/style.css
+++ b/web/forms/account/address/style.css
@@ -5,27 +5,16 @@
 }
 .address .box
 {
-	max-width: 40em;
+	max-width: 30em;
+	padding: 2em;
 }
-.address .box .body
+.address .form
 {
 	margin: 0 auto;
 	max-width: 25em;
-	padding: 3em;
 }
-div.form-group
+.address .form-group
 {
 	padding: 0.4em;
 }
-.address label
-{
-	display: block;
-	margin-bottom: 0.5em;
-}
-.address input,
-.address select
-{
-	margin: 0;
-	width: 100%;
-}
 
diff --git a/web/forms/account/address/ui.xml b/web/forms/account/address/ui.xml
index 89c4076b..c8a7f77d 100755
--- a/web/forms/account/address/ui.xml
+++ b/web/forms/account/address/ui.xml
@@ -1,38 +1,47 @@
 <vn>
 <vn-group>
-	<vn-param id="address">
-		<vn-hash-param key="address"/>
-	</vn-param>
+	<vn-param id="address"/>
+	<vn-hash-param key="address" param="address"/>
 	<db-form id="iter" on-status-changed="onStatusChange">
-		<db-param id="country" one-way="true" column="country_id"/>
-		<db-model id="model" updatable="true" mode="ON_DEMAND" on-operations-done="onOperationsDone">
-			SELECT a.id, a.name, a.consignee, a.city, a.zip_code, a.province_id, c.Id country_id
-				FROM address_view a
-				LEFT JOIN vn2008.province p ON p.province_id = a.province_id
-				JOIN vn2008.Paises c ON c.Id = p.Paises_Id
-					WHERE active != FALSE AND a.id = #address
+		<db-model
+		 	id="model"
+			property="model"
+			updatable="true"
+			mode="ON_DEMAND"
+			on-operations-done="onOperationsDone">
+			<custom>
+				SELECT a.id, a.name, a.consignee, a.city, a.zip_code, a.province_id, c.Id country_id
+					FROM address_view a
+					LEFT JOIN vn2008.province p ON p.province_id = a.province_id
+					JOIN vn2008.Paises c ON c.Id = p.Paises_Id
+						WHERE active != FALSE AND a.id = #address
+			</custom>
 			<sql-batch property="batch">
-				<item name="address" param="address"/>
+				<custom>
+					<item name="address" param="address"/>
+				</custom>
 			</sql-batch>
 		</db-model>
 	</db-form>
 </vn-group>
+<div id="title">
+	<h1><t>AddEditAddress</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/ok.svg"
+		tip="_Accept"
+		on-click="onAcceptClick"
+		showText="true"/>
+	<htk-button
+		image="image/dark/close.svg"
+		tip="_Return"
+		on-click="onReturnClick"
+		showText="true"/>
+</div>
 <div id="form" class="address">
 	<div class="box">
-		<div class="header">
-			<h1><t>AddEditAddress</t></h1>
-			<div class="action-bar">
-				<button on-click="onReturnClick">
-					<img src="image/dark/go-previous.svg" alt=""/>
-					<t>Return</t>
-				</button>
-				<button on-click="onAcceptClick">
-					<img src="image/dark/ok.svg" alt=""/>
-					<t>Accept</t>
-				</button>
-			</div>
-		</div>
-		<div class="body">
+		<div class="form">
 			<div class="form-group">
 				<label><t>Name</t></label>
 				<htk-entry column="consignee" form="iter"/>
@@ -51,10 +60,18 @@
 			</div>
 			<div class="form-group">
 				<label><t>Country</t></label>
-				<htk-combo param="country">
+				<htk-combo>
+					<db-param
+						id="country"
+						property="param"
+						form="iter"
+						column="country_id"
+						one-way="true"/>
 					<db-model property="model">
-						SELECT Id, Pais FROM vn2008.Paises
-							ORDER BY Pais
+						<custom>
+							SELECT Id, Pais FROM vn2008.Paises
+								ORDER BY Pais
+						</custom>
 					</db-model>
 				</htk-combo>
 			</div>
@@ -62,11 +79,15 @@
 				<label><t>Province</t></label>
 				<htk-combo column="province_id" form="iter">
 					<db-model property="model">
-						SELECT province_id, name FROM vn2008.province
-							WHERE Paises_Id = #country
-							ORDER BY name
+						<custom>
+							SELECT province_id, name FROM vn2008.province
+								WHERE Paises_Id = #country
+								ORDER BY name
+						</custom>
 						<sql-batch property="batch">
-							<item name="country" param="country"/>
+							<custom>
+								<item name="country" param="country"/>
+							</custom>
 						</sql-batch>
 					</db-model>
 				</htk-combo>
diff --git a/web/forms/account/conf/conf.js b/web/forms/account/conf/conf.js
index 3f89b752..440f12f3 100755
--- a/web/forms/account/conf/conf.js
+++ b/web/forms/account/conf/conf.js
@@ -1,7 +1,7 @@
 
 Vn.Conf = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
diff --git a/web/forms/account/conf/style.css b/web/forms/account/conf/style.css
index 73e95e6e..ece49089 100755
--- a/web/forms/account/conf/style.css
+++ b/web/forms/account/conf/style.css
@@ -5,29 +5,18 @@
 }
 .conf .box
 {
-	max-width: 40em;
+	max-width: 30em;
+	padding: 2em;
 }
 .conf .form
 {
 	margin: 0 auto;
 	max-width: 25em;
-	padding: 2em;
 }
 .conf .form-group
 {
 	padding: 0.4em;
 }
-.conf .form-group label
-{
-	display: block;
-	margin-bottom: 0.5em;
-}
-.conf .form-group input[type=text],
-.conf .form-group input[type=password]
-{
-	margin: 0;
-	width: 100%;
-}
 .conf .form-group input[type=password]
 {
 	margin-bottom: 0.5em;
diff --git a/web/forms/account/conf/ui.xml b/web/forms/account/conf/ui.xml
index 7fd48b11..6473c5ce 100755
--- a/web/forms/account/conf/ui.xml
+++ b/web/forms/account/conf/ui.xml
@@ -1,33 +1,37 @@
 <vn>
 <vn-group>
 	<db-form id="user-form">
-		<db-model id="user-model" updatable="true">
-			SELECT id, u.name, email, mail, c.user_id, c.default_address
-				FROM user_view u
-				LEFT JOIN customer_view c
-					ON u.id = c.user_id
+		<db-model property="model" id="user-model" updatable="true">
+			<custom>
+				SELECT id, u.name, email, mail, c.user_id, c.default_address
+					FROM user_view u
+					LEFT JOIN customer_view c
+						ON u.id = c.user_id
+			</custom>
 		</db-model>
 	</db-form>
 	<db-model id="addresses" updatable="true">
-		SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
-			FROM address_view a
-			LEFT JOIN vn2008.province p ON a.province_id = p.province_id
-			JOIN vn2008.Paises c ON c.Id = p.Paises_Id
-				WHERE active != FALSE
+		<custom>
+			SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
+				FROM address_view a
+				LEFT JOIN vn2008.province p ON a.province_id = p.province_id
+				JOIN vn2008.Paises c ON c.Id = p.Paises_Id
+					WHERE active != FALSE
+		</custom>
 	</db-model>
 </vn-group>
+<div id="title">
+	<h1><t>Configuration</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/place.svg"
+		tip="_Addresses"
+		on-click="onAddressesClick"
+		showText="true"/>
+</div>
 <div id="form" class="conf">
 	<div class="box">
-		<div class="header">
-			<h1><t>Configuration</t></h1>
-			<div class="action-bar">
-				<button on-click="onAddressesClick">
-					<img src="image/dark/shipping.svg" alt=""/>
-					<t>Addresses</t>
-				</button>
-			</div>
-			<div class="clear"/>
-		</div>
 		<div class="form">
 			<div class="form-group">
 				<label for="user-name"><t>UserName</t></label>
diff --git a/web/forms/admin/access-log/access-log.js b/web/forms/admin/access-log/access-log.js
index 108fc6cd..f226a950 100755
--- a/web/forms/admin/access-log/access-log.js
+++ b/web/forms/admin/access-log/access-log.js
@@ -1,6 +1,6 @@
 
 Vn.AccessLog = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 });
 
diff --git a/web/forms/admin/access-log/style.css b/web/forms/admin/access-log/style.css
index 35a35eb1..9a6b0cfe 100755
--- a/web/forms/admin/access-log/style.css
+++ b/web/forms/admin/access-log/style.css
@@ -1,15 +1,36 @@
 .access-log
 {
 	padding: 1em;
-	min-width: 35em;
 }
 .access-log .box
 {
-	max-width: 50em;
+	max-width: 25em;
 	margin: 0 auto;
 }
-.access-log .htk-grid tbody tr
+.access-log .form
 {
-	height: 3.4em;
+	padding: 2em;
+}
+.access-log .form > p
+{
+	font-size: 1.2em;
+	margin: .1em 0;
+}
+
+/* List */
+
+.access-log .list
+{
+	margin-top: 1em;
+}
+.access-log .item
+{
+	display: block;
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
+}
+.access-log .item > p
+{
+	margin: .1em 0;
 }
 
diff --git a/web/forms/admin/access-log/ui.xml b/web/forms/admin/access-log/ui.xml
index 1dff1256..a3eaa665 100755
--- a/web/forms/admin/access-log/ui.xml
+++ b/web/forms/admin/access-log/ui.xml
@@ -1,80 +1,77 @@
 <vn>
 <vn-group>
-	<vn-param id="user">
-		<vn-hash-param key="user"/>
-	</vn-param>
+	<vn-param id="user"/>
+	<vn-hash-param key="user" param="user"/>
 	<db-form id="user-form">
-		<db-model>
-			SELECT Id_Cliente, Cliente, Telefono, movil
-				FROM vn2008.Clientes WHERE Id_Cliente = #user
+		<db-model property="model">
+			<custom>
+				SELECT Id_Cliente, Cliente, Telefono, movil
+					FROM vn2008.Clientes WHERE Id_Cliente = #user
+			</custom>
 			<sql-batch property="batch">
-				<item name="user" param="user"/>
+				<custom>
+					<item name="user" param="user"/>
+				</custom>
 			</sql-batch>
 		</db-model>
 	</db-form>
 </vn-group>
+<div id="title">
+	<h1><t>AccessLog</t></h1>
+</div>
 <div id="form" class="access-log">
 	<div class="box">
-		<div class="header">
-			<h1><t>AccessLog</t></h1>
+		<div class="form">
+			<p>
+				<htk-text form="user-form" column="Id_Cliente"/>
+			</p>
+			<p>
+				<htk-text form="user-form" column="Cliente"/>
+			</p>
+			<p>
+				<htk-text form="user-form" column="Telefono"/>
+			</p>
+			<p>
+				<htk-text form="user-form" column="movil"/>
+			</p>
 		</div>
-		<table class="form">
-			<tbody>
-			<tr>
-				<td class="label">
-					<label><t>UserNumber:</t></label>
-				</td>
-				<td>
-					<htk-text column="Id_Cliente" form="user-form"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="label">
-					<label><t>User:</t></label>
-				</td>
-				<td>
-					<htk-text column="Cliente" form="user-form"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="label">
-					<label><t>Phone:</t></label>
-				</td>
-				<td>
-					<htk-text column="Telefono" form="user-form"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="label">
-					<label><t>Mobile:</t></label>
-				</td>
-				<td>
-					<htk-text column="movil" form="user-form"/>
-				</td>
-			</tr>
-			</tbody>
-		</table>
+	</div>
+	<div class="list box">
 		<div>
-			<htk-grid>
-				<db-model>
-					SELECT u.date_time, a.platform, a.browser, a.version, a.javascript, a.cookies
-						FROM visit_user u
-						JOIN visit_access c ON u.access_id = c.id
-						JOIN visit_agent a ON c.agent_id = a.id
-							WHERE u.user_id = #user
-							ORDER BY u.date_time DESC
-							LIMIT 30
+			<htk-repeater form-id="iter">
+				<db-model property="model">
+					<custom>
+						SELECT u.date_time, a.platform, a.browser, a.version, a.javascript, a.cookies
+							FROM visit_user u
+							JOIN visit_access c ON u.access_id = c.id
+							JOIN visit_agent a ON c.agent_id = a.id
+								WHERE u.user_id = #user
+								ORDER BY u.date_time DESC
+								LIMIT 8
+					</custom>
 					<sql-batch property="batch">
-						<item name="user" param="user"/>
+						<custom>
+							<item name="user" param="user"/>
+						</custom>
 					</sql-batch>
 				</db-model>
-				<htk-column-date title="_Access" column="date_time" format="_%a, %e %b %Y at %T"/>
-				<htk-column-text title="_SO" column="platform"/>
-				<htk-column-text title="_Browser" column="browser"/>
-				<htk-column-text title="_Version" column="version"/>
-				<htk-column-check title="_Javascript" column="javascript"/>
-				<htk-column-check title="_Cookies" column="cookies"/>
-			</htk-grid>
+				<custom>
+					<div class="item">
+						<p>
+							<htk-text form="iter" column="date_time" format="_%a, %e %b %Y at %T"/>
+						</p>
+						<p>
+							<htk-text form="iter" column="platform"/> - 
+							<htk-text form="iter" column="browser"/> 
+							<htk-text form="iter" column="version"/>
+						</p>
+<!--					<p>
+							<htk-text form="iter" column="javascript"/>, 
+							<htk-text form="iter" column="cookies"/>
+						</p>
+-->					</div>
+				</custom>
+			</htk-repeater>
 		</div>
 	</div>
 </div>
diff --git a/web/forms/admin/connections/connections.js b/web/forms/admin/connections/connections.js
new file mode 100755
index 00000000..ba3fd12f
--- /dev/null
+++ b/web/forms/admin/connections/connections.js
@@ -0,0 +1,53 @@
+
+Vn.Connections = new Class
+({
+	Extends: Vn.Form
+	
+	,_timeoutId: null
+
+	,onModelStatusChange: function (model, status)
+	{
+		if (!model.ready)
+			return;
+
+		if (this._timeoutId)
+			clearTimeout (this._timeoutId);
+			
+		this._timeoutId = setTimeout (this.onRefreshClick.bind (this), 60000);
+	}
+	
+	,deactivate: function ()
+	{
+		clearTimeout (this._timeoutId);
+	}
+	
+	,onRefreshClick: function ()
+	{
+		this.$('sessions').refresh ();	
+	}
+
+	,onAccessLogClick: function (button, form)
+	{
+		this.hash.set ({
+			 'form': 'admin/access-log'
+			,'user': form.get ('user_id')
+		});
+	}
+
+	,onChangeUserClick: function (button, form)
+	{
+		this.gui.supplantUser (form.get ('user_id'),
+			this.onUserSupplant.bind (this));
+	}
+	
+	,onUserSupplant: function (userName)
+	{
+		this.hash.set ({'form': 'ecomerce/orders'});
+	}
+	
+	,sessionsFunc: function ()
+	{
+		return 1;
+	}
+});
+
diff --git a/web/forms/admin/connections/style.css b/web/forms/admin/connections/style.css
new file mode 100755
index 00000000..b27e9449
--- /dev/null
+++ b/web/forms/admin/connections/style.css
@@ -0,0 +1,44 @@
+.connections
+{
+	padding: 1em;
+}
+.connections .box
+{
+	max-width: 25em;
+	margin: 0 auto;
+}
+.action-bar .connections-sum
+{
+	padding: .4em;
+	margin-top: .9em;
+	margin-right: .5em;
+	background-color: #1e88e5;
+	border-radius: 0.1em;
+	box-shadow: 0 0 0.4em #666;
+}
+
+/* List */
+
+.connections .item
+{
+	display: block;
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
+}
+.connections .item > button
+{
+	float: right;
+	margin: 0;
+}
+.connections .item > p
+{
+	margin: .1em 0;
+}
+.connections .item > p.important
+{
+	font-size: 1.2em;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
diff --git a/web/forms/admin/connections/ui.xml b/web/forms/admin/connections/ui.xml
new file mode 100755
index 00000000..e6d2a079
--- /dev/null
+++ b/web/forms/admin/connections/ui.xml
@@ -0,0 +1,69 @@
+<vn>
+<div id="title">
+	<h1><t>Connections</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/refresh.svg"
+		tip="_Refresh"
+		on-click="onRefreshClick"
+		showText="true"/>
+	<div class="connections-sum">
+		<htk-text>
+			<db-calc-sum
+				property="param"
+				model="sessions"
+				func="sessionsFunc"/>
+		</htk-text> 
+		<t>connections</t>
+	</div>
+</div>
+<div id="form" class="connections">
+	<div class="box">
+		<htk-repeater form-id="iter">
+			<db-model property="model" id="sessions" on-status-changed="onModelStatusChange">
+				<custom>
+					SELECT s.id, e.user_id, c.Cliente, e.date_time login, is_new,
+					s.date_time last_activity, a.platform, a.browser, a.version
+						FROM user_session s
+						JOIN visit_user e ON s.visit_user_id = e.id
+						JOIN visit_access c ON e.access_id = c.id
+						JOIN visit_agent a ON c.agent_id = a.id
+						JOIN visit v ON a.visit_id = v.id
+						JOIN account.user u ON e.user_id = u.id
+						JOIN vn2008.Clientes c ON e.user_id = c.Id_cliente
+							ORDER BY last_activity DESC
+				</custom>
+			</db-model>
+			<custom>
+				<div class="item">
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_Supplant user"
+						image="image/incognito.svg"
+						on-click="onChangeUserClick"/>
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_Access log"
+						image="image/gnome.svg"
+						on-click="onAccessLogClick"/>
+					<p class="important">
+						<htk-text form="iter" column="Cliente"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="login" format="%a, %T"/> - 
+						<htk-text form="iter" column="last_activity" format="%T"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="platform"/> - 
+						<htk-text form="iter" column="browser"/> 
+						<htk-text form="iter" column="version"/>
+					</p>
+			</div>
+			</custom>
+		</htk-repeater>
+	</div>
+</div>
+</vn>
diff --git a/web/forms/admin/items/items.js b/web/forms/admin/items/items.js
new file mode 100755
index 00000000..bb42361d
--- /dev/null
+++ b/web/forms/admin/items/items.js
@@ -0,0 +1,23 @@
+
+Vn.Items = new Class
+({
+	Extends: Vn.Form
+	
+	,activate: function ()
+	{
+		this.$('warehouse').value = 7;
+		this.$('realm').value = null;
+	}
+	
+	,onPreviewClick: function ()
+	{
+		var batch = new Sql.Batch ();
+		batch.addValues ({
+			 'warehouse': this.$('warehouse').value
+			,'realm': this.$('realm').value
+			,'rate': this.$('rate').value
+		});
+		this.gui.openReport ('items-report', batch);
+	}
+});
+
diff --git a/web/forms/admin/items/style.css b/web/forms/admin/items/style.css
new file mode 100755
index 00000000..ff9ba1be
--- /dev/null
+++ b/web/forms/admin/items/style.css
@@ -0,0 +1,43 @@
+
+.items
+{	
+	padding: 1em;
+}
+.items .box
+{
+	max-width: 30em;
+	padding: 2em;
+}
+.items .form
+{
+	max-width: 25em;
+	margin: auto;
+}
+.items .form-group
+{
+	padding: 0.4em;
+}
+.items form label
+{
+	display: block;
+	margin-bottom: 0.5em;
+}
+.items input[type=text],
+.items select
+{
+	margin: 0;
+	width: 100%;
+}
+
+/* Footer */
+
+.items .footer
+{
+	text-align: center;
+	margin-top: 1.5em;
+}
+.items .footer > button
+{
+	margin: 0 .2em;
+}
+
diff --git a/web/forms/admin/items/ui.xml b/web/forms/admin/items/ui.xml
new file mode 100755
index 00000000..65f97fbb
--- /dev/null
+++ b/web/forms/admin/items/ui.xml
@@ -0,0 +1,48 @@
+<vn>
+<div id="title">
+	<h1><t>Item list</t></h1>
+</div>
+<div id="form" class="items">
+	<div class="box">
+		<div class="form">
+			<div class="form-group">
+				<label><t>Store</t></label>
+				<htk-combo>
+					<vn-param property="param" id="warehouse"/>
+					<db-model property="model">
+						<custom>
+							SELECT id, name FROM vn2008.warehouse
+								WHERE reserve ORDER BY name
+						</custom>
+					</db-model>
+				</htk-combo>
+			</div>
+			<div class="form-group">
+				<label><t>Realm</t></label>
+				<htk-combo not-null="false">
+					<vn-param property="param" id="realm"/>
+					<db-model property="model">
+						<custom>
+							SELECT id, reino FROM vn2008.reinos
+								WHERE display != FALSE ORDER BY reino
+						</custom>
+					</db-model>
+				</htk-combo>
+			</div>
+			<div class="form-group">
+				<label><t>Rate</t></label>
+				<select id="rate">
+					<option>3</option>
+					<option>2</option>
+					<option>1</option>
+				</select>
+			</div>
+		</div>
+		<div class="footer">
+			<button class="thin" on-click="onPreviewClick">
+				<t>Preview</t>
+			</button>
+		</div>
+	</div>
+</div>
+</vn>
diff --git a/web/forms/admin/links/links.js b/web/forms/admin/links/links.js
index c5a3ea5a..41c14fa7 100755
--- a/web/forms/admin/links/links.js
+++ b/web/forms/admin/links/links.js
@@ -1,16 +1,11 @@
 
 Vn.Links = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
-	,activate: function ()
+	,repeaterFunc: function (res, form)
 	{
-		this.$('column-link').renderer = this.linkRenderer;
-	}
-	
-	,linkRenderer: function (column, form)
-	{
-		column.href = form.get ('link');
+		res.$('link').href = form.get ('link');
 	}
 });
 
diff --git a/web/forms/admin/links/style.css b/web/forms/admin/links/style.css
index 962e8734..a2a73f3a 100755
--- a/web/forms/admin/links/style.css
+++ b/web/forms/admin/links/style.css
@@ -5,14 +5,34 @@
 }
 .cpanel .box
 {
-	max-width: 60em;
-	min-width: 25em;
+	max-width: 30em;
 }
-.cpanel tbody tr
+
+/* Items */
+
+.cpanel .item
 {
-	height: 3.5em;
+	display: block;
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
 }
-.cpanel tbody td img
+.cpanel .item:hover
 {
-	min-height: 1.6em;
+	background-color: rgba(1, 1, 1, 0.05);
+}
+.cpanel .item > img
+{
+	margin: .2em 0;
+	margin-right: 1em;
+	float: left;
+	max-height: 3em;
+	max-width: 3em;
+}
+.cpanel .item > p
+{
+	margin: .1em 0;
+}
+.cpanel .item > p.important
+{
+	font-size: 1.2em;
 }
diff --git a/web/forms/admin/links/ui.xml b/web/forms/admin/links/ui.xml
index 41c8adaf..79540fd9 100755
--- a/web/forms/admin/links/ui.xml
+++ b/web/forms/admin/links/ui.xml
@@ -1,18 +1,32 @@
 <vn>
+<div id="title">
+	<h1><t>ControlPanel</t></h1>
+</div>
 <div id="form" class="cpanel">
 	<div class="box">
-		<div class="header">
-			<h1><t>ControlPanel</t></h1>
-		</div>
-		<htk-grid show-header="false">
-			<db-model>
-				SELECT image, name, description, link FROM link
-					ORDER BY name
+		<htk-repeater form-id="iter" renderer="repeaterFunc">
+			<db-model property="model">
+				<custom>
+					SELECT image, name, description, link FROM link
+						ORDER BY name
+				</custom>
 			</db-model>
-			<htk-column-image directory="link" subdir="full" column="image"/>
-			<htk-column-link column="name" target="\_blank" id="column-link"/>
-			<htk-column-text column="description"/>
-		</htk-grid>
+			<custom>
+				<a id="link" class="item" target="_blank">
+					<htk-image
+						form="iter"
+						column="image"
+						directory="link"
+						subdir="full"/>
+					<p class="important">
+						<htk-text form="iter" column="name"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="description"/>
+					</p>
+				</a>
+			</custom>
+		</htk-repeater>
 	</div>
 </div>
 </vn>
diff --git a/web/forms/admin/photos/photos.js b/web/forms/admin/photos/photos.js
index 8033f604..0f2b7da4 100755
--- a/web/forms/admin/photos/photos.js
+++ b/web/forms/admin/photos/photos.js
@@ -1,7 +1,7 @@
 
 Vn.Photos = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
diff --git a/web/forms/admin/photos/send-data.php b/web/forms/admin/photos/send-data.php
deleted file mode 100755
index b202eaef..00000000
--- a/web/forms/admin/photos/send-data.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-session_start ();
-
-$params = array
-(
-	 'name'
-	,'surname'
-	,'email'
-	,'message'
-	,'address'
-	,'pc'
-	,'city'
-	,'phone'
-	,'captcha'
-);
-
-$paramsOk = TRUE;
-
-foreach ($params as $param)
-if (!isset ($_POST[$param]) || $_POST[$param] == '')
-{
-	$paramsOk = FALSE;
-	break;
-}
-
-header ('Content-Type: application/json');
-
-if ($paramsOk && isset ($_SESSION['captcha'])
-&& $_POST['captcha'] == $_SESSION['captcha'])
-{
-	mail ('nuria@verdnatura.es', 'Verdnatura', print_r ($_POST, TRUE),
-		'From: Verdnatura <www-data@verdnatura.es>');
-
-	echo json_encode (TRUE);
-}
-else
-	echo json_encode (FALSE);
-
-unset ($_SESSION['captcha']);
-
-?>
diff --git a/web/forms/admin/photos/style.css b/web/forms/admin/photos/style.css
index 1d43878d..c25d6923 100755
--- a/web/forms/admin/photos/style.css
+++ b/web/forms/admin/photos/style.css
@@ -5,28 +5,14 @@
 }
 .photos .box
 {
-	max-width: 40em;
+	max-width: 30em;
+	padding: 2em;
 }
-.photos form
+.photos .form
 {
 	margin: 0 auto;
 	max-width: 25em;
 }
-div.form-group
-{
-	padding: 0.4em;
-}
-.photos form label
-{
-	display: block;
-	margin-bottom: 0.5em;
-}
-.photos input,
-.photos select
-{
-	margin: 0;
-	width: 100%;
-}
 .photos iframe
 {
 	display: none;
diff --git a/web/forms/admin/photos/ui.xml b/web/forms/admin/photos/ui.xml
index 46e7be67..1b074152 100755
--- a/web/forms/admin/photos/ui.xml
+++ b/web/forms/admin/photos/ui.xml
@@ -1,10 +1,10 @@
 <vn>
+<div id="title">
+	<h1><t>Photos</t></h1>
+</div>
 <div id="form" class="photos">
 	<div class="box">
-		<div class="header">
-			<h1><t>Photos</t></h1>
-		</div>
-		<div class="body">
+		<div class="form">
 			<form
 				id="html-form"
 				method="post"
@@ -33,7 +33,7 @@
 					<input type="file" name="image"/>
 					<input type="hidden" name="MAX_FILE_SIZE" id="photo-size"/>
 				</div>
-				<button class="flat" id="submit">
+				<button class="thin" id="submit">
 					<t>Upload</t>
 				</button>
 			</form>
diff --git a/web/forms/admin/queries/queries.js b/web/forms/admin/queries/queries.js
new file mode 100755
index 00000000..4e273761
--- /dev/null
+++ b/web/forms/admin/queries/queries.js
@@ -0,0 +1,102 @@
+
+Vn.Queries = new Class
+({
+	Extends: Vn.Form
+	
+	,activate: function  ()
+	{
+		this.$('result-index').value = 0;
+	}
+	
+	,clean: function ()
+	{
+		if (this._grid)
+		{
+			this.$('grid-holder').removeChild (this._grid.getNode ());
+			this._grid.unref ();
+			this._grid = null;
+		}
+	}
+	
+	,_onExecuteClick: function ()
+	{
+		this.clean ();
+		
+		var model = new Db.Model ({
+			conn: this.conn,
+			query: this.$('sql').value,
+			resultIndex: this.$('result-index').value,
+			updatable: this.$('updatable').value
+		});
+		model.on ('status-changed', this._onModelChange, this);
+	}
+	
+	,_onCleanClick: function ()
+	{
+		this.clean ();
+	}
+	
+	,_onModelChange: function (model, status)
+	{
+		if (status !== Db.Model.Status.LOADING)
+		{
+			model.disconnect ('status-changed', this._onModelChange, this);
+			model.unref ();
+		}
+
+		if (status !== Db.Model.Status.READY)
+			return;
+
+		Htk.Toast.showMessage (_('Query executed!'));
+
+		var gridHolder = this.$('grid-holder');
+		
+		if (gridHolder.firstChild)
+			gridHolder.removeChilds (gridHolder.firstChild);
+
+		var grid = new Htk.Grid ();
+		
+		var columns = model.columns;
+		
+		for (var i = 0; i < columns.length; i++)
+		{
+			var c = columns[i];
+		
+			switch (c.type)
+			{
+				case Db.Conn.Type.BOOLEAN:
+					var column = new Htk.ColumnCheck ();
+					break;
+				case Db.Conn.Type.INTEGER:
+					var column = new Htk.ColumnSpin ();
+					break;
+				case Db.Conn.Type.DOUBLE:
+					var column = new Htk.ColumnSpin ({digits: 2});
+					break;
+				case Db.Conn.Type.DATE:
+					var column = new Htk.ColumnDate ({format: '%a, %e %b %Y'});
+					break;
+				case Db.Conn.Type.DATE_TIME:
+					var column = new Htk.ColumnDate ({format: '%a, %e %b %Y, %T'});
+					break;
+				case Db.Conn.Type.STRING:
+				default:
+					var column = new Htk.ColumnText ();
+			}
+		
+			column.setProperties ({
+				title: c.name,
+				editable: this.$('updatable').value,
+				columnIndex: i
+			});
+			
+			grid.appendColumn (column);
+		}
+		
+		grid.model = model;
+		gridHolder.appendChild (grid.getNode ());
+		this._grid = grid;
+	
+	}
+});
+
diff --git a/web/forms/admin/queries/style.css b/web/forms/admin/queries/style.css
new file mode 100755
index 00000000..e3c925ca
--- /dev/null
+++ b/web/forms/admin/queries/style.css
@@ -0,0 +1,25 @@
+.queries
+{
+	padding: 1em;
+}
+.queries .box
+{
+	max-width: 40em;
+	margin: 0 auto;
+}
+.queries .form
+{
+	box-sizing: border-box;
+	padding: 2em;
+}
+.queries textarea
+{
+	display: block;
+	width: 100%;
+	height: 8em;
+}
+.queries .result
+{
+	margin-top: 1em;
+	overflow: auto;
+}
diff --git a/web/forms/admin/queries/ui.xml b/web/forms/admin/queries/ui.xml
new file mode 100755
index 00000000..a944946f
--- /dev/null
+++ b/web/forms/admin/queries/ui.xml
@@ -0,0 +1,40 @@
+<vn>
+<div id="title">
+	<h1><t>Queries</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/ok.svg"
+		tip="_Execute"
+		on-click="_onExecuteClick"
+		showText="true"/>
+	<htk-button
+		image="image/dark/delete.svg"
+		tip="_Clean"
+		on-click="_onCleanClick"
+		showText="true"/>
+</div>
+<div id="form" class="queries">
+	<div class="box form">
+		<div class="form-group">
+			<label><t>SQL query</t></label>
+			<textarea
+				id="sql"
+				autocorrect="off"
+				autocapitalize="off"
+				spellcheck="false"/>
+		</div>
+		<div class="form-group">
+			<label><t>Result index</t></label>
+			<htk-spin id="result-index"/>
+		</div>
+		<div class="form-group">
+			<label><t>Updatable</t></label>
+			<htk-check id="updatable"/>
+		</div>
+	</div>
+	<div class="box result">
+		<div id="grid-holder"/>
+	</div>
+</div>
+</vn>
diff --git a/web/forms/admin/shelves/shelves.js b/web/forms/admin/shelves/shelves.js
index 12181c6a..0d97dfc2 100755
--- a/web/forms/admin/shelves/shelves.js
+++ b/web/forms/admin/shelves/shelves.js
@@ -1,7 +1,7 @@
 
 Vn.Shelves = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 	
 	,activate: function ()
 	{
@@ -25,385 +25,18 @@ Vn.Shelves = new Class
 	,onPreviewClick: function ()
 	{
 		var batch = new Sql.Batch ();
-		batch.addParam ('shelf', this.$('shelf'));
-		batch.addParam ('wh', this.$('warehouse'));
-		batch.addParam ('date', this.$('date'));
-		batch.addParam ('family', this.$('family'));
-		batch.addParam ('filter', this.$('filter'));
-
-		var report = new Vn.ShelvesReport ({conn: this.conn});
-		report.setParams (
-			this.$('report-title').value,
-			this.$('max-amount').value,
-			this.$('show-packing').value,
-			this.$('stack').value,
-			batch
-		);
-		report.open ();
+		batch.addValues ({
+			'shelf': this.$('shelf').value,
+			'wh': this.$('warehouse').value,
+			'date': this.$('date').value,
+			'family': this.$('family').value,
+			'filter': this.$('filter').value,
+			'title': this.$('report-title').value,
+			'max-amount': this.$('max-amount').value,
+			'show-packing': this.$('show-packing').value,
+			'stack': this.$('stack').value,
+		});
+		this.gui.openReport ('shelves-report', batch);
 	}
 });
 
-Vn.ShelvesReport = new Class
-({
-	Extends: Vn.Report
-
-	,nItem: -1
-	,nColors: 5
-	
-	,setParams: function (title, maxAmount, showPacking, stack, batch)
-	{
-		this.title = title;
-		this.maxAmount = maxAmount;
-		this.batch = batch;
-		this.showPacking = showPacking;
-		this.stack = stack;
-	}
-	
-	,open: function ()
-	{
-		var query =
-			'SELECT id, name, width, height, depth, max_height, tray_height, '+
-			'first_tray_elevation, tray_density, vspacing, hspacing '+
-				'FROM shelf WHERE id = #shelf; '+
-			'CALL item_organizer (#wh, #date, #family, #filter)';
-		
-		this.conn.execQuery (query, this.onQueryExec.bind (this), this.batch);
-	}
-	
-	,onQueryExec: function (resultSet)
-	{
-		// Fetch query data
-
-		var res = resultSet.fetchResult ();
-		res.next ();
-		
-		var maxWidth = 170;
-		var maxHeight = 200;
-		
-		var scale = maxWidth / res.get ('width');
-		
-		if (res.get ('max_height') * scale > maxHeight)
-			scale = maxHeight / res.get ('max_height');
-		
-		var shelf = this.shelf =
-		{
-			 width: res.get ('width') * scale
-			,height: res.get ('height') * scale
-			,depth: res.get ('depth') * scale
-			,maxHeight: res.get ('max_height') * scale
-			,trayHeight: res.get ('tray_height') * scale
-			,firstTrayElevation: res.get ('first_tray_elevation') * scale
-			,trayDensity: res.get ('tray_density') * scale
-			,vspacing: res.get ('vspacing') * scale
-			,hspacing: res.get ('hspacing') * scale
-		};
-		
-		var items = [];
-		var remainings = [];
-		var res = resultSet.fetchResult ();
-		
-		if (res.data.length == 0)
-		{
-			Htk.Toast.showError (_('No items found, check that all fields are correct'));
-			return;
-		}
-		
-		var boxScale = scale * 10;
-		
-		while (res.next ())
-		if (!this.maxAmount || res.get ('etiquetas') <= this.maxAmount)
-		{
-			items.push ({
-				 id: res.get ('Id_Article')
-				,name: res.get ('Article')
-				,packing: res.get ('packing')
-				,amount: res.get ('etiquetas')
-				,boxHeight: res.get ('z') * boxScale
-				,boxWidth: res.get ('x') * boxScale
-				,boxDepth: res.get ('y') * boxScale
-			});
-		}
-		else
-		{
-			remainings.push ({
-				 id: res.get ('Id_Article')
-				,name: res.get ('Article')
-				,packing: res.get ('packing')
-				,amount: res.get ('etiquetas')
-			});
-		}
-
-		// Intializes the allocator
-			
-		alloc = new Vn.Allocator ();
-		alloc.items = items;
-		alloc.shelfFunc = this.drawShelf.bind (this);
-		alloc.boxFunc = this.drawBox.bind (this);
-		alloc.stack = this.stack;
-		alloc.nTrays = Math.ceil (
-			(shelf.height - shelf.firstTrayElevation) /
-			(shelf.trayHeight + shelf.trayDensity)
-		);
-		alloc.width = shelf.width - shelf.hspacing * 2;
-		alloc.depth = shelf.depth;
-		alloc.trayHeight = shelf.trayHeight - shelf.vspacing;
-		alloc.topTrayHeight = shelf.maxHeight - shelf.vspacing
-			- shelf.firstTrayElevation - (alloc.nTrays - 1) * shelf.trayHeight;
-		
-		// Opens the report
-		
-		if (!this.createWindow ('shelves'))
-			return;
-		
-		// Remaining amount
-		
-		if (remainings.length > 0)
-		{
-			var sheet = this.doc.createElement ('div');
-			sheet.className = 'sheet';
-			this.doc.body.appendChild (sheet);
-			
-			var title = this.doc.createElement ('h1');
-			title.className = 'title';
-			title.appendChild (this.doc.createTextNode (this.title));
-			sheet.appendChild (title);
-		
-			var subtitle = this.doc.createElement ('h2');
-			subtitle.className = 'subtitle';
-			subtitle.appendChild (this.doc.createTextNode (_('Pallets')));
-			sheet.appendChild (subtitle);
-			
-			var ul = this.doc.createElement ('ul');
-			sheet.appendChild (ul);
-	
-			for (var i = 0; i < remainings.length; i++)
-			{
-				var li = this.doc.createElement ('li');
-				ul.appendChild (li);
-
-				var span = this.doc.createElement ('span');
-				span.className = 'item-id';
-				span.appendChild (this.doc.createTextNode (remainings[i].id.toLocaleString ()));
-				li.appendChild (span);
-			
-				var span = this.doc.createElement ('span');
-				span.className = 'item';
-				span.appendChild (this.doc.createTextNode (remainings[i].name));
-				li.appendChild (span);
-				
-				if (this.showPacking)
-					span.appendChild (this.doc.createTextNode (' '+ remainings[i].packing));
-
-				var span = this.doc.createElement ('span');
-				span.className = 'amount';
-				span.appendChild (this.doc.createTextNode (remainings[i].amount));
-				li.appendChild (span);
-			}
-		}
-		
-		// Draws the shelves
-
-		alloc.run ();
-		this.drawShelfEnding ();
-	}
-
-	,drawShelf: function (allocator, item)
-	{
-		var shelf = this.shelf;
-
-		var sheet = this.doc.createElement ('div');
-		sheet.className = 'sheet';
-		this.doc.body.appendChild (sheet);
-		
-		// Draws the title
-		
-		var pageNumber = this.doc.createElement ('h1');
-		pageNumber.className = 'page-number';
-		pageNumber.appendChild (this.doc.createTextNode (allocator.currentShelf + 1));
-		sheet.appendChild (pageNumber);
-		
-		var title = this.doc.createElement ('h1');
-		title.className = 'title';
-		title.appendChild (this.doc.createTextNode (this.title));
-		sheet.appendChild (title);
-		
-		var subtitle = this.doc.createElement ('h2');
-		subtitle.className = 'subtitle';
-		subtitle.appendChild (this.doc.createTextNode (item.id.toLocaleString ()));
-		sheet.appendChild (subtitle);
-		
-		this.drawShelfEnding ();
-		this.lastSubtitle = subtitle;
-
-		// Draws the shelf
-		
-		var shelfDiv = this.shelfDiv = this.doc.createElement ('div');
-		shelfDiv.className = 'shelf';
-		shelfDiv.style.width = this.mm (shelf.width);
-		shelfDiv.style.height = this.mm (shelf.maxHeight);
-		sheet.appendChild (shelfDiv);
-
-		// Draws trays
-
-		var lastTrayY = shelf.firstTrayElevation;
-
-		if (shelf.trayHeight > 0)
-		while (lastTrayY + shelf.trayDensity < shelf.height)
-		{
-			var tray = this.doc.createElement ('div');
-			tray.className = 'tray';
-			tray.style.width = this.mm (shelf.width);
-			tray.style.height = this.mm (shelf.trayDensity);
-			tray.style.bottom = this.mm (lastTrayY);
-			shelfDiv.appendChild (tray);
-
-			lastTrayY += shelf.trayHeight + shelf.trayDensity;
-		}
-	}
-	
-	,drawShelfEnding: function ()
-	{
-		if (this.lastSubtitle)
-			this.lastSubtitle.appendChild (
-				this.doc.createTextNode (' - '+ this.lastItem.id.toLocaleString ()));
-	}
-	
-	,mm: function (size)
-	{
-		return size.toFixed (2) +'mm';
-	}
-
-	,drawBox: function (allocator, item, amount)
-	{
-		if (item.boxWidth == 0 || item.boxHeight == 0)
-			return;
-
-		var shelf = this.shelf;
-
-		var x = allocator.trayX + shelf.hspacing;
-		var y = allocator.trayY
-			+ shelf.firstTrayElevation + shelf.trayDensity
-			+ allocator.currentTray * (shelf.trayHeight + shelf.trayDensity);
-
-		var box = this.doc.createElement ('div');
-		box.className = 'box';
-		this.shelfDiv.appendChild (box);
-		
-		box.style.left = this.mm (x);
-		box.style.bottom = this.mm (y);
-		box.style.width = this.mm (item.boxWidth);
-		box.style.height = this.mm (item.boxHeight);
-	
-		if (amount == 0)
-			this.nItem++;
-
-		var nColor = this.nItem % this.nColors;
-		Vn.Node.addClass (box, 'color'+ nColor);
-
-		if (amount == 0 || allocator.firstShelfBox)
-		{
-			var fontSize = item.boxWidth / 5.2;
-			
-			if (fontSize > item.boxHeight - 1)
-				fontSize = item.boxHeight - 1;
-		
-			var boxLabel = this.doc.createElement ('div');
-			boxLabel.className = 'box-label';
-			boxLabel.style.fontSize = this.mm (fontSize);
-			boxLabel.appendChild (this.doc.createTextNode (item.id.toLocaleString ()));
-			box.appendChild (boxLabel);
-		}
-
-		this.lastItem = item;
-	}
-});
-
-Vn.Allocator = new Class
-({
-	addShelf: function (item)
-	{
-		this.currentShelf++;
-		this.firstShelfBox = true;
-	
-		if (this.shelfFunc)
-			this.shelfFunc (this, item);
-	}
-
-	,addTray: function (item)
-	{
-		if (this.currentTray <= 0)
-		{
-			this.addShelf (item);
-			this.currentTray = this.nTrays - 1;
-		}
-		else
-			this.currentTray--;
-		
-		this.trayX = 0;
-	}
-
-	,addColumn: function (item)
-	{
-		if (this.trayX + this.columnWidth + item.boxWidth > this.width
-		|| this.currentTray == -1)
-			this.addTray (item);
-		else
-			this.trayX += this.columnWidth;
-
-		this.trayY = 0;
-		this.columnWidth = item.boxWidth;
-		this.lastBoxWidth = item.boxWidth;
-	}
-
-	,addBox: function (item, amount)
-	{
-		var trayHeight = this.trayHeight;
-	
-		if (this.currentTray == this.nTrays - 1)
-			trayHeight = this.topTrayHeight;
-
-		if (this.trayY + item.boxHeight > trayHeight
-		|| item.boxWidth > this.lastBoxWidth
-		|| (!this.stack && amount == 0))
-			this.addColumn (item);
-
-		if (this.boxFunc)
-			this.boxFunc (this, item, amount);
-
-		this.trayY += item.boxHeight;
-	
-		if (item.boxWidth < this.lastBoxWidth)
-			this.lastBoxWidth = item.boxWidth;
-	}
-
-	,run: function ()
-	{
-		this.firstShelfBox = false;
-		this.currentShelf = -1;
-		this.currentTray = -1;
-		this.columnWidth = 0;
-		this.lastBoxWidth = 0;
-		this.trayX = 0;
-		this.trayY = 0;
-		this.remaining = false;
-
-		for (var i = 0; i < this.items.length; i++)
-		{
-			var item = this.items[i];
-			var boxIncrement = Math.floor (this.depth / item.boxDepth);
-			
-			if (boxIncrement < 1)
-				boxIncrement = 1;
-		
-			for (var amount = 0; amount < item.amount; amount += boxIncrement)
-			{
-				this.addBox (item, amount);
-				this.firstShelfBox = false;
-			}
-		}
-	
-		return this.currentShelf + 1;
-	}
-	
-});
-
diff --git a/web/forms/admin/shelves/style.css b/web/forms/admin/shelves/style.css
index b2f20fec..c97b766f 100755
--- a/web/forms/admin/shelves/style.css
+++ b/web/forms/admin/shelves/style.css
@@ -5,14 +5,13 @@
 }
 .shelves .box
 {
-	max-width: 40em;
+	max-width: 30em;
 	padding: 2em;
 }
-.shelves .body
+.shelves .form
 {
-	max-width: 20em;
+	max-width: 25em;
 	margin: auto;
-	padding: 0;
 }
 .shelves .form-group
 {
diff --git a/web/forms/admin/shelves/ui.xml b/web/forms/admin/shelves/ui.xml
index 4d3935ab..9b7dae07 100755
--- a/web/forms/admin/shelves/ui.xml
+++ b/web/forms/admin/shelves/ui.xml
@@ -1,10 +1,12 @@
 <vn>
 <vn-group>
 	<db-model property="model" id="configs-model">
-		SELECT c.id, c.name, c.name_prefix, c.warehouse_id, c.family_id,
-		c.shelf_id, c.max_amount, c.show_packing, c.stack, t.reino_id
-			FROM shelf_config c
-			JOIN vn2008.Tipos t ON t.tipo_id = c.family_id
+		<custom>
+			SELECT c.id, c.name, c.name_prefix, c.warehouse_id, c.family_id,
+			c.shelf_id, c.max_amount, c.show_packing, c.stack, t.reino_id
+				FROM shelf_config c
+				JOIN vn2008.Tipos t ON t.tipo_id = c.family_id
+		</custom>
 	</db-model>
 </vn-group>
 <div id="title">
@@ -12,7 +14,7 @@
 </div>
 <div id="form" class="shelves">
 	<div class="box">
-		<div class="body">
+		<div class="form">
 			<div class="form-group">
 				<label><t>Configuration</t></label>
 				<htk-combo
@@ -22,12 +24,18 @@
 					on-changed="onConfigChange"
 					on-ready="onConfigChange"/>
 			</div>
+			<div class="form-group">
+				<label><t>Date</t></label>
+				<htk-date-chooser id="date"/>
+			</div>
 			<div class="form-group">
 				<label><t>Reign</t></label>
 				<htk-combo id="reign">
 					<db-model property="model" id="reigns">
-						SELECT id, reino FROM vn2008.reinos
-							WHERE display != FALSE ORDER BY reino
+						<custom>
+							SELECT id, reino FROM vn2008.reinos
+								WHERE display != FALSE ORDER BY reino
+						</custom>
 					</db-model>
 				</htk-combo>
 			</div>
@@ -35,10 +43,14 @@
 				<label><t>Family</t></label>
 				<htk-combo id="family">
 					<db-model property="model">
-						SELECT tipo_id, Tipo FROM vn2008.Tipos 
-							WHERE reino_id = #reign ORDER BY Tipo
+						<custom>
+							SELECT tipo_id, Tipo FROM vn2008.Tipos 
+								WHERE reino_id = #reign ORDER BY Tipo
+						</custom>
 						<sql-batch property="batch">
-							<item name="reign" param="reign"/>
+							<custom>
+								<item name="reign" param="reign"/>
+							</custom>
 						</sql-batch>
 					</db-model>
 				</htk-combo>
@@ -47,20 +59,20 @@
 				<label><t>Store</t></label>
 				<htk-combo id="warehouse">
 					<db-model property="model" id="warehouses">
-						SELECT id, name FROM vn2008.warehouse
-							WHERE reserve ORDER BY name
+						<custom>
+							SELECT id, name FROM vn2008.warehouse
+								WHERE reserve ORDER BY name
+						</custom>
 					</db-model>
 				</htk-combo>
 			</div>
-			<div class="form-group">
-				<label><t>Date</t></label>
-				<htk-date-chooser id="date"/>
-			</div>
 			<div class="form-group">
 				<label><t>Shelf</t></label>
 				<htk-combo id="shelf">
 					<db-model property="model" id="shelves">
-						SELECT id, name FROM shelf
+						<custom>
+							SELECT id, name FROM shelf
+						</custom>
 					</db-model>
 				</htk-combo>
 			</div>
diff --git a/web/forms/admin/users/style.css b/web/forms/admin/users/style.css
index d4dd41d4..5dc8d8c8 100755
--- a/web/forms/admin/users/style.css
+++ b/web/forms/admin/users/style.css
@@ -1,15 +1,35 @@
 .users
 {
 	padding: 1em;
-	min-width: 35em;
 }
 .users .box
 {
-	max-width: 50em;
+	max-width: 30em;
 	margin: 0 auto;
 }
-.users tbody tr
+.users-box
 {
-	height: 3.4em;
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
+}
+.users-box > button
+{
+	float: right;
+	margin: 0;
+}
+.users-box > p
+{
+	margin: .2em 0;
+}
+.users-box > p.important
+{
+	font-size: 1.2em;
+}
+
+/* Topbar */
+
+.action-bar .htk-search-entry
+{
+	margin: .8em .6em;
 }
 
diff --git a/web/forms/admin/users/ui.xml b/web/forms/admin/users/ui.xml
index 96b2bb4c..ac6e69f6 100755
--- a/web/forms/admin/users/ui.xml
+++ b/web/forms/admin/users/ui.xml
@@ -1,26 +1,20 @@
 <vn>
+<vn-group>
+	<vn-param id="user-name"/>
+	<vn-hash-param key="user" param="user-name"/>
+</vn-group>
+<div id="title">
+	<h1><t>UserManagement</t></h1>
+</div>
+<div id="actions">
+	<htk-search-entry
+		param="user-name"/>
+</div>
 <div id="form" class="users">
 	<div class="box">
-		<div class="header">
-			<h1><t>UserManagement</t></h1>
-		</div>
-		<table class="form">
-			<tbody>
-			<tr>
-				<td class="label">
-					<label><t>UserName:</t></label>
-				</td>
-				<td>
-					<htk-entry>
-						<vn-param id="user-name"/>
-					</htk-entry>
-				</td>
-			</tr>
-			</tbody>
-		</table>
-		<div>
-			<htk-grid>
-				<db-model>
+		<htk-repeater form-id="iter">
+			<db-model property="model">
+				<custom>
 					SELECT u.id, u.name, c.Cliente
 						FROM account.user u
 						INNER JOIN vn2008.Clientes c ON u.id = c.Id_Cliente
@@ -28,25 +22,38 @@
 							OR c.Cliente LIKE CONCAT('%', #user, '%')
 							OR u.id = #user
 							ORDER BY u.name LIMIT 200
-					<sql-batch property="batch">
+				</custom>
+				<sql-batch property="batch">
+					<custom>
 						<item name="user" param="user-name"/>
-					</sql-batch>
-				</db-model>
-				<htk-column-button
-					column="id"
-					image="image/supplant.png"
-					tip="_AccessAsUser"
-					on-clicked="onChangeUserClick"/>
-				<htk-column-button
-					column="id"
-					image="image/access-log.svg"
-					tip="_AccessLog"
-					on-clicked="onAccessLogClick"/>
-				<htk-column-spin title="_UserNumber" column="id"/>
-				<htk-column-text title="_UserName" column="name"/>
-				<htk-column-text title="_Alias" column="Cliente"/>
-			</htk-grid>
-		</div>
+					</custom>
+				</sql-batch>
+			</db-model>
+			<custom>
+				<div class="users-box">
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_AccessAsUser"
+						image="image/incognito.svg"
+						on-click="onChangeUserClick"/>
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_AccessLog"
+						image="image/gnome.svg"
+						on-click="onAccessLogClick"/>
+					<p class="important">
+						<htk-text form="iter" column="Cliente"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="id"/> - 
+						<htk-text form="iter" column="name"/>
+					</p>
+					<div class="clear"/>
+				</div>
+			</custom>
+		</htk-repeater>
 	</div>
 </div>
 </vn>
diff --git a/web/forms/admin/users/users.js b/web/forms/admin/users/users.js
index c60d290f..e04f0b3f 100755
--- a/web/forms/admin/users/users.js
+++ b/web/forms/admin/users/users.js
@@ -1,26 +1,23 @@
 
 Vn.Users = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
-	,onChangeUserClick: function (column, value)
-	{
-		var batch = new Sql.Batch ();
-		batch.addValue ('user', value);
-	
-		var query = 'UPDATE user_session_view SET user_id = #user';
-		this.conn.execQuery (query, this.userChanged.bind (this), batch);
-	}
-
-	,onAccessLogClick: function (column, value)
+	,onAccessLogClick: function (button, form)
 	{
 		this.hash.set ({
 			 'form': 'admin/access-log'
-			,'user': value
+			,'user': form.get ('id')
 		});
 	}
+
+	,onChangeUserClick: function (button, form)
+	{
+		this.gui.supplantUser (form.get ('id'),
+			this.onUserSupplant.bind (this));
+	}
 	
-	,userChanged: function ()
+	,onUserSupplant: function (userName)
 	{
 		this.hash.set ({'form': 'ecomerce/orders'});
 	}
diff --git a/web/forms/admin/visits/style.css b/web/forms/admin/visits/style.css
index a93e51ba..4ccdc136 100755
--- a/web/forms/admin/visits/style.css
+++ b/web/forms/admin/visits/style.css
@@ -1,18 +1,46 @@
 .visits
 {
 	padding: 1em;
-	min-width: 50em;
 }
 .visits .box
 {
-	max-width: 80em;
+	max-width: 25em;
 	margin: 0 auto;
 }
-
-/* Steps */
-
-div.step
+.visits .form
 {
-	display: none;
+	padding: 1.5em;
+	max-width: 20em;
+}
+.visits .summary
+{
+	margin-top: 1em;
+}
+.visits .summary p
+{
+	padding: 1.5em;
+	font-size: 1.4em;
+	text-align: right;
+}
+
+/* List */
+
+.visits .list
+{
+	margin-top: 1em;
+}
+.visits .item
+{
+	display: block;
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
+}
+.visits .item > p
+{
+	margin: .1em 0;
+}
+.visits .item > p.important
+{
+	font-size: 1.2em;
 }
 
diff --git a/web/forms/admin/visits/ui.xml b/web/forms/admin/visits/ui.xml
index 9683a5a2..354aa783 100755
--- a/web/forms/admin/visits/ui.xml
+++ b/web/forms/admin/visits/ui.xml
@@ -1,147 +1,97 @@
 <vn>
+<div id="title">
+	<h1><t>Visits</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/refresh.svg"
+		tip="_Refresh"
+		on-click="onRefreshClick"
+		showText="true"/>
+	<htk-button
+		image="image/dark/user-info.svg"
+		tip="_Connections"
+		on-click="onSessionsClick"
+		showText="true"/>
+</div>
 <div id="form" class="visits">
 	<div class="box">
-		<div class="header">
-			<h1><t>VisitsManagement</t></h1>
-			<div class="action-bar">
-				<button on-click="onRefreshClick">
-					<img src="image/dark/refresh.svg" alt=""/>
-					<t>Refresh</t>
-				</button>
-				<button on-click="onSessionsClick">
-					<img src="image/dark/user-info.svg" alt=""/>
-					<t>ActiveSessions</t>
-				</button>
-				<button on-click="onVisitsClick">
-					<img src="image/dark/graph.svg" alt=""/>
-					<t>VisitsQuery</t>
-				</button>
+		<div class="form">
+			<div class="form-group">
+				<label><t>From</t></label>
+				<htk-date-chooser>
+					<vn-param property="param" id="from"/>
+				</htk-date-chooser>
 			</div>
-		</div>
-		<div class="step" id="sessions-step">
-			<table class="form">
-				<tbody>
-				<tr>
-					<td class="label">
-						<label><t>ActiveSessions:</t></label>
-					</td>
-					<td>
-						<htk-label>
-							<db-calc-sum model="sessions" id="num-sessions"/>
-						</htk-label>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label><t>NewVisitsTotal:</t></label>
-					</td>
-					<td>
-						<htk-label>
-							<db-calc-sum model="sessions" column-name="is_new"/>
-						</htk-label>
-					</td>
-				</tr>
-				</tbody>
-			</table>
-			<div>
-				<htk-grid>
-					<db-model id="sessions">
-						SELECT s.id, c.Cliente, e.date_time login, is_new,
-						s.date_time last_activity, a.platform, a.browser, a.version
-							FROM user_session s
-							JOIN visit_user e ON s.visit_user_id = e.id
-							JOIN visit_access c ON e.access_id = c.id
-							JOIN visit_agent a ON c.agent_id = a.id
-							JOIN visit v ON a.visit_id = v.id
-							JOIN account.user u ON e.user_id = u.id
-							JOIN vn2008.Clientes c ON e.user_id = c.Id_cliente
-								ORDER BY last_activity DESC
-					</db-model>
-					<htk-column-spin title="_SessionNumber" column="id"/>
-					<htk-column-text title="_User" column="Cliente"/>
-					<htk-column-date title="_Login" column="login" format="%a, %T"/>
-					<htk-column-date title="_LastActivity" column="last_activity" format="%a, %T"/>
-					<htk-column-text title="_SO" column="platform"/>
-					<htk-column-text title="_Browser" column="browser"/>
-					<htk-column-text title="_Version" column="version"/>
-					<htk-column-check title="_NewVisit" column="is_new"/>
-				</htk-grid>
-			</div>
-		</div>
-		<div class="step" id="visits-step">
-			<table class="form">
-				<tbody>
-				<tr>
-					<td class="label">
-						<label><t>FromDate:</t></label>
-					</td>
-					<td>
-						<htk-date-chooser>
-							<vn-param id="date-from"/>
-						</htk-date-chooser>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label><t>ToDate:</t></label>
-					</td>
-					<td>
-						<htk-date-chooser>
-							<vn-param id="date-to"/>
-						</htk-date-chooser>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label><t>VisitsTotal:</t></label>
-					</td>
-					<td>
-						<htk-label>
-							<db-calc-sum model="visits" column-name="visits"/>
-						</htk-label>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label><t>NewVisitsTotal:</t></label>
-					</td>
-					<td>
-						<htk-label>
-							<db-calc-sum model="visits" column-name="new_visits"/>
-						</htk-label>
-					</td>
-				</tr>
-				</tbody>
-			</table>
-			<div>
-				<htk-grid empty-message="SelectDateInterval">
-					<db-model id="visits">
-						SELECT browser
-						,MIN(CAST(version AS DECIMAL(4,1))) min_version
-						,MAX(CAST(version AS DECIMAL(4,1))) max_version
-						,MAX(e.date_time) last_visit
-						,COUNT(DISTINCT c.id) visits
-						,SUM(is_new) new_visits
-							FROM visit_user e
-							JOIN visit_access c ON e.access_id = c.id
-							JOIN visit_agent a ON c.agent_id = a.id
-							JOIN visit v ON a.visit_id = v.id
-								WHERE e.date_time BETWEEN TIMESTAMP(#from,'00:00:00') AND TIMESTAMP(#to,'23:59:59')
-								GROUP BY browser ORDER BY visits DESC
-						<sql-batch property="batch">
-							<item name="from" param="date-from"/>
-							<item name="to" param="date-to"/>
-						</sql-batch>
-					</db-model>
-					<htk-column-text title="_Browser" column="browser"/>
-					<htk-column-spin title="_MinVersion" column="min_version" digits="1"/>
-					<htk-column-spin title="_MaxVersion" column="max_version" digits="1"/>
-					<htk-column-date title="_LastVisit" column="last_visit" format="_%a, %e %b %Y at %T"/>
-					<htk-column-spin title="_Visits" column="visits"/>
-					<htk-column-spin title="_NewVisits" column="new_visits"/>
-				</htk-grid>
+			<div class="form-group">
+				<label><t>To</t></label>
+				<htk-date-chooser>
+					<vn-param property="param" id="to"/>
+				</htk-date-chooser>
 			</div>
 		</div>
 	</div>
+	<div class="summary box">
+		<p>
+			<htk-text>
+				<db-calc-sum
+					property="param"
+					model="visits"
+					column-name="visits"/>
+			</htk-text> 
+			<t>visits</t>,
+			<htk-text>
+				<db-calc-sum
+					property="param"
+					model="visits"
+					column-name="new_visits"/>
+			</htk-text> 
+			<t>news</t>
+		</p>
+	</div>
+	<div class="list box">
+		<htk-repeater form-id="iter" empty-message="_Select date interval">
+			<db-model property="model" id="visits">
+				<custom>
+					SELECT browser
+					,MIN(CAST(version AS DECIMAL(4,1))) min_version
+					,MAX(CAST(version AS DECIMAL(4,1))) max_version
+					,MAX(e.date_time) last_visit
+					,COUNT(DISTINCT c.id) visits
+					,SUM(is_new) new_visits
+						FROM visit_user e
+						JOIN visit_access c ON e.access_id = c.id
+						JOIN visit_agent a ON c.agent_id = a.id
+						JOIN visit v ON a.visit_id = v.id
+							WHERE e.date_time BETWEEN TIMESTAMP(#from,'00:00:00') AND TIMESTAMP(#to,'23:59:59')
+							GROUP BY browser ORDER BY visits DESC
+				</custom>
+				<sql-batch property="batch">
+					<custom>
+						<item name="from" param="from"/>
+						<item name="to" param="to"/>
+					</custom>
+				</sql-batch>
+			</db-model>
+			<custom>
+				<div class="item">
+					<p class="important">
+						<htk-text form="iter" column="browser"/> 
+						<htk-text form="iter" column="min_version"/> - 
+						<htk-text form="iter" column="max_version"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="visits"/> 
+						<t>visits</t>, 
+						<htk-text form="iter" column="new_visits"/> 
+						<t>news</t>
+					</p>
+					<p>
+						<htk-text form="iter" column="last_visit" format="_%a, %e %b %Y at %T"/>
+					</p>
+			</div>
+			</custom>
+		</htk-repeater>
+	</div>
 </div>
 </vn>
diff --git a/web/forms/admin/visits/visits.js b/web/forms/admin/visits/visits.js
index e77debac..a8454491 100755
--- a/web/forms/admin/visits/visits.js
+++ b/web/forms/admin/visits/visits.js
@@ -1,44 +1,22 @@
 
 Vn.Visits = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
-		this.$('date-to').value = new Date ();
-		this.$('num-sessions').func = this.sessionsFunc;
-		this.onSessionsClick ();
-	}
-
-	,showStep: function (stepId)
-	{
-		if (this.currentStep)
-			this.currentStep.style.display = 'none';
-			
-		this.currentStep = this.$(stepId);
-		this.currentStep.style.display = 'inline';
+		this.$('from').value = new Date ();
+		this.$('to').value = new Date ();
 	}
 	
 	,onRefreshClick: function ()
 	{
-		this.model.refresh ();	
+		this.$('visits').refresh ();	
 	}
 	
 	,onSessionsClick: function ()
 	{
-		this.showStep ('sessions-step');
-		this.model = this.$('sessions');
-	}
-	
-	,onVisitsClick: function ()
-	{
-		this.showStep ('visits-step');
-		this.model = this.$('visits');
-	}
-	
-	,sessionsFunc: function ()
-	{
-		return 1;
+		this.hash.set ({'form': 'admin/connections'});
 	}
 });
 
diff --git a/web/forms/agencies/packages/packages.js b/web/forms/agencies/packages/packages.js
index b63aab73..d3f0db86 100755
--- a/web/forms/agencies/packages/packages.js
+++ b/web/forms/agencies/packages/packages.js
@@ -1,7 +1,7 @@
 
 Vn.Packages = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 	
 	,onShowClick: function  (column, agencyId)
 	{
diff --git a/web/forms/agencies/packages/ui.xml b/web/forms/agencies/packages/ui.xml
index 3853b34e..fea7f9c6 100755
--- a/web/forms/agencies/packages/ui.xml
+++ b/web/forms/agencies/packages/ui.xml
@@ -1,12 +1,14 @@
 <vn>
+<div id="title">
+	<h1><t>ListByAgency</t></h1>
+</div>
 <div id="form" class="packages">
 	<div class="box">
-		<div class="header">
-			<h1><t>ListByAgency</t></h1>
-		</div>
 		<htk-grid>
 			<db-model property="model">
-				CALL vn2008.agencia_volume ()
+				<custom>
+					CALL vn2008.agencia_volume ()
+				</custom>
 			</db-model>
 			<htk-column-button
 				column="agency_id"
diff --git a/web/forms/agencies/provinces/provinces.js b/web/forms/agencies/provinces/provinces.js
index b160d5e0..fe50c3d1 100755
--- a/web/forms/agencies/provinces/provinces.js
+++ b/web/forms/agencies/provinces/provinces.js
@@ -1,11 +1,6 @@
 
 Vn.Provinces = new Class
 ({
-	Extends: Vn.Module
-	
-	,onReturnClick: function ()
-	{
-		window.history.back();
-	}
+	Extends: Vn.Form
 });
 
diff --git a/web/forms/agencies/provinces/ui.xml b/web/forms/agencies/provinces/ui.xml
index 85fc9fab..5094002a 100755
--- a/web/forms/agencies/provinces/ui.xml
+++ b/web/forms/agencies/provinces/ui.xml
@@ -1,26 +1,22 @@
 <vn>
 <vn-group>
-	<vn-param id="agency">
-		<vn-hash-param key="agency"/>
-	</vn-param>
+	<vn-param id="agency"/>
+	<vn-hash-param key="agency" param="agency"/>
 </vn-group>
+<div id="title">
+	<h1><t>ByProvince</t></h1>
+</div>
 <div id="form" class="provinces">
 	<div class="box">
-		<div class="header">
-			<h1><t>ByProvince</t></h1>
-			<div class="action-bar">
-				<button on-click="onReturnClick">
-					<img src="image/dark/go-previous.svg" alt=""/>
-					<t>Return</t>
-				</button>
-			</div>
-			<div class="clear"/>
-		</div>
 		<htk-grid>
-			<db-model>
-				CALL vn2008.desglose_volume (#agency)
+			<db-model property="model">
+				<custom>
+					CALL vn2008.desglose_volume (#agency)
+				</custom>
 				<sql-batch property="batch">
-					<item name="agency" param="agency"/>
+					<custom>
+						<item name="agency" param="agency"/>
+					</custom>
 				</sql-batch>
 			</db-model>
 			<htk-column-text title="_Province" column="Provincia"/>
diff --git a/web/forms/cms/about/about.js b/web/forms/cms/about/about.js
index 3afbcc80..fa65a1cc 100755
--- a/web/forms/cms/about/about.js
+++ b/web/forms/cms/about/about.js
@@ -1,6 +1,6 @@
 
 Vn.About = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 });
 
diff --git a/web/forms/cms/about/style.css b/web/forms/cms/about/style.css
index 3f4e5f7a..6d7a41eb 100755
--- a/web/forms/cms/about/style.css
+++ b/web/forms/cms/about/style.css
@@ -3,10 +3,49 @@
 {
 	padding: 1em;
 }
+.about .cols
+{
+	max-width: 85em;
+	margin: 0 auto;
+}
+@media screen and (min-width: 1000px) /* and (max-width: 1399px) */
+{
+	.about .cols
+	{
+		column-count: 2;
+		-moz-column-count: 2;
+		-webkit-column-count: 2;
+	}
+}/*
+@media screen and (min-width: 1400px)
+{
+	.about .cols
+	{
+		column-count: 3;
+		-moz-column-count: 3;
+		-webkit-column-count: 3;
+	}
+}
+@media screen and (min-width: 2000px)
+{
+	.about .cols
+	{
+		column-count: 4;
+		-moz-column-count: 4;
+		-webkit-column-count: 4;
+	}
+}*/
 .about .box
 {
-	max-width: 50em;
-	margin: 0 auto;
+	margin-bottom: 1em;
+	padding: 2em;
+}
+.about h1
+{
+	padding: 0;
+	margin: 0;
+	font-weight: normal;
+	font-size: 1.6em;
 }
 .about h2
 {
@@ -20,28 +59,22 @@
 	text-align: center;
 	font-size: 1.2em;
 	font-weight: normal;
-	margin: 1em;
-	color: #4A1;
+	padding: 1em;
+	color: #00796B;
 }
 .about p
 {
-	width: 90%;
-    display: block;
-    margin: 1em auto;
+    margin: 1em 0;
 }
-.summary
+.about p.summary
 {
-	padding-bottom: 1em;
-}
-.summary p
-{
-	max-width: 30em;
+	max-width: 26em;
 	text-align: center;
 	background-color: #FF8;
 	padding: 1em;
 	border-radius: 0.1em;
 	box-shadow: 0 0.2em 0.2em #AAA;
-    margin: 2em auto;
+    margin: 1.5em auto;
 }
 
 /* Images */
diff --git a/web/forms/cms/about/ui.xml b/web/forms/cms/about/ui.xml
index 0a1589a2..79628032 100755
--- a/web/forms/cms/about/ui.xml
+++ b/web/forms/cms/about/ui.xml
@@ -1,10 +1,13 @@
 <vn>
+<div id="title">
+	<h1><t>About</t></h1>
+</div>
 <div id="form" class="about">
-<div class="box">
-	<div>
-		<div class="header">
-			<h1><t>QualityAndVariety</t></h1>
-		</div>
+<div class="cols">
+	<div class="box">
+		<h1>
+			<t>QualityAndVariety</t>
+		</h1>
 		<p><t>MaximumFreshness</t></p>
 		<h3><t>SquareMeters</t></h3>
 		<img src="forms/cms/about/image/store.png" alt="store"/>
@@ -17,26 +20,26 @@
 		</p>
 		<img src="forms/cms/about/image/palletizing.png" alt="palletizing"/>
 	</div>
-	<div>
-		<div class="header">
-			<h1><t>WhatMakeUsDifferent</t></h1>
-		</div>
+	<div class="box">
+		<h1>
+			<t>WhatMakeUsDifferent</t>
+		</h1>
 		<p><t>DesignVariety</t></p>
 		<img src="forms/cms/about/image/differentiates_us.png" alt="differentiates_us"/>
 		<p><t>AdaptToYourNeeds</t></p>
 		<h3><t>TheBestQuality</t></h3>
 	</div>
-	<div>
-		<div class="header">
-			<h1><t>AtYourService</t></h1>
-		</div>
+	<div class="box">
+		<h1>
+			<t>AtYourService</t>
+		</h1>
 		<h2><t>BuyersAndTraders</t></h2>
 		<img src="forms/cms/about/image/commercial.png" alt="commercial"/>
 	</div>
-	<div>
-		<div class="header">
-			<h1><t>Training</t></h1>
-		</div>
+	<div class="box">
+		<h1>
+			<t>Verdnatura training</t>
+		</h1>
 		<p><t>GoodTraining</t></p>
 		<img src="forms/cms/about/image/training.png" alt="training"/>
 		<p><t>SpecialTrainingPrices</t></p>
@@ -44,10 +47,10 @@
 		<h2><t>YoutubeChannel</t></h2>
 		<img src="forms/cms/about/image/youtube.png" alt="youtube"/>
 	</div>
-	<div>
-		<div class="header">
-			<h1><t>HowWeWork</t></h1>
-		</div>
+	<div class="box">
+		<h1>
+			<t>HowWeWork</t>
+		</h1>
 		<p><t>AalsmeerAuction</t></p>
 		<img src="forms/cms/about/image/auction.png" alt="auction"/>
 		<p><t>BeforeAuction</t></p>
@@ -85,9 +88,7 @@
 		<p><t>AfterEmbedAgency</t></p>
 		<img src="forms/cms/about/image/agencies.png" alt="agencies"/>
 		<p><t>FreshnessGuaranteed</t></p>
-	</div>
-	<div class="summary">
-		<p>
+		<p class="summary">
 			<t>AboutSummary</t>
 			<img src="image/logo.svg" alt="Verdnatura"/>
 		</p>
diff --git a/web/forms/cms/contact/contact.js b/web/forms/cms/contact/contact.js
index 10aa5f8f..7e562d8c 100755
--- a/web/forms/cms/contact/contact.js
+++ b/web/forms/cms/contact/contact.js
@@ -1,7 +1,7 @@
 
 Vn.Contact = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
diff --git a/web/forms/cms/contact/send-data.php b/web/forms/cms/contact/send-data.php
index 8dce55e8..42b1b9e7 100755
--- a/web/forms/cms/contact/send-data.php
+++ b/web/forms/cms/contact/send-data.php
@@ -26,7 +26,7 @@ header ('Content-Type: application/json');
 if ($paramsOk && isset ($_SESSION['captcha'])
 && $_POST['captcha'] == $_SESSION['captcha'])
 {
-	mail ('nuria@verdnatura.es', 'Verdnatura', print_r ($_POST, TRUE),
+	mail ('comunicacion@verdnatura.es', 'Verdnatura', print_r ($_POST, TRUE),
 		'From: Verdnatura <www-data@verdnatura.es>');
 
 	echo json_encode (TRUE);
diff --git a/web/forms/cms/contact/style.css b/web/forms/cms/contact/style.css
index 963fd2db..00aeb54a 100755
--- a/web/forms/cms/contact/style.css
+++ b/web/forms/cms/contact/style.css
@@ -5,19 +5,19 @@
 }
 .contact .box
 {
-	max-width: 40em;
+	max-width: 30em;
+	padding: 2em;
 }
-.contact p
+.contact .form
 {
 	position: relative;
-	text-align: center;
+	text-align: left;
 	max-width: 25em;
-	margin: 1em auto;
+	margin: 0 auto;
 }
 .contact form
 {
 	margin: 0 auto;
-	max-width: 25em;
 }
 .contact form p
 {
@@ -25,21 +25,6 @@
 	display: block;
 	margin-top: 2em;
 }
-div.form-group
-{
-	padding: 0.4em;
-}
-.contact form label
-{
-	display: block;
-	margin-bottom: 0.5em;
-}
-.contact input,
-.contact textarea
-{
-	margin: 0;
-	width: 100%;
-}
 .contact textarea
 {
 	height: 5em;
@@ -51,6 +36,10 @@ div.form-group
 	margin-top: 1em;
 	padding: 0.6em;
 }
+.contact .mandatory-message
+{
+	font-size: .9em;
+}
 
 /* Captcha */
 
diff --git a/web/forms/cms/contact/ui.xml b/web/forms/cms/contact/ui.xml
index 9c347d71..e7ae453f 100755
--- a/web/forms/cms/contact/ui.xml
+++ b/web/forms/cms/contact/ui.xml
@@ -1,10 +1,10 @@
 <vn>
+<div id="title">
+	<h1><t>IWantCustomer</t></h1>
+</div>
 <div id="form" class="contact">
 	<div class="box">
-		<div class="header">
-			<h1><t>IWantCustomer</t></h1>
-		</div>
-		<div class="body">
+		<div class="form">
 			<p>
 				<t>FillFormData</t>
 			</p>
@@ -38,13 +38,13 @@
 				</div>
 				<div class="form-group captcha">
 					<label><t>Anti-Spam</t></label>
-					<img alt="Captcha" id="captcha-img"/>
 					<input type="text" name="captcha"/>
+					<img alt="Captcha" id="captcha-img"/>
 				</div>
-				<p>
+				<p class="mandatory-message">
 					<t>AllFieldsMandatory</t>
 				</p>
-				<button class="flat">
+				<button class="thin">
 					<t>Send</t>
 				</button>
 			</form>
diff --git a/web/forms/cms/home/home.js b/web/forms/cms/home/home.js
index 2f099370..2306c4c6 100755
--- a/web/forms/cms/home/home.js
+++ b/web/forms/cms/home/home.js
@@ -1,6 +1,11 @@
 
 Vn.Home = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
+	
+	,onStartOrderClick: function ()
+	{
+		this.hash.set ({'form': 'ecomerce/catalog'});
+	}
 });
 
diff --git a/web/forms/cms/home/style.css b/web/forms/cms/home/style.css
index 9dac9a27..a3e7f890 100755
--- a/web/forms/cms/home/style.css
+++ b/web/forms/cms/home/style.css
@@ -1,14 +1,22 @@
 
 /* News panel */
 
-.home
-{
-	margin: .5em;
-}
 .column
 {
+	margin: .5em;
 	max-width: 120em;
 }
+.action-bar button.start-order
+{
+	background-color: #EF5350;
+	margin: .7em;
+	padding: .5em;
+	box-shadow: 0 0 0.4em rgba(1, 1, 1, 0.4);
+}
+.action-bar button.start-order:hover
+{
+	background-color: #F44336;
+}
 
 /* New */
 
@@ -19,7 +27,7 @@
 	color: #222;
 	border: none;
 	border-radius: 0.1em;
-	box-shadow: 0 0.2em 0.2em #CCC;
+	box-shadow: 0 0.2em 0.2em rgba(1, 1, 1, 0.2);
 	margin: .5em;
 }
 .new .top
diff --git a/web/forms/cms/home/ui.xml b/web/forms/cms/home/ui.xml
index b722ede4..13cc1f3f 100755
--- a/web/forms/cms/home/ui.xml
+++ b/web/forms/cms/home/ui.xml
@@ -1,29 +1,45 @@
 <vn>
-<div id="form" class="home">
-<div class="column mansonry" id="news-column">
-	<htk-repeater form-id="new">
-		<db-model>
-			SELECT title, date_time, text, image, id  FROM news
-				WHERE tag != 'course'
-				ORDER BY priority, date_time DESC
-		</db-model>
-		<template>
-			<div class="masonry-box">
-			<div class="new">
-				<div class="top">
-					<h2><htk-text form="new" column="title"/></h2>
-					<p class="new-info">
-						<htk-text format="_%a, %e %b %Y" form="new" column="date_time"/>
-					</p>
-					<div class="new-text">
-						<htk-html form="new" column="text"/>
-					</div>
-				</div>
-				<htk-image directory="news/full" form="new" column="image"/>
-			</div>
-			</div>
-		</template>
-	</htk-repeater>
+<div id="title">
+	<h1><t>Home</t></h1>
 </div>
+<div id="actions" class="catalog-actions">
+	<htk-button
+		class="start-order"
+		image="image/dark/new-order.svg"
+		tip="_Start order"
+		on-click="onStartOrderClick"
+		showText="true"/>
+</div>
+<div id="form" class="home">
+	<div class="column mansonry" id="news-column">
+		<htk-repeater form-id="new">
+			<db-model property="model">
+				<custom>
+					SELECT title, date_time, text, image, id  FROM news
+						WHERE tag != 'course'
+						ORDER BY priority, date_time DESC
+				</custom>
+			</db-model>
+			<custom>
+				<div class="masonry-box">
+				<div class="new">
+					<div class="top">
+						<h2><htk-text form="new" column="title"/></h2>
+						<!--
+						<p class="new-info">
+							<htk-text format="_%a, %e %b %Y" form="new" column="date_time"/>
+						</p>
+						-->
+						<div class="new-text">
+							<htk-html form="new" column="text"/>
+						</div>
+					</div>
+					<htk-image directory="news/full" form="new" column="image" editable="false"/>
+				</div>
+				</div>
+			</custom>
+		</htk-repeater>
+		<div class="clear"/>
+	</div>
 </div>
 </vn>
diff --git a/web/forms/cms/location/location.js b/web/forms/cms/location/location.js
index 361addde..a1f051bf 100755
--- a/web/forms/cms/location/location.js
+++ b/web/forms/cms/location/location.js
@@ -3,7 +3,7 @@ var gmapsIsLoaded = false;
 
 Vn.Location = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,locations: null
 
diff --git a/web/forms/cms/location/ui.xml b/web/forms/cms/location/ui.xml
index 91571408..58388869 100755
--- a/web/forms/cms/location/ui.xml
+++ b/web/forms/cms/location/ui.xml
@@ -1,3 +1,6 @@
 <vn>
+	<div id="title">
+		<h1><t>Location</t></h1>
+	</div>
 	<div id="form" class="location"/>
 </vn>
diff --git a/web/forms/cms/training/training.js b/web/forms/cms/training/training.js
index d9cca5cb..2e7b514b 100755
--- a/web/forms/cms/training/training.js
+++ b/web/forms/cms/training/training.js
@@ -1,5 +1,5 @@
 
 Vn.Training = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 });
diff --git a/web/forms/cms/training/ui.xml b/web/forms/cms/training/ui.xml
index 314a3c96..6f20f33c 100755
--- a/web/forms/cms/training/ui.xml
+++ b/web/forms/cms/training/ui.xml
@@ -1,13 +1,18 @@
 <vn>
+<div id="title">
+	<h1><t>Training</t></h1>
+</div>
 <div id="form" class="training">
 <div class="column masonry" id="news-column">
 	<htk-repeater form-id="new">
-		<db-model id="news">
-			SELECT title, date_time, text, image, id  FROM news
-				WHERE tag = 'course'
-				ORDER BY priority, date_time DESC
+		<db-model property="model">
+			<custom>
+				SELECT title, date_time, text, image, id  FROM news
+					WHERE tag = 'course'
+					ORDER BY priority, date_time DESC
+			</custom>
 		</db-model>
-		<template>
+		<custom>
 			<div class="masonry-box">
 			<div class="new">
 				<div class="top">
@@ -22,7 +27,7 @@
 				<htk-image directory="news/full" form="new" column="image"/>
 			</div>
 			</div>
-		</template>
+		</custom>
 	</htk-repeater>
 </div>
 </div>
diff --git a/web/forms/cms/why/ui.xml b/web/forms/cms/why/ui.xml
index 8ad3f086..dfc6db71 100755
--- a/web/forms/cms/why/ui.xml
+++ b/web/forms/cms/why/ui.xml
@@ -1,9 +1,9 @@
 <vn>
+<div id="title">
+	<h1><t>AboutCompany</t></h1>
+</div>
 <div id="form" class="why">
 	<div class="box">
-		<div class="header">
-			<h1><t>AboutCompany</t></h1>
-		</div>
 		<div class="body">
 			<ul>
 				<li><t>BecauseOurBigCatalog</t></li>
diff --git a/web/forms/cms/why/why.js b/web/forms/cms/why/why.js
index f07cdd3d..a29a3c04 100755
--- a/web/forms/cms/why/why.js
+++ b/web/forms/cms/why/why.js
@@ -1,6 +1,6 @@
 
 Vn.Why = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 });
 
diff --git a/web/forms/ecomerce/basket/basket.js b/web/forms/ecomerce/basket/basket.js
index 9ca00bdf..02785f37 100755
--- a/web/forms/ecomerce/basket/basket.js
+++ b/web/forms/ecomerce/basket/basket.js
@@ -1,27 +1,21 @@
 
 Vn.Basket = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,open: function ()
 	{
-		if (this.basketChecked)
-			this.parent ();
-	}
+		this.close ();
+		this.isOpen = true;
 
-	,activate: function ()
-	{
 		Vn.BasketChecker.check (this.conn,
 			this.onBasketCheck.bind (this));
 	}
 	
 	,onBasketCheck: function (isOk)
 	{
-		if (!isOk)
-			return;
-			
-		this.basketChecked = true;
-		this.open ();
+		if (isOk)
+			this.loadUi ();
 	}
 
 	,onConfigureClick: function ()
@@ -40,55 +34,21 @@ Vn.Basket = new Class
 		this.hash.set ({'form': 'ecomerce/confirm'});
 	}
 
-	,amountRender: function (renderer, form)
+	,repeaterFunc: function (res, form)
 	{
-		var amount = form.get ('amount');
-		var grouping = form.get ('grouping');
-	
-		if (amount && grouping)
-			renderer.value = amount / grouping;
-		else
-			renderer.value = null;
+		res.$('subtotal').value = this.subtotal (form);
 	}
 
-	,onAmountChange: function (renderer, row, newValue)
+	,onDeleteClick: function  (button, form)
 	{
-		var model = this.$('items');
-		model.set (row, 'amount', newValue * model.get (row, 'grouping'));
-	}
-	
-	,featuresRender: function (renderer, form)
-	{
-		renderer.value = form.get ('Medida') +' '+ form.get ('Categoria') +' '+ form.get ('Color');
-	}
-	
-	,stemsRender: function (renderer, form)
-	{
-		renderer.value = Vn.Value.format (form.get ('price'), '%.2d€') +' x '+ form.get ('amount');
-	
-		if (form.get ('amount') > form.get ('available'))
-			renderer.td.className = 'available-exceeded';
-		else
-			renderer.td.className = '';
-	}
-
-	,subtotalRender: function (renderer, form)
-	{
-		renderer.value = this.subtotal (form);
+		if (confirm (_('ReallyDelete')))
+			form.deleteRow ();
 	}
 
 	,subtotal: function (form)
 	{
 		return form.get ('amount') * form.get ('price');
 	}
-	
-	,availableRender: function (renderer, form)
-	{
-		if (form.get ('amount') > form.get ('avail'))
-			renderer.value = 'unavailable';
-		else
-			renderer.value = 'invisible';
-	}
 });
 
 
diff --git a/web/forms/ecomerce/basket/style.css b/web/forms/ecomerce/basket/style.css
index b78411a2..c250a813 100755
--- a/web/forms/ecomerce/basket/style.css
+++ b/web/forms/ecomerce/basket/style.css
@@ -1,18 +1,12 @@
 .basket
 {
 	padding: 1em;
-	min-width: 25em;
 }
 .basket .box
 {
-	max-width: 45em;
+	max-width: 30em;
 	margin: 0 auto;
-}
-.basket .form
-{
-	padding: 1em;
-	margin: 0;
-	background-color: #009688;
+	padding: 0 2em;
 }
 .basket .form > p
 {
@@ -21,12 +15,55 @@
 	color: white;
 	text-align: right;
 }
-.basket .config
+.basket .head
+{
+	padding: 1.8em 0;
+	margin: 0;
+	border-bottom: 1px solid #DDD;
+}
+.basket .head p
 {
 	margin: 0;
+	padding: 0;
+	font-size: 1.4em;
+	text-align: right;
 }
 
-/* Rows */
+/* Lines */
+
+.basket .lines
+{
+	padding: .8em 0;
+}
+.basket .line
+{
+	padding: 1em 0;
+}
+.basket .line > .delete
+{
+	margin: -0.5em;
+	margin-top: .3em;
+	margin-right: .5em;
+	float: left;
+}
+.basket .line > .photo
+{
+	margin-right: 1em;
+	float: left;
+	border-radius: 50%;
+	height: 3.2em;
+}
+.basket .line > p
+{
+	margin: .1em 0;
+	margin-left: 7.5em;
+}
+.basket .line .subtotal
+{
+	float: right;
+}
+
+/* Fields */
 
 .basket td.available-exceeded input
 {
diff --git a/web/forms/ecomerce/basket/ui.xml b/web/forms/ecomerce/basket/ui.xml
index bced3573..629c3036 100755
--- a/web/forms/ecomerce/basket/ui.xml
+++ b/web/forms/ecomerce/basket/ui.xml
@@ -1,54 +1,79 @@
 <vn>
+<div id="title">
+	<h1><t>ShoppingBasket</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/ok.svg"
+		tip="_Checkout"
+		on-click="onCheckoutClick"
+		show-text="true"/>
+	<htk-button
+		image="image/dark/view-dual.svg"
+		tip="_Catalog"
+		on-click="onCatalogClick"
+		show-text="true"/>
+	<htk-button
+		image="image/dark/preferences.svg"
+		tip="_ConfigureOrder"
+		on-click="onConfigureClick"
+		show-text="true"/>
+</div>
 <div id="form" class="basket">
-<div class="box">
-	<div class="header">
-		<h1><t>Basket</t></h1>
-		<div class="action-bar">
-			<button on-click="onConfigureClick" title="_ConfigureOrder">
-				<img class="config" src="image/dark/preferences.svg" alt=""/>
-				<t>ConfigureOrder</t>
-			</button>
-			<button on-click="onCatalogClick">
-				<img src="image/dark/menu.svg" alt=""/>
-				<t>Catalog</t>
-			</button>
-			<button on-click="onCheckoutClick">
-				<img src="image/dark/ok.svg" alt=""/>
-				<t>Checkout</t>
-			</button>
-		</div>
-		<div class="clear"/>
-	</div>
-	<div>
-		<htk-grid show-header="false">
-			<db-model id="items" updatable="true">
-				SELECT i.id, i.amount, i.price, a.Article, a.Categoria, 
-				a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto
-					FROM basket_item i
-					INNER JOIN vn2008.Articles a ON a.Id_Article = i.item_id
-					LEFT JOIN vn2008.Origen o ON a.id_origen = o.id;
-			</db-model>
-			<htk-column-image
-				column="Foto"
-				directory="catalog"
-				subdir="50x50"
-				show-full="true"
-				full-dir="900x900"
-				class="icon"/>
-			<htk-column-text title="_Item" column="Article"/>
-			<htk-column-text renderer="featuresRender"/>
-			<htk-column-text title="_Amount" column="amount" renderer="stemsRender"/>
-			<htk-column-spin unit="€" digits="2" renderer="subtotalRender"/>
-		</htk-grid>
-		<div class="form">
+	<div class="box">
+		<div class="head">
 			<p>
-				<t>OrderTotal</t> 
+				<t>Total</t> 
 				<htk-text format="%.2d€">
-					<db-calc-sum func="subtotal" model="items"/>
+					<db-calc-sum property="param" func="subtotal" model="items"/>
 				</htk-text>
 			</p>
 		</div>
+		<div class="lines">
+			<htk-repeater form-id="iter" renderer="repeaterFunc">
+				<db-model id="items" property="model" updatable="true">
+					<custom>
+						SELECT i.id, i.amount, i.price, a.Article, a.Categoria, 
+						a.Medida, a.Tallos, a.Color, o.Abreviatura, a.Foto
+							FROM basket_item i
+								JOIN vn2008.Articles a ON a.Id_Article = i.item_id
+								LEFT JOIN vn2008.Origen o ON a.id_origen = o.id
+					</custom>
+				</db-model>
+				<custom>
+					<div class="line">
+						<htk-button
+							form="iter"
+							column="ticket_id"
+							class="delete"
+							tip="_Remove"
+							image="image/delete.svg"
+							on-click="onDeleteClick"/>
+						<htk-image
+							form="iter"
+							column="Foto"
+							class="photo"
+							directory="catalog"
+							subdir="200x200"
+							show-full="true"
+							full-dir="900x900"/>
+						<p class="concept">
+							<htk-text form="iter" column="Article"/> 
+							<htk-text form="iter" column="Medida"/> 
+							<htk-text form="iter" column="Categoria"/>
+						</p>
+						<p class="amount">
+							<htk-text form="iter" column="amount"/> x
+							<htk-text form="iter" column="price" format="%.2d€"/>
+							<span class="subtotal">
+								<htk-text id="subtotal" format="%.2d€"/>
+							</span>
+						</p>
+						<div class="clear"/>
+					</div>
+				</custom>
+			</htk-repeater>
+		</div>
 	</div>
 </div>
-</div>
 </vn>
diff --git a/web/forms/ecomerce/catalog/catalog.js b/web/forms/ecomerce/catalog/catalog.js
index dffdeaf2..e7a7f012 100755
--- a/web/forms/ecomerce/catalog/catalog.js
+++ b/web/forms/ecomerce/catalog/catalog.js
@@ -1,17 +1,16 @@
 
 Vn.Catalog = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
+	
+	,_menuShown: false
 
 	,open: function ()
 	{
-		if (this.basketChecked)
-			this.parent ();
-	}
+		this.close ();
+		this.isOpen = true;
 	
-	,activate: function ()
-	{
-		if (!Vn.Url.getQuery ('guest'))
+		if (!Vn.Cookie.check ('hedera_guest'))
 		{		
 			Vn.BasketChecker.check (this.conn,
 				this.onBasketCheck.bind (this));
@@ -19,27 +18,65 @@ Vn.Catalog = new Class
 		else
 		{
 			var query = 'CALL basket_configure_for_guest ()';
-			this.conn.execQuery (query, this.onBasketForGuest.bind (this));
+			this.conn.execQuery (query, this.loadUi.bind (this));
 		}
 	}
-	
-	,onBasketForGuest: function ()
-	{
-		this.onBasketCheck (true);
-	}
 
 	,onBasketCheck: function (isOk)
 	{
-		if (!isOk)
-			return;
+		if (isOk)
+			this.loadUi ();
+	}
+	
+	,activate: function ()
+	{
+		document.body.appendChild (this.$('right-panel'));
 	
-		this.basketChecked = true;
-		this.open ();
-
-		this.popup = new Htk.Popup ();
-		this.popup.setChildNode (this.$('lots-popup'));
-
 		this.$('items-model').setInfo ('a', 'Articles', 'vn2008', ['item_id']);
+		
+		if (Vn.Cookie.check ('hedera_view'))
+			this.setView (Vn.Cookie.getInt ('hedera_view'));
+		else
+			this.setView (Vn.Catalog.View.GRID);
+	}
+	
+	,deactivate: function ()
+	{
+		this.hideMenu ();
+		this.gui.$('top-bar').style.backgroundColor = '';
+		Vn.Node.remove (this.$('right-panel'));
+	}
+
+	,setView: function (view)
+	{
+		if (view === Vn.Catalog.View.GRID)
+		{
+			this.$('view-button').setProperties ({
+				image: 'image/dark/view-list.svg',
+				tip: _('List view')
+			});
+			this.view = Vn.Catalog.View.GRID;
+			var className = 'grid-view';
+		}
+		else
+		{
+			this.$('view-button').setProperties ({
+				image: 'image/dark/view-grid.svg',
+				tip: _('Grid view')
+			});
+			this.view = Vn.Catalog.View.LIST;
+			var className = 'list-view';
+		}
+		
+		var node = this.$('grid-view').getNode ();
+		node.className = className;
+		Vn.Cookie.set ('hedera_view', this.view);
+	}
+	
+	,onSwitchViewClick: function ()
+	{
+		this.setView (this.view === Vn.Catalog.View.LIST ?
+			Vn.Catalog.View.GRID : Vn.Catalog.View.LIST);
 	}
 	
 	,onBasketReady: function (form)
@@ -56,6 +93,33 @@ Vn.Catalog = new Class
 		link.href = this.hash.make ({'type': form.get ('tipo_id')}, true);
 	}
 	
+	,onItemsChange: function (model, status)
+	{
+		if (status !== Db.Model.Status.CLEAN)
+			this.$('order').style.display = 'block';
+		else
+			this.$('order').style.display = 'none';
+	}
+	
+	,onOrderChange: function (e)
+	{
+		var value = e.target.value;	
+		var sortField = value.substr (2);
+		var sortWay = value.charAt (0) === 'A' ?
+			Db.Model.SortWay.ASC : Db.Model.SortWay.DESC;
+		
+		if (sortField)
+			this.$('items-model').sortByName (sortField, sortWay);
+		
+		this.hideMenu ();
+	}
+	
+	,onFilterChange: function (param, newValue)
+	{
+		if (newValue)
+			this.hideMenu ();
+	}
+	
 	,realmRenderer: function (builder, form)
 	{
 		var link = builder.$('link');
@@ -65,43 +129,72 @@ Vn.Catalog = new Class
 		});
 		
 		var img = builder.$('image');
-		img.src = 'image/family/'+ form.get ('id') +'.svg';
-		img.title = form.get ('reino');
+		img.src = 'image/family_dark/'+ form.get ('id') +'.svg';
+		img.title = form.get ('name');
 		img.alt = img.title;
 	}
-
-	,onTypeChange: function ()
+	
+	,onRealmChange: function (param, newValue)
 	{
-		if (Vn.isMobile () && this.$('type').value)
-			this.hideMenu ();
+		if (newValue)
+		{
+			this.$('filters').style.display = 'block';
+			this.$('realm-msg').style.display = 'none';
+		}
+		else
+		{
+			this.$('filters').style.display = 'none';
+			this.$('realm-msg').style.display = 'block';
+		}
+	
+		this.refreshTitleColor ();
+		this.refreshFilter (newValue, undefined);
+	}
 
+	,onTypeChange: function (param, newValue)
+	{
+		this.onFilterChange (param, newValue);
+		this.refreshTitle ();
+		this.refreshFilter (undefined, newValue);
+	}
+	
+	,refreshFilter: function (realm, type)
+	{
+		var batch = this.$('filter-batch');
+		batch.block ();
+		this.$('realm-value').value = realm;
+		this.$('type-value').value = type;
+		this.$('search').value = undefined;
+		this.$('color').value = undefined;
+		this.$('origin').value = undefined;
+		this.$('category').value = undefined;
+		this.$('producer').value = undefined;
+		batch.unblock ();
+		batch.changed ();
+	}
+	
+	,refreshTitleColor: function ()
+	{
 		var realms = this.$('realms-model');
-		
+
 		if (!realms.ready)
 			return;
-		
-		this.refreshTitle ();
 
 		var color = null;
+		var realm = this.$('realm').value;
 		
-		if (this.$('type').value)
+		if (realm)
 		{
-			var row = realms.search ('id', this.$('realm').value);
+			var row = realms.search ('id', realm);
 
 			if (row != -1)
 				color = '#'+ realms.get (row, 'color');
 		}
 
-		this.$('header').style.backgroundColor = color;
-
-		var tr = this.$('items-grid').getNode ()
-			.getElementsByTagName ('thead')[0]
-			.getElementsByTagName ('tr')[0];
-			//.querySelector ('thead tr');
-		tr.style.backgroundColor = color;
+		this.gui.$('top-bar').style.backgroundColor = color;
 	}
 	
-	,refreshTitle: function (title)
+	,refreshTitle: function ()
 	{
 		var types = this.$('types-model');
 		
@@ -109,73 +202,56 @@ Vn.Catalog = new Class
 			return;
 		
 		var title = _('Catalog');
+		var type = this.$('type').value;
 		
-		if (this.$('type').value)
+		if (type)
 		{
-			var row = types.search ('tipo_id', this.$('type').value);
+			var row = types.search ('tipo_id', type);
 
 			if (row != -1)
-				title = types.get (row, 'Tipo');
-		}
-		else if (this.$('search-entry').value)
-			title = _('SearchResults');
-
-		Vn.Node.setText (this.$('title'), title);
-	}
-
-	,onSearch: function (event)
-	{
-		var searchTags = this.$('search-entry').value;
-		searchTags = searchTags != '' ? searchTags : undefined;
-
-		var batch = this.$('batch');
-		batch.block ();
-
-		this.$('search').value = searchTags;
-
-		if (searchTags)
-		{
-			this.$('type').value = undefined;
-			this.$('realm').value = undefined;
+				title = types.get (row, 'name');
 		}
 
-		batch.unblock ();
-		batch.changed ();
+		Vn.Node.setText (this.$('title-text'), title);
 	}
 
-	,onMenuClick: function (event)
+	,onRightPanelClick: function (event)
 	{
 		event.stopPropagation ();
 	}
 
 	,onShowMenuClick: function (event)
 	{
+		this._menuShown = true;
 		event.stopPropagation ();
 		this.gui.showBackground ();
-		this.$('menu').style.display = 'block';
+		Vn.Node.addClass (this.$('right-panel'), 'show');
 		this.hideMenuCallback = this.hideMenu.bind (this);
 		document.addEventListener ('click', this.hideMenuCallback);
 	}
 
 	,hideMenu: function ()
 	{
+		if (!this._menuShown)
+			return;
+
 		this.gui.hideBackground ();
-		this.$('menu').style.display = 'none';
+		Vn.Node.removeClass (this.$('right-panel'), 'show');
 		document.removeEventListener ('click', this.hideMenuCallback);
 		this.hideMenuCallback = null;
 	}
 	
 	,onBasketClick: function ()
 	{
-		if (!Vn.Url.getQuery ('guest'))
+		if (!Vn.Cookie.check ('hedera_guest'))
 			this.hash.set ({'form': 'ecomerce/basket'});
 		else
 			Htk.Toast.showError (_('YouMustBeLoggedIn'));
 	}
-	
-	,onConfigClick: function ()
+
+	,onConfigureClick: function ()
 	{
-		if (!Vn.Url.getQuery ('guest'))
+		if (!Vn.Cookie.check ('hedera_guest'))
 			this.hash.set ({'form': 'ecomerce/checkout'});
 		else
 			Htk.Toast.showError (_('YouMustBeLoggedIn'));
@@ -183,17 +259,7 @@ Vn.Catalog = new Class
 	
 	,nameRenderer: function (renderer, form)
 	{
-		var producer = form.get ('producer');
-	
-//		if (producer)
-//			producer = producer.toUpperCase ();
-		
-		renderer.subtitle = producer;
-	}
-	
-	,featuresRender: function (renderer, form)
-	{
-		renderer.value = form.get ('Medida') +' '+ form.get ('Categoria') +' '+ form.get ('Color');
+		renderer.subtitle = form.get ('producer');
 	}
 
 	,amountRender: function (renderer, form)
@@ -227,10 +293,35 @@ Vn.Catalog = new Class
 				column.td.className = '';
 		}
 	}
+
+	,onInfoClick: function  (button, form)
+	{
+		var descNode = this.$('description');
+		Vn.Node.removeChilds (descNode);
+		
+		var desc = form.get ('description');
+		
+		if (!desc)
+			desc = _('No info available');
+
+		descNode.appendChild (document.createTextNode (desc));
+		
+		this.$('desc-popup').show (button.getNode ());
+	}
+
+	,onGridAddItemClick: function (button, form)
+	{
+		this.showAmountPopup (button.getNode (), form.row);
+	}
 	
 	,onAddItemClick: function  (column, value, row, button)
 	{
-		if (Vn.Url.getQuery ('guest'))
+		this.showAmountPopup (button, row);
+	}
+	
+	,showAmountPopup: function (button, row)
+	{
+		if (Vn.Cookie.check ('hedera_guest'))
 		{
 			Htk.Toast.showError (_('YouMustBeLoggedIn'));
 			return;
@@ -241,7 +332,7 @@ Vn.Catalog = new Class
 
 		this.itemRow = row;
 		this.onEraseClick ();
-		this.popup.show (button);
+		this.$('lots-popup').show (button);
 	}
 	
 	,onAddLotClick: function (column, value, row, button)
@@ -305,16 +396,209 @@ Vn.Catalog = new Class
 				sprintf (_('Added%dOf%s'), amountSum, itemName));
 		}
 
-		this.popup.hide ();
+		this.$('lots-popup').hide ();
 	}
 	
 	,onStatusChange: function (model)
 	{
-		if (this.popup)
-			this.popup.reset ();
+		this.$('lots-popup').reset ();
+	}
+	
+	,gridRenderer: function (res, form)
+	{
+		if (!form.get ('description'))
+		{
+			var button = res.$('info-button').getNode ();
+			button.style.display = 'none';
+		}
 	}
 });
 
+Vn.Catalog.extend
+({
+	View: {
+		LIST: 0,
+		GRID: 1
+	}
+});
+
+Vn.Filter = new Class
+({
+	Extends: Htk.Field
+	,Tag: 'vn-filter'
+	,Child: 'model'
+	,Properties:
+	{
+		model:
+		{
+			type: Db.Model
+			,set: function (x)
+			{
+				x.batch = this._batch;
+				this._model = x;
+				this._select.model = x;
+			}
+			,get: function ()
+			{
+				return this._model;
+			}
+		},
+		placeholder:
+		{
+			type: String
+			,set: function (x)
+			{
+				this._select.placeholder = x;
+				this._placeholder = x;
+			}
+			,get: function ()
+			{
+				return this._placeholder;
+			}
+		},
+		filter:
+		{
+			type: Sql.Filter
+			,set: function (x)
+			{
+				this._filter = x;
+				this._batch.addObject ('filter', x);
+			}
+			,get: function ()
+			{
+				return this._filter;
+			}
+		},
+	}
+	
+	,_valueColumnIndex: 0
+	,_showColumnIndex: 1
+	
+	,initialize: function (props)
+	{
+		this.createElement ('div');
+		this.node.className = 'vn-filter';
+		
+		this._select = new Htk.Select ();
+		this._select.on ('mousedown', this._onMouseDown, this);
+		this._select.on ('changed', this._onChange, this);
+		this._select.on ('ready', this._onReady, this);
+		this.node.appendChild (this._select.getNode ());
+		
+		this._ul = document.createElement ('ul');
+		this.node.appendChild (this._ul);
+		
+		this._batch = new Sql.Batch ();
+		this.parent (props);
+	}
+	
+	,_onMouseDown: function (e)
+	{
+		if (this._model && this._model.status === Db.Model.Status.CLEAN)
+			this._model.refresh ();
+	}
+	
+	,_onCloseClick: function (li)
+	{
+		this._removeSelectionNode ();
+		this._changeValue (undefined);
+	}
+	
+	,_removeSelectionNode: function ()
+	{
+		if (this._lastLi)
+		{
+			Vn.Node.remove (this._lastLi);
+			this._lastLi = null;
+			this._label = null;
+		}		
+	}
+	
+	,_onChange: function ()
+	{
+		if (this._select.value === null
+		|| this._select.value === undefined)
+			return;
+			
+		this._realSetValue (this._select.value);
+	}
+	
+	,_onReady: function ()
+	{
+		if (this._emptyLabel)
+			this._refreshLabel ();
+	}
+	
+	,_changeValue: function (newValue)
+	{
+		this._batch.block ();
+		this.value = newValue;
+		this._batch.unblock ();
+	}
+	
+	,_onTimeout: function ()
+	{
+		this._select.value = null;
+	}
+	
+	,putValue: function (value)
+	{
+		this._onMouseDown ();
+		this._realSetValue (value);
+	}
+		
+	,_realSetValue: function (value)
+	{
+		this._removeSelectionNode ();
+
+		if (value === null || value === undefined)
+			return;
+
+		var li = this._lastLi = document.createElement ('li');
+		this._ul.appendChild (li);
+			
+		var button = document.createElement ('button');
+		button.addEventListener ('click',
+			this._onCloseClick.bind (this, li));
+		li.appendChild (button);
+		
+		var img = document.createElement ('img');
+		img.src = 'image/close.svg';
+		button.appendChild (img);
+			
+		var text = this._label = document.createTextNode ('');
+		li.appendChild (text);
+		
+		setTimeout (this._onTimeout.bind (this));
+
+		this._changeValue (value);
+		this._refreshLabel ();
+	}
+	
+	,_refreshLabel: function ()
+	{
+		if (!this._label)
+			return;
+	
+		var row = -1;
+
+		if (this._model.ready)
+			row = this._model.searchByIndex (this._valueColumnIndex, this._value);
+
+		if (row != -1)
+		{
+			var label = this._model.getByIndex (row, this._showColumnIndex);
+			this._label.nodeValue = label;
+			this._emptyLabel = false;
+		}
+		else
+		{
+			this._emptyLabel = true;
+			this._label.nodeValue = _('Loading...');
+		}
+	}
+})
+
 Vn.ColumnItem = new Class
 ({
 	Extends: Htk.Column
@@ -340,5 +624,5 @@ Vn.ColumnItem = new Class
 
 		return td;
 	}
-});
+})
 
diff --git a/web/forms/ecomerce/catalog/style.css b/web/forms/ecomerce/catalog/style.css
index d11de58c..8e12e9bf 100755
--- a/web/forms/ecomerce/catalog/style.css
+++ b/web/forms/ecomerce/catalog/style.css
@@ -1,288 +1,417 @@
 .catalog
 {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	min-height: 25em;
-}
-.catalog div.center
-{
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 17em;
+	margin-right: 17em;
 }
 
 /* Main */
 
-.catalog div.main
+.htk-toast
 {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	overflow: auto;
-	padding: 1em;
-}
-.catalog div.main .box
-{
-	margin: 0 auto;
-	max-width: 50em;
-	min-width: 25em;
-}
-
-.catalog .footer-message
-{
-	padding-bottom: 1em;
-	text-align: center;
+	margin-left: -11em;
 }
 
 /* Topbar */
 
-.catalog .action-bar
+.catalog-actions > .htk-search-entry
 {
-	max-width: 15em;
-}
-.catalog .search
-{
-	float: left;
-	display: block;
-	background-color: white;
-	height: 2.2em;
-	padding: 0;
-}
-.catalog .search > input
-{
-	margin: 0;
-	border: none;
-	width: 10em;
-	box-shadow: none;
-}
-.catalog .search > input:focus
-{
-	background-color: initial;
-}
-.catalog .search > img
-{
-	margin: 0.4em;
-	margin-top: 0;
-	vertical-align: middle;
-}
-.catalog button.menu
-{
-	float: left;
-	display: none;
-	border: none;
-	background-color: transparent;
-	box-shadow: none;
-	padding: 0.3em;
-	padding-left: 0;
-	margin-left: 0;
-}
-.catalog button.menu > img
-{
-	height: 1.8em;
+	margin-top: .8em;
+	margin-right: .4em;
 }
 
 /* Right panel */
 
 .right-panel
 {
-	position: absolute;
-	z-index: 20;
-	top: 0;
+	position: fixed;
+	top: 3.9em;
 	bottom: 0;
 	right: 0;
 	width: 17em;
 	background-color: white;
-	box-shadow: 0 0.2em 0.2em #AAA;
+	box-shadow: 0 0 .2em rgba(1, 1, 1, 0.4);
+	overflow: auto;
 }
-.right-panel button.basket,
-.right-panel button.configure
+.right-panel .basket-info
 {
-	width: 100%;
-	height: 3em;
-	font-size: 1.1em;
-	text-align: center;
-	background-color: #00BCD4;
-	border-radius: 0;
-	display: inline-block;
-	width: 50%;
-	margin: 0;
-	padding: 0;
+	background-color: #00ACC1;
+	color: white;
+	box-shadow: 0 .1em .1em rgba(1, 1, 1, 0.3);
+	padding: 1.2em 2em;
 }
-.right-panel button.basket:hover
+.right-panel .basket-info > button
 {
-	background-color: #0AB;
-}
-.right-panel button.configure
-{
-	background-color: #0097A7;
-}
-.right-panel button.configure:hover
-{
-	background-color: #00838F;
+	color: #E0F2F1;
+	margin: 0 auto;
+	display: block;
+	margin-top: .4em;
 }
 .right-panel .basket-info > p
-{
-	margin: 1em 1.2em;
-	color: #555;
-	font-size: 1.2em;
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: nowrap;
-}
-.right-panel .basket-info span
-{
-	font-size: 1em;
-}
-.right-panel .realms-box
-{
-	box-shadow: 0 0 0.4em #AAA;
-	background-color: rgba(1, 1, 1, .1);
-}
-.right-panel .realms-box a
-{
-	display: block;
-	float: left;
-	line-height: 0;
-	width: 33.3%;
-}
-.right-panel .realms-box a > img
-{
-	width: 100%;
-	border: 0;
-	padding: 0;
-	cursor: pointer;
-}
-.right-panel .realms-box img:hover
-{
-	opacity: 0.85;
-}
-.right-panel .types-box
-{
-	position: absolute;
-	top: 21.6em;
-	bottom: 0;
-	right: 0;
-	left: 0;
-	overflow: auto;
-}
-.right-panel .types-box a
-{
-	padding: .5em 1.5em;
-	display: block;
-}
-.right-panel .types-box a:hover
-{
-	background-color: rgba(1, 1, 1, .1);
-}
-
-/* Grid view */
-
-.item-box
-{
-	padding: 1em;
-	border-bottom: 1px solid #DDD;
-	min-height: 14em;
-}
-.item-box > .image
-{
-	width: 8em;
-	height: 14em;
-	float: left;
-	margin-right: 1em;
-}
-.item-box img
-{
-	max-width: 8em;
-	max-height: 8em;
-	display: block;
-	margin: 0 auto;
-}
-.item-box p
 {
 	margin: 0;
-	padding: 0.6em;
+	padding: .4em 0;
+	font-size: 1.1em;
+	text-align: left;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
 }
-.item-box h2
+.right-panel .filter
+{
+	padding: 1em 1.8em;
+}
+.right-panel .filters,
+.right-panel .order
+{
+	display: none;
+}
+.right-panel .realm-msg
+{
+	margin-top: 1em;
+/*	box-shadow: 0 0 .3em rgba(1, 1, 1, 0.5);
+	border-radius: 50%;
+	overflow: hidden;*/
+}
+.right-panel .realm-msg > h1
 {
 	font-weight: normal;
+	text-align: center;
+	padding: 2.5em 0;
+	color: #777;
+/*	background-color: #009688;
+	color: white;*/
 }
-.item-box .amount
+.right-panel h2
 {
-	width: 3em;
+	font-weight: normal;
+	padding: .4em 0;
+	color: #777;
+	font-size: 1.1em;
 }
-.amount-p
+.right-panel .realms
 {
-	text-align: right;
+	width: 95%;
+	margin: .2em auto;
+}
+.right-panel .realms a
+{
+	display: block;
+	float: left;
+	width: 33.33%;
+}
+.right-panel .realms a:hover
+{
+	background-color: rgba(1, 1, 1, 0.05);
+	border-radius: .1em;
+}
+.right-panel .realms a > img
+{
+	display: block;
+	padding: 0;
+	width: 100%;
+}
+.right-panel .vn-filter,
+.right-panel select
+{
+	margin: 0 auto;
+	margin-bottom: .7em;
+	width: 90%;
+	display: block;
+}
+.vn-filter > ul
+{
+	margin: 0;
+	list-style-type: none;
+	text-align: left;
+	color: #666;
+	padding-left: .8em;
+}
+.vn-filter li
+{
+	margin: 0;
+	margin-top: .3em;
+	line-height: 2em;
+	max-width: 90%;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+.vn-filter li > button
+{
+	vertical-align: middle;
+	text-align: center;
+	padding: .2em;
+	margin: 0;
+	margin-right: .2em;
+}
+.right-panel .filters > button
+{
+	display: block;
+	margin: 0 auto;
+	margin-top: 1em;
+}
+
+/* Item description */
+
+.desc-popup
+{
+	padding: 1em;
+	max-width: 15em;
 }
 
 /* Lots popup*/
 
-div.amount
+.lots-popup .footer
 {
 	text-align: center;
 	background-color: #009688;
 	color: white;
-	line-height: 2.5em;
-	padding: 0.2em;
+	line-height: 2em;
+	padding: .4em;
 }
-button.erase
+.lots-popup .footer > button
+{
+	margin: 0;
+}
+.lots-popup .erase
 {
 	float: left;
 }
-button.confirm
+.lots-popup .confirm
 {
 	float: right;
 }
-button.erase > img,
-button.confirm > img
+.lots-popup .erase > img,
+.lots-popup .confirm > img
 {
+	display: block;
 	height: 1em;
 }
 
-/* List view */
+/* Items */
 
-.items
-{
-	width: 100%;
-}
-.catalog div.box div.header,
-.items > thead > tr,
-.realms-bar
-{
-	background-color: #777;
-}
-.items > tbody > tr
-{
-	height: 6em;
-}
-.items .icon
-{
-	width: 6em;
-	padding: .2em;
-	padding-right: .5em;
-}
-.items .icon > img
-{
-	max-height: 6em;
-	max-width: 6em;
-}
-td.second-category
+.catalog .second-category
 {
 	font-weight: bold;
 	color: orange;
 }
-td.third-category
+.catalog .third-category
 {
 	font-weight: bold;
 	color: red;
 }
-td.price
+.catalog .price
 {
 	color: green;
+	font-size: 1.1em;
+}
+.catalog .footer-message
+{
+	padding-bottom: 1em;
+	text-align: center;
+}
+.catalog .item-info > h2
+{
+	font-weight: normal;
+}
+.catalog .item-info > p
+{
+	margin: 0;
+	padding: 0;
+	color: #777;
+	font-size: .8em;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+.grid-view .item-info > .producer
+{
+	text-transform: uppercase;
+}
+.catalog .item-info > .htk-button
+{
+	margin: -0.3em;
+	padding: .3em;
+}
+.catalog .item-info > .htk-button > img
+{
+	vertical-align: middle;
+}
+.catalog .item-info .from
+{
+	font-size: .8em;
+	font-style: italic;
+}
+
+/* List view */
+
+.list-view
+{
+	max-width: 30em;
+	margin: 0 auto;
+	padding: 1em;
+}
+.list-view .item-box
+{
+	display: block;
+	position: relative;
+	width: 100%;
+	margin: 0;
+	height: 5.5em;
+	overflow: visible;
+	border-bottom: 1px solid #DDD;
+}
+.list-view .item-box > .image
+{
+	margin: 1em;
+	width: 3.5em;
+	height: 3.5em;
+	float: left;
+	border-radius: 50%;
+	overflow: hidden;
+}
+.list-view .item-box > .image > img
+{
+	max-width: 100%;
+	height: 100%;
+	display: block;
+	margin: 0 auto;
+}
+.list-view .item-info
+{
+	position: absolute;
+	left: 5.5em;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	margin: .9em;
+	margin-left: 0;
+}
+.list-view .item-info > h2
+{
+	font-size: 1em;
+	padding: 0;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+.list-view .item-info > .color
+{
+	display: none;
+}
+.list-view .item-info > .aval-price
+{
+	position: absolute;
+	bottom: 0;
+	right: .3em;
+}
+.list-view .item-info > .htk-button
+{
+	float: right;
+}
+.list-view .item-info > .info-button
+{
+	margin-right: 0;
+}
+
+/* Grid view */
+
+.grid-view
+{
+	padding: 1em;
+	padding-right: .2em;
+	padding-bottom: .4em;
+	text-align: center;
+}
+.grid-view .item-box
+{
+	text-align: left;
+	position: relative;
+	display: inline-block;
+	width: 22.5em;
+	margin: 0;
+	margin-right: .8em;
+	margin-bottom: .6em;
+	height: 10em;
+	overflow: hidden;
+}
+.grid-view .item-box > .image
+{
+	width: 10em;
+	height: 100%;
+	float: left;
+}
+.grid-view .item-box > .image > img
+{
+	max-width: 100%;
+	height: 100%;
+	display: block;
+	margin: 0 auto;
+}
+.grid-view .item-info
+{
+	position: absolute;
+	left: 10.4em;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	margin: .6em;
+}
+.grid-view .item-info > h2
+{
+	font-weight: normal;
+	padding-top: 0;
+}
+.grid-view .item-info > .aval-price
+{
+	position: absolute;
+	bottom: 0;
+	right: 2.8em;
+}
+.grid-view .item-info .add-button
+{
+	position: absolute;
+	bottom: 0;
+	right: 0;
+}
+.grid-view .item-info > .info-button
+{
+	float: right;
+}
+
+/* Mobile */
+
+.catalog-actions > button.menu
+{
+	display: none;
+	padding: 1.1em .5em;
+}
+.catalog-actions > button.menu > img
+{
+	height: 1.8em;
+}
+
+@media (max-width: 960px)
+{
+	.catalog-actions > button.menu
+	{
+		display: block;
+	}
+	.right-panel
+	{
+		top: 0;
+		right: -17em;
+		z-index: 20;
+		transition: transform 200ms ease-out;
+		-webkit-transition: transform 200ms ease-out;
+	}
+	.right-panel.show
+	{
+		transform: translateZ(0) translateX(-17em);
+		-webkit-transform: translateZ(0) translateX(-17em);
+	}
+	.catalog
+	{
+		margin-right: 0;
+	}
 }
 
diff --git a/web/forms/ecomerce/catalog/ui.xml b/web/forms/ecomerce/catalog/ui.xml
index f5d05074..ab5a5704 100755
--- a/web/forms/ecomerce/catalog/ui.xml
+++ b/web/forms/ecomerce/catalog/ui.xml
@@ -1,111 +1,183 @@
 <vn>
 <vn-group>
-	<vn-param id="realm" on-changed="onTypeChange">
-		<vn-hash-param key="realm"/>
-	</vn-param>
-	<vn-param id="type" on-changed="onTypeChange">
-		<vn-hash-param key="type"/>
-	</vn-param>
-	<vn-param id="search"/>
+	<vn-param id="realm" on-changed="onRealmChange"/>
+	<vn-param id="type" on-changed="onTypeChange"/>
+	<vn-param id="search" on-changed="onFilterChange"/>
+	<vn-param id="color" on-changed="onFilterChange"/>
+	<vn-param id="origin" on-changed="onFilterChange"/>
+	<vn-param id="category" on-changed="onFilterChange"/>
+	<vn-param id="producer" on-changed="onFilterChange"/>
+	<vn-hash-param key="realm" param="realm"/>
+	<vn-hash-param key="type" param="type"/>
 	<sql-filter type="AND" id="filter">
-		<sql-filter-item type="EQUAL" id="sql-type">
-			<sql-field name="tipo_id"/>
-			<sql-value param="type"/>
+		<sql-filter-item type="EQUAL" primary="false" id="op-realm">
+			<sql-field name="reino_id" target="t"/>
+			<sql-value id="realm-value"/>
 		</sql-filter-item>
-		<sql-filter-item type="LIKE">
+		<sql-filter-item type="EQUAL" id="op-type">
+			<sql-field name="tipo_id" target="a"/>
+			<sql-value id="type-value"/>
+		</sql-filter-item>
+		<sql-filter-item type="LIKE" id="op-name">
 			<sql-field name="Article"/>
 			<sql-search-tags param="search"/>
 		</sql-filter-item>
+		<sql-filter-item type="EQUAL" id="op-color">
+			<sql-field name="Color"/>
+			<sql-value param="color"/>
+		</sql-filter-item>
+		<sql-filter-item type="EQUAL" id="op-origin">
+			<sql-field name="id_origen"/>
+			<sql-value param="origin"/>
+		</sql-filter-item>
+		<sql-filter-item type="EQUAL" id="op-category">
+			<sql-field name="Categoria"/>
+			<sql-value param="category"/>
+		</sql-filter-item>
+		<sql-filter-item type="EQUAL" id="op-producer">
+			<sql-field name="producer_id"/>
+			<sql-value param="producer"/>
+		</sql-filter-item>
 	</sql-filter>
 	<db-query id="basket-lines">
-		SELECT item_id, warehouse_id, SUM(amount) amount
-			FROM basket_item
-			GROUP BY warehouse_id
+		<custom>
+			SELECT item_id, warehouse_id, SUM(amount) amount
+				FROM basket_item
+				GROUP BY warehouse_id
+		</custom>
 	</db-query>
-	<db-model result-index="2" id="items-model">
-		CREATE TEMPORARY TABLE tmp.bionic_calc
-		(INDEX (item_id))
-		ENGINE=MEMORY
-		SELECT Id_Article item_id FROM vn2008.Articles
-			WHERE #filter;
-		CALL bionic_calc ();
-		SELECT a.Id_Article item_id, t.available, t.price, p.name producer, 
-		a.Foto, a.Article, a.Categoria, a.Medida, a.Tallos, a.Color, o.Abreviatura
-			FROM tmp.bionic_item t
-				JOIN vn2008.Articles a ON a.Id_Article = t.item_id
-       			LEFT JOIN vn2008.producer p ON p.producer_id = a.producer_id
-				LEFT JOIN vn2008.Origen o ON a.id_origen = o.id
-			WHERE t.available > 0
-			ORDER BY a.Article, a.Medida
-			LIMIT 400;
-		<sql-batch property="batch" id="batch">
-			<item name="filter" object="filter"/>
+	<db-model result-index="2" id="items-model" on-status-changed="onItemsChange">
+		<custom>
+			CREATE TEMPORARY TABLE tmp.bionic_calc
+			(INDEX (item_id))
+			ENGINE=MEMORY
+			SELECT a.Id_Article item_id FROM vn2008.Articles a
+				JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
+				WHERE #filter;
+			CALL bionic_calc ();
+			SELECT a.Id_Article item_id, a.description, b.available, b.price,
+			p.name producer, a.Foto, a.Article, a.Categoria, a.Medida,
+			IF(a.Tallos > 1, a.Tallos, NULL) Tallos, c.str color, o.str origin
+				FROM tmp.bionic_item b
+					JOIN vn2008.Articles a ON a.Id_Article = b.item_id
+		    		LEFT JOIN vn2008.producer p ON p.producer_id = a.producer_id
+					LEFT JOIN vn_locale.color_view c ON c.color_id = a.Color
+					LEFT JOIN vn_locale.origin_view o ON o.origin_id = a.id_origen
+				WHERE b.available > 0
+				ORDER BY a.Article, a.Medida
+				LIMIT 400;
+		</custom>
+		<sql-batch property="batch" id="filter-batch">
+			<custom>
+				<item name="filter" object="filter"/>
+			</custom>
 		</sql-batch>
 	</db-model>
 	<db-model id="item-lots" result-index="1" on-status-changed-after="onStatusChange">
-		CALL bionic_from_item (#item);
-		SELECT p.warehouse_id, p.grouping, p.price, p.rate, l.available
-			FROM tmp.bionic_lot l
-				JOIN tmp.bionic_price p
-					ON p.warehouse_id = l.warehouse_id
-			ORDER BY warehouse_id, grouping;
+		<custom>
+			CALL bionic_from_item (#item);
+			SELECT p.warehouse_id, w.name warehouse, p.grouping, p.price, p.rate, l.available
+				FROM tmp.bionic_lot l
+					JOIN tmp.bionic_price p ON p.warehouse_id = l.warehouse_id
+					JOIN vn2008.warehouse w ON w.id = p.warehouse_id
+				ORDER BY warehouse_id, grouping;
+		</custom>
 		<sql-batch property="batch" id="lots-batch"/>
 	</db-model>
 	<db-form id="basket" on-ready="onBasketReady">
-		<db-model>
-			SELECT o.id, o.date_send, ag.description agency, v.code method
-				FROM basket o
-					JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
-					JOIN vn2008.Vistas v ON v.vista_id = o.delivery_method_id
+		<db-model property="model">
+			<custom>
+				SELECT o.id, o.date_send, ag.description agency, v.code method
+					FROM basket o
+						JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
+						JOIN vn2008.Vistas v ON v.vista_id = o.delivery_method_id
+			</custom>
 		</db-model>
 	</db-form>
 </vn-group>
+<div id="title">
+	<h1 id="title-text"><t>Catalog</t></h1>
+</div>
+<div id="actions" class="catalog-actions">
+	<button class="menu" on-click="onShowMenuClick">
+		<img src="image/dark/menu.svg" alt="_Menu"/>
+	</button>
+	<htk-button
+		id="a"
+		image="image/dark/basket.svg"
+		tip="_ShoppingBasket"
+		on-click="onBasketClick"
+		showText="true"/>
+	<htk-button
+		id="view-button"
+		tip="_Switch view"
+		on-click="onSwitchViewClick"
+		showText="true"/>
+	<htk-search-entry
+		param="search"/>
+</div>
 <div id="form" class="catalog">
-	<div class="center">
-		<div class="main">
-		<div class="box">
-			<div id="header" class="header">
-				<button class="menu" on-click="onShowMenuClick">
-					<img src="image/dark/menu.svg" alt="_Menu"/>
-				</button>
-				<h1 id="title"><t>Catalog</t></h1>
-				<div class="action-bar">
-					<div class="search">
-						<img src="image/search.svg" alt="_Search" class="icon"/>
-						<input type="text" id="search-entry" on-change="onSearch"/>
-					</div>
-				</div>
-				<div class="clear"/>
-			</div>
-			<htk-grid empty-message="_SelectSubtype" id="items-grid" class="items" model="items-model">
-				<htk-column-image
-					title="*"
-					class="icon"
-					column="Foto"
+	<div id="main" class="main">
+	<htk-repeater
+		id="grid-view"
+		empty-message="_Choose filter from right menu"
+		form-id="item"
+		renderer="gridRenderer"
+		model="items-model">
+		<custom>
+		<div class="box item-box">
+			<div class="image">
+				<htk-image
 					directory="catalog"
 					subdir="200x200"
+					form="item"
+					column="Foto"
 					show-full="true"
 					full-dir="900x900"
 					editable="true"/>
-				<vn-column-item title="_Name" column="Article" renderer="nameRenderer"/>
-				<htk-column-text title="_Cat" renderer="featuresRender"/>
-				<htk-column-spin title="_Aval" column="available"/>
-				<htk-column-text
-					title="_Price"
-					column="price"
-					format="_from %.2d€"
-					class="price"/>
-				<htk-column-button
+			</div>
+			<div class="item-info">
+				<htk-button
+					form="item"
 					column="id"
-					image="image/add.svg"
 					tip="_AddToBasket"
-					on-clicked="onAddItemClick"/>
-			</htk-grid>
-			<p class="footer-message">
-				<t>IndicativePhotos</t>
-			</p>
-		</div>
+					image="image/add.svg"
+					on-click="onGridAddItemClick"
+					class="add-button"/>
+				<htk-button
+					form="item"
+					column="id"
+					tip="_More info"
+					image="image/info.svg"
+					on-click="onInfoClick"
+					id="info-button"
+					class="info-button"/>
+				<div class="aval-price">
+					<htk-text form="item" column="available"/> 
+					<span class="from">
+						<t>from</t>
+					</span> 
+					<span class="price">
+						<htk-text form="item" column="price" format="%.2d€"/>
+					</span>
+				</div>
+				<h2>
+					<htk-text form="item" column="Article"/>
+				</h2>
+				<p class="producer">
+					<htk-text form="item" column="producer"/>
+				</p>
+				<p>
+					<t>Size</t> <htk-text form="item" column="Medida"/>, 
+					<t>Category</t> <htk-text form="item" column="Categoria"/>
+				</p>
+				<p class="color">
+					<t>Color</t> <htk-text form="item" column="color"/>
+					<htk-text form="item" column="Tallos" format="_, %.0d Units"/>
+				</p>
+			</div>
 		</div>
+<<<<<<< HEAD
 	</div>
 	<div id="menu" class="right-panel" on-click="onMenuClick">
 		<button class="basket" on-click="onBasketClick" title="Shopping basket">
@@ -155,68 +227,253 @@
 				</a>
 			</template>
 		</htk-repeater>
+=======
+		</custom>
+	</htk-repeater>
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	</div>
 </div>
-<div id="lots-popup" class="lots-popup">
-	<htk-grid class="lots-grid" model="item-lots" show-header="false">
-		<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
-		<htk-column-text title="_Pack" column="grouping" format="x%.0d"/>
-		<htk-column-button
-			column="id"
-			image="image/add.svg"
-			tip="_Add"
-			on-clicked="onAddLotClick"/>
-	</htk-grid>
-	<div class="amount">
-		<button on-click="onEraseClick" title="_Erase" class="erase">
-			<img
-				src="image/dark/delete.svg"
-				alt="_Erase"/>
+<div id="right-panel" class="right-panel" on-click="onRightPanelClick">
+	<div class="basket-info">
+		<p>
+			<htk-text form="basket" column="date_send" format="_%A, %e of %B"/>
+		</p>
+		<p>
+			<span id="method"/> 
+			<htk-text form="basket" column="agency"/>
+		</p>
+		<button class="thin" on-click="onConfigureClick">
+			<t>Change</t>
 		</button>
-		<htk-text id="amount"/>
-		<button on-click="onConfirmClick" title="_Confirm" class="confirm">
-			<img
-				src="image/dark/ok.svg"
-				alt="_Confirm"/>
-		</button>
-		<div class="clear"/>
 	</div>
-</div>
-<!--
-<htk-repeater id="grid-view" form-id="item">
-	<template>
-	<div class="item-box">
-		<div class="image">
-			<div>
-				<htk-image form="item" column="Foto" directory="catalog/200x200"/>
+	<div class="filter">
+		<div class="categories">
+			<div class="realms">
+				<htk-repeater
+					model="realms-model"
+					form-id="realm-form"
+					renderer="realmRenderer"
+					class="realms-box">
+					<db-model
+						id="realms-model"
+						property="model"
+						on-status-changed="refreshTitleColor">
+						<custom>
+							SELECT r.id, l.str name, r.color
+								FROM vn2008.reinos r
+									LEFT JOIN vn_locale.realm_view l ON l.realm_id = r.id
+								WHERE r.display != FALSE
+								ORDER BY name
+						</custom>
+					</db-model>
+					<custom>
+						<a id="link">
+							<img id="image"/>
+						</a>
+					</custom>
+				</htk-repeater>
+				<div class="clear"/>
 			</div>
 		</div>
-		<h2>
-			<htk-text form="item" column="Article"/>
-		</h2>
-		<p>
-			<htk-text form="item" column="Medida"/> /
-			<htk-text form="item" column="Categoria"/> /
-			<htk-text form="item" column="Color"/> /
-			<htk-text form="item" column="Tallos"/> /
-			<htk-text form="item" column="Abreviatura"/>
-		</p>
-		<p>
-			<t>Available:</t>
-			<htk-text form="item" column="available"/>
-		</p>
-		<p>
-			<t>Price:</t>
-			<htk-text form="item" column="price" format="%.2d€"/>
-		</p>
-		<p class="amount-p">
-			<htk-entry id="stems" class="amount"/>
-			<htk-text form="item" column="grouping" format="x%.0d"/>
-			<htk-entry form="item" column="amount" class="amount"/>
-		</p>
-		<div class="clear"/>
+		<div id="realm-msg" class="realm-msg">
+			<h1><t>Choose a realm</t></h1>
+		</div>
+		<div id="filters" class="filters">
+			<h2><t>Filter by</t></h2>
+			<vn-filter
+				placeholder="_Family"
+				param="type">
+				<db-model
+					id="types-model"
+					property="model"
+					conn="conn"
+					result-index="1"
+					on-status-changed="refreshTitle">
+					<custom>
+						CALL item_available ();
+						SELECT DISTINCT t.tipo_id, l.str name
+							FROM vn2008.Tipos t
+								JOIN vn2008.Articles a ON a.tipo_id = t.tipo_id
+								LEFT JOIN vn_locale.family_view l ON l.family_id = t.tipo_id
+								JOIN tmp.item_available i ON i.item_id = a.Id_Article
+							WHERE #filter
+							ORDER BY name
+					</custom>
+				</db-model>
+				<sql-filter property="filter" type="AND">
+					<sql-filter-item type="EQUAL">
+						<sql-field name="reino_id" target="t"/>
+						<sql-value param="realm"/>
+					</sql-filter-item>
+				</sql-filter>
+			</vn-filter>
+			<vn-filter
+				placeholder="_Color"
+				param="color">
+				<db-model property="model" auto-load="false" result-index="1">
+					<custom>
+						CALL item_available ();
+						SELECT DISTINCT c.Id_Tinta, l.str name
+							FROM vn2008.Tintas c
+								JOIN vn2008.Articles a ON a.Color = c.Id_Tinta
+								JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
+								LEFT JOIN vn_locale.color_view l ON l.color_id = c.Id_Tinta
+								JOIN tmp.item_available i ON i.item_id = a.Id_Article
+							WHERE #filter
+							ORDER BY name
+					</custom>
+				</db-model>
+				<sql-filter property="filter" always-ready="true" type="AND">
+					<pointer object="op-realm"/>
+					<pointer object="op-type"/>
+					<pointer object="op-name"/>
+					<pointer object="op-origin"/>
+					<pointer object="op-category"/>
+					<pointer object="op-producer"/>
+				</sql-filter>
+			</vn-filter>
+			<vn-filter
+				placeholder="_Producer"
+				param="producer">
+				<db-model property="model" auto-load="false" result-index="1">
+					<custom>
+						CALL item_available ();
+						SELECT DISTINCT p.producer_id, p.name
+							FROM vn2008.producer p
+								JOIN vn2008.Articles a ON a.producer_id = p.producer_id
+								JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
+								JOIN tmp.item_available i ON i.item_id = a.Id_Article
+							WHERE #filter
+							ORDER BY name
+					</custom>
+				</db-model>
+				<sql-filter property="filter" always-ready="true" type="AND">
+					<pointer object="op-realm"/>
+					<pointer object="op-type"/>
+					<pointer object="op-name"/>
+					<pointer object="op-origin"/>
+					<pointer object="op-color"/>
+					<pointer object="op-category"/>
+				</sql-filter>
+			</vn-filter>
+			<vn-filter
+				placeholder="_Origin"
+				param="origin">
+				<db-model property="model" auto-load="false" result-index="1">
+					<custom>
+						CALL item_available ();
+						SELECT DISTINCT o.id, l.str name, o.Abreviatura
+							FROM vn2008.Origen o
+								JOIN vn2008.Articles a ON a.id_origen = o.id
+								JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
+								LEFT JOIN vn_locale.origin_view l ON l.origin_id = o.id
+								JOIN tmp.item_available i ON i.item_id = a.Id_Article
+							WHERE #filter
+							ORDER BY name
+					</custom>
+				</db-model>
+				<sql-filter property="filter" always-ready="true" type="AND">
+					<pointer object="op-realm"/>
+					<pointer object="op-type"/>
+					<pointer object="op-name"/>
+					<pointer object="op-color"/>
+					<pointer object="op-category"/>
+					<pointer object="op-producer"/>
+				</sql-filter>
+			</vn-filter>
+			<vn-filter
+				placeholder="_Category"
+				param="category">
+				<db-model property="model" auto-load="false" result-index="1">
+					<custom>
+						CALL item_available ();
+						SELECT DISTINCT a.Categoria, a.Categoria category
+							FROM vn2008.Articles a
+								JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id
+								JOIN tmp.item_available i ON i.item_id = a.Id_Article
+							WHERE #filter
+							ORDER BY a.Categoria
+					</custom>
+				</db-model>
+				<sql-filter property="filter" always-ready="true" type="AND">
+					<pointer object="op-realm"/>
+					<pointer object="op-type"/>
+					<pointer object="op-name"/>
+					<pointer object="op-color"/>
+					<pointer object="op-origin"/>
+					<pointer object="op-producer"/>
+				</sql-filter>
+			</vn-filter>
+		</div>
+		<div id="order" class="order">
+			<h2><t>Order by</t></h2>
+			<select on-change="onOrderChange">
+				<option value="A|Article" selected="true">
+					<t>Name</t>
+				</option>
+				<option value="A|price">
+					<t>Lower price</t>
+				</option>
+				<option value="D|price">
+					<t>Higher price</t>
+				</option>
+				<option value="A|available">
+					<t>Available</t>
+				</option>
+				<option value="A|Medida">
+					<t>Lower size</t>
+				</option>
+				<option value="D|Medida">
+					<t>Higher size</t>
+				</option>
+				<option value="A|color">
+					<t>Color</t>
+				</option>
+				<option value="A|producer">
+					<t>Producer</t>
+				</option>
+				<option value="A|Abreviatura">
+					<t>Origin</t>
+				</option>
+				<option value="A|Categoria">
+					<t>Category</t>
+				</option>
+			</select>
+		</div>
 	</div>
-	</template>
-</htk-repeater>
--->
+</div>
+<htk-popup id="desc-popup">
+	<div
+		property="child-node"
+		class="desc-popup"
+		id="description"/>
+</htk-popup>
+<htk-popup id="lots-popup">
+	<div property="child-node" class="lots-popup">
+		<htk-grid class="lots-grid" model="item-lots" show-header="false">
+			<htk-column-text title="_Store" column="warehouse"/>
+			<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
+			<htk-column-text title="_Pack" column="grouping" format="x%.0d"/>
+			<htk-column-button
+				column="id"
+				image="image/add.svg"
+				tip="_Add"
+				on-clicked="onAddLotClick"/>
+		</htk-grid>
+		<div class="footer">
+			<button on-click="onEraseClick" title="_Erase" class="erase">
+				<img
+					src="image/dark/delete.svg"
+					alt="_Erase"/>
+			</button>
+			<htk-text id="amount"/>
+			<button on-click="onConfirmClick" title="_Confirm" class="confirm">
+				<img
+					src="image/dark/ok.svg"
+					alt="_Confirm"/>
+			</button>
+			<div class="clear"/>
+		</div>
+	</div>
+</htk-popup>
 </vn>
diff --git a/web/forms/ecomerce/checkout/checkout.js b/web/forms/ecomerce/checkout/checkout.js
index 14246c36..7eb04457 100755
--- a/web/forms/ecomerce/checkout/checkout.js
+++ b/web/forms/ecomerce/checkout/checkout.js
@@ -1,7 +1,7 @@
 
 Vn.Checkout = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
@@ -44,9 +44,18 @@ Vn.Checkout = new Class
 
 		this.autoStepLocked = false;
 	}
+	
+	,disableButtons: function (disable)
+	{
+		this.$('confirm-agency').disabled = disable;
+		this.$('confirm-delivery').disabled = disable;
+		this.$('confirm-pickup').disabled = disable;
+	}
 
 	,onConfirmClick: function ()
 	{
+		this.disableButtons (true);
+	
 		var query = 'CALL basket_configure (#date, #method, #agency, #address)';
 	
 		var batch = new Sql.Batch ();
@@ -61,6 +70,8 @@ Vn.Checkout = new Class
 
 	,onBasketConfigured: function (resultSet)
 	{
+		this.disableButtons (false);
+
 		if (!resultSet.fetchResult ())
 			return;
 	
diff --git a/web/forms/ecomerce/checkout/style.css b/web/forms/ecomerce/checkout/style.css
index 854768e3..9fa8fdb3 100755
--- a/web/forms/ecomerce/checkout/style.css
+++ b/web/forms/ecomerce/checkout/style.css
@@ -18,9 +18,9 @@
 {
 	font-size: 1.4em;
 }
-.answers select
+.answers .htk-select
 {
-	min-width: 8em;
+	max-width: 8em;
 	display: block;
 	margin: 0 auto;
 	font-size: 1.6em;
@@ -78,7 +78,7 @@
 {
 	color: white;
 }
-.htk-assistant button
+.htk-assistant .thin
 {
 	float: right;
 }
diff --git a/web/forms/ecomerce/checkout/ui.xml b/web/forms/ecomerce/checkout/ui.xml
index 4c3b81c6..34704a90 100755
--- a/web/forms/ecomerce/checkout/ui.xml
+++ b/web/forms/ecomerce/checkout/ui.xml
@@ -5,61 +5,73 @@
 	<vn-param id="agency"/>
 	<vn-param id="address" on-changed="onAddressChange"/>
 	<db-form id="defaults" on-ready="onValuesReady">
-		<db-model>
-			SELECT delivery_method, agency_id, address_id
-				FROM basket_defaults
+		<db-model property="model">
+			<custom>
+				SELECT delivery_method, agency_id, address_id
+					FROM basket_defaults
+			</custom>
 		</db-model>
 	</db-form>
 	<db-form id="order-form" on-ready="onValuesReady">
-		<db-model>
-			SELECT v.code delivery_method, o.date_send, o.agency_id, o.address_id
-				FROM basket o
-					JOIN vn2008.Vistas v ON o.delivery_method_id = v.vista_id
+		<db-model property="model">
+			<custom>
+				SELECT v.code delivery_method, o.date_send, o.agency_id, o.address_id
+					FROM basket o
+						JOIN vn2008.Vistas v ON o.delivery_method_id = v.vista_id
+			</custom>
 		</db-model>
 	</db-form>
-	<db-model property="model" id="agencies" auto-load="false" result-index="1" on-status-changed="onAgenciesReady">
-		CALL agency_list_from_date (#date, #address);
-		SELECT a.Id_Agencia, a.description
-			FROM t_agency t
-				JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
-				JOIN vn2008.Vistas v ON a.Vista = v.vista_id
-			WHERE a.web != FALSE
-				AND v.code = 'AGENCY'
-			ORDER BY a.description;
-		DROP TEMPORARY TABLE t_agency;
+	<db-model id="agencies" auto-load="false" result-index="1" on-status-changed="onAgenciesReady">
+		<custom>
+			CALL agency_list_from_date (#date, #address);
+			SELECT a.Id_Agencia, a.description
+				FROM t_agency t
+					JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
+					JOIN vn2008.Vistas v ON a.Vista = v.vista_id
+				WHERE a.web != FALSE
+					AND v.code = 'AGENCY'
+				ORDER BY a.description;
+			DROP TEMPORARY TABLE t_agency;
+		</custom>
 		<sql-batch property="batch">
-			<item name="address" param="address"/>
-			<item name="date" param="date"/>
+			<custom>
+				<item name="address" param="address"/>
+				<item name="date" param="date"/>
+			</custom>
 		</sql-batch>
 	</db-model>
-	<db-model property="model" id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady">
-		CALL agency_list_from_date (#date, #address);
-		SELECT a.Id_Agencia, a.description
-			FROM t_agency t
-				JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
-				JOIN vn2008.Vistas v ON a.Vista = v.vista_id
-			WHERE a.web != FALSE
-				AND v.code = 'PICKUP'
-			ORDER BY a.description;
-		DROP TEMPORARY TABLE t_agency;
+	<db-model id="warehouses" auto-load="false" result-index="1" on-status-changed="onWarehousesReady">
+		<custom>
+			CALL agency_list_from_date (#date, #address);
+			SELECT a.Id_Agencia, SUBSTR(a.description, 5) description
+				FROM t_agency t
+					JOIN vn2008.Agencias a ON a.Id_Agencia = t.agency_id
+					JOIN vn2008.Vistas v ON a.Vista = v.vista_id
+				WHERE a.web != FALSE
+					AND v.code = 'PICKUP'
+				ORDER BY a.description;
+			DROP TEMPORARY TABLE t_agency;
+		</custom>
 		<sql-batch property="batch">
-			<item name="address" param="address"/>
-			<item name="date" param="date"/>
+			<custom>
+				<item name="address" param="address"/>
+				<item name="date" param="date"/>
+			</custom>
 		</sql-batch>
 	</db-model>
 </vn-group>
+<div id="title">
+	<h1><t>ConfigureOrder</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/close.svg"
+		tip="_Cancel"
+		on-click="onCancelClick"
+		showText="true"/>
+</div>
 <div id="form" class="checkout">
 	<div class="box">
-		<div class="header">
-			<h1><t>ConfigureOrder</t></h1>
-			<div class="action-bar">
-				<button on-click="onCancelClick">
-					<img src="image/dark/close.svg" alt=""/>
-					<t>Cancel</t>
-				</button>
-			</div>
-			<div class="clear"/>
-		</div>
 		<div class="form">
 			<htk-assistant
 				id="assistant"
@@ -108,14 +120,16 @@
 							form-id="iter"
 							on-change="onAddressChange"
 							renderer="addressRenderer">
-							<db-model id="addresses">
-								SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
-									FROM address_view a
-									LEFT JOIN vn2008.province p ON a.province_id = p.province_id
-									JOIN vn2008.Paises c ON c.Id = p.Paises_Id
-										WHERE active != FALSE
+							<db-model property="model" id="addresses">
+								<custom>
+									SELECT a.id, a.consignee, p.name province, a.zip_code, a.city, a.name, a.active, c.Pais country
+										FROM address_view a
+										LEFT JOIN vn2008.province p ON a.province_id = p.province_id
+										JOIN vn2008.Paises c ON c.Id = p.Paises_Id
+											WHERE active != FALSE
+								</custom>
 							</db-model>
-							<template>
+							<custom>
 								<div class="address" id="address">
 									<p class="consignee">
 										<htk-text form="iter" column="consignee"/>
@@ -124,7 +138,7 @@
 										<htk-text form="iter" column="name"/>
 									</p>
 								</div>
-							</template>
+							</custom>
 						</htk-repeater>
 					</div>
 				</div>
@@ -162,7 +176,7 @@
 							<t>Agency</t> 
 							<htk-text form="agency-combo" column="description"/>
 						</p>
-						<button class="thin" on-click="onConfirmClick">
+						<button id="confirm-agency" class="thin" on-click="onConfirmClick">
 							<t>Confirm</t>
 						</button>
 						<div class="clear"/>
@@ -181,7 +195,7 @@
 						<p>
 							<t>ReceiveThroughtRoute</t>
 						</p>
-						<button class="thin" on-click="onConfirmClick">
+						<button id="confirm-delivery" class="thin" on-click="onConfirmClick">
 							<t>Confirm</t>
 						</button>
 						<div class="clear"/>
@@ -198,7 +212,7 @@
 							<t>Warehouse</t> 
 							<htk-text form="warehouse-combo" column="description"/>
 						</p>
-						<button class="thin" on-click="onConfirmClick">
+						<button id="confirm-pickup" class="thin" on-click="onConfirmClick">
 							<t>Confirm</t>
 						</button>
 						<div class="clear"/>
diff --git a/web/forms/ecomerce/confirm/confirm.js b/web/forms/ecomerce/confirm/confirm.js
index 92baf158..c7907dcb 100755
--- a/web/forms/ecomerce/confirm/confirm.js
+++ b/web/forms/ecomerce/confirm/confirm.js
@@ -1,7 +1,22 @@
 
 Vn.Confirm = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
+
+	,open: function ()
+	{
+		this.close ();
+		this.isOpen = true;
+
+		Vn.BasketChecker.check (this.conn,
+			this.onBasketCheck.bind (this));
+	}
+	
+	,onBasketCheck: function (isOk)
+	{
+		if (isOk)
+			this.loadUi ();
+	}
 	
 	,onOrderReady: function (form)
 	{
@@ -18,14 +33,98 @@ Vn.Confirm = new Class
 			Vn.Node.hide (this.$('address'));
 			Vn.Node.setText (this.$('method'), _('Warehouse'));
 		}
+
+		var total = form.get ('tax_base') + form.get ('vat');
+		
+		if (total === null)
+			total = 0;
+
+		var credit = form.get ('credit');
+		var debt = form.get ('debt');
+
+		var totalDebt = debt + total;
+		var exceededCredit = totalDebt - credit;
+		var creditExceededCond = exceededCredit > 0;
+			
+		if (creditExceededCond)
+			Htk.Toast.showWarning (
+				_('You have exceeded your credit.'));
+
+		this.$('debt').value = debt;
+		this.$('total-debt').value = totalDebt;
+		this.$('total-amount').value = totalDebt;
+		this.$('credit-excess').value = exceededCredit;
+		this.$('excess-amount').value = exceededCredit;
+		
+		this.$('pay-amount').value = 'ALL';
+		
+		if (credit > 0)
+		{
+			this.$('credit-info').style.display = 'table-row';
+
+			if (creditExceededCond)
+			{
+				this.$('amount-selector').style.display = 'block';
+				this.$('exceeded-info').style.display = 'table-row';
+				this.$('pay-amount').value = 'EXCEEDED';
+			}
+		}
+		
+		var methods = [];
+		
+		if (totalDebt <= 0)
+		{
+			methods = ['balance'];
+			selectedMethod = 'BALANCE';
+		}
+		else
+		{
+			methods = ['card', 'transfer', 'later'];
+
+			if (!creditExceededCond)
+			{
+				methods.push ('credit');
+				selectedMethod = 'CREDIT';
+			}
+			else
+				selectedMethod = 'CARD';
+		}
+		
+		for (var i = 0; i < methods.length; i++)
+			this.$(methods[i] +'-method').style.display = 'block';
+		
+		this.$('pay-method').value = selectedMethod;
 	}
 	
-	,onImportReady: function (form)
+	,onPayMethodChange: function (payMethod)
 	{
-		if (form.row != -1)
-			this.$('total').value = form.get ('tax_base') + form.get ('vat');
-		else
-			this.$('total').value = null;
+		var id = this.displayedInfo;
+	
+		if (id)
+			Vn.Node.removeClass (this.$(id), 'selected');
+	
+		switch (payMethod.value)
+		{
+			case 'BALANCE':
+				id = 'balance-method';
+				break;
+			case 'CREDIT':
+				id = 'credit-method';
+				break;
+			case 'CARD':
+				id = 'card-method';
+				break;
+			case 'TRANSFER':
+				id = 'transfer-method';
+				break;
+			default:
+				id = null;
+		}
+		
+		this.displayedInfo = id;
+		
+		if (id)
+			Vn.Node.addClass (this.$(id), 'selected');
 	}
 	
 	,disableButtons: function (disable)
@@ -47,29 +146,32 @@ Vn.Confirm = new Class
 
 	,onConfirm: function (query, resultSet)
 	{
-		var res = resultSet.fetchResult ();
-		var debt = resultSet.fetchValue ();
-	
-		if (res)
+		this.disableButtons (false);
+
+		if (resultSet.fetchResult ())
 		{
 			Vn.Cookie.unset ('order');
-			this.pay = debt > this.$('order-form').get ('credit');
-
-			this.popup = new Htk.Popup ();
-			this.popup.setChildNode (this.$('success-dialog'));
-			this.popup.showCenter ();
+			this.$('success-dialog').show ();
 		}
-		else
-			this.disableButtons (false);
 	}
 	
 	,onAcceptClick: function ()
 	{
-		this.popup.hide ();
+		this.$('success-dialog').hide ();
+	}
+	
+	,onPopupClose: function ()
+	{
+		if (this.$('pay-method').value === 'CARD')
+		{
+			if (this.$('pay-amount').value === 'EXCEEDED')
+				var payAmount = this.$('excess-amount').value;
+			else
+				var payAmount = this.$('total-amount').value;
 		
-		if (this.pay)
-			Vn.Tpv.pay (this.conn, this.$('total').value,
-				this.$('order-form').get ('company_id'));
+			var tpv = new Vn.Tpv ({conn: this.conn});
+			tpv.pay (payAmount, this.$('order-form').get ('company_id'));
+		}
 		else
 			this.hash.set ({'form': 'ecomerce/orders'});
 	}
diff --git a/web/forms/ecomerce/confirm/style.css b/web/forms/ecomerce/confirm/style.css
index 7676263c..cc34a201 100755
--- a/web/forms/ecomerce/confirm/style.css
+++ b/web/forms/ecomerce/confirm/style.css
@@ -1,84 +1,125 @@
 .confirm
 {
 	padding: 1em;
-	max-width: 40em;
+	max-width: 30em;
 	margin: 0 auto;
+	color: #555;
+}
+.confirm .box
+{
+	padding: 2.2em 2.5em;
+}
+.confirm .summary
+{
+	margin-bottom: 1em;
+}
+.confirm .address
+{
+	margin-top: .8em;
 }
 .confirm h2
 {
+	font-size: 1.1em;
+	font-weight: normal;
 	padding: 0;
-	font-size: 1.6em;
-	color: black;
-	margin: 0 3em;
+	margin: 0;
+	margin-bottom: .5em;
+	color: #333;
 }
-.confirm .form
-{
-	margin: 0 auto;
-	padding: 3em 4em;
-	color: #555;
-}
-.confirm .form p,
-.confirm .form select,
-.confirm .form button
+.confirm button
 {
 	font-size: 1.4em;
 }
-.confirm .form > div.section
-{
-	margin-bottom: 1.5em;
-}
-.confirm .form p
+.confirm p
 {
 	margin: .2em 0;
 }
-.confirm .form p.small
-{
-	font-size: 1em;
-}
-.button-bar
-{
-	margin-top: 2em;
-}
-.modify-order
+.confirm .modify-order
 {
 	float: left;
 }
-.confirm-order
+.confirm .confirm-order
 {
 	float: right;
 }
+.confirm .payment > div
+{
+	margin-bottom: 1.4em;
+}
+.confirm .payment > .button-bar
+{
+	margin: 0;
+	margin-top: 1.8em;
+}
 
-/* Success dialog */
+/* Table */
 
-.success-dialog
-{
-	padding: 2em;
-	min-width: 30em;
-	max-width: 35em;
-}
-.success-dialog *
-{
-	font-weight: normal;
-	color: #555;
-}
-.success-dialog p,
-.success-dialog button
-{
-	font-size: 1.4em;
-}
-.success-dialog img
-{
-	float: left;
-	height: 3em;
-	margin-top: 0;
-	margin-right: 1.5em;
-}
-.success-dialog p
+.confirm .debt-info
 {
 	padding: 0;
 }
-.success-dialog > button
+.confirm .debt-info > table
 {
-	margin-top: 0.5em;
+	border-collapse: collapse;
+}
+.confirm td
+{
+	padding: .15em 0;
+}
+.confirm .sum-total > td
+{
+	border-top: solid 1px #DDD;
+	font-weight: bold;
+}
+.confirm .currency
+{
+	text-align: right;
+}
+.confirm .credit-info
+{
+	display: none;
+}
+.confirm .exceeded-info
+{
+	display: none;
+	color: #E53935;
+}
+
+/* Pay */
+
+.confirm .amount-selector,
+.confirm .pay-methods > div,
+.confirm .pay-info
+{
+	display: none;
+}
+.confirm .pay-methods > div.selected > .pay-info
+{
+	display: block;
+}
+.confirm .radio > div
+{
+	margin: .3em 0;
+}
+.confirm .radio > div > *
+{
+	vertical-align: middle;
+}
+.confirm .radio > div > input[type=radio]
+{
+	margin: 0;
+	margin-right: .5em;
+}
+.confirm .pay-info
+{
+	padding: .5em 1.3em;
+}
+.confirm .transfer-account
+{
+	margin-top: .5em;
+}
+.confirm .transfer-account > p
+{
+	margin: .1em 0;
 }
 
diff --git a/web/forms/ecomerce/confirm/ui.xml b/web/forms/ecomerce/confirm/ui.xml
index fc99e48c..bd6d14e0 100755
--- a/web/forms/ecomerce/confirm/ui.xml
+++ b/web/forms/ecomerce/confirm/ui.xml
@@ -1,91 +1,228 @@
 <vn>
 <vn-group>
 	<db-form id="order-form" on-ready="onOrderReady">
-		<db-model>
-			SELECT o.id, o.date_send, o.note, o.company_id,
-				ag.description agency, v.code method, c.credit,			
-				ad.consignee, ad.zip_code, ad.city, ad.name address
-				FROM basket o
-					JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
-					LEFT JOIN address_view ad ON ad.id = o.address_id
-					JOIN vn2008.Vistas v ON v.vista_id = o.delivery_method_id
-					JOIN customer_view c
-		</db-model>
-	</db-form>
-	<db-form id="total-form" on-ready="onImportReady">
-		<db-model result-index="1">
-			CALL basket_get_vat ();
-			SELECT
-				IFNULL(SUM(tax_base), 0) tax_base,
-				IFNULL(SUM(vat + surcharge), 0) vat
-				FROM t_order_vat; 
-			DROP TEMPORARY TABLE t_order_vat;
+		<db-model property="model" result-index="1">
+			<custom>
+				CALL basket_get_vat ();
+				SELECT o.id, o.date_send, o.note, o.company_id, 
+					ag.description agency, v.code method, 
+					ad.consignee, ad.zip_code, ad.city, ad.name address, 
+					t.*, c.credit, customer_get_debt() debt
+					FROM basket o
+						JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id 
+						LEFT JOIN address_view ad ON ad.id = o.address_id 
+						JOIN vn2008.Vistas v ON v.vista_id = o.delivery_method_id
+						JOIN customer_view c
+						JOIN (
+							SELECT
+								IFNULL(SUM(tax_base), 0) tax_base,
+								IFNULL(SUM(vat + surcharge), 0) vat
+								FROM t_order_vat
+						) t;
+				DROP TEMPORARY TABLE t_order_vat;					
+			</custom>
 		</db-model>
 	</db-form>
 	<db-query id="confirm-query" on-ready="onConfirm">
-		CALL basket_confirm ();
-		SELECT customer_get_debt();
+		<custom>
+			CALL basket_confirm ()
+		</custom>
 	</db-query>
 </vn-group>
+<div id="title">
+	<h1><t>Order summary</t></h1>
+</div>
 <div id="form" class="confirm">
-	<div class="box">
-		<div class="header">
-			<h1><t>OrderSummary</t></h1>
-		</div>
-		<div class="form">
-			<div class="section">
+	<div class="box summary">
+		<div>
+			<div class="delivery">
 				<p>
-					<t>Arrival</t> 
-					<htk-text format="_%A, %e of %B" form="order-form" column="date_send"/>
+					<t>Delivery at</t> 
+					<htk-text format="%D" form="order-form" column="date_send"/>
 				</p>
-				<p class="small">
+				<p>
 					<span id="method"><t>Agency</t></span> 
 					<htk-text form="order-form" column="agency"/>
 				</p>
 			</div>
-			<div id="address" class="section">
+			<div id="address" class="address">
 				<p>
 					<htk-text form="order-form" column="consignee"/>
 				</p>
-				<p class="small">
+				<p>
 					<htk-text form="order-form" column="address"/>
 				</p>
-				<p class="small">
+				<p>
 					<htk-text form="order-form" column="zip_code"/>, 
 					<htk-text form="order-form" column="city"/>
 				</p>
 			</div>
-			<div class="section">
-				<p>
-					<t>Total</t> 
-					<htk-text id="total" format="%.2d€"/>
-				</p>
-				<p class="small">
-					(<t>TaxBase</t> <htk-text form="total-form" column="tax_base" format="%.2d€"/> +
-					<t>VAT</t> <htk-text form="total-form" column="vat" format="%.2d€"/>)
-				</p>
+		</div>
+	</div>
+	<div class="box payment">
+		<div>
+			<table class="debt-info">
+				<tbody>
+					<tr>
+						<td>
+							<t>Previous balance</t>
+						</td>
+						<td class="currency">
+							<htk-text format="%.2d€" id="debt"/>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<t>Order total</t>
+						</td>
+						<td class="currency">
+							<htk-text format="%.2d€" form="order-form" column="tax_base"/>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<t>Order VAT</t>
+						</td>
+						<td class="currency">
+							<htk-text format="%.2d€" form="order-form" column="vat"/>
+						</td>
+					</tr>
+					<tr class="total-debt sum-total">
+						<td>
+							<t>Total debt</t>
+						</td>
+						<td class="currency">
+							<htk-text format="%.2d€" id="total-debt"/>
+						</td>
+					</tr>
+					<tr id="credit-info" class="credit-info">
+						<td>
+							<t>Credit</t>
+						</td>
+						<td class="currency">
+							<htk-text format="%.2d€" form="order-form" column="credit"/>
+						</td>
+					</tr>
+					<tr id="exceeded-info" class="exceeded-info sum-total">
+						<td>
+							<t>Exceeded credit</t>
+						</td>
+						<td class="currency">
+							<htk-text format="%.2d€" id="credit-excess"/>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		<div id="amount-selector" class="amount-selector">
+			<h2>
+				<t>Amount to pay</t>
+			</h2>
+			<div class="radio">
+				<htk-radio-group
+					id="pay-amount"/>
+				<div>
+					<htk-radio radio-group="pay-amount" value="ALL"/>
+					<label>
+						<t>Total debt</t>, 
+						<htk-text format="%.2d€" id="total-amount"/>
+					</label>
+				</div>
+				<div>
+					<htk-radio radio-group="pay-amount" value="EXCEEDED"/>
+					<label>
+						<t>Exceeded credit</t>, 
+						<htk-text format="%.2d€" id="excess-amount"/>
+					</label>
+				</div>
 			</div>
-			<div class="button-bar">
-				<button on-click="onModifyClick" id="modify" class="thin modify-order">
-					<t>Modify</t>
-				</button>
-				<button on-click="onConfirmClick" id="confirm" class="thin confirm-order">
-					<t>Confirm</t>
-				</button>
-				<div class="clear"/>
+		</div>
+		<div>
+			<h2>
+				<t>Pay method</t>
+			</h2>
+			<div class="pay-methods radio">
+				<htk-radio-group
+					id="pay-method"
+					on-changed="onPayMethodChange"/>
+				<div id="balance-method">
+					<htk-radio radio-group="pay-method" value="BALANCE"/>
+					<label><t>Use my balance</t></label>
+					<div class="pay-info">
+						<t>You have a favorable balance.</t>
+					</div>
+				</div>
+				<div id="credit-method">
+					<htk-radio radio-group="pay-method" value="CREDIT"/>
+					<label><t>Use my credit</t></label>
+					<div class="pay-info">
+						<t>You have a favorable credit.</t>
+					</div>
+				</div>
+				<div id="card-method">
+					<htk-radio radio-group="pay-method" value="CARD"/>
+					<label><t>Credit card</t></label>
+					<div class="pay-info">
+						<t>You will be redirected to the payment.</t>
+					</div>
+				</div>
+				<div id="transfer-method">
+					<htk-radio radio-group="pay-method" value="TRANSFER"/>
+					<label><t>Bank Transfer</t></label>
+					<div class="pay-info">
+						<t>Make a transfer to one account.</t>
+						<htk-repeater form-id="iter">
+							<db-model property="model">
+								<custom>
+									SELECT description, iban, entity_id, office, dc, number
+										FROM vn2008.account_customer c						
+								</custom>
+							</db-model>
+							<custom>
+								<div class="transfer-account">
+									<p>
+										<htk-text form="iter" column="description"/>
+									</p>
+									<p>
+										<htk-text form="iter" column="iban"/> 
+										<htk-text form="iter" column="entity_id"/> 
+										<htk-text form="iter" column="office"/> 
+										<htk-text form="iter" column="DC"/> 
+										<htk-text form="iter" column="number"/>
+									</p>
+								</div>
+							</custom>
+						</htk-repeater>
+					</div>
+				</div>
+				<div id="later-method">
+					<htk-radio radio-group="pay-method" value="LATER"/>
+					<label><t>Pay later</t></label>
+				</div>
 			</div>
 		</div>
+		<div class="button-bar">
+			<button on-click="onModifyClick" id="modify" class="thin modify-order">
+				<t>Modify</t>
+			</button>
+			<button on-click="onConfirmClick" id="confirm" class="thin confirm-order">
+				<t>Confirm</t>
+			</button>
+			<div class="clear"/>
+		</div>
 	</div>
 </div>
-<div id="success-dialog" class="success-dialog">
-	<div>
-		<img src="image/ok.svg" alt="_Ok"/>
-		<p><t>OrderPlacedSuccessfully</t></p>
+<htk-popup id="success-dialog" modal="true" on-closed="onPopupClose">
+	<div property="child-node" class="dialog">
+		<div>
+			<img src="image/ok.svg" alt="_Ok"/>
+			<p><t>Order confirmed successfully</t></p>
+			<div class="clear"/>
+		</div>
+		<button class="thin" on-click="onAcceptClick">
+			<t>Accept</t>
+		</button>
 		<div class="clear"/>
 	</div>
-	<button on-click="onAcceptClick" class="thin confirm-order">
-		<t>Accept</t>
-	</button>
-	<div class="clear"/>
-</div>
+</htk-popup>
 </vn>
diff --git a/web/forms/ecomerce/invoices/invoices.js b/web/forms/ecomerce/invoices/invoices.js
index 456ed352..ff623b35 100755
--- a/web/forms/ecomerce/invoices/invoices.js
+++ b/web/forms/ecomerce/invoices/invoices.js
@@ -1,7 +1,7 @@
 
 Vn.Invoices = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function () {}
 
diff --git a/web/forms/ecomerce/invoices/ui.xml b/web/forms/ecomerce/invoices/ui.xml
index 74c0c392..5f50c1b6 100755
--- a/web/forms/ecomerce/invoices/ui.xml
+++ b/web/forms/ecomerce/invoices/ui.xml
@@ -1,27 +1,29 @@
 <vn>
+<div id="title">
+	<h1><t>Invoices</t></h1>
+</div>
 <div id="form" class="invoices">
 	<div class="box">
-		<div class="header">
-			<h1><t>Invoices</t></h1>
-		</div>
-		<div>
-			<htk-grid show-header="false">
-				<db-model id="tickets">
-					SELECT invoice_id, serial_num, issued, amount
-						FROM invoice_view
-						ORDER BY issued DESC
-						LIMIT 100
-				</db-model>
-				<htk-column-text title="_Serial" column="serial_num"/>
-				<htk-column-date title="_Date" column="issued" format="_%e %b %Y"/>
-				<htk-column-spin title="_Import" column="amount" unit="€" digits="2"/>
-				<htk-column-button
-					column="invoice_id"
-					image="image/download.svg"
-					tip="_Download PDF"
-					on-clicked="onDownloadClick"/>
-			</htk-grid>
-		</div>
+	<div>
+	<htk-grid show-header="false">
+		<db-model property="model" id="tickets">
+			<custom>
+				SELECT invoice_id, serial_num, issued, amount
+					FROM invoice_view
+					ORDER BY issued DESC
+					LIMIT 100
+			</custom>
+		</db-model>
+		<htk-column-text title="_Serial" column="serial_num"/>
+		<htk-column-date title="_Date" column="issued" format="_%e %b %Y"/>
+		<htk-column-spin title="_Import" column="amount" unit="€" digits="2"/>
+		<htk-column-button
+			column="invoice_id"
+			image="image/download.svg"
+			tip="_Download PDF"
+			on-clicked="onDownloadClick"/>
+	</htk-grid>
+	</div>
 	</div>
 </div>
 </vn>
diff --git a/web/forms/ecomerce/orders/orders.js b/web/forms/ecomerce/orders/orders.js
index 6a17a87b..460e1b72 100755
--- a/web/forms/ecomerce/orders/orders.js
+++ b/web/forms/ecomerce/orders/orders.js
@@ -1,26 +1,30 @@
 
 Vn.Orders = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
-		this.payPopup = new Htk.Popup ();
-		this.payPopup.setChildNode (this.$('balance-popup'));
-
-		Vn.Tpv.check (this.conn);
+		this.tpv = new Vn.Tpv ({conn: this.conn});
+		this.tpv.check (this._onTpvCheck.bind (this));
+	}
+	
+	,_onTpvCheck: function (tpv, tpvOrder, tpvStatus)
+	{
+		if (tpvStatus === 'ko')
+			this.$('error-dialog').show ();
 	}
 
 	,onBasketClick: function ()
 	{
 		this.hash.set ({'form': 'ecomerce/basket'});
 	}
-
-	,onShowClick: function  (column, ticketId)
+	
+	,repeaterFunc: function (res, form)
 	{
-		this.hash.set ({
+		res.$('link').href = this.hash.make ({
 			'form': 'ecomerce/ticket',
-			'ticket': ticketId
+			'ticket': form.get ('ticket_id')
 		});
 	}
 
@@ -28,26 +32,15 @@ Vn.Orders = new Class
 	
 	,balanceConditionalFunc: function (field, value)
 	{
-		var className = 'balance-amount ';
-	
-		if (value > 0)
-			className += 'positive-balance';
+		if (value >= 0)
+			Vn.Node.removeClass (this.$('balance'), 'negative');
 		else
-			className += 'negative-balance';
-			
-		field.node.className = className;
+			Vn.Node.addClass (this.$('balance'), 'negative');
 	}
 	
 	,onPayButtonClick: function ()
 	{
-		this.payPopup.show (this.$('pay-button'));
-	}
-	
-	,onCompanyPayClick: function (column, value, row)
-	{
-		var model = this.$('balance');
-		var company = model.get (row, 'id');
-		var amount = model.get (row, 'amount');
+		var amount = -this.$('debt').value;
 
 		amount = amount <= 0 ? null : amount;
 
@@ -58,7 +51,18 @@ Vn.Orders = new Class
 
 		var amount = parseFloat (prompt (_('AmountToPay:'), defaultAmountStr));
 	
-		Vn.Tpv.pay (this.conn, amount, company);
+		this.tpv.pay (amount, null);
+	}
+	
+	,onCancelPay: function ()
+	{
+		this.$('error-dialog').hide ();
+	}
+
+	,onRetryPay: function ()
+	{
+		this.$('error-dialog').hide ();
+		this.tpv.retryPay ();
 	}
 });
 
diff --git a/web/forms/ecomerce/orders/style.css b/web/forms/ecomerce/orders/style.css
index 4807abbf..c4d325a7 100755
--- a/web/forms/ecomerce/orders/style.css
+++ b/web/forms/ecomerce/orders/style.css
@@ -4,68 +4,38 @@
 }
 .orders .box
 {
-	max-width: 45em;
-}
-.orders .box .header,
-.balance-grid > thead > tr
-{
-	background-color: #3F51B6;
-}
-.orders .htk-grid tbody tr
-{
-	height: 5em;
-}
-
-/* Info box */
-
-.orders .info
-{
-	padding: 0.4em;
-	background-color: #FFC;
-	border-radius: 0.1em;
-}
-.orders .info > img
-{
-	vertical-align: middle;
-	margin: 0.7em;
-	height: 1.5em;
-}
-
-/* Buttons */
-
-.orders td.hide
-{
-	display: none;
+	max-width: 25em;
 }
 
 /* Balance */
 
-.balance img
+.balance
+{
+	margin-top: 1.2em;
+	margin-right: .5em;
+}
+.balance > *
 {
 	vertical-align: middle;
-	padding-left: 0.3em;
-	cursor: pointer;
 }
-.balance-amount
+.balance > .amount
 {
 	color: white;
 	padding: 0.3em;
 }
-.balance-info
+.balance > .info
 {
-	height: 1em;
+	display: inline;
+	cursor: pointer;
+	height: 1.2em;
 	cursor: pointer;
 }
-.positive-balance
+.balance > .negative
 {
 	background-color: #EF5350;
 	border-radius: 0.1em;
 	box-shadow: 0 0 0.4em #666;
 }
-.negative-balance
-{
-	color: white;
-}
 .balance-popup
 {
 	width: 25em;
@@ -76,3 +46,28 @@
 	margin: auto;
 }
 
+/* List */
+
+.orders .item
+{
+	display: block;
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
+}
+.orders .item:hover
+{
+	background-color: rgba(1, 1, 1, 0.05);
+}
+.orders .item > p
+{
+	margin: .1em 0;
+}
+.orders .item > p.important
+{
+	font-size: 1.2em;
+}
+.orders .item > p.total
+{
+	float: right;
+}
+
diff --git a/web/forms/ecomerce/orders/ui.xml b/web/forms/ecomerce/orders/ui.xml
index 97a2228a..0131bd17 100755
--- a/web/forms/ecomerce/orders/ui.xml
+++ b/web/forms/ecomerce/orders/ui.xml
@@ -1,53 +1,90 @@
 <vn>
-<div id="form" class="orders">
-	<div class="box confirmed">
-		<div class="header">
-			<h1><t>LastOrders</t></h1>
-			<div class="action-bar">
-				<div id="balance">
-					<t>PendingBalance:</t>
-					<htk-label format="%.2d€" conditional-func="balanceConditionalFunc">
-						<db-calc-sum model="balance" column-name="amount"/>
-					</htk-label>
-					<img src="image/dark/info.svg" title="_PaymentInfo" class="balance-info" alt="Info"/>
-				</div>
-				<button id="pay-button" title="_MakePayment" on-click="onPayButtonClick">		
-					<img src="image/dark/pay.svg" alt="_MakePayment"/>
-				</button>
-				<button on-click="onBasketClick" title="_ShoppingBasket">
-					<img src="image/dark/basket.svg" alt=""/>
-					<t>Basket</t>
-				</button>
-			</div>
-			<div class="clear"/>
-		</div>
-		<div>
-			<htk-grid show-header="false">
-				<db-model id="tickets">
-					CALL ticket_list ();
-				</db-model>
-				<htk-column-date column="date" format="%A, %e of %B"/>
-				<htk-column-text title="_SendMethod" column="type"/>
-				<htk-column-spin column="total" unit="€" digits="2"/>
-				<htk-column-button
-					column="ticket_id"
-					image="image/show.svg"
-					tip="_SeeOrder"
-					on-clicked="onShowClick"/>
-			</htk-grid>
-		</div>
+<vn-group>
+	<db-model id="debt-model" result-index="1">
+		<custom>
+			CALL customer_get_debt_by_company ();
+			SELECT -amount amount FROM t_customer_debt;
+			DROP TEMPORARY TABLE t_customer_debt;
+		</custom>
+	</db-model>
+</vn-group>
+<div id="title">
+	<h1><t>LastOrders</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/basket.svg"
+		tip="_ShoppingBasket"
+		on-click="onBasketClick"/>
+	<htk-button
+		id="pay-button"
+		image="image/dark/pay.svg"
+		tip="_MakePayment"
+		on-click="onPayButtonClick"/>
+	<div class="balance">
+		<span class="label">
+			<t>Balance:</t>
+		</span> 
+		<span class="amount" id="balance">
+			<htk-text
+				format="%.2d€"
+				conditional-func="balanceConditionalFunc">
+				<db-calc-sum
+					property="param"
+					model="debt-model"
+					column-name="amount"
+					id="debt"/>
+			</htk-text>
+		</span> 
+		<img
+			src="image/dark/info.svg"
+			title="_PaymentInfo"
+			class="info"
+			alt="Info"/>
 	</div>
 </div>
-<div id="balance-popup" class="balance-popup">
-	<htk-grid class="balance-grid" show-header="false">
-		<db-model id="balance" result-index="1">
-			CALL customer_get_debt_by_company ();
-			SELECT * FROM t_customer_debt;
-			DROP TEMPORARY TABLE t_customer_debt;
-		</db-model>
-		<htk-column-text title="_Company" column="abbreviation"/>
-		<htk-column-spin title="_Pending" column="amount" unit="€" digits="2"/>
-		<htk-column-button title="_Pay" image="image/pay.svg" tip="Pay" on-clicked="onCompanyPayClick"/>
-	</htk-grid>
+<div id="form" class="orders">
+	<div class="box confirmed">
+		<htk-repeater form-id="iter" renderer="repeaterFunc">
+			<db-model property="model" id="tickets">
+				<custom>
+					CALL ticket_list ();
+				</custom>
+			</db-model>
+			<custom>
+				<a id="link" class="item" title="_SeeOrder">
+					<p class="important total">
+						<htk-text form="iter" column="total" format="%.2d€"/>
+					</p>
+					<p class="important">
+						<htk-text form="iter" column="date" format="%D"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="consignee"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="type"/>
+					</p>
+					<div class="clear"/>
+				</a>
+			</custom>
+		</htk-repeater>
+	</div>
 </div>
+<htk-popup id="error-dialog" modal="true">
+	<div property="child-node" class="dialog">
+		<div>
+			<img src="image/error.svg" alt="_Error"/>
+			<p><t>An error has been in the payment</t></p>
+			<div class="clear"/>
+		</div>
+		<button class="thin" on-click="onRetryPay">
+			<t>Retry</t>
+		</button>
+		<button class="thin" on-click="onCancelPay">
+			<t>Accept</t>
+		</button>
+		<div class="clear"/>
+	</div>
+</htk-popup>
 </vn>
diff --git a/web/forms/ecomerce/ticket/style.css b/web/forms/ecomerce/ticket/style.css
index b61f2cc4..f815ff9e 100755
--- a/web/forms/ecomerce/ticket/style.css
+++ b/web/forms/ecomerce/ticket/style.css
@@ -1,18 +1,57 @@
 .ticket
 {
 	padding: 1em;
-	min-width: 50em;
 }
 .ticket .box
 {
-	max-width: 70em;
+	max-width: 30em;
 	margin: 0 auto;
+	padding: 2em;
+	color: #333;
 }
 
-/* Data */
+/* Header */
 
-.ticket td.label
+.ticket .head
 {
-	width: 10em;
+	padding: 0;
+	padding-bottom: .2em;
+	border-bottom: 1px solid #DDD;
+	margin-bottom: 1em;
+}
+.ticket .head > div
+{
+	padding-bottom: .8em;
+}
+.ticket .head p
+{
+	margin: .2em;
+}
+.ticket .head p.important
+{
+	font-size: 1.4em;
+}
+.ticket .total
+{
+	text-align: right;
+}
+
+/* Lines */
+
+.ticket .line
+{
+	padding: .5em 0;
+}
+.ticket .line p
+{
+	margin: .1em 0;
+}
+.ticket .amount
+{
+	float: left;
+}
+.ticket .subtotal
+{
+	float: right;
 }
 
diff --git a/web/forms/ecomerce/ticket/ticket.js b/web/forms/ecomerce/ticket/ticket.js
index 7327d774..e677e41a 100755
--- a/web/forms/ecomerce/ticket/ticket.js
+++ b/web/forms/ecomerce/ticket/ticket.js
@@ -1,27 +1,24 @@
 
 Vn.Ticket = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
-	,activate: function ()
+	,onPrintClick: function (event)
 	{
-		this.$('print').addEventListener ('click', this.printClicked.bind (this));
-		this.$('subtotal').renderer = this.subtotalRenderer.bind (this);
-		this.$('ticket-subtotal').func = this.subtotal;
-	}
-
-	,printClicked: function (event)
-	{
-		var report = window.open ('', 'report',
-			'resizable=yes,height=600,width=750,scrollbars=yes,menubar=no');
-		report.document.body.innerHTML = this.$('report').innerHTML;
-		report.print ();
+		var batch = new Sql.Batch ();
+		batch.addValue ('ticket', this.$('ticket-id').value);
+		this.gui.openReport ('delivery-note', batch);
 	}
 	
 	,subtotalRenderer: function (column, form)
 	{
 		column.value = this.subtotal (form);
 	}
+	
+	,repeaterFunc: function (res, form)
+	{
+		res.$('subtotal').value = this.subtotal (form);
+	}
 
 	,subtotal: function (form)
 	{
diff --git a/web/forms/ecomerce/ticket/ui.xml b/web/forms/ecomerce/ticket/ui.xml
index 5f6bc1b8..a3e3fe35 100755
--- a/web/forms/ecomerce/ticket/ui.xml
+++ b/web/forms/ecomerce/ticket/ui.xml
@@ -1,90 +1,75 @@
 <vn>
 <vn-group>
-	<vn-param id="ticket-id">
-		<vn-hash-param key="ticket"/>
-	</vn-param>
+	<vn-param id="ticket-id"/>
+	<vn-hash-param key="ticket" param="ticket-id"/>
 	<db-form id="ticket">
-		<db-model id="ticket-data">
-			SELECT t.id, date, a.Agencia, note, p.name province,
-			zip_code, city, c.name, consignee, invoice
-				FROM ticket_view t
-				JOIN address_view c ON t.address_id = c.id
-				JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia
-				JOIN vn2008.province p ON c.province_id = p.province_id
-					WHERE t.id = #ticket
+		<db-model property="model" id="ticket-data">
+			<custom>
+				SELECT t.id, date, a.Agencia, note, p.name province,
+				zip_code, city, c.name, consignee, invoice, delivery
+					FROM ticket_view t
+					JOIN address_view c ON t.address_id = c.id
+					JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia
+					JOIN vn2008.province p ON c.province_id = p.province_id
+						WHERE t.id = #ticket
+			</custom>
 			<sql-batch property="batch">
-				<item name="ticket" param="ticket-id"/>
+				<custom>
+					<item name="ticket" param="ticket-id"/>
+				</custom>
 			</sql-batch>
 		</db-model>
 	</db-form>
 </vn-group>
+<div id="title">
+	<h1><t>OrderDetail</t></h1>
+</div>
+<div id="actions" class="action-bar">
+	<htk-button
+		image="image/dark/print.svg"
+		tip="_Print delivery note"
+		on-click="onPrintClick"
+		show-text="true"/>
+</div>
 <div id="form" class="ticket">
 	<div class="box">
-		<div class="header">
-			<h1><t>OrderDetail</t></h1>
-			<div class="action-bar">
-				<button id="print">
-					<img src="image/dark/print.svg" alt=""/>
-					<t>Print</t>
-				</button>
+		<div class="head">
+			<div>
+				<p class="important ticket-id">
+					<htk-text column="id" form="ticket"/>
+				</p>
+				<p>
+					<htk-text form="ticket" column="delivery" format="%A, %e of %B %Y"/>
+				</p>
+			</div>
+			<div>
+				<p>
+					<t>Delivery</t> <htk-text form="ticket" column="Agencia"/>
+				</p>
+				<p>
+					<htk-text form="ticket" column="consignee"/>
+				</p>
+				<p>
+					<htk-text form="ticket" column="name"/>
+				</p>
+				<p>
+					<htk-text form="ticket" column="zip_code"/> 
+					<htk-text form="ticket" column="city"/> 
+					(<htk-text form="ticket" column="province"/>)
+				</p>
+			</div>
+			<div>
+				<p class="important total">
+					<t>Total</t> 
+					<htk-text format="%.2d€">
+						<db-calc-sum property="param" func="subtotal" model="movements"/>
+					</htk-text>
+				</p>
 			</div>
 		</div>
-		<div id="report">
-			<table class="form">
-			<tbody>
-				<tr>
-					<td class="label">
-						<label><t>TicketNumber:</t></label>
-					</td>
-					<td>
-						<htk-text column="id" form="ticket"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label><t>DateExit:</t></label>
-					</td>
-					<td>
-						<htk-date-chooser column="date" form="ticket" editable="false"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label><t>SendMethod:</t></label>
-					</td>
-					<td>
-						<htk-text column="Agencia" form="ticket"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label><t>Notes:</t></label>
-					</td>
-					<td>
-						<htk-text column="note" form="ticket"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="label">
-						<label for="total"><t>Subtotal:</t></label>
-					</td>
-					<td>
-						<htk-text format="%.2d€">
-							<db-calc-sum id="ticket-subtotal" model="movements"/>
-						</htk-text>
-					</td>
-				</tr>
-			</tbody>
-			</table>
-			<htk-grid model="ticket-data">
-				<htk-column-spin title="_PC" column="zip_code"/>
-				<htk-column-text title="_City" column="city"/>
-				<htk-column-text title="_Province" column="province"/>
-				<htk-column-text title="_Address" column="name"/>
-				<htk-column-text title="_Consignee" column="consignee"/>
-			</htk-grid>
-			<htk-grid>
-				<db-model id="movements">
+		<htk-repeater form-id="iter" renderer="repeaterFunc">
+			<db-model property="model" id="movements">
+				<custom>
 					SELECT m.item_id, amount, concept, Categoria, Medida, Tallos, Color,
 					Abreviatura, IF(fixed != FALSE, price, NULL) price, fixed, discount
 						FROM ticket_row_view m
@@ -93,23 +78,31 @@
 						LEFT JOIN vn2008.Origen o
 							ON a.id_origen = o.id
 							ORDER BY concept
-					<sql-batch property="batch">
+				</custom>
+				<sql-batch property="batch">
+					<custom>
 						<item name="ticket" param="ticket-id"/>
-					</sql-batch>
-				</db-model>
-				<htk-column-spin title="_ItemNumber" column="item_id"/>
-				<htk-column-spin title="_Amount" column="amount"/>
-				<htk-column-text title="_Item" column="concept"/>
-				<htk-column-text title="_Category" column="Categoria"/>
-				<htk-column-text title="_S1" column="Medida"/>
-				<htk-column-text title="_Stems" column="Tallos"/>
-				<htk-column-text title="_Color" column="Color"/>
-				<htk-column-text title="_Origin" column="Abreviatura"/>
-				<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
-				<htk-column-spin title="_Desc" column="discount" unit="%"/>
-				<htk-column-spin title="_Subtotal" unit="€" digits="2" id="subtotal"/>
-			</htk-grid>
-		</div>
+					</custom>
+				</sql-batch>
+			</db-model>
+			<custom>
+				<div class="line">
+					<p class="concept">
+						<htk-text form="iter" column="concept"/> 
+						<htk-text form="iter" column="Medida"/> 
+						<htk-text form="iter" column="Categoria"/>
+					</p>
+					<p class="amount">
+						<htk-text form="iter" column="amount"/> x
+						<htk-text form="iter" column="price" format="%.2d€"/>
+					</p>
+					<p class="subtotal">
+						<htk-text id="subtotal" format="%.2d€"/>
+					</p>
+					<div class="clear"/>
+				</div>
+			</custom>
+		</htk-repeater>
 	</div>
 </div>
 </vn>
diff --git a/web/forms/news/new/new.js b/web/forms/news/new/new.js
index c6664236..2111620d 100755
--- a/web/forms/news/new/new.js
+++ b/web/forms/news/new/new.js
@@ -1,7 +1,10 @@
 
+Vn.include ('js/misc/tinymce/tinymce.min');
+Vn.define (function () {
+
 Vn.New = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,activate: function ()
 	{
@@ -68,3 +71,5 @@ Vn.New = new Class
 	}
 });
 
+});
+
diff --git a/web/forms/news/new/style.css b/web/forms/news/new/style.css
index 7f0704d8..e7aa96d5 100755
--- a/web/forms/news/new/style.css
+++ b/web/forms/news/new/style.css
@@ -5,35 +5,18 @@
 }
 .new .box
 {
-	max-width: 50em;
-	margin: 0 auto;
+	max-width: 35em;
+	padding: 2em;
 }
 
 /* Form */
 
 .new .form
 {
-	padding: 2em;
-}
-.new div.form-group
-{
-	padding: 0.4em;
-}
-.new div.form-group label
-{
-	display: block;
-	margin-bottom: 0.5em;
-}
-.new div.form-group input,
-.new div.form-group textarea,
-.new div.form-group select
-{
-	margin: 0;
-	width: 100%;
 }
 .new textarea
 {
-	min-height: 26em;
+	min-height: 20em;
 }
 
 .new .foot
diff --git a/web/forms/news/new/ui.xml b/web/forms/news/new/ui.xml
index 26e749a6..3df63967 100755
--- a/web/forms/news/new/ui.xml
+++ b/web/forms/news/new/ui.xml
@@ -1,46 +1,56 @@
 <vn>
 <vn-group>
-	<vn-param id="new-id">
-		<vn-hash-param key="new"/>
-	</vn-param>
+	<vn-param id="new-id"/>
+	<vn-hash-param key="new" param="new-id"/>
 	<db-form id="iter" on-status-changed="onStatusChange">
-		<db-param column="text" on-changed="onBodyChange"/>
-		<db-model id="model" updatable="true" on-operations-done="onOperationsDone">
-			SELECT id, title, text, tag
-				FROM news WHERE id = #new
+		<db-model
+			id="model"
+			property="model"
+			updatable="true"
+			on-operations-done="onOperationsDone">
+			<custom>
+				SELECT id, title, text, tag
+					FROM news WHERE id = #new
+			</custom>
 			<sql-batch property="batch">
-				<item name="new" param="new-id"/>
+				<custom>
+					<item name="new" param="new-id"/>
+				</custom>
 			</sql-batch>
 		</db-model>
 	</db-form>
+	<db-param form="iter" column="text" on-changed="onBodyChange"/>
 </vn-group>
+<div id="title">
+	<h1><t>AddEditNew</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/ok.svg"
+		tip="_Accept"
+		on-click="onAcceptClick"
+		showText="true"/>
+	<htk-button
+		image="image/dark/close.svg"
+		tip="_Return"
+		on-click="onReturnClick"
+		showText="true"/>
+</div>
 <div id="form" class="new">
 	<div class="box">
-		<div class="header">
-			<h1><t>AddEditNew</t></h1>
-			<div class="action-bar">
-				<button on-click="onReturnClick">
-					<img src="image/dark/go-previous.svg" alt=""/>
-					<t>Return</t>
-				</button>
-				<button on-click="onAcceptClick">
-					<img src="image/dark/ok.svg" alt=""/>
-					<t>Accept</t>
-				</button>
-			</div>
-			<div class="clear"/>
-		</div>
 		<div class="form">
 			<div class="form-group">
 				<label><t>Title</t></label>
-				<htk-entry column="title" form="iter"/>
+				<htk-entry form="iter" column="title"/>
 			</div>
 			<div class="form-group">
 				<label><t>Tag</t></label>
-				<htk-combo column="tag" form="iter">
+				<htk-combo form="iter" column="tag">
 					<db-model property="model">
-						SELECT name, description FROM news_tag
-							ORDER BY description
+						<custom>
+							SELECT name, description FROM news_tag
+								ORDER BY description
+						</custom>
 					</db-model>
 				</htk-combo>
 			</div>
diff --git a/web/forms/news/news/news.js b/web/forms/news/news/news.js
index 456664a5..3cd36773 100755
--- a/web/forms/news/news/news.js
+++ b/web/forms/news/news/news.js
@@ -1,7 +1,7 @@
 
 Vn.News = new Class
 ({
-	Extends: Vn.Module
+	Extends: Vn.Form
 
 	,editNew: function (newId)
 	{
@@ -11,9 +11,15 @@ Vn.News = new Class
 		});
 	}
 
-	,onEditClick: function (column, newId)
+	,onEditClick: function (button, form)
 	{
-		this.editNew (newId);
+		this.editNew (button.value);
+	}
+
+	,onDeleteClick: function (button, form)
+	{
+		if (confirm (_('ReallyDelete')))
+			form.deleteRow ();
 	}
 	
 	,onAddClick: function ()
diff --git a/web/forms/news/news/style.css b/web/forms/news/news/style.css
index c355c3ce..06654959 100755
--- a/web/forms/news/news/style.css
+++ b/web/forms/news/news/style.css
@@ -1,10 +1,48 @@
 .news
 {
 	padding: 1em;
-	min-width: 35em;
 }
 .news .box
 {
-	max-width: 60em;
+	max-width: 35em;
 	margin: 0 auto;
 }
+
+/* Items */
+
+.news .item
+{
+	padding: 1em;
+	border-bottom: 1px solid #DDD;
+}
+.news .item > p
+{
+	margin: .1em 0;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+.news .item > p.important
+{
+	font-size: 1.2em;
+}
+.news .item > .photo
+{
+	float: left;
+	margin-right: 1em;
+	height: 5em;
+	width: 5em;
+}
+.news .item > .photo > img
+{
+	display: block;
+	margin: 0 auto;
+	height: 100%;
+	max-width: 100%;
+	border-radius: .3em;
+}
+.news .item > button
+{
+	float: right;
+	margin: 0;
+}
diff --git a/web/forms/news/news/ui.xml b/web/forms/news/news/ui.xml
index bef968bd..ea13a7ee 100755
--- a/web/forms/news/news/ui.xml
+++ b/web/forms/news/news/ui.xml
@@ -1,38 +1,61 @@
 <vn>
+<div id="title">
+	<h1><t>NewsManagement</t></h1>
+</div>
+<div id="actions">
+	<htk-button
+		image="image/dark/add.svg"
+		tip="_AddNew"
+		on-click="onAddClick"
+		showText="true"/>
+</div>
 <div id="form" class="news">
 	<div class="box">
-		<div class="header">
-			<h1><t>NewsManagement</t></h1>
-			<div class="action-bar">
-				<button on-click="onAddClick">
-					<img src="image/dark/add.svg" alt=""/>
-					<t>AddNew</t>
-				</button>
-			</div>
-		</div>
-		<htk-grid>
-			<db-model id="news-model" updatable="true">
-				SELECT n.id, c.Cliente, priority, image,
-				CONCAT(LEFT(n.title, 25), '...') title
-					FROM news n
-					JOIN vn2008.Clientes c ON n.user_id = c.Id_Cliente
-						ORDER BY priority, n.date_time DESC
+		<htk-repeater form-id="iter">
+			<db-model property="model" id="news-model" updatable="true">
+				<custom>
+					SELECT n.id, c.Cliente, priority, image, title
+						FROM news n
+						JOIN vn2008.Clientes c ON n.user_id = c.Id_Cliente
+							ORDER BY priority, n.date_time DESC
+				</custom>
 			</db-model>
-			<htk-column-button
-				column="id"
-				tip="_EditNew"
-				image="image/edit.svg"
-				on-clicked="onEditClick"/>
-			<htk-column-image
-				column="image"
-				directory="news"
-				subdir="50x50"
-				show-full="true"
-				editable="true"/>
-			<htk-column-text title="_Title" column="title"/>
-			<htk-column-text title="_Author" column="Cliente"/>
-			<htk-column-spin title="_Priority" column="priority"/>
-		</htk-grid>
+			<custom>
+				<div class="item">
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_EditNew"
+						image="image/edit.svg"
+						on-click="onEditClick"/>
+					<htk-button
+						form="iter"
+						column="id"
+						tip="_Remove"
+						image="image/delete.svg"
+						on-click="onDeleteClick"/>
+					<div class="photo">
+						<htk-image
+							form="iter"
+							column="image"
+							class="photo"
+							directory="news"
+							subdir="200x200"
+							editable="true"/>
+					</div>
+					<p class="important">
+						<htk-text form="iter" column="title"/>
+					</p>
+					<p>
+						<htk-text form="iter" column="Cliente"/>
+					</p>
+					<p>
+						<t>Priority</t> 
+						<htk-text form="iter" column="priority"/>
+					</p>
+				</div>
+			</custom>
+		</htk-repeater>
 	</div>
 </div>
 </vn>
diff --git a/web/global/mobile.css b/web/global/mobile.css
deleted file mode 100755
index 5d811904..00000000
--- a/web/global/mobile.css
+++ /dev/null
@@ -1,124 +0,0 @@
-
-/* Generic */
-@media screen and (orientation: landscape)
-{
-	* { font-size: 13pt; }
-}
-
-@media screen and (orientation: portrait)
-{
-	* { font-size: 26pt; }
-}
-
-/* Smartphones (portrait and landscape) */
-@media only screen and (min-device-width : 320px) and (max-device-width : 480px){
-	* { font-size: 26pt; }
-}
-
-/* Smartphones (landscape) */
-@media only screen and (min-width : 321px){
-	* { font-size: 13pt; }
-}
-
-/* Smartphones (portrait) */
-@media only screen and (max-width : 320px){
-	* { font-size: 26pt; }
-}
-
-/* iPads (portrait and landscape) */
-@media only screen and (min-device-width : 768px) and (max-device-width : 1024px){
-	* { font-size: 13pt; }
-}
-
-/* iPads (landscape) */
-@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : landscape){
-	* { font-size: 10pt; }
-}
-
-/* iPads (portrait) */
-@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : portrait){
-	* { font-size: 13pt; }
-}
-
-/* iPad 3 */
-@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : landscape) and (-webkit-min-device-pixel-ratio : 2){
-	* { font-size: 10pt; }
-}
-
-@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (orientation : portrait) and (-webkit-min-device-pixel-ratio : 2){
-	* { font-size: 13pt; }
-}
-
-/* Desktops and laptops */
-@media only screen and (min-width : 1224px){
-	* { font-size: 13pt; }
-}
-
-/* Large screens */
-@media only screen and (min-width : 1824px){
-	* { font-size: 13pt; }
-}
-
-/* iPhone 4 */
-@media only screen and (min-device-width : 320px) and (max-device-width : 480px) and (orientation : landscape) and (-webkit-min-device-pixel-ratio : 2){
-	* { font-size: 13pt; }
-}
-
-@media only screen and (min-device-width : 320px) and (max-device-width : 480px) and (orientation : portrait) and (-webkit-min-device-pixel-ratio : 2){
-	* { font-size: 26pt; }
-}
-
-/* iPhone 5 */
-@media only screen and (min-device-width: 320px) and (max-device-height: 568px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 13pt; }
-}
-
-@media only screen and (min-device-width: 320px) and (max-device-height: 568px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 26pt; }
-}
-
-/* iPhone 6 */
-@media only screen and (min-device-width: 375px) and (max-device-height: 667px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 13pt; }
-}
-
-@media only screen and (min-device-width: 375px) and (max-device-height: 667px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 26pt; }
-}
-
-/* iPhone 6+ */
-@media only screen and (min-device-width: 414px) and (max-device-height: 736px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 13pt; }
-}
-
-@media only screen and (min-device-width: 414px) and (max-device-height: 736px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 26pt; }
-}
-
-/* Samsung Galaxy S3 */
-@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 13pt; }
-}
-
-@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 2){
-	* { font-size: 26pt; }
-}
-
-/* Samsung Galaxy S4 */
-@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 3){
-	* { font-size: 13pt; }
-}
-
-@media only screen and (min-device-width: 320px) and (max-device-height: 640px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 3){
-	* { font-size: 26pt; }
-}
-
-/* Samsung Galaxy S5 */
-@media only screen and (min-device-width: 360px) and (max-device-height: 640px) and (orientation : landscape) and (-webkit-device-pixel-ratio: 3){
-	* { font-size: 13pt; }
-}
-
-@media only screen and (min-device-width: 360px) and (max-device-height: 640px) and (orientation : portrait) and (-webkit-device-pixel-ratio: 3){
-	* { font-size: 26pt; }
-}
-
diff --git a/web/global/report.css b/web/global/report.css
deleted file mode 100755
index feb6589e..00000000
--- a/web/global/report.css
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/* Global */
-
-@font-face {
-    font-family: 'Open Sans';
-    src: url(opensans.ttf) format('truetype');
-}
-*
-{
-	font-size: 13px;
-	font-family: 'Open Sans', 'Verdana', 'Sans';
-}
diff --git a/web/image/add-photo.svg b/web/image/add-photo.svg
new file mode 100644
index 00000000..4beae49e
--- /dev/null
+++ b/web/image/add-photo.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   viewBox="0 0 16 16"
+   width="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="add-photo.svg"
+   style="fill:#000000">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12.20339"
+     inkscape:cy="12"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <path
+       d="M 24,24 0,24 0,0 24,0 24,24 Z"
+       id="a"
+       inkscape:connector-curvature="0" />
+  </defs>
+  <clipPath
+     id="b">
+    <use
+       overflow="visible"
+       xlink:href="#a"
+       id="use8"
+       style="overflow:visible"
+       x="0"
+       y="0"
+       width="100%"
+       height="100%" />
+  </clipPath>
+  <path
+     clip-path="url(#b)"
+     d="M 3,4 3,1 5,1 5,4 8,4 8,6 5,6 5,9 3,9 3,6 0,6 0,4 3,4 Z M 6,10 6,7 9,7 9,4 16,4 17.83,6 21,6 c 1.1,0 2,0.9 2,2 l 0,12 c 0,1.1 -0.9,2 -2,2 L 5,22 C 3.9,22 3,21.1 3,20 l 0,-10 3,0 z m 7,9 c 2.76,0 5,-2.24 5,-5 0,-2.76 -2.24,-5 -5,-5 -2.76,0 -5,2.24 -5,5 0,2.76 2.24,5 5,5 z M 9.8,14 c 0,1.77 1.43,3.2 3.2,3.2 1.77,0 3.2,-1.43 3.2,-3.2 0,-1.77 -1.43,-3.2 -3.2,-3.2 -1.77,0 -3.2,1.43 -3.2,3.2 z"
+     id="path10"
+     inkscape:connector-curvature="0"
+     transform="matrix(0.60869565,0,0,0.60869565,1,1)"
+     style="fill:#666666;fill-opacity:1" />
+</svg>
diff --git a/web/image/blog.svg b/web/image/blog.svg
new file mode 100644
index 00000000..c162845a
--- /dev/null
+++ b/web/image/blog.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="23.998131"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="blog.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2555">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop2557" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop2559" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2555"
+       id="linearGradient2449"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.5914583,0,0,0.5914584,210.0216,142.2324)"
+       x1="-344.15295"
+       y1="274.711"
+       x2="-395.84943"
+       y2="425.39993" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.461017"
+     inkscape:cx="12"
+     inkscape:cy="11.999065"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:description />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.13803,-539.84063)">
+    <rect
+       inkscape:export-ydpi="7.7063322"
+       inkscape:export-xdpi="7.7063322"
+       inkscape:export-filename="C:\Documents and Settings\Molumen\Desktop\path3511111.png"
+       transform="scale(-1,1)"
+       ry="3.6241345"
+       rx="3.6241345"
+       y="539.84064"
+       x="-408.13803"
+       height="23.998131"
+       width="24"
+       id="rect1942"
+       style="fill:#8ed300;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.06372762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 393.34458,546.3858 3.48268,-0.0536 c 1.5948,0.0441 2.48113,1.17454 2.46467,2.46428 0.15459,1.52402 -0.27455,3.24973 -2.67899,3.21427 l -3.4291,0 c -1.51194,0.0146 -2.71918,-0.87387 -2.62541,-2.62499 -0.0749,-1.45077 0.40414,-3.02091 2.78615,-2.99999 z"
+       id="path3778"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.06372762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 398.97045,558.17147 -5.35798,0 c -2.23262,0.0286 -3.30805,-0.9892 -3.1612,-3.32141 0.0105,-2.09647 1.2266,-2.69508 3.05404,-2.73214 l 5.3044,0 c 3.60674,-0.0963 3.21282,-0.13119 3.26837,2.78571 -0.0227,2.1206 -1.18894,3.25161 -3.10763,3.26784 z"
+       id="path3780"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#ffffff;stroke-width:3.06372762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 390.45127,555.27863 0.10716,-6.42855"
+       id="path3782"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#8ed300;stroke-width:2.55310631;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 393.59928,549.13968 2.9913,0.0475"
+       id="path3786"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#8ed300;stroke-width:2.55310631;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 393.25946,554.98949 5.98261,0"
+       id="path3788"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/web/image/dark/exit.svg b/web/image/dark/exit.svg
new file mode 100644
index 00000000..e1e0f40d
--- /dev/null
+++ b/web/image/dark/exit.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="exit.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="51.5"
+     inkscape:cx="7.8543689"
+     inkscape:cy="8"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="m 0,-32 48,0 0,48 -48,0 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+  <path
+     d="M 6.7233333,10.39 7.6666664,11.333334 11,8 7.6666664,4.6666664 6.7233333,5.6099996 8.4466664,7.3333328 2,7.3333328 l 0,1.3333344 6.4466664,0 L 6.7233333,10.39 Z M 12.666667,2 3.3333333,2 C 2.5966666,2 2,2.5966664 2,3.3333332 l 0,2.6666664 1.3333333,0 0,-2.6666664 9.3333337,0 0,9.3333338 -9.3333337,0 0,-2.666667 L 2,10 2,12.666667 C 2,13.403334 2.5966666,14 3.3333333,14 l 9.3333337,0 C 13.403334,14 14,13.403334 14,12.666667 L 14,3.3333332 C 14,2.5966664 13.403334,2 12.666667,2 Z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:0.94117647;stroke:none;stroke-opacity:1" />
+</svg>
diff --git a/web/image/dark/info.svg b/web/image/dark/info.svg
index 54837200..97a12573 100644
--- a/web/image/dark/info.svg
+++ b/web/image/dark/info.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- The icon can be used freely in both personal and commercial projects with no attribution required, but always appreciated. 
+You may NOT sub-license, resell, rent, redistribute or otherwise transfer the icon without express written permission from iconmonstr.com -->
 
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -9,115 +10,41 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg7384"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   x="0px"
+   y="0px"
+   width="16"
    height="16"
-   sodipodi:docname="info.svg"
-   width="16">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:cy="7.0274833"
-     inkscape:current-layer="layer9"
-     inkscape:window-width="1920"
-     pagecolor="#555753"
-     showborder="false"
-     showguides="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10"
-     showgrid="false"
-     inkscape:object-nodes="true"
-     inkscape:pageshadow="2"
-     inkscape:guide-bbox="true"
-     inkscape:window-x="1920"
-     inkscape:snap-bbox="true"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 512 512"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="info.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     id="namedview88"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:window-y="27"
-     gridtolerance="10"
-     inkscape:zoom="45.078231"
-     inkscape:window-height="1014"
      borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
      guidetolerance="10"
-     inkscape:cx="3.8262706"
-     inkscape:bbox-paths="false"
-     inkscape:snap-grids="true"
-     inkscape:pageopacity="1"
-     inkscape:snap-to-guides="true">
-    <inkscape:grid
-       visible="true"
-       spacingx="1px"
-       type="xygrid"
-       spacingy="1px"
-       id="grid4866"
-       empspacing="2"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline">
-    <path
-       d="m 287.53551,259.96102 c -0.32661,0 -0.66541,0.12985 -0.91815,0.38255 l -5.20278,5.20277 c -0.50544,0.50543 -0.50544,1.33087 0,1.83629 l 5.20278,5.20279 c 0.50544,0.50541 1.33084,0.50541 1.83629,0 l 5.20277,-5.20279 c 0.50544,-0.50542 0.50544,-1.33086 0,-1.83629 l -5.20277,-5.20277 c -0.25273,-0.2527 -0.59154,-0.38255 -0.91814,-0.38255 z m -0.15302,2.42286 c 1.34042,-0.075 2.52629,0.95493 2.60138,2.29534 -8e-5,1.14368 -0.30825,1.56841 -1.30069,2.32085 -0.15583,0.11723 -0.26573,0.20453 -0.30604,0.25504 -0.0403,0.0507 -0.0254,0.0271 -0.0254,0.0254 0.006,0.43119 -0.38491,0.81613 -0.81612,0.81613 -0.43122,0 -0.82184,-0.38494 -0.81612,-0.81613 0,-0.41 0.183,-0.76994 0.38255,-1.02014 0.19955,-0.25025 0.40096,-0.42144 0.58659,-0.56109 0.16652,-0.13104 0.37609,-0.31383 0.56108,-0.53558 0.0763,-0.0915 0.10528,-0.25108 0.10202,-0.35706 l 0,-0.0255 c -0.0258,-0.45966 -0.40746,-0.7909 -0.86714,-0.76511 -0.45966,0.0258 -0.79089,0.35644 -0.7651,0.81613 l -1.63226,0 c -0.075,-1.34043 0.95494,-2.37322 2.29535,-2.44838 z m 0.15302,6.52899 c 0.45072,0 0.81612,0.36539 0.81612,0.81611 0,0.45073 -0.3654,0.81612 -0.81612,0.81612 -0.45072,0 -0.81612,-0.36539 -0.81612,-0.81612 0,-0.45072 0.3654,-0.81611 0.81612,-0.81611 z"
-       id="path19592"
-       style="color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer11"
-     inkscape:label="apps" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer13"
-     inkscape:label="places" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="g4953"
-     inkscape:label="categories"
-     style="display:inline" />
-</svg>
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="51.6875"
+     inkscape:cx="7.2631221"
+     inkscape:cy="7.9613059"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><path
+     id="info-2-icon"
+     d="m 7.999935,2.762144 c 2.89471,0 5.237934,2.342561 5.237934,5.23783 0,2.894749 -2.342691,5.237882 -5.237934,5.237882 -2.89471,0 -5.237804,-2.342626 -5.237804,-5.237882 0,-2.894723 2.342626,-5.23783 5.237804,-5.23783 m 0,-1.262144 C 4.410141,1.5 1.5,4.410115 1.5,7.999974 1.5,11.589846 4.410141,14.5 7.999935,14.5 11.589794,14.5 14.5,11.589846 14.5,7.999974 14.5,4.410115 11.589833,1.5 7.999935,1.5 l 0,0 z m 0.941044,10.020335 -1.818921,0 0,-4.321798 1.818921,0 0,4.321798 z M 8.031551,6.304566 c -0.552877,0 -1.001156,-0.448253 -1.001156,-1.001195 0,-0.552877 0.448253,-1.001169 1.001156,-1.001169 0.552942,0 1.00113,0.448253 1.00113,1.001169 0,0.552942 -0.448188,1.001195 -1.00113,1.001195 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/web/image/dark/new-order.svg b/web/image/dark/new-order.svg
new file mode 100644
index 00000000..2ea94463
--- /dev/null
+++ b/web/image/dark/new-order.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 512 512"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="new-order.svg"><metadata
+     id="metadata11"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs9" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview7"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="51.6875"
+     inkscape:cx="7.544033"
+     inkscape:cy="7.9613059"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g2988"
+     transform="matrix(0.03325942,0,0,0.03325942,-0.51441152,-0.68070862)"
+     style="fill:#ffffff;fill-opacity:1"><path
+       id="path3"
+       d="m 461.5,222 h -411 c -11.046,0 -20,8.954 -20,20 l 40,207 c 0,11.046 8.954,20 20,20 h 331 c 11.046,0 20,-8.954 20,-20 l 40,-207 c 0,-11.046 -8.954,-20 -20,-20 z M 138,403.5 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 66,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 62,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1" /><path
+       id="path5"
+       d="M 319.9,71.008 C 318.899,60.897 310.373,53 300,53 l -87,0 c -10.387,0 -18.92,7.919 -19.901,18.049 -19.155,-0.169 -49.697,-0.793 -60.374,3.647 -19.07,7.12 -34.01,24.74 -37.04,44.99 -4.64,29.089 -9.399,58.169 -13.91,87.291 6.721,0.029 13.44,0.159 20.16,-0.021 4.53,-27.64 8.83,-55.31 13.34,-82.95 1.83,-16.4 15.96,-30.24 32.12,-32.61 C 154.332,90.778 178.309,91 193.67,91.053 195.911,99.648 203.703,106 213,106 l 87,0 c 9.31,0 17.11,-6.37 19.34,-14.982 1.40554,-6.929611 1.55505,-12.101213 0.56,-20.01 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="cssccccccccsscc" /></g><path
+     style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#ff0b0b;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:26.89999962;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+     d="m 12.193371,0.78469625 0,1.99999315 -1.999993,0 0,0.9999966 1.999993,0 0,1.9999934 0.999997,0 0,-1.9999934 1.999994,0 0,-0.9999966 -1.999994,0 0,-1.99999315 -0.999997,0 z"
+     id="rect31992"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/web/image/dark/ok.svg b/web/image/dark/ok.svg
index d6f243e3..c570f0e2 100644
--- a/web/image/dark/ok.svg
+++ b/web/image/dark/ok.svg
@@ -9,10 +9,10 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="ok-dark.svg"
-   height="13.21348"
+   sodipodi:docname="ok.svg"
+   height="16"
    id="svg7384"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    version="1.1"
    width="16">
   <metadata
@@ -32,8 +32,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer15"
-     inkscape:cx="8.032386"
-     inkscape:cy="6.60674"
+     inkscape:cx="8"
+     inkscape:cy="8"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -54,12 +54,12 @@
      inkscape:snap-nodes="false"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="1014"
+     inkscape:window-height="1016"
      inkscape:window-maximized="1"
      inkscape:window-width="1920"
      inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="61.755117"
+     inkscape:zoom="51.6875"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -85,55 +85,55 @@
      id="layer9"
      inkscape:label="status"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer10"
      inkscape:label="devices"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer11"
      inkscape:label="apps"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer13"
      inkscape:label="places"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer14"
      inkscape:label="mimetypes"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer15"
      inkscape:label="emblems"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)">
+     transform="translate(-463.9375,-398.125)">
     <path
        inkscape:connector-curvature="0"
-       d="m 475.64536,402.5632 -5.32585,5.32584 -2.08987,-2.08989 -2.29214,2.29215 3.23595,3.23594 1.14606,1.14607 1.14607,-1.14607 6.47192,-6.47192 -2.29214,-2.29212 z"
+       d="m 475.64536,401.16994 -5.32585,5.32584 -2.08987,-2.08989 -2.29214,2.29215 3.23595,3.23594 1.14606,1.14608 1.14607,-1.14608 6.47192,-6.47192 -2.29214,-2.29212 z"
        id="path5037"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="g71291"
      inkscape:label="emotes"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="g4953"
      inkscape:label="categories"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="actions"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
 </svg>
diff --git a/web/image/dark/order.svg b/web/image/dark/place.svg
similarity index 100%
rename from web/image/dark/order.svg
rename to web/image/dark/place.svg
diff --git a/web/image/dark/view-dual.svg b/web/image/dark/view-dual.svg
new file mode 100644
index 00000000..5753e204
--- /dev/null
+++ b/web/image/dark/view-dual.svg
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="view-dual.svg"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="2.8446602"
+     inkscape:cy="7.961165"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:zoom="51.5">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="60.0002px"
+       originy="650.00012px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-181,-867.00012)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-181,-867.00012)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 181,868 0,1 0,11 0,1 1,0 5,0 c 0.1754,0 0.52538,0.15166 0.8125,0.34375 0.28712,0.19209 0.46875,0.375 0.46875,0.375 L 189,882.4375 l 0.71875,-0.75 c 0,0 0.8963,-0.6875 1.28125,-0.6875 l 5,0 1,0 0,-1 0,-11 0,-1 -1,0 -5,0 c -0.87652,0 -1.56017,0.34756 -2.03125,0.6875 -0.0301,-0.0207 -0.031,-0.0105 -0.0625,-0.0312 C 188.44557,868.35254 187.82811,868 187,868 l -5,0 -1,0 z m 2,2 4,0 c 0.13821,0 0.51476,0.14746 0.8125,0.34375 0.29774,0.19629 0.5,0.375 0.5,0.375 l 0.71875,0.6875 0.6875,-0.71875 c 0,0 0.89975,-0.6875 1.28125,-0.6875 l 4,0 0,9 -4,0 c -0.87693,0 -1.56008,0.34735 -2.03125,0.6875 -0.0196,-0.0135 -0.011,-0.0177 -0.0312,-0.0312 C 188.47725,879.34834 187.83512,879 187,879 l -4,0 0,-9 z"
+       id="rect7352-28-4-8"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <rect
+       height="2"
+       id="rect42942-5-3-1-4-4-5-9"
+       inkscape:label="a"
+       rx="0.375"
+       ry="0.375"
+       style="opacity:0.7;color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;stroke-opacity:1"
+       transform="scale(-1,1)"
+       width="3.0000136"
+       x="-187.00021"
+       y="871.99976" />
+    <rect
+       height="2.0002136"
+       id="rect42944-7-5-3-5-1-5-0-2-62-5"
+       inkscape:label="a"
+       rx="0.375"
+       ry="0.375"
+       style="opacity:0.7;color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;stroke-opacity:1"
+       transform="scale(-1,1)"
+       width="3.0000129"
+       x="-187.00021"
+       y="874.99976" />
+    <rect
+       height="2.0002136"
+       id="rect42942-5-3-1-4-4-6-0-1"
+       inkscape:label="a"
+       rx="0.375"
+       ry="0.375"
+       style="opacity:0.7;color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;stroke-opacity:1"
+       transform="scale(-1,1)"
+       width="3.0000136"
+       x="-194.00021"
+       y="871.99976" />
+    <rect
+       height="2.0002136"
+       id="rect42944-7-5-3-5-1-5-0-2-6-4-6"
+       inkscape:label="a"
+       rx="0.375"
+       ry="0.375"
+       style="opacity:0.7;color:#bebebe;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;stroke-opacity:1"
+       transform="scale(-1,1)"
+       width="3.0000129"
+       x="-194.00021"
+       y="874.99976" />
+  </g>
+</svg>
diff --git a/web/image/dark/view-grid.svg b/web/image/dark/view-grid.svg
new file mode 100644
index 00000000..86f11ed6
--- /dev/null
+++ b/web/image/dark/view-grid.svg
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="view-grid.svg"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-paths="false"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#555753"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:zoom="51.6875">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-61.0004,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-61.0004,-867)">
+    <g
+       id="g4152"
+       transform="matrix(1.2,0,0,1.2,-13.799838,-175)">
+      <rect
+         y="870"
+         x="64.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13363"
+         height="2" />
+      <rect
+         y="870"
+         x="68.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13365"
+         height="2" />
+      <rect
+         y="870"
+         x="72.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13367"
+         height="2" />
+      <rect
+         y="874.01562"
+         x="64.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13369"
+         height="2" />
+      <rect
+         y="874.01562"
+         x="68.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13371"
+         height="2" />
+      <rect
+         y="874.01562"
+         x="72.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13373"
+         height="2" />
+      <rect
+         y="878"
+         x="64.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13375"
+         height="2" />
+      <rect
+         y="878"
+         x="68.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13377"
+         height="2" />
+      <rect
+         y="878"
+         x="72.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect13379"
+         height="2" />
+    </g>
+  </g>
+</svg>
diff --git a/web/image/dark/view-list.svg b/web/image/dark/view-list.svg
new file mode 100644
index 00000000..43de6898
--- /dev/null
+++ b/web/image/dark/view-list.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="view-list.svg"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   height="16"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:zoom="51.6875">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="199.9998px"
+       originy="650px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-41.000401,-867)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-41.000401,-867)">
+    <g
+       id="g4149"
+       transform="matrix(1.1999999,0,0,1.1999999,-9.7998324,-174.99977)">
+      <rect
+         y="869.99976"
+         x="47.000198"
+         width="7.0000005"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none"
+         inkscape:label="a"
+         id="rect5356"
+         height="2.0002136" />
+      <rect
+         y="873.99976"
+         x="47.000198"
+         width="7.0000005"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none"
+         inkscape:label="a"
+         id="rect5358"
+         height="2.0002136" />
+      <rect
+         y="877.99976"
+         x="47.000198"
+         width="7.0000005"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none"
+         inkscape:label="a"
+         id="rect5360"
+         height="2.0002136" />
+      <rect
+         y="870"
+         x="44.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect5398"
+         height="2" />
+      <rect
+         y="874.01562"
+         x="44.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect5401"
+         height="2" />
+      <rect
+         y="878"
+         x="44.000198"
+         width="2.0000002"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+         ry="0.37878788"
+         rx="0.38461545"
+         id="rect5403"
+         height="2" />
+    </g>
+  </g>
+</svg>
diff --git a/web/image/dark/view.svg b/web/image/dark/view.svg
new file mode 100644
index 00000000..41ade484
--- /dev/null
+++ b/web/image/dark/view.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="eye.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#494949"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.5"
+     inkscape:cx="0.15346619"
+     inkscape:cy="7.92233"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       id="path4138"
+       d="m 8,1040.1853 c 3.58462,0 6,4.1847 6,4.1847 0,0 -2.41538,4.1692 -6,4.1692 -3.58462,0 -6,-4.1692 -6,-4.1692 0,0 2.41538,-4.1847 6,-4.1847 z m 0,7.1231 c 1.61538,0 2.93846,-1.3231 2.93846,-2.9384 0,-1.6154 -1.32308,-2.9385 -2.93846,-2.9385 -1.61538,0 -2.93846,1.3231 -2.93846,2.9385 0,1.6153 1.32308,2.9384 2.93846,2.9384 z m 1.32308,-2.9384 c 0,0.723 -0.61539,1.3077 -1.32308,1.3077 -0.72308,0 -1.30769,-0.5847 -1.30769,-1.3077 0,-0.7078 0.58461,-1.3231 1.30769,-1.3231 0.70769,0 1.32308,0.6154 1.32308,1.3231 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/web/image/empty.png b/web/image/empty.png
deleted file mode 100644
index 9666805b..00000000
Binary files a/web/image/empty.png and /dev/null differ
diff --git a/web/image/exit.svg b/web/image/exit.svg
new file mode 100644
index 00000000..1469607a
--- /dev/null
+++ b/web/image/exit.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="exit.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="51.5"
+     inkscape:cx="7.8543689"
+     inkscape:cy="8"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="m 0,-32 48,0 0,48 -48,0 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+  <path
+     d="M 6.7233333,10.39 7.6666664,11.333334 11,8 7.6666664,4.6666664 6.7233333,5.6099996 8.4466664,7.3333328 2,7.3333328 l 0,1.3333344 6.4466664,0 L 6.7233333,10.39 Z M 12.666667,2 3.3333333,2 C 2.5966666,2 2,2.5966664 2,3.3333332 l 0,2.6666664 1.3333333,0 0,-2.6666664 9.3333337,0 0,9.3333338 -9.3333337,0 0,-2.666667 L 2,10 2,12.666667 C 2,13.403334 2.5966666,14 3.3333333,14 l 9.3333337,0 C 13.403334,14 14,13.403334 14,12.666667 L 14,3.3333332 C 14,2.5966664 13.403334,2 12.666667,2 Z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:#66666f;fill-opacity:0.94117647;stroke:none;stroke-opacity:1" />
+</svg>
diff --git a/web/image/family_dark/1.svg b/web/image/family_dark/1.svg
new file mode 100644
index 00000000..665cb84f
--- /dev/null
+++ b/web/image/family_dark/1.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 444.488 324"
+   xml:space="preserve"
+   id="svg3218"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="1.svg"><metadata
+     id="metadata3449"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3447" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview3445"
+     showgrid="false"
+     inkscape:zoom="20.675"
+     inkscape:cx="7.9322854"
+     inkscape:cy="19.903265"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3218"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="Background"
+     transform="translate(-4.4638381,-117.67518)" /><g
+     id="Guides"
+     transform="translate(-4.4638381,-117.67518)" /><path
+     d="M 20,20"
+     id="path3283"
+     inkscape:connector-curvature="0"
+     style="fill:#8ed300;stroke-width:2.5;stroke-miterlimit:3.86369991;stroke-dasharray:none" /><path
+     style="fill:none;stroke:#b92a26;stroke-width:2.5;stroke-miterlimit:3.86369991;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path3297"
+     d="m 9.152909,24.579892 c -0.5065455,-1.890545 0.2378182,-3.82109 1.725818,-4.913818 -0.09127,-0.07818 -0.180363,-0.160363 -0.266909,-0.247272 -1.8018181,-1.801455 -1.8018181,-4.722546 0,-6.524 1.383273,-1.383273 3.426545,-1.704728 5.116364,-0.963637 0.02182,-0.117091 0.04836,-0.234545 0.08,-0.351272 0.659272,-2.461455 3.189091,-3.9218186 5.650181,-3.2621822 1.889091,0.5061818 3.189091,2.1141822 3.392728,3.9472722 0.112727,-0.03964 0.227636,-0.07564 0.345454,-0.106909 2.461091,-0.659272 4.990909,0.801091 5.650546,3.262182 0.506545,1.890546 -0.237819,3.821455 -1.725819,4.914182 0.09091,0.07782 0.179637,0.159636 0.265455,0.245818 1.801818,1.801818 1.801818,4.722546 0,6.524 -1.381818,1.381818 -3.421818,1.704 -5.110545,0.966182 -0.02182,0.116363 -0.04836,0.233454 -0.07964,0.349818 -0.659273,2.461091 -3.189454,3.921455 -5.650545,3.262182 -1.889455,-0.506182 -3.189455,-2.114909 -3.392364,-3.948727 -0.114182,0.04036 -0.230909,0.07673 -0.349818,0.108363 C 12.342,28.500983 9.8121817,27.04062 9.152909,24.579892 Z"
+     stroke-miterlimit="3.8637" /><circle
+     stroke-miterlimit="3.8637"
+     cx="20"
+     cy="20"
+     r="3.3763635"
+     id="circle3315"
+     style="fill:none;stroke:#b92a26;stroke-width:2.5;stroke-miterlimit:3.86369991;stroke-dasharray:none;stroke-opacity:1" /><path
+     stroke-miterlimit="3.8637"
+     d="M 20,20"
+     id="path3317"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-miterlimit:3.86369991;stroke-dasharray:none" /></svg>
\ No newline at end of file
diff --git a/web/image/family_dark/2.svg b/web/image/family_dark/2.svg
new file mode 100644
index 00000000..f658ceb3
--- /dev/null
+++ b/web/image/family_dark/2.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 444.488 324"
+   xml:space="preserve"
+   id="svg3218"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="2.svg"><metadata
+     id="metadata3449"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3447" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview3445"
+     showgrid="false"
+     inkscape:zoom="20.675"
+     inkscape:cx="8.305428"
+     inkscape:cy="25.495398"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3218"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="Background"
+     transform="translate(-156.32787,-82.717)" /><g
+     id="Guides"
+     transform="translate(-156.32787,-82.717)" /><path
+     style="fill:#8ed300;stroke:#00978a;stroke-opacity:1;stroke-width:2.2;stroke-miterlimit:3.92211413;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path3387"
+     d="M 20.816063,16.718122" /><g
+     id="g3401"
+     transform="matrix(0.34545455,0,0,0.34545455,-52.866888,-3.4816067)"
+     style="stroke:#00978a;stroke-opacity:1;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-dasharray:none"><g
+       id="g3403"
+       style="stroke:#00978a;stroke-opacity:1;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-dasharray:none" /></g><g
+     id="g3407"
+     transform="matrix(0.34545455,0,0,0.34545455,-52.866888,-3.4816067)"
+     style="stroke:#00978a;stroke-opacity:1;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-dasharray:none"><g
+       id="g3409"
+       style="stroke:#00978a;stroke-opacity:1;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-dasharray:none"><g
+         id="g3411"
+         style="stroke:#00978a;stroke-opacity:1;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-dasharray:none"><path
+           id="path3415"
+           style="fill:none;stroke:#00978a;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-opacity:1;stroke-dasharray:none"
+           d="m 211.599,61.305 m 18.57101,0 a 18.57,6.3759999 0 0 1 -18.57,6.376 18.57,6.3759999 0 0 1 -18.57,-6.376 18.57,6.3759999 0 0 1 18.57,-6.376 18.57,6.3759999 0 0 1 18.57,6.376 z M 224.431,97.786 c 0,2.549 -5.695,4.615 -12.72,4.615 -6.749,0 -12.271,-1.907 -12.693,-4.317 -0.207,-0.331 -0.316,-0.674 -0.316,-1.027 0,-0.067 0.004,-0.134 0,-0.2 0,0 -4.964,-32.619 -5.143,-33.792 0.174,1.143 7.998,4.723 18.034,4.723 9.308,0 16.979,-2.28 18.044,-5.22 l -5.207,35.018 c -0.003,0.066 0.001,0.132 0.001,0.2 z" /></g></g></g><path
+     style="clip-rule:evenodd;fill:#ffffff;stroke:#00978a;stroke-width:2.2;stroke-miterlimit:3.92211413;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path3423"
+     d="M 20.335796,16.959222 C 16.784178,11.681368 6.7670325,13.819386 9.1945416,23.46655 11.787178,22.122731 16.960705,12.288331 20.335796,16.959222 Z"
+     stroke-miterlimit="3.8637" /><path
+     style="clip-rule:evenodd;fill:#ffffff;stroke:#00978a;stroke-width:2.2;stroke-miterlimit:3.92211413;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path3429"
+     d="M 20.126796,16.959222 C 23.678415,11.681368 33.69556,13.819386 31.268051,23.46655 28.675414,22.122731 23.501887,12.288331 20.126796,16.959222 Z"
+     stroke-miterlimit="3.8637" /><path
+     stroke-miterlimit="3.8637"
+     d="m 21.156942,16.975113 c -2.695237,-5.762527 4.296763,-13.2467997 11.316745,-6.1978 -2.487963,1.530364 -13.582927,0.899564 -11.316745,6.1978 z"
+     id="path3437"
+     inkscape:connector-curvature="0"
+     style="clip-rule:evenodd;fill:#ffffff;stroke:#00978a;stroke-width:2.2;stroke-miterlimit:3.92211413;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" /><path
+     stroke-miterlimit="3.8637"
+     d="m 19.305305,16.975113 c 2.695582,-5.762527 -4.296763,-13.2467997 -11.3163998,-6.1978 2.4879638,1.530364 13.5829278,0.899564 11.3163998,6.1978 z"
+     id="path3443"
+     inkscape:connector-curvature="0"
+     style="clip-rule:evenodd;fill:#ffffff;stroke:#00978a;stroke-width:2.2;stroke-miterlimit:3.92211413;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/web/image/family_dark/3.svg b/web/image/family_dark/3.svg
new file mode 100644
index 00000000..ebf769fa
--- /dev/null
+++ b/web/image/family_dark/3.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 444.488 324"
+   xml:space="preserve"
+   id="svg3218"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="3.svg"><metadata
+     id="metadata3449"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3447" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview3445"
+     showgrid="false"
+     inkscape:zoom="20.675"
+     inkscape:cx="14.932118"
+     inkscape:cy="15.821879"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3218"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="Background"
+     transform="translate(-156.32787,-82.717)" /><g
+     id="Guides"
+     transform="translate(-156.32787,-82.717)" /><g
+     id="g3401"
+     transform="matrix(0.34545455,0,0,0.34545455,-52.866888,-3.4816067)"
+     style="stroke:#00978a;stroke-opacity:1;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-dasharray:none"><g
+       id="g3403"
+       style="stroke:#00978a;stroke-opacity:1;stroke-width:6.36842097;stroke-miterlimit:3.92211413;stroke-dasharray:none" /></g><g
+     id="g3407"
+     transform="matrix(0.45504845,0,0,0.45504845,-76.288257,-15.796386)"
+     style="stroke:#f11b65;stroke-width:5.49392048;stroke-miterlimit:3.92211413;stroke-dasharray:none;stroke-opacity:1"><g
+       id="g3409"
+       style="stroke:#f11b65;stroke-width:5.49392048;stroke-miterlimit:3.92211413;stroke-dasharray:none;stroke-opacity:1"><g
+         id="g3411"
+         style="stroke:#f11b65;stroke-width:5.49392048;stroke-miterlimit:3.92211413;stroke-dasharray:none;stroke-opacity:1"><path
+           id="path3415"
+           style="fill:none;stroke:#f11b65;stroke-width:5.49392048;stroke-miterlimit:3.92211413;stroke-dasharray:none;stroke-opacity:1"
+           d="m 211.599,61.305 m 18.57101,0 a 18.57,6.3759999 0 0 1 -18.57,6.376 18.57,6.3759999 0 0 1 -18.57,-6.376 18.57,6.3759999 0 0 1 18.57,-6.376 18.57,6.3759999 0 0 1 18.57,6.376 z M 224.431,97.786 c 0,2.549 -5.695,4.615 -12.72,4.615 -6.749,0 -12.271,-1.907 -12.693,-4.317 -0.207,-0.331 -0.316,-0.674 -0.316,-1.027 0,-0.067 0.004,-0.134 0,-0.2 0,0 -4.964,-32.619 -5.143,-33.792 0.174,1.143 7.998,4.723 18.034,4.723 9.308,0 16.979,-2.28 18.044,-5.22 l -5.207,35.018 c -0.003,0.066 0.001,0.132 0.001,0.2 z"
+           inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
diff --git a/web/image/family_dark/4.svg b/web/image/family_dark/4.svg
new file mode 100644
index 00000000..bcf2debb
--- /dev/null
+++ b/web/image/family_dark/4.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 444.488 324"
+   xml:space="preserve"
+   id="svg3218"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="4.svg"><metadata
+     id="metadata3449"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3447" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview3445"
+     showgrid="false"
+     inkscape:zoom="20.675"
+     inkscape:cx="7.9322854"
+     inkscape:cy="19.903265"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3218"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="Background"
+     transform="translate(-296.818,-250.8545)" /><g
+     id="Guides"
+     transform="translate(-296.818,-250.8545)" /><path
+     d="M 20,20"
+     id="path3361"
+     inkscape:connector-curvature="0"
+     style="fill:#8ed300;stroke-width:2.5;stroke-miterlimit:3.86369991;stroke-dasharray:none" /><path
+     style="fill:none;stroke:#ff9d02;stroke-width:2.5;stroke-miterlimit:3.86369991;stroke-opacity:1;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path3373"
+     d="m 17.731398,17.73071 4.536164,0 0,4.536164 -4.536164,0 0,-4.536164 0,0 z m -6.403,2.253746 -3.751982,-2.1736 2.1736,-3.751982 2.173945,-3.752327 3.752328,2.173945 0.0069,-4.3364909 4.336491,0.00725 4.336491,0.00725 -0.0073,4.3361459 3.759928,-2.160473 2.160818,3.759927 2.160473,3.759582 -3.759582,2.160818 3.752672,2.171528 -2.171872,3.752672 -2.171528,3.752328 -3.752672,-2.171528 -0.0086,4.336491 -4.336145,-0.0086 -4.336146,-0.0086 0.0086,-4.336146 -3.758891,2.162891 -2.1632367,-3.758545 -2.162891,-3.759237 3.7585457,-2.163236 0,0 0,0 0,0 z"
+     stroke-miterlimit="3.8637" /></svg>
\ No newline at end of file
diff --git a/web/image/family_dark/5.svg b/web/image/family_dark/5.svg
new file mode 100644
index 00000000..9a9bf0ff
--- /dev/null
+++ b/web/image/family_dark/5.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 444.488 324"
+   xml:space="preserve"
+   id="svg3218"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="5.svg"><metadata
+     id="metadata3449"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3447" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview3445"
+     showgrid="false"
+     inkscape:zoom="20.675"
+     inkscape:cx="7.9322854"
+     inkscape:cy="19.903265"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3218"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="Background"
+     transform="translate(-139.618,-259.377)" /><g
+     id="Guides"
+     transform="translate(-139.618,-259.377)" /><path
+     d="M 20,20"
+     id="path3333"
+     inkscape:connector-curvature="0"
+     style="fill:#8ed300" /><path
+     style="fill:none;stroke:#aeb52b;stroke-width:2.7;stroke-miterlimit:3.86369991;stroke-opacity:1;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path3349"
+     d="M 31.935062,28.699333 C 37.512403,15.912334 24.291458,4.8098836 6.7719251,15.762511 20.142612,27.944131 32.773051,16.114662 31.935062,28.699333 Z"
+     stroke-miterlimit="3.8637" /></svg>
\ No newline at end of file
diff --git a/web/image/family_dark/7.svg b/web/image/family_dark/7.svg
new file mode 100644
index 00000000..830a9ad6
--- /dev/null
+++ b/web/image/family_dark/7.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="40"
+   height="40"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 444.488 324"
+   xml:space="preserve"
+   id="svg3218"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="7.svg"><metadata
+     id="metadata3449"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3447" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview3445"
+     showgrid="false"
+     inkscape:zoom="20.675"
+     inkscape:cx="7.9322854"
+     inkscape:cy="19.903265"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3218"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><g
+     id="Background"
+     transform="translate(-4.4638381,-117.67518)" /><g
+     id="Guides"
+     transform="translate(-4.4638381,-117.67518)" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#795548;stroke-width:2.2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3.89777493;stroke-dasharray:none;stroke-opacity:1"
+     d="m 11.161597,17.565028 4.753832,12.877285 -0.926791,2.453599 10.604652,-0.04021 -1.057195,-2.444686 4.09778,-12.990193 z"
+     id="path4214"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" /><path
+     d="M 20.237553,22.829118"
+     id="path3283"
+     inkscape:connector-curvature="0"
+     style="fill:#8ed300;stroke-width:2.2;stroke-miterlimit:3.89777493;stroke-dasharray:none;stroke:#795548;stroke-opacity:1" /><path
+     stroke-miterlimit="3.8637"
+     d="M 20.237553,22.829118"
+     id="path3317"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#795548;stroke-width:2.2;stroke-miterlimit:3.89777493;stroke-dasharray:none;stroke-opacity:1" /><path
+     style="fill:#8ed300;stroke:#795548;stroke-opacity:1;stroke-width:2.2;stroke-miterlimit:3.89777493;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path3387"
+     d="M 19.053615,19.524958" /><path
+     style="clip-rule:evenodd;fill:#ffffff;fill-opacity:1;stroke:#795548;stroke-width:2.2;stroke-miterlimit:3.89777493;stroke-opacity:1;stroke-dasharray:none"
+     inkscape:connector-curvature="0"
+     id="path3429"
+     d="M 20.638584,19.072817 C 24.190203,13.794962 34.207348,15.93298 31.779839,25.580144 29.187203,24.236326 24.013676,14.401926 20.638584,19.072817 Z"
+     stroke-miterlimit="3.8637" /><path
+     stroke-miterlimit="3.8637"
+     d="M 20.559545,19.781949 C 17.864308,14.019422 24.856307,6.5351504 31.876289,13.58415 29.388326,15.114513 18.293363,14.483713 20.559545,19.781949 Z"
+     id="path3437"
+     inkscape:connector-curvature="0"
+     style="clip-rule:evenodd;fill:#ffffff;fill-opacity:1;stroke:#795548;stroke-width:2.2;stroke-miterlimit:3.89777493;stroke-opacity:1;stroke-dasharray:none" /><g
+     id="g3295"
+     transform="matrix(0.24902799,0,0,0.2507763,1.1033566,-2.4096201)"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:8.8034997;stroke-miterlimit:3.89777493;stroke-dasharray:none;stroke:#795548;stroke-opacity:1"><path
+       stroke-miterlimit="3.8637"
+       d="m 25.409,81.75 c -1.393,-5.199 0.654,-10.508 4.746,-13.513 -0.251,-0.215 -0.496,-0.441 -0.734,-0.68 -4.955,-4.954 -4.955,-12.987 0,-17.941 3.804,-3.804 9.423,-4.688 14.07,-2.65 0.06,-0.322 0.133,-0.645 0.22,-0.966 1.813,-6.769 8.77,-10.785 15.538,-8.971 5.195,1.392 8.77,5.814 9.33,10.855 0.31,-0.109 0.626,-0.208 0.95,-0.294 6.768,-1.813 13.725,2.203 15.539,8.971 1.393,5.199 -0.654,10.509 -4.746,13.514 0.25,0.214 0.494,0.439 0.73,0.676 4.955,4.955 4.955,12.987 0,17.941 -3.8,3.8 -9.41,4.686 -14.054,2.657 -0.06,0.32 -0.133,0.642 -0.219,0.962 -1.813,6.768 -8.771,10.784 -15.539,8.971 -5.196,-1.392 -8.771,-5.816 -9.329,-10.859 -0.314,0.111 -0.635,0.211 -0.962,0.298 -6.77,1.812 -13.727,-2.204 -15.54,-8.971 z"
+       id="path3297"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;stroke:#795548;stroke-width:8.8034997;stroke-miterlimit:3.89777493;stroke-dasharray:none;stroke-opacity:1" /></g><ellipse
+     stroke-miterlimit="3.8637"
+     cx="14.859289"
+     cy="14.932889"
+     id="circle3315"
+     style="fill:none;fill-opacity:1;stroke:#795548;stroke-width:2.2;stroke-miterlimit:3.89777493;stroke-dasharray:none;stroke-opacity:1"
+     rx="2.3122249"
+     ry="2.3284578" /></svg>
\ No newline at end of file
diff --git a/web/image/firefox.png b/web/image/firefox.png
deleted file mode 100755
index a3acedcc..00000000
Binary files a/web/image/firefox.png and /dev/null differ
diff --git a/web/image/gnome.svg b/web/image/gnome.svg
new file mode 100644
index 00000000..0f0c6b6a
--- /dev/null
+++ b/web/image/gnome.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="16"
+   height="16"
+   viewBox="0 0 2.55976 4.0244"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="gnome.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
+  <metadata
+     id="metadata35">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs33" />
+  <sodipodi:namedview
+     inkscape:window-height="1016"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="51.6875"
+     inkscape:cx="3.1729141"
+     inkscape:cy="7.9613059"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <g
+     id="g4"
+     transform="matrix(0.02977634,0,0,0.02977634,-0.15250938,0.25152507)"
+     style="fill:#666666;fill-opacity:1">
+    <g
+       id="g6"
+       style="fill:#666666;fill-opacity:1">
+      <path
+         d="M 86.068,0 C 61.466,0 56.851,35.041 70.691,35.041 84.529,35.041 110.671,0 86.068,0 Z"
+         id="path8"
+         inkscape:connector-curvature="0"
+         style="fill:#666666;fill-opacity:1" />
+      <path
+         d="M 45.217,30.699 C 52.586,31.149 60.671,2.577 46.821,4.374 32.976,6.171 37.845,30.249 45.217,30.699 Z"
+         id="path10"
+         inkscape:connector-curvature="0"
+         style="fill:#666666;fill-opacity:1" />
+      <path
+         d="M 11.445,48.453 C 16.686,46.146 12.12,23.581 3.208,29.735 -5.7,35.89 6.204,50.759 11.445,48.453 Z"
+         id="path12"
+         inkscape:connector-curvature="0"
+         style="fill:#666666;fill-opacity:1" />
+      <path
+         d="M 26.212,36.642 C 32.451,35.37 32.793,9.778 21.667,14.369 10.539,18.961 19.978,37.916 26.212,36.642 l 0,0 z"
+         id="path14"
+         inkscape:connector-curvature="0"
+         style="fill:#666666;fill-opacity:1" />
+      <path
+         d="m 58.791,93.913 c 1.107,8.454 -6.202,12.629 -13.36,7.179 C 22.644,83.743 83.16,75.088 79.171,51.386 75.86,31.712 15.495,37.769 8.621,68.553 3.968,89.374 27.774,118.26 52.614,118.26 c 12.22,0 26.315,-11.034 28.952,-25.012 C 83.58,82.589 57.867,86.86 58.791,93.913 l 0,0 z"
+         id="path16"
+         inkscape:connector-curvature="0"
+         style="fill:#666666;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/web/image/incognito.svg b/web/image/incognito.svg
new file mode 100644
index 00000000..e7ccf679
--- /dev/null
+++ b/web/image/incognito.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="ninjas.digital"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="incognito.svg">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="51.6875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="ninjas.digital" />
+  <path
+     d="m 14.996965,14.12302 -13.10513,0 c 0.017,-0.065 0.034,-0.12598 0.05,-0.18797 l 0.19097,-0.7059 c 0.056,-0.20597 0.10898,-0.41294 0.17097,-0.61691 0.043,-0.14298 0.088,-0.28596 0.14898,-0.42094 0.046,-0.10299 0.11399,-0.19798 0.17798,-0.29296 0.13398,-0.20097 0.30395,-0.36995 0.48093,-0.53893 -0.063,-0.098 -0.12598,-0.19397 -0.18797,-0.29095 L 2.330775,10.14059 1.753855,9.2427202 c -0.18197,-0.28296 -0.36295,-0.56592 -0.54392,-0.84988 -0.071,-0.11099 -0.13998,-0.22297 -0.20997,-0.33395 l 0.067,0 c 0.24996,0.003 0.49893,0.006 0.74889,0.01 0.11099,0.002 0.22297,0.007 0.33396,0.01 l 0.40494,0.01 c 0.11298,0.003 0.22597,0.006 0.33895,0.01 0.067,0.003 0.13298,0.009 0.21497,0.015 -0.02,-0.022 -0.029,-0.033 -0.04,-0.044 -0.15597,-0.15297 -0.28695,-0.32595 -0.38294,-0.52192 -0.094,-0.19097 -0.15598,-0.39294 -0.18697,-0.60491 -0.026,-0.17198 -0.035,-0.34496 -0.025,-0.51693 0.011,-0.17997 0.081,-0.34295 0.18497,-0.49093 0.099,-0.14098 0.22097,-0.25696 0.35395,-0.36495 0.21997,-0.17797 0.46794,-0.31095 0.7229,-0.42794 0.28496,-0.13098 0.57992,-0.23596 0.87987,-0.32795 0.011,-0.004 0.019,-0.021 0.028,-0.032 0.002,-0.002 0,-0.006 0,-0.01 0.003,-0.57292 0.008,-1.14584 0.009,-1.71876 0.001,-0.21597 -0.008,-0.43294 -0.008,-0.64891 0,-0.11598 0.023,-0.22896 0.083,-0.32895 0.065,-0.10898 0.17397,-0.16098 0.29296,-0.17697 0.12698,-0.017 0.25696,-0.026 0.38594,-0.02 0.23597,0.011 0.47093,0.037 0.7029,0.086 l 0.56592,0.12198 c 0.18897,0.04 0.37795,0.079 0.56792,0.11498 0.13098,0.025 0.26296,0.049 0.39494,0.068 0.10399,0.015 0.20997,0.023 0.31496,0.031 0.16397,0.012 0.32795,0.023 0.49293,0.029 0.16497,0.007 0.33095,0.011 0.49693,0.009 0.12898,-10e-4 0.25796,-0.007 0.38594,-0.02 0.25396,-0.024 0.50893,-0.037 0.76389,-0.027 0.27096,0.011 0.52593,0.083 0.75989,0.22697 0.14398,0.089 0.19297,0.22097 0.20797,0.37494 0.016,0.16298 0.028,0.32696 0.04,0.48993 0.005,0.06 0.009,0.11999 0.01,0.18098 0.004,0.30395 0.007,0.60691 0.01,0.91087 0,0.012 10e-4,0.023 0,0.035 -0.008,0.076 -0.007,0.073 0.066,0.09 0.15498,0.036 0.30996,0.072 0.46194,0.11698 0.18797,0.056 0.37395,0.11599 0.55792,0.18498 0.20097,0.075 0.39194,0.17097 0.57392,0.28496 0.13398,0.084 0.25796,0.18097 0.36594,0.29695 0.14798,0.15998 0.25097,0.34495 0.28296,0.56092 0.037,0.25097 -0.007,0.49193 -0.10698,0.7249 -0.077,0.17797 -0.18297,0.33595 -0.30996,0.48193 -0.19297,0.22297 -0.41494,0.40994 -0.6619,0.56792 -0.15598,0.1 -0.31696,0.19197 -0.47993,0.27896 -0.13998,0.075 -0.28696,0.13898 -0.42994,0.20797 -0.008,0.004 -0.016,0.009 -0.023,0.022 0.071,0 0.14298,-0.002 0.21397,0 0.12498,0.004 0.25097,0.011 0.37595,0.017 0.015,0.001 0.03,0.001 0.044,0.001 0.22497,0.003 0.44994,0.006 0.6739,0.01 0.13599,0.002 0.27197,0.006 0.40795,0.01 0.14398,0.003 0.28796,0.006 0.43293,0.01 l 0.33396,0.01 c 0.13998,0.004 0.27996,0.006 0.41894,0.01 0.061,0.002 0.12298,0.009 0.18997,0.014 -0.024,0.03 -0.046,0.059 -0.07,0.087 -0.10598,0.12299 -0.21297,0.24497 -0.31895,0.36895 -0.10099,0.11798 -0.19898,0.23897 -0.29996,0.35795 -0.084,0.099 -0.16998,0.19597 -0.25497,0.29496 -0.09,0.10498 -0.17797,0.21097 -0.26696,0.31495 -0.081,0.095 -0.16297,0.1889798 -0.24396,0.2849598 -0.10599,0.12498 -0.21097,0.24997 -0.31796,0.37495 -0.063,0.074 -0.12798,0.14698 -0.19097,0.22197 l -0.26396,0.31195 -0.18697,0.21797 -0.26697,0.31596 c -0.064,0.075 -0.12998,0.14997 -0.19497,0.22496 -0.048,0.055 -0.095,0.11099 -0.13998,0.17198 0.022,-0.013 0.044,-0.026 0.065,-0.04 0.24797,-0.17097 0.49593,-0.34195 0.7429,-0.51392 0.31495,-0.21897 0.62991,-0.43694 0.94486,-0.65691 0.033,-0.023 0.052,-0.023 0.082,0.006 0.10798,0.10199 0.22597,0.19397 0.32695,0.30196 0.13098,0.14098 0.24897,0.29396 0.36995,0.44393 0.13998,0.17198 0.25096,0.36395 0.35295,0.55892 0.082,0.15598 0.15098,0.31996 0.21697,0.48294 0.06,0.14697 0.11498,0.29695 0.15998,0.44793 0.065,0.21697 0.12398,0.43494 0.17497,0.65591 0.034,0.14598 0.049,0.29596 0.071,0.44393 -0.001,0.007 -0.003,0.018 -0.003,0.033 z M 6.413195,9.1097402 c 0.006,0.062 0.006,0.11098 0.016,0.15797 0.022,0.10499 0.041,0.21197 0.077,0.31296 0.071,0.19797 0.17398,0.37994 0.31196,0.5409198 0.13198,0.15498 0.27996,0.28796 0.46093,0.38395 0.26397,0.13998 0.54393,0.20597 0.84288,0.16597 0.13298,-0.018 0.26896,-0.039 0.39595,-0.08 0.27796,-0.091 0.50592,-0.26096 0.6869,-0.48893 0.14498,-0.1829698 0.25296,-0.3889398 0.32295,-0.6119098 0.047,-0.14998 0.082,-0.30395 0.11798,-0.45593 0.013,-0.056 0.015,-0.11399 0.024,-0.18098 -0.53492,0.11899 -1.06785,0.19697 -1.60477,0.23797 -0.54692,0.04 -1.09384,0.066 -1.65176,0.018 z m -1.78175,-3.10956 c 0,0.08 0.006,0.15598 -0.002,0.22997 -0.008,0.071 0.025,0.10698 0.077,0.14498 0.24896,0.17997 0.51093,0.33595 0.78789,0.46893 0.25296,0.12098 0.51092,0.22697 0.77989,0.30696 0.12898,0.039 0.25796,0.081 0.38994,0.10698 0.19897,0.04 0.39994,0.073 0.60091,0.1 0.15298,0.021 0.30696,0.033 0.46094,0.039 0.12598,0.005 0.25196,-0.002 0.37795,-0.009 0.13298,-0.007 0.26696,-0.014 0.39894,-0.03 0.15498,-0.018 0.31195,-0.035 0.46393,-0.071 0.23397,-0.056 0.46594,-0.12299 0.6949,-0.19498 0.25797,-0.081 0.50393,-0.19297 0.7439,-0.31795 0.22496,-0.11698 0.44193,-0.24597 0.6479,-0.39494 0.055,-0.039 0.057,-0.079 0.053,-0.12999 -10e-4,-0.021 -0.009,-0.041 -0.014,-0.063 -0.009,0.002 -0.018,0.004 -0.027,0.007 -0.20397,0.057 -0.40694,0.11799 -0.61291,0.16998 -0.26696,0.067 -0.53392,0.12898 -0.80289,0.18597 -0.18397,0.039 -0.36994,0.071 -0.55592,0.1 -0.15797,0.025 -0.31695,0.042 -0.47593,0.06 -0.16297,0.018 -0.32595,0.045 -0.48893,0.047 -0.24396,0.003 -0.48793,0.018 -0.73189,-0.016 -0.15798,-0.023 -0.31896,-0.034 -0.47594,-0.061 -0.21397,-0.038 -0.42693,-0.08 -0.6379,-0.13198 -0.35595,-0.087 -0.7059,-0.19397 -1.05085,-0.31795 -0.19898,-0.073 -0.39395,-0.15098 -0.60092,-0.22897 z m 1.56078,3.10356 c -0.92887,-0.08 -1.82774,-0.21097 -2.65062,-0.67191 0.007,0.016 0.011,0.023 0.012,0.03 0.037,0.15498 0.07,0.30995 0.11098,0.46293 0.065,0.24697 0.15198,0.48693 0.26496,0.7169 0.064,0.12898 0.13898,0.24996 0.23097,0.3619498 0.13698,0.16597 0.30396,0.27496 0.52092,0.29296 0.16498,0.014 0.32296,-0.024 0.47094,-0.093 0.28696,-0.13298 0.50592,-0.3489498 0.6919,-0.5979098 0.11898,-0.15898 0.22797,-0.32696 0.34795,-0.50193 z"
+     id="path3"
+     inkscape:connector-curvature="0"
+     style="clip-rule:evenodd;fill:#666666;fill-rule:evenodd;fill-opacity:1" />
+</svg>
diff --git a/web/image/info.svg b/web/image/info.svg
index f9ffc299..c0803073 100644
--- a/web/image/info.svg
+++ b/web/image/info.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- The icon can be used freely in both personal and commercial projects with no attribution required, but always appreciated. 
+You may NOT sub-license, resell, rent, redistribute or otherwise transfer the icon without express written permission from iconmonstr.com -->
 
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -9,115 +10,41 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg7384"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   x="0px"
+   y="0px"
+   width="16"
    height="16"
-   sodipodi:docname="info.svg"
-   width="16">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:cy="2.2028437"
-     inkscape:current-layer="layer9"
-     inkscape:window-width="1920"
-     pagecolor="#555753"
-     showborder="false"
-     showguides="true"
-     inkscape:snap-nodes="true"
-     objecttolerance="10"
-     showgrid="false"
-     inkscape:object-nodes="true"
-     inkscape:pageshadow="2"
-     inkscape:guide-bbox="true"
-     inkscape:window-x="1920"
-     inkscape:snap-bbox="true"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 512 512"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="info.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     id="namedview88"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:window-y="27"
-     gridtolerance="10"
-     inkscape:zoom="7.9687808"
-     inkscape:window-height="1014"
      borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
      guidetolerance="10"
-     inkscape:cx="5.435957"
-     inkscape:bbox-paths="false"
-     inkscape:snap-grids="true"
-     inkscape:pageopacity="1"
-     inkscape:snap-to-guides="true">
-    <inkscape:grid
-       visible="true"
-       spacingx="1px"
-       type="xygrid"
-       spacingy="1px"
-       id="grid4866"
-       empspacing="2"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline">
-    <path
-       d="m 287.53551,259.96102 c -0.32661,0 -0.66541,0.12985 -0.91815,0.38255 l -5.20278,5.20277 c -0.50544,0.50543 -0.50544,1.33087 0,1.83629 l 5.20278,5.20279 c 0.50544,0.50541 1.33084,0.50541 1.83629,0 l 5.20277,-5.20279 c 0.50544,-0.50542 0.50544,-1.33086 0,-1.83629 l -5.20277,-5.20277 c -0.25273,-0.2527 -0.59154,-0.38255 -0.91814,-0.38255 z m -0.15302,2.42286 c 1.34042,-0.075 2.52629,0.95493 2.60138,2.29534 -8e-5,1.14368 -0.30825,1.56841 -1.30069,2.32085 -0.15583,0.11723 -0.26573,0.20453 -0.30604,0.25504 -0.0403,0.0507 -0.0254,0.0271 -0.0254,0.0254 0.006,0.43119 -0.38491,0.81613 -0.81612,0.81613 -0.43122,0 -0.82184,-0.38494 -0.81612,-0.81613 0,-0.41 0.183,-0.76994 0.38255,-1.02014 0.19955,-0.25025 0.40096,-0.42144 0.58659,-0.56109 0.16652,-0.13104 0.37609,-0.31383 0.56108,-0.53558 0.0763,-0.0915 0.10528,-0.25108 0.10202,-0.35706 l 0,-0.0255 c -0.0258,-0.45966 -0.40746,-0.7909 -0.86714,-0.76511 -0.45966,0.0258 -0.79089,0.35644 -0.7651,0.81613 l -1.63226,0 c -0.075,-1.34043 0.95494,-2.37322 2.29535,-2.44838 z m 0.15302,6.52899 c 0.45072,0 0.81612,0.36539 0.81612,0.81611 0,0.45073 -0.3654,0.81612 -0.81612,0.81612 -0.45072,0 -0.81612,-0.36539 -0.81612,-0.81612 0,-0.45072 0.3654,-0.81611 0.81612,-0.81611 z"
-       id="path19592"
-       style="color:#bebebe;fill:#748cc9;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer11"
-     inkscape:label="apps" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer13"
-     inkscape:label="places" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline" />
-  <g
-     transform="translate(-281.0002,-257)"
-     inkscape:groupmode="layer"
-     id="g4953"
-     inkscape:label="categories"
-     style="display:inline" />
-</svg>
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="51.6875"
+     inkscape:cx="7.2631221"
+     inkscape:cy="7.9613059"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><path
+     id="info-2-icon"
+     d="m 7.999935,2.762144 c 2.89471,0 5.237934,2.342561 5.237934,5.23783 0,2.894749 -2.342691,5.237882 -5.237934,5.237882 -2.89471,0 -5.237804,-2.342626 -5.237804,-5.237882 0,-2.894723 2.342626,-5.23783 5.237804,-5.23783 m 0,-1.262144 C 4.410141,1.5 1.5,4.410115 1.5,7.999974 1.5,11.589846 4.410141,14.5 7.999935,14.5 11.589794,14.5 14.5,11.589846 14.5,7.999974 14.5,4.410115 11.589833,1.5 7.999935,1.5 l 0,0 z m 0.941044,10.020335 -1.818921,0 0,-4.321798 1.818921,0 0,4.321798 z M 8.031551,6.304566 c -0.552877,0 -1.001156,-0.448253 -1.001156,-1.001195 0,-0.552877 0.448253,-1.001169 1.001156,-1.001169 0.552942,0 1.00113,0.448253 1.00113,1.001169 0,0.552942 -0.448188,1.001195 -1.00113,1.001195 z"
+     inkscape:connector-curvature="0"
+     style="fill:#666666;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/web/image/loader-black.gif b/web/image/loader-black.gif
deleted file mode 100644
index dec45f56..00000000
Binary files a/web/image/loader-black.gif and /dev/null differ
diff --git a/web/image/loader-white.gif b/web/image/loader-white.gif
deleted file mode 100644
index 757c9c2b..00000000
Binary files a/web/image/loader-white.gif and /dev/null differ
diff --git a/web/image/loader.gif b/web/image/loader.gif
deleted file mode 100644
index 77b27250..00000000
Binary files a/web/image/loader.gif and /dev/null differ
diff --git a/web/image/new-order.svg b/web/image/new-order.svg
new file mode 100644
index 00000000..53f1855d
--- /dev/null
+++ b/web/image/new-order.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 512 512"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="new-order.svg"><metadata
+     id="metadata11"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs9" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview7"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="51.6875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g2988"
+     transform="matrix(0.03325942,0,0,0.03325942,-0.51441152,-0.68070862)"
+     style="fill:#666666;fill-opacity:1"><path
+       id="path3"
+       d="m 461.5,222 h -411 c -11.046,0 -20,8.954 -20,20 l 40,207 c 0,11.046 8.954,20 20,20 h 331 c 11.046,0 20,-8.954 20,-20 l 40,-207 c 0,-11.046 -8.954,-20 -20,-20 z M 138,403.5 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 66,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 62,0 c 0,5.799 -4.701,10.5 -10.5,10.5 h 0 c -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 h 0.001 c 5.798,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z m 65,0 c 0,5.799 -4.701,10.5 -10.5,10.5 -5.799,0 -10.5,-4.701 -10.5,-10.5 v -117 c 0,-5.799 4.701,-10.5 10.5,-10.5 5.799,0 10.5,4.701 10.5,10.5 v 117 z"
+       inkscape:connector-curvature="0"
+       style="fill:#666666;fill-opacity:1" /><path
+       id="path5"
+       d="M 319.9,71.008 C 318.899,60.897 310.373,53 300,53 l -87,0 c -10.387,0 -18.92,7.919 -19.901,18.049 -19.155,-0.169 -49.697,-0.793 -60.374,3.647 -19.07,7.12 -34.01,24.74 -37.04,44.99 -4.64,29.089 -9.399,58.169 -13.91,87.291 6.721,0.029 13.44,0.159 20.16,-0.021 4.53,-27.64 8.83,-55.31 13.34,-82.95 1.83,-16.4 15.96,-30.24 32.12,-32.61 C 154.332,90.778 178.309,91 193.67,91.053 195.911,99.648 203.703,106 213,106 l 87,0 c 9.31,0 17.11,-6.37 19.34,-14.982 1.40554,-6.929611 1.55505,-12.101213 0.56,-20.01 z"
+       inkscape:connector-curvature="0"
+       style="fill:#666666;fill-opacity:1"
+       sodipodi:nodetypes="cssccccccccsscc" /></g><path
+     style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#666666;fill-opacity:1;stroke:#ff0b0b;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:26.89999962;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+     d="m 12.193371,0.78469625 0,1.99999315 -1.999993,0 0,0.9999966 1.999993,0 0,1.9999934 0.999997,0 0,-1.9999934 1.999994,0 0,-0.9999966 -1.999994,0 0,-1.99999315 -0.999997,0 z"
+     id="rect31992"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/web/image/ok.svg b/web/image/ok.svg
index 8c8e1335..37ba5ede 100644
--- a/web/image/ok.svg
+++ b/web/image/ok.svg
@@ -10,9 +10,9 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="ok.svg"
-   height="13.21348"
+   height="16"
    id="svg7384"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    version="1.1"
    width="16">
   <metadata
@@ -33,7 +33,7 @@
      borderopacity="1"
      inkscape:current-layer="layer15"
      inkscape:cx="8"
-     inkscape:cy="6.60674"
+     inkscape:cy="8"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -54,12 +54,12 @@
      inkscape:snap-nodes="false"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="1014"
+     inkscape:window-height="1016"
      inkscape:window-maximized="1"
      inkscape:window-width="1920"
      inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="61.755117"
+     inkscape:zoom="51.6875"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -85,55 +85,55 @@
      id="layer9"
      inkscape:label="status"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer10"
      inkscape:label="devices"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer11"
      inkscape:label="apps"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer13"
      inkscape:label="places"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer14"
      inkscape:label="mimetypes"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer15"
      inkscape:label="emblems"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)">
+     transform="translate(-463.9375,-398.125)">
     <path
        inkscape:connector-curvature="0"
-       d="m 475.64536,402.5632 -5.32585,5.32584 -2.08987,-2.08989 -2.29214,2.29215 3.23595,3.23594 1.14606,1.14607 1.14607,-1.14607 6.47192,-6.47192 -2.29214,-2.29212 z"
+       d="m 475.64536,401.16994 -5.32585,5.32584 -2.08987,-2.08989 -2.29214,2.29215 3.23595,3.23594 1.14606,1.14608 1.14607,-1.14608 6.47192,-6.47192 -2.29214,-2.29212 z"
        id="path5037"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#78d478;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#78d478;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="g71291"
      inkscape:label="emotes"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="g4953"
      inkscape:label="categories"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
   <g
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="actions"
      style="display:inline"
-     transform="translate(-463.9375,-400.91152)" />
+     transform="translate(-463.9375,-398.125)" />
 </svg>
diff --git a/web/image/order.svg b/web/image/place.svg
similarity index 100%
rename from web/image/order.svg
rename to web/image/place.svg
diff --git a/web/image/supplant.png b/web/image/supplant.png
deleted file mode 100755
index d596c2bf..00000000
Binary files a/web/image/supplant.png and /dev/null differ
diff --git a/web/image/supplant.svg b/web/image/supplant.svg
new file mode 100644
index 00000000..743eb22c
--- /dev/null
+++ b/web/image/supplant.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   width="16"
+   height="16"
+   viewBox="0 0 16.000001 16"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="35140.svg"><metadata
+     id="metadata41"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview37"
+     showgrid="false"
+     inkscape:zoom="51.6875"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><g
+     id="g3"
+     transform="matrix(0.02428826,0,0,0.02428826,1.0000122,1.0000189)"
+     style="fill:#666666;fill-opacity:1"><path
+       d="m 575.391,177.483 c -8.801,10.27 -18.997,9.354 -29.011,5.667 -13.919,-5.126 -27.604,-10.93 -41.223,-16.826 -33.546,-14.523 -68.137,-23.306 -105.074,-20.64 -28.259,2.054 -55.848,7.495 -82.41,17.187 -9.892,3.603 -19.688,5.646 -29.47,6.094 -9.78,-0.447 -19.578,-2.491 -29.468,-6.094 -26.561,-9.687 -54.151,-15.132 -82.413,-17.187 -36.935,-2.671 -71.528,6.116 -105.073,20.64 -13.617,5.9 -27.305,11.699 -41.223,16.826 -10.011,3.687 -20.208,4.603 -29.01,-5.667 -3.37,53.865 1.028,105.223 22.478,154.106 12.553,28.609 30.311,53.35 56.17,71.285 41.837,29.006 87.425,36.068 135.737,19.651 10.669,-3.625 20.249,-10.892 29.81,-17.244 15.117,-10.055 30.311,-17.001 43.44,-17.001 13.128,0 27.408,6.946 42.531,17.001 9.566,6.362 19.144,13.619 29.812,17.244 48.312,16.407 93.907,9.354 135.734,-19.651 25.862,-17.936 43.614,-42.676 56.167,-71.285 21.465,-48.883 25.873,-100.241 22.496,-154.106 z M 110.009,337.49 C 62.675,312.791 52.082,239.538 52.082,239.538 c 0,0 60.829,-23.016 108.158,1.674 47.334,24.699 63.246,87.757 63.246,87.757 0,0 -66.142,33.21 -113.477,8.521 z m 356.399,0 c -47.332,24.688 -113.478,-8.521 -113.478,-8.521 0,0 15.919,-63.058 63.246,-87.757 47.337,-24.689 108.161,-1.674 108.161,-1.674 0,0 -10.598,73.253 -57.929,97.952 z"
+       id="path5"
+       inkscape:connector-curvature="0"
+       style="fill:#666666;fill-opacity:1" /></g><g
+     id="g7"
+     transform="translate(0,-560.40906)" /><g
+     id="g9"
+     transform="translate(0,-560.40906)" /><g
+     id="g11"
+     transform="translate(0,-560.40906)" /><g
+     id="g13"
+     transform="translate(0,-560.40906)" /><g
+     id="g15"
+     transform="translate(0,-560.40906)" /><g
+     id="g17"
+     transform="translate(0,-560.40906)" /><g
+     id="g19"
+     transform="translate(0,-560.40906)" /><g
+     id="g21"
+     transform="translate(0,-560.40906)" /><g
+     id="g23"
+     transform="translate(0,-560.40906)" /><g
+     id="g25"
+     transform="translate(0,-560.40906)" /><g
+     id="g27"
+     transform="translate(0,-560.40906)" /><g
+     id="g29"
+     transform="translate(0,-560.40906)" /><g
+     id="g31"
+     transform="translate(0,-560.40906)" /><g
+     id="g33"
+     transform="translate(0,-560.40906)" /><g
+     id="g35"
+     transform="translate(0,-560.40906)" /></svg>
\ No newline at end of file
diff --git a/web/image/unavailable.svg b/web/image/unavailable.svg
index f405c9a0..60d72cac 100644
--- a/web/image/unavailable.svg
+++ b/web/image/unavailable.svg
@@ -12,7 +12,7 @@
    sodipodi:docname="unavailable.svg"
    height="16"
    id="svg7384"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    version="1.1"
    width="16">
   <metadata
@@ -33,8 +33,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer9"
-     inkscape:cx="7.0453912"
-     inkscape:cy="10.43808"
+     inkscape:cx="8"
+     inkscape:cy="8"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -55,12 +55,12 @@
      inkscape:snap-nodes="true"
      inkscape:snap-others="false"
      inkscape:snap-to-guides="true"
-     inkscape:window-height="702"
+     inkscape:window-height="1016"
      inkscape:window-maximized="1"
-     inkscape:window-width="1366"
-     inkscape:window-x="0"
+     inkscape:window-width="1920"
+     inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="23.610133">
+     inkscape:zoom="51.6875">
     <inkscape:grid
        empspacing="2"
        enabled="true"
@@ -100,9 +100,9 @@
      transform="translate(-321,-257)">
     <path
        inkscape:connector-curvature="0"
-       d="m 328.90645,257.09375 c -0.5255,-0.0286 -1.03823,0.28305 -1.4375,0.96875 l -6.25,11.59375 C 320.68548,270.61964 321.26717,272 322.3127,272 l 13.15625,0 c 0.98172,0 1.90311,-1.15939 1.21875,-2.34375 L 330.3752,258.125 c -0.39872,-0.64617 -0.94325,-1.00262 -1.46875,-1.03125 z m 0.0625,3.9375 c 0.54448,-0.0172 1.04849,0.48677 1.03125,1.03125 l 0,3.9375 c 0.007,0.52831 -0.47163,1 -1,1 -0.52836,0 -1.00747,-0.47169 -1,-1 l 0,-3.9375 c -0.008,-0.4666 0.3541,-0.91253 0.8125,-1 0.0511,-0.0145 0.10345,-0.0249 0.15625,-0.0312 z M 329.0002,268 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+       d="m 328.94324,258.44109 c -0.4625,-0.0252 -0.91377,0.24912 -1.26518,0.85263 l -5.50079,10.20397 c -0.46952,0.84791 0.0424,2.0628 0.96264,2.0628 l 11.57917,0 c 0.86404,0 1.67498,-1.02041 1.07266,-2.0628 l -5.55581,-10.14897 c -0.35092,-0.56871 -0.83018,-0.88243 -1.29269,-0.90763 z m 0.055,3.4655 c 0.47921,-0.0151 0.92281,0.42842 0.90763,0.90764 l 0,3.4655 c 0.006,0.46498 -0.41509,0.88012 -0.88012,0.88012 -0.46503,0 -0.8867,-0.41514 -0.88013,-0.88012 l 0,-3.4655 c -0.007,-0.41067 0.31165,-0.80315 0.7151,-0.88013 0.045,-0.0128 0.091,-0.0219 0.13752,-0.0275 z m 0.0275,6.13339 c 0.48608,0 0.88013,0.39405 0.88013,0.88013 0,0.48607 -0.39405,0.88013 -0.88013,0.88013 -0.48607,0 -0.88012,-0.39406 -0.88012,-0.88013 0,-0.48608 0.39405,-0.88013 0.88012,-0.88013 z"
        id="path18112"
-       style="color:#bebebe;fill:#ee3333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988000000006;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#ee3333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/web/image/unknown.svg b/web/image/unknown.svg
new file mode 100644
index 00000000..72fc7b21
--- /dev/null
+++ b/web/image/unknown.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   height="16"
+   sodipodi:docname="unknown.svg"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:cy="8"
+     inkscape:current-layer="layer9"
+     inkscape:window-width="1920"
+     pagecolor="#555753"
+     showborder="false"
+     showguides="true"
+     inkscape:snap-nodes="true"
+     objecttolerance="10"
+     showgrid="false"
+     inkscape:object-nodes="true"
+     inkscape:pageshadow="2"
+     inkscape:guide-bbox="true"
+     inkscape:window-x="1920"
+     inkscape:snap-bbox="true"
+     bordercolor="#666666"
+     id="namedview88"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:window-y="27"
+     gridtolerance="10"
+     inkscape:zoom="51.6875"
+     inkscape:window-height="1016"
+     borderopacity="1"
+     guidetolerance="10"
+     inkscape:cx="8"
+     inkscape:bbox-paths="false"
+     inkscape:snap-grids="true"
+     inkscape:pageopacity="1"
+     inkscape:snap-to-guides="true">
+    <inkscape:grid
+       visible="true"
+       spacingx="1px"
+       type="xygrid"
+       spacingy="1px"
+       id="grid4866"
+       empspacing="2"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline">
+    <path
+       d="m 289.00021,258.49827 c -0.32661,0 -0.66541,0.12985 -0.91815,0.38255 l -5.20278,5.20277 c -0.50544,0.50543 -0.50544,1.33087 0,1.83629 l 5.20278,5.20279 c 0.50544,0.50541 1.33084,0.50541 1.83629,0 l 5.20277,-5.20279 c 0.50544,-0.50542 0.50544,-1.33086 0,-1.83629 l -5.20277,-5.20277 c -0.25273,-0.2527 -0.59154,-0.38255 -0.91814,-0.38255 z m -0.15302,2.42286 c 1.34042,-0.075 2.52629,0.95493 2.60138,2.29534 -8e-5,1.14368 -0.30825,1.56841 -1.30069,2.32085 -0.15583,0.11723 -0.26573,0.20453 -0.30604,0.25504 -0.0403,0.0507 -0.0254,0.0271 -0.0254,0.0254 0.006,0.43119 -0.38491,0.81613 -0.81612,0.81613 -0.43122,0 -0.82184,-0.38494 -0.81612,-0.81613 0,-0.41 0.183,-0.76994 0.38255,-1.02014 0.19955,-0.25025 0.40096,-0.42144 0.58659,-0.56109 0.16652,-0.13104 0.37609,-0.31383 0.56108,-0.53558 0.0763,-0.0915 0.10528,-0.25108 0.10202,-0.35706 l 0,-0.0255 c -0.0258,-0.45966 -0.40746,-0.7909 -0.86714,-0.76511 -0.45966,0.0258 -0.79089,0.35644 -0.7651,0.81613 l -1.63226,0 c -0.075,-1.34043 0.95494,-2.37322 2.29535,-2.44838 z m 0.15302,6.52899 c 0.45072,0 0.81612,0.36539 0.81612,0.81611 0,0.45073 -0.3654,0.81612 -0.81612,0.81612 -0.45072,0 -0.81612,-0.36539 -0.81612,-0.81612 0,-0.45072 0.3654,-0.81611 0.81612,-0.81611 z"
+       id="path19592"
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#748cc9;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices" />
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps" />
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions" />
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places" />
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes" />
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline" />
+  <g
+     transform="translate(-281.0002,-257)"
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline" />
+</svg>
diff --git a/web/image/warning.svg b/web/image/warning.svg
index 908d40b8..d7e450ff 100644
--- a/web/image/warning.svg
+++ b/web/image/warning.svg
@@ -33,8 +33,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer9"
-     inkscape:cx="-4.1997805"
-     inkscape:cy="10.353371"
+     inkscape:cx="8"
+     inkscape:cy="8"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -60,7 +60,7 @@
      inkscape:window-width="1920"
      inkscape:window-x="1920"
      inkscape:window-y="27"
-     inkscape:zoom="23.610133">
+     inkscape:zoom="51.6875">
     <inkscape:grid
        empspacing="2"
        enabled="true"
@@ -100,9 +100,9 @@
      transform="translate(-321,-257)">
     <path
        inkscape:connector-curvature="0"
-       d="m 328.90645,257.09375 c -0.5255,-0.0286 -1.03823,0.28305 -1.4375,0.96875 l -6.25,11.59375 C 320.68548,270.61964 321.26717,272 322.3127,272 l 13.15625,0 c 0.98172,0 1.90311,-1.15939 1.21875,-2.34375 L 330.3752,258.125 c -0.39872,-0.64617 -0.94325,-1.00262 -1.46875,-1.03125 z m 0.0625,3.9375 c 0.54448,-0.0172 1.04849,0.48677 1.03125,1.03125 l 0,3.9375 c 0.007,0.52831 -0.47163,1 -1,1 -0.52836,0 -1.00747,-0.47169 -1,-1 l 0,-3.9375 c -0.008,-0.4666 0.3541,-0.91253 0.8125,-1 0.0511,-0.0145 0.10345,-0.0249 0.15625,-0.0312 z M 329.0002,268 c 0.55228,0 1,0.44772 1,1 0,0.55228 -0.44772,1 -1,1 -0.55228,0 -1,-0.44772 -1,-1 0,-0.55228 0.44772,-1 1,-1 z"
+       d="m 328.94324,258.44109 c -0.4625,-0.0252 -0.91377,0.24912 -1.26518,0.85263 l -5.50079,10.20397 c -0.46952,0.84791 0.0424,2.0628 0.96264,2.0628 l 11.57917,0 c 0.86404,0 1.67498,-1.02041 1.07266,-2.0628 l -5.55581,-10.14897 c -0.35092,-0.56871 -0.83018,-0.88243 -1.29269,-0.90763 z m 0.055,3.4655 c 0.47921,-0.0151 0.92281,0.42842 0.90763,0.90764 l 0,3.4655 c 0.006,0.46498 -0.41509,0.88012 -0.88012,0.88012 -0.46503,0 -0.8867,-0.41514 -0.88013,-0.88012 l 0,-3.4655 c -0.007,-0.41067 0.31165,-0.80315 0.7151,-0.88013 0.045,-0.0128 0.091,-0.0219 0.13752,-0.0275 z m 0.0275,6.13339 c 0.48608,0 0.88013,0.39405 0.88013,0.88013 0,0.48607 -0.39405,0.88013 -0.88013,0.88013 -0.48607,0 -0.88012,-0.39406 -0.88012,-0.88013 0,-0.48608 0.39405,-0.88013 0.88012,-0.88013 z"
        id="path18112"
-       style="color:#bebebe;fill:#ffb920;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#ffb920;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/web/image/youtube.svg b/web/image/youtube.svg
index 80fc42d6..c38c48c4 100644
--- a/web/image/youtube.svg
+++ b/web/image/youtube.svg
@@ -13,7 +13,7 @@
    height="23.999996"
    id="svg11927"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="youtube.svg">
   <defs
      id="defs3" />
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="64.326307"
-     inkscape:cy="46.777283"
+     inkscape:zoom="34.458339"
+     inkscape:cx="12"
+     inkscape:cy="11.999998"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="mm"
@@ -37,7 +37,7 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1920"
-     inkscape:window-height="1014"
+     inkscape:window-height="1016"
      inkscape:window-x="1920"
      inkscape:window-y="27"
      inkscape:window-maximized="1" />
@@ -49,7 +49,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -59,8 +59,8 @@
      id="layer1"
      transform="translate(-65.660672,-187.08936)">
     <path
-       style="fill:#c30000;fill-opacity:1;stroke:none;display:inline"
-       d="m 68.556274,210.90728 c -2.293676,-0.68242 -2.880675,-2.99702 -2.89518,-11.41603 -0.01025,-5.94721 0.16327,-7.96905 0.8512,-9.91843 0.533461,-1.51166 1.175311,-1.99041 3.044687,-2.27101 1.814868,-0.27242 11.459518,-0.28621 15.293323,-0.0219 5.345509,0.48245 4.737665,4.05194 4.797521,11.13 0.06208,7.3381 -0.07728,8.93495 -0.942901,10.80584 -0.857753,1.85393 -0.528524,1.79528 -10.467487,1.86487 -5.046388,0.0354 -9.231633,-0.0396 -9.681163,-0.17336 z m 14.0137,-11.9128 c -9.225924,-6.1861 1.31465,0.90117 -8.167349,-5.4762 0.0541,2.97456 0.0086,8.38462 0.04076,11.04998 9.474932,-6.37668 -1.004697,0.69337 8.126587,-5.57378 z"
+       style="display:inline;fill:#c30000;fill-opacity:1;stroke:none"
+       d="m 68.556274,210.90728 c -2.293676,-0.68242 -2.880675,-2.99702 -2.89518,-11.41603 -0.01025,-5.94721 0.16327,-7.96905 0.8512,-9.91843 0.533461,-1.51166 1.175311,-1.99041 3.044687,-2.271 1.814867,-0.27243 11.459517,-0.28622 15.293322,-0.0219 5.345509,0.48245 4.737665,4.05194 4.797522,11.13 0.06208,7.3381 -0.07728,8.93495 -0.942902,10.80584 -0.857753,1.85393 -0.528524,1.79528 -10.467486,1.86487 -5.046389,0.0354 -9.231633,-0.0396 -9.681163,-0.17336 z m 14.013699,-11.9128 c -9.225923,-6.1861 1.31465,0.90117 -8.167348,-5.4762 0.0541,2.97456 0.0086,8.38462 0.04076,11.04998 9.474933,-6.37668 -1.004697,0.69337 8.126587,-5.57378 z"
        id="path11905"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cssscccsccccc" />
diff --git a/web/index.php b/web/index.php
index 716d4a51..fb8efb50 100755
--- a/web/index.php
+++ b/web/index.php
@@ -64,7 +64,7 @@ Web::init ();
 if (isset ($_GET['page']) && Vn\Hedera\checkToken ($_GET['page']))
 	$page = $_GET['page'];
 else
-	$page = 'login';
+	$page = 'main';
 
 // Checking the browser version
 
diff --git a/web/js/db/conn.js b/web/js/db/conn.js
index ca73d908..0b0bff13 100755
--- a/web/js/db/conn.js
+++ b/web/js/db/conn.js
@@ -16,9 +16,9 @@ Db.Conn = new Class ().extend
 	,Type:
 	{
 		 BOOLEAN   : 1
-		,INTEGER   : 2
-		,DOUBLE    : 3
-		,STRING    : 4
+		,INTEGER   : 3
+		,DOUBLE    : 4
+		,STRING    : 5
 		,DATE      : 8
 		,DATE_TIME : 9
 	}
@@ -47,7 +47,7 @@ Db.Conn.implement
 	 * @param {Boolean} remember Specifies if the user should be remembered
 	 * @param {Function} openCallback The function to call when operation is done
 	 **/
-	,open: function (user, pass, remember, openCallback)
+	,open: function (user, pass, remember, openCallback, guest)
 	{		
 		this.signalEmit ('loading-changed', true);
 
@@ -63,6 +63,8 @@ Db.Conn.implement
 				,'remember': remember
 			});
 		}
+		else if (guest)
+			request.add ({'guest': true});
 
 		request.send ('rest.php',
 			this.opened.bind (this, request, openCallback));
@@ -73,22 +75,35 @@ Db.Conn.implement
 	 */
 	,opened: function (request, openCallback, success)
 	{
+		var error = null;
 		var openSuccess = false;
 
 		if (success)
 		try {
 			var json = request.getJson ();
-			openSuccess = true /* json.data */;
+			openSuccess = json.data == true;
+			
+			if (json.error)
+				error = new Vn.Error (
+					json.error.domain,
+					json.error.code,
+					json.error.message);
 		}
-		catch (e) {}
-	
+		catch (e)
+		{
+			error = e;
+		}
+
 		if (openSuccess)
+		{
 			this.connected = true;
-		
+			this.signalEmit ('openned');
+		}
+
 		this.signalEmit ('loading-changed', false);
 		
 		if (openCallback)
-			openCallback (this, openSuccess);
+			openCallback (this, openSuccess, error);
 	}
 
 	/**
@@ -101,7 +116,7 @@ Db.Conn.implement
 		this.signalEmit ('loading-changed', true);
 
 		var request = new Vn.HttpRequest ();
-		request.addValue ({'action': 'close'});
+		request.add ({'action': 'logout'});
 		request.send ('rest.php',
 			this.closed.bind (this, closeCallback));
 	}
diff --git a/web/js/db/db.js b/web/js/db/db.js
new file mode 100755
index 00000000..d1c3899a
--- /dev/null
+++ b/web/js/db/db.js
@@ -0,0 +1,5 @@
+/**
+ * The namespace.
+ **/
+var Db = {};
+
diff --git a/web/js/db/main.js b/web/js/db/main.js
index d1c3899a..742d8350 100755
--- a/web/js/db/main.js
+++ b/web/js/db/main.js
@@ -1,5 +1,17 @@
-/**
- * The namespace.
- **/
-var Db = {};
+
+Vn.include ('js/sql/main');
+Vn.includeLib ('db',
+[
+	 'db'
+	,'conn'
+	,'result'
+	,'result-set'
+	,'model'
+	,'iterator'
+	,'form'
+	,'param'
+	,'query'
+	,'calc'
+	,'calc-sum'
+]);
 
diff --git a/web/js/db/main.php b/web/js/db/main.php
deleted file mode 100755
index 0a284f2c..00000000
--- a/web/js/db/main.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once ('js/sql/main.php');
-
-Vn\Hedera\Js::includeLib ('db'
-	,'main'
-	,'conn'
-	,'result'
-	,'result-set'
-	,'model'
-	,'iterator'
-	,'form'
-	,'param'
-	,'query'
-	,'calc'
-	,'calc-sum'
-);
-
-?>
diff --git a/web/js/db/model.js b/web/js/db/model.js
index e0698e92..3afde179 100755
--- a/web/js/db/model.js
+++ b/web/js/db/model.js
@@ -111,11 +111,14 @@ Db.Model.implement
 			type: String
 			,set: function (x)
 			{
-				this._stmt = new Sql.String ({query: x});
+				this.stmt = new Sql.String ({query: x});
 			}
 			,get: function ()
 			{
-				return this._stmt.render (null);
+				if (this._stmt)
+					return this._stmt.render (null);
+				else
+					return null;
 			}
 		},
 		/**
@@ -127,7 +130,7 @@ Db.Model.implement
 			,set: function (x)
 			{
 				this._mainTable = null;
-				this.requestedMainTable = x;
+				this._requestedMainTable = x;
 				this._refreshMainTable ();
 			}
 			,get: function ()
@@ -144,7 +147,7 @@ Db.Model.implement
 			,set: function (x)
 			{
 				this._updatable = false;
-				this.requestedUpdatable = x;
+				this._requestedUpdatable = x;
 				this._refreshUpdatable ();
 			}
 			,get: function ()
@@ -206,6 +209,7 @@ Db.Model.implement
 		}
 	}
 
+	,_conn: null
 	,_resultIndex: 0
 	,_batch: null
 	,_stmt: null
@@ -216,16 +220,19 @@ Db.Model.implement
 	,columnMap: null
 	,_updatable: false
 
-	,sortColumn: -1
-	,sortWay: null
-	,requestedIndexes: {}
-	,indexes: []
+	,_requestedSortIndex: -1
+	,_requestedSortName: null
+	,_sortColumn: -1
+	,_sortWay: null
 
-	,requestedUpdatable: false
-	,operations: null
-	,operationsMap: null
-	,defaults: []
-	,requestedMainTable: null
+	,_requestedIndexes: {}
+	,_indexes: []	
+
+	,_requestedUpdatable: false
+	,_operations: null
+	,_operationsMap: null
+	,_defaults: []
+	,_requestedMainTable: null
 
 	,initialize: function (props)
 	{
@@ -248,6 +255,8 @@ Db.Model.implement
 	{
 		if (this.autoLoad)
 			this.refresh ();
+		else
+			this.clean ();
 	}
 
 	/**
@@ -255,20 +264,43 @@ Db.Model.implement
 	 **/
 	,refresh: function ()
 	{
-		if (this._stmt && this._batch)
-			this._stmt.findHolders (this._batch);
+		var ready = false;
+	
+		if (this._stmt && this._conn)
+		{
+			var ids = this._stmt.findHolders ();
+		
+			if (ids)
+			{
+				if (this._batch && this._batch.isReady ())
+				{
+					ready = true;
 
-		if (this._conn && this._stmt
-		&& (!this._batch || this._batch.isReady ()))
+					for (var i = 0; i < ids.length; i++)
+					if (!this._batch.get (ids[i]))
+					{
+						ready = false;
+						break;
+					}
+				}
+			}
+			else
+				ready = true;
+		}
+
+		if (ready)
 		{
 			this._setStatus (Db.Model.Status.LOADING);
 			this._conn.execStmt (this._stmt, this._selectDone.bind (this), this._batch);
 		}
 		else
-		{
-			this._cleanData ();
-			this._setStatus (Db.Model.Status.CLEAN);
-		}
+			this.clean ();
+	}
+	
+	,clean: function ()
+	{
+		this._cleanData ();
+		this._setStatus (Db.Model.Status.CLEAN);
 	}
 
 	,_selectDone: function (resultSet)
@@ -284,7 +316,6 @@ Db.Model.implement
 
 		if (dataResult && typeof dataResult === 'object')
 		{
-			this.sortColumn = -1;
 			this.data = dataResult.data;
 			this.tables = dataResult.tables;
 			this.columns = dataResult.columns;
@@ -292,9 +323,20 @@ Db.Model.implement
 			this._repairColumns ();
 			this._refreshRowIndexes (0);
 			this._refreshMainTable ();
-			
-			for (column in this.requestedIndexes)
+
+			for (column in this._requestedIndexes)
 				this._buildIndex (column);
+
+			var sortColumn = -1;
+
+			if (this._requestedSortName)
+				sortColumn = this.getColumnIndex (this._requestedSortName);
+			else if (this._requestedSortIndex !== -1
+			&& this.checkColExists (this._requestedSortIndex))
+				sortColumn = this._requestedSortIndex;
+
+			if (sortColumn !== -1)
+				this._realSort (sortColumn, this._sortWay);
 			
 			this._setStatus (Db.Model.Status.READY);
 		}
@@ -307,12 +349,12 @@ Db.Model.implement
 		for (var i = start; i < this.data.length; i++)
 			this.data[i].index = i;
 		
-		if (this.operationsMap)
+		if (this._operationsMap)
 		{
-			this.operationsMap = {};
+			this._operationsMap = {};
 			
-			for (var i = 0; i < this.operations.length; i++)
-				this.operationsMap[i] = this.operations[i];
+			for (var i = 0; i < this._operations.length; i++)
+				this._operationsMap[i] = this._operations[i];
 		}
 	}
 
@@ -322,14 +364,15 @@ Db.Model.implement
 		this.tables = null;
 		this.columns = null;
 		this.columnMap = null;
-		this.indexes = [];
+		this._sortColumn = -1;
+		this._indexes = [];
 		this._resetOperations ();
 	}
 	
 	,_refreshUpdatable: function ()
 	{
 		var oldValue = this._updatable;
-		this._updatable = this._mainTable !== null && this.requestedUpdatable;
+		this._updatable = this._mainTable !== null && this._requestedUpdatable;
 		
 		if (oldValue != this._updatable)
 			this.signalEmit ('updatable-changed');
@@ -343,8 +386,8 @@ Db.Model.implement
 		if (tables)
 		for (var i = 0; i < tables.length; i++)
 		if (tables[i].pks.length > 0)
-		if (!this.requestedMainTable
-		|| tables[i].name === this.requestedMainTable)
+		if (!this._requestedMainTable
+		|| tables[i].name === this._requestedMainTable)
 		{
 			newMainTable = i;
 			break;
@@ -363,7 +406,7 @@ Db.Model.implement
 	 **/
 	,setDefault: function (field, table, expr)
 	{
-		this.defaults.push
+		this._defaults.push
 		({
 			 field: field
 			,table: table
@@ -380,7 +423,7 @@ Db.Model.implement
 	 **/
 	,setDefaultFromValue: function (field, table, value)
 	{
-		this.defaults.push
+		this._defaults.push
 		({
 			 field: field
 			,table: table
@@ -398,7 +441,7 @@ Db.Model.implement
 	 **/
 	,setDefaultFromColumn: function (field, table, srcColumn)
 	{
-		this.defaults.push
+		this._defaults.push
 		({
 			 field: field
 			,table: table
@@ -582,7 +625,7 @@ Db.Model.implement
 		var op = this._createOperation (rowIndex);
 		op.type |= Db.Model.Operation.DELETE;
 
-		if (!this.requestedMainTable)
+		if (!this._requestedMainTable)
 		{
 			this.signalEmit ('row-deleted-before', rowIndex);
 			this.data.splice (rowIndex, 1);
@@ -650,7 +693,7 @@ Db.Model.implement
 	 **/
 	,performOperations: function ()
 	{
-		var ops = this.operations;
+		var ops = this._operations;
 	
 		if (ops.length === 0)
 		{
@@ -733,9 +776,9 @@ Db.Model.implement
 			var dmlQuery = new Sql.Insert ();
 			var table = this.tables[tableIndex];
 
-			for (var i = 0; i < this.defaults.length; i++)
+			for (var i = 0; i < this._defaults.length; i++)
 			{
-				var def = this.defaults[i];
+				var def = this._defaults[i];
 
 				if (def.table === table.name)
 				{
@@ -789,10 +832,10 @@ Db.Model.implement
 	{
 		if (resultSet.getError ())
 		{
-			this.operations = this.operations.concat (ops);
+			this._operations = this._operations.concat (ops);
 			
 			for (var i = 0; i < ops.length; i++)
-				this.operationsMap[ops[i].row.index] = ops[i];
+				this._operationsMap[ops[i].row.index] = ops[i];
 		
 			return;
 		}
@@ -865,9 +908,9 @@ Db.Model.implement
 	 **/
 	,reverseOperations: function ()
 	{
-		for (var i = 0; i < this.operations.length; i++)
+		for (var i = 0; i < this._operations.length; i++)
 		{
-			var op = this.operations[i];
+			var op = this._operations[i];
 			var row = op.row;
 
 			if (op.type & Db.Model.Operation.DELETE
@@ -900,8 +943,8 @@ Db.Model.implement
 	
 	,_resetOperations: function ()
 	{
-		this.operations = [];
-		this.operationsMap = {};
+		this._operations = [];
+		this._operationsMap = {};
 	}
 	
 	/*
@@ -929,6 +972,23 @@ Db.Model.implement
 			
 		return 0;
 	}
+	
+	/**
+	 * Orders the model by the specified column name.
+	 *
+	 * @param {integer} column The column name
+	 * @param {Db.Model.SortWay} way The sort way
+	 **/
+	,sortByName: function (columnName, way)
+	{
+		this._requestedSortIndex = -1;
+		this._requestedSortName = columnName;
+
+		var index = this.getColumnIndex (columnName);
+		
+		if (index != -1)
+			this._sort (index, way);
+	}
 
 	/**
 	 * Orders the model by the specified column.
@@ -938,28 +998,40 @@ Db.Model.implement
 	 **/
 	,sort: function (column, way)
 	{
+		this._requestedSortIndex = column;
+		this._requestedSortName = null;
+
 		if (!this.checkColExists (column))
 			return;
-	
-		this._setStatus (Db.Model.Status.LOADING);
 
-		if (column !== this.sortColumn)
+		this._sort (column, way);
+	}
+	 
+	,_sort: function (column, way)
+	{
+		this._setStatus (Db.Model.Status.LOADING);
+		this._realSort (column, way);
+		this._setStatus (Db.Model.Status.READY);
+	}
+	
+	,_realSort: function (column, way)
+	{
+		if (column !== this._sortColumn)
 		{
 			if (way === Db.Model.SortWay.DESC)
 				var sortFunction = this.sortFunctionDesc;
 			else
 				var sortFunction = this.sortFunctionAsc;
-		
+	
 			this.data.sort (sortFunction.bind (this, column));
 		}
-		else if (way !== this.sortWay)
+		else if (way !== this._sortWay)
 			this.data.reverse ();
-		
-		this.sortColumn = column;
-		this.sortWay = way;
+
+		this._sortColumn = column;
+		this._sortWay = way;
 
 		this._refreshRowIndexes (0);
-		this._setStatus (Db.Model.Status.READY);
 	}
 
 	/**
@@ -973,7 +1045,7 @@ Db.Model.implement
 	 **/
 	,indexColumn: function (column)
 	{
-		this.requestedIndexes[column] = true;
+		this._requestedIndexes[column] = true;
 
 		if (this._status === Db.Model.Status.READY)
 			this._buildIndex (column);
@@ -1001,7 +1073,7 @@ Db.Model.implement
 						index[data[i][columnIndex]] = i;
 			}
 
-			this.indexes[columnIndex] = index;
+			this._indexes[columnIndex] = index;
 		}
 	}
 
@@ -1052,7 +1124,7 @@ Db.Model.implement
 		
 		// Searchs the value using an internal index.
 		
-		var index = this.indexes[col];
+		var index = this._indexes[col];
 		
 		if (index)
 		{
@@ -1143,7 +1215,7 @@ Db.Model.implement
 
 	,_createOperation: function (rowIndex)
 	{
-		var op = this.operationsMap[rowIndex];
+		var op = this._operationsMap[rowIndex];
 
 		if (!op)
 		{		
@@ -1151,8 +1223,8 @@ Db.Model.implement
 				type: 0,
 				row: this.data[rowIndex]
 			};
-			this.operations.push (op);
-			this.operationsMap[rowIndex] = op;
+			this._operations.push (op);
+			this._operationsMap[rowIndex] = op;
 		}
 			
 		return op;
@@ -1212,14 +1284,28 @@ Db.Model.implement
 				for (var j = 0; j < tableInfo.pks.length; j++)
 				{
 					var colIndex = this.getColumnIndex (tableInfo.pks[j]);
-					table.pks.push (colIndex);
+					
+					if (colIndex !== -1)
+						table.pks.push (colIndex);
+					else
+						console.warn ('Db.Model: Can\'t repair primary key: `%s`.`%s`'
+							,tableInfo.orgname
+							,tableInfo.pks[j]
+						);
 				}
 			}
 
 			if (tableInfo.ai)
 			{
 				var colIndex = this.getColumnIndex (tableInfo.ai);
-				this.columns[colIndex].flags |= Db.Conn.Flag.AI;
+				
+				if (colIndex !== -1)
+					this.columns[colIndex].flags |= Db.Conn.Flag.AI;
+				else
+					console.warn ('Db.Model: Can\'t repair autoincrement column: `%s`.`%s`'
+						,tableInfo.orgname
+						,tableInfo.ai
+					);
 			}
 		}
 	}
diff --git a/web/js/db/param.js b/web/js/db/param.js
index 7eac6343..538507b8 100755
--- a/web/js/db/param.js
+++ b/web/js/db/param.js
@@ -94,17 +94,12 @@ Db.Param = new Class
 		
 		var formValue;
 	
-		if (this._columnIndex != -1)
+		if (this._columnIndex !== -1)
 			formValue = this._form.getByIndex (this._columnIndex);
 		else
-			formValue = null;
-		
-		if (formValue != this._formValue)
-		{
-			this.value = formValue;
-			this._formValue = formValue;
-		}
+			formValue = undefined;
 		
+		this.value = formValue;		
 		this._formLock = false;
 	}
 
diff --git a/web/js/hedera/app.js b/web/js/hedera/app.js
new file mode 100644
index 00000000..e6d8d806
--- /dev/null
+++ b/web/js/hedera/app.js
@@ -0,0 +1,219 @@
+
+Vn.App = new Class
+({
+	Extends: Vn.Object
+
+	,initialize: function ()
+	{
+		window.onerror = this._onWindowError.bind (this);
+		window.onunload = this._onWindowUnload.bind (this);
+		Vn.Hash.initialize ();
+
+		this._isGuest = new Vn.HashParam
+		({
+			type: Boolean,
+			key: 'guest'
+		});
+		this._isGuest.on ('changed', this._onGuestChange, this);
+
+		var conn = new Db.Conn ();
+		this.link ({_conn: conn}, {'error': this._onConnError});
+	}
+	
+	,run: function ()
+	{
+		var guest = Vn.Cookie.check ('hedera_guest');
+		
+		if (guest)
+			Vn.Cookie.unset ('hedera_guest');
+	
+		if (Vn.Cookie.check ('vn_pass'))
+		{
+			this._conn.open (null, null, null,
+				this._onAutoLogin.bind (this));
+		}
+		else if (this._isGuest.value || guest)
+		{
+			this._guestLogin ();
+		}
+		else
+		{
+			var login = this._login = new Vn.Login ({conn: this._conn});
+			login.on ('login', this._onLogin, this);
+			login.show ();
+		}
+	}
+	
+	,_onGuestChange: function ()
+	{
+		if (this._isGuest.value)
+			this._guestLogin ();
+	}
+	
+	,_guestLogin: function ()
+	{
+		this._conn.open (
+			null,
+			null,
+			null,
+			this._onGuestLogin.bind (this),
+			true
+		);
+	}
+	
+	,_onGuestLogin: function (conn, success)
+	{
+		this._isGuest.value = undefined;
+
+		if (success)
+		{
+			Vn.Cookie.set ('hedera_guest', true);
+			this._onLogin ();
+		}
+		else
+			this.run ();
+	}
+	
+	,_onAutoLogin: function (success)
+	{
+		if (!success)
+		{
+			Vn.Cookie.unset ('vn_pass');
+			this.run ();
+		}
+		else
+			this._onLogin ();
+	}
+	
+	,_onLogin: function ()
+	{
+		this._freeLogin ();
+		
+		var gui = this._gui = new Vn.Gui ({conn: this._conn});
+		gui.on ('logout', this._onLogout, this);
+		gui.show ();
+	}
+	
+	,_onLogout: function (gui)
+	{
+		this._freeGui ();
+		Vn.Cookie.unset ('hedera_guest');
+		Vn.Cookie.unset ('vn_pass');
+		this.run ();
+	}
+	
+	,_onWindowError: function (message, file, line)
+	{
+		var error = new Error (message);
+		error.fileName = file;
+		error.lineNumber = line;
+
+		Htk.Toast.showError (_('There was an internal error'));
+		this._notifyError (error);
+	}
+	
+	,_onWindowUnload: function ()
+	{
+		this.unref ();
+	}
+
+	,_onConnError: function (conn, error)
+	{
+		if (error instanceof Vn.Error)
+		switch (error.domain)
+		{
+			case 'Auth':
+				Htk.Toast.showError (_('You\'ve been too idle'));
+				if (this._gui)
+					this._gui.logout ();
+				break;
+			case 'Version':
+				this._newVersion (error);
+				break;
+			case 'User':
+				Htk.Toast.showError (error.message);
+				break;
+			default:
+				console.error (error.message);
+				Htk.Toast.showError (_('There was an internal error'));
+		}
+		else
+		{
+			console.error (error);
+			Htk.Toast.showError (_('There was an internal error'));
+			this._notifyError (error);
+		}
+	}
+	
+	,_newVersion: function (error)
+	{
+		if (this.newVersionBlock || this.skipVersion)
+			return;
+			
+		this.newVersionBlock = true;
+
+		var reload;
+		var message = _('New version available') +"\n\n"+ error.message;
+
+		if (error.code == 'criticalVersion')
+		{
+			alert (message)
+			reload = true;
+		}
+		else
+		{
+			reload = confirm (message);
+			this.skipVersion = true;
+		}
+
+		if (reload)
+			location.reload ();
+			
+		this.newVersionBlock = false;
+	}
+	
+	,_notifyError: function (error)
+	{
+		if (error instanceof Error)
+		{
+			var httpRequest = new Vn.HttpRequest ()
+			httpRequest.add
+			({
+				 'file': error.fileName
+				,'line': error.lineNumber
+				,'message': error.message
+				,'stack': error.stack
+			});
+			httpRequest.send ('log.php');
+		}
+	}
+	
+	,_freeLogin: function ()
+	{
+		if (this._login)
+		{
+			this._login.disconnectByInstance (this);
+			this._login.hide ();
+			this._login.unref ();
+			this._login = null;
+		}
+	}
+	
+	,_freeGui: function ()
+	{
+		if (this._gui)
+		{
+			this._gui.disconnectByInstance (this);
+			this._gui.hide ();
+			this._gui.unref ();
+			this._gui = null;
+		}
+	}
+	
+	,_destroy: function ()
+	{
+		this._freeLogin ();
+		this._freeGui ();
+		this._conn.unref ();
+	}
+});
diff --git a/web/js/hedera/form.js b/web/js/hedera/form.js
new file mode 100755
index 00000000..720cd96f
--- /dev/null
+++ b/web/js/hedera/form.js
@@ -0,0 +1,125 @@
+
+Vn.Form = new Class
+({
+	Extends: Vn.Object
+	
+	,isOpen: false
+	,uiLoaded: false
+
+	,initialize: function (gui, formInfo)
+	{
+		this.gui = gui;
+		this.conn = gui.conn;
+		this.hash = gui.hash;
+		this.formInfo = formInfo;
+	}
+
+	/**
+	 * Gets an object from the builder associated to this form.
+	 *
+	 * @param {string} objectId The object identifier
+	 * @return {Object} The object, or %null if not found
+	 **/
+	,$: function (objectId)
+	{
+		if (this.builder)
+			return this.builder.getById (objectId);
+			
+		return null;
+	}
+	
+	,loadUi: function ()
+	{
+		if (!this.isOpen)
+			return;
+	
+		var builder = new Vn.Builder ();
+		builder.signalData = this;
+		builder.add ('conn', this.conn);
+		builder.loadXml ('forms/'+ this.formInfo.path +'/ui.xml');
+
+		var res = this.builder = builder.load ();
+		this.node = res.$('form');
+		res.link ();
+
+		var models = res.getByTagName ('db-model');
+
+		for (var i = 0; i < models.length; i++)
+			models[i].conn = this.conn;
+
+		var queries = res.getByTagName ('db-query');
+
+		for (var i = 0; i < queries.length; i++)
+			queries[i].conn = this.conn;
+			
+		if (this.node)
+		{
+			this.gui.setForm (this.node);
+			this.gui.setTitle (res.$('title'));
+			this.gui.setActions (res.$('actions'));
+			this.activate ();
+		}
+		
+		this.uiLoaded = true;
+	}
+	
+	,unloadUi: function ()
+	{
+		if (!this.uiLoaded)
+			return;
+
+		if (this.node)
+		{
+			this.deactivate ();
+			this.gui.setTitle (null);
+			this.gui.setActions (null);
+			Vn.Node.remove (this.node);
+			this.deactivate ();
+			this.node = null;
+		}
+		if (this.builder)
+		{
+			this.builder.unref ();
+			this.builder = null;
+		}
+	}
+
+	/**
+	 * Called when the form is opened.
+	 **/
+	,open: function ()
+	{
+		this.close ();
+		this.isOpen = true;
+		this.loadUi ();
+	}
+
+	/**
+	 * Called when the form is closed.
+	 **/
+	,close: function ()
+	{
+		if (!this.isOpen)
+			return;
+
+		this.isOpen = false;
+		this.unloadUi ();
+	}
+	
+	/**
+	 * Called when the form is activated.
+	 **/
+	,activate: function () {}
+	
+	/**
+	 * Called when the form is deactivated.
+	 **/
+	,deactivate: function () {}
+
+	,_destroy: function ()
+	{
+		this.close ();
+		this.parent ();
+	}
+});
+
diff --git a/web/js/hedera/gui.css b/web/js/hedera/gui.css
new file mode 100755
index 00000000..96f5223a
--- /dev/null
+++ b/web/js/hedera/gui.css
@@ -0,0 +1,391 @@
+
+.vn-gui
+{
+	height: inherit;
+}
+
+/* Font */
+
+.vn-gui .user-info,
+.vn-gui .menu-title,
+.vn-gui .main-menu a
+{
+	font-size: 1.1em;
+}
+
+/* Navigation bar */
+
+.vn-gui .navbar
+{
+	position: fixed;
+	background-color: #009688;
+	left: 15em;
+	top: 0;
+	right: 0;
+	z-index: 1;
+	overflow: hidden;
+	box-shadow: 0 0.1em 0.1em rgba(1, 1, 1, 0.3);
+	height: 3.9em;
+	color: white;
+
+	transition-property: left, background-color, transform;
+	transition-duration: 200ms;
+	transition-timing-function: ease-in-out;
+/*	transition: transform 100ms ease-in-out;
+	-webkit-transition: transform 100ms ease-in-out;*/
+}
+.vn-gui .menu-button
+{
+	position: absolute;
+	left: 0;
+	display: none;
+	border: none;
+	background-color: transparent;
+	padding: 0 .4em;
+	margin: 0;
+	height: 100%;
+}
+.vn-gui .menu-button:hover
+{
+	background-color: rgba(0, 0, 0, .2);
+}
+.vn-gui .menu-button img
+{
+	vertical-align: middle;
+	height: 1.8em;
+}
+.vn-gui .title
+{
+	float: left;
+}
+.vn-gui .title h1
+{
+	font-weight: normal;
+	font-size: 1.4em;
+	padding: .8em .6em;
+	padding-right: .3em;
+	margin: 0;
+}
+.vn-gui .navbar > .htk-spinner
+{
+	float: left;
+	margin: 1.05em .8em;
+}
+
+/* Action bar */
+
+.vn-gui .action-bar
+{
+	float: right;
+	padding: 0;
+	margin: 0;
+	height: 100%;
+}
+.vn-gui .action-bar > div
+{
+	padding: 0;
+	margin: 0;
+	height: 100%;
+}
+.vn-gui .action-bar > div > *
+{
+	float: right;
+}
+.vn-gui .action-bar button
+{
+	margin: 0;
+	padding: 1.25em .5em;
+}
+.vn-gui .action-bar button:hover
+{
+	background-color: rgba(1, 1, 1, 0.2);
+}
+.vn-gui .action-bar button > img
+{
+	vertical-align: middle;
+	height: 1.4em;
+}
+
+/* Background */
+
+.vn-gui > .background
+{
+	z-index: 10;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	visibility: hidden;
+	background-color: rgba(1, 1, 1, 0.7);
+	opacity: 0;
+}
+.vn-gui > .background.show
+{
+	visibility: visible;
+	transition: opacity 200ms ease-out;
+	opacity: 1;
+}
+
+/* Left panel */
+
+.vn-gui .left-panel
+{
+	z-index: 20;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	top: 0;
+	background-color: white;
+	z-index: 20;
+	box-shadow: 0 0.2em 0.2em rgba(1, 1, 1, 0.4);
+	width: 15em;
+}
+.vn-gui .menu-overflow
+{
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 4em;
+	overflow: auto;
+}
+.vn-gui .menu-header
+{
+	background-color: #333;
+	color: white;
+	padding: 1em;
+}
+.vn-gui .logo
+{
+	display: block;
+	width: 12em;
+	margin-bottom: .8em;
+}
+.vn-gui .user-info
+{
+	width: 100%;
+	overflow: hidden;
+}
+.vn-gui .user-info > p
+{
+	margin: 0;
+	margin-top: .2em;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.vn-gui button.logout
+{
+	float: right;
+	margin: 0;
+	padding: .2em;
+	display: block;
+}
+.vn-gui button.logout > img
+{
+	height: 1.2em;
+	display: block;
+}
+.vn-gui .supplant
+{
+	margin-top: .2em;
+	display: none;
+}
+
+/* Test link */
+
+.vn-gui .test-link
+{
+	display: block;
+	margin: 1em auto;
+	max-width: 70%;
+	background-color: #3f51b5;
+	color: white;
+	padding: 0 1em;
+	line-height: 2em;
+	border-radius: 0.1em;
+	text-align: center;
+}
+.vn-gui .test-link:hover
+{
+	background-color: #4f61c5;
+}
+
+/* Menu */
+
+.vn-gui .main-menu
+{
+	list-style-type: none;
+	padding: 0;
+	margin: 0;
+}
+.vn-gui .main-menu > li
+{
+	display: block;
+	float: left;
+	clear: both;
+	padding: 0;
+	margin: 0;
+	width: 100%;
+}
+.vn-gui .main-menu > li > a
+{
+	line-height: 2.8em;
+	width: 70%;
+	padding: 0 15%;
+}
+.vn-gui .main-menu a
+{
+	float: left;
+}
+.vn-gui .main-menu a:hover
+{
+	background-color: #DDD /* #AC6 */;
+}
+.vn-gui .main-menu a.selected
+{
+	background-color: #EEE;
+}
+.vn-gui ul.submenu
+{
+	display: none;
+	position: fixed;
+	border: none;
+	border-radius: 1px;
+	background-color: white;
+	box-shadow: 0 0.2em 0.2em #CCC;
+	z-index: 50;
+	list-style-type: none;
+	padding-left: 0;
+	width: 15em;
+}
+.vn-gui ul.submenu a
+{
+	width: 60%;
+	padding: 0.7em 20%;
+}
+
+/* Links */
+
+.vn-gui .links
+{
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	padding: 0.8em;
+}
+.vn-gui .links a
+{
+	padding: 0.1em;
+	display: block;
+	float: left;
+	max-width: 2.2em;
+}
+.vn-gui .links img
+{
+	height: 1.8em;
+}
+
+/* Body */
+
+.vn-gui > .body
+{
+	margin-left: 15em;
+	padding-top: 3.9em;
+	height: inherit;
+	box-sizing: border-box;
+	height: inherit;
+
+	transition-property: margin-left, margin-right;
+	transition-duration: 200ms;
+}
+.vn-gui .form-holder
+{
+	position: relative;
+	height: inherit;
+	opacity: 0;
+
+	transform: translateZ(0) translateX(-2em);
+	-webkit-transform: translateZ(0) translateX(-2em);
+}
+.vn-gui .form-holder.show
+{
+	opacity: 1;
+	transform: translateZ(0) translateX(0em);
+	-webkit-transform: translateZ(0) translateX(0em);
+
+	transition: all 250ms ease-out;
+	-webkit-transition: all 250ms ease-out;
+}
+
+/* Desktop */
+
+@media (min-width: 951px)
+{
+	.htk-toast
+	{
+		margin-left: -3em;
+	}
+	.vn-gui ul.submenu.show
+	{
+		display: inline;
+	}
+}
+
+/* Mobile */
+
+@media (max-width: 960px)
+{
+	.action-bar span.label,
+	.htk-button > span
+	{
+		display: none;
+	}
+	.vn-gui > .navbar
+	{
+		padding-left: 2.8em;
+		left: 0;
+	}
+	.vn-gui > .body
+	{
+		margin-left: 0;
+	}
+	.vn-gui .menu-button
+	{
+		display: block;
+	}
+	.vn-gui .left-panel
+	{
+		top: 0;
+		left: -15em;
+		box-shadow: 0 0.2em 0.2em #333;
+
+		transition: transform 200ms ease-out;
+		-webkit-transition: transform 200ms ease-out;
+	}
+	.vn-gui .left-panel.show
+	{
+		transform: translateZ(0) translateX(15em);
+		-webkit-transform: translateZ(0) translateX(15em);
+	}
+	.vn-gui .form-holder
+	{
+		left: 0;
+	}
+	.vn-gui ul.submenu
+	{
+		display: block;
+		position: relative;
+		border: none;
+		border-radius: 0;
+		background-color: white;
+		box-shadow: none;
+		width: auto;
+	}
+	.htk-toast
+	{
+		margin-left: -10.5em;
+	}
+}
+
diff --git a/web/js/hedera/gui.js b/web/js/hedera/gui.js
new file mode 100755
index 00000000..34bab537
--- /dev/null
+++ b/web/js/hedera/gui.js
@@ -0,0 +1,562 @@
+
+Vn.resource ('js/hedera/gui.xml');
+Vn.define (function () {
+
+Vn.Gui = new Class
+({
+	Extends: Htk.Widget,
+	Properties:
+	{
+		conn:
+		{
+			type: Db.Conn
+			,set: function (x)
+			{
+				this.link ({_conn: x},
+					{'loading-changed': this._onConnLoadChange });
+
+				var sql = 'SELECT default_form, image_dir, image_host FROM config;'
+					+'SELECT production_domain, test_domain FROM config;'
+					+'SELECT name FROM customer_user;'
+					+'CALL form_list ();';
+				x.execQuery (sql, this.onMainQueryDone.bind (this));
+
+				if (Vn.Cookie.check ('hedera_supplant'))
+					this.supplantUser (Vn.Cookie.get ('hedera_supplant'));
+			}
+			,get: function ()
+			{
+				return this._conn;
+			}
+		}
+	}
+
+	,forms: {}
+	,activeForm: null
+	,activeCss: null
+	,requestedForm: null
+	,menuShown: false
+	,menuOptions: {}
+	,choosedOption: null
+	,_shown: false
+	,_scrollTimeout: null
+	,_navbarVisible: true
+
+	,initialize: function (props)
+	{
+		this.builderInit ('js/hedera/gui.xml');
+	
+		this.loadingCount = 0;
+
+		this.$('background').onclick = function () {};
+
+		this.$('menu-button').addEventListener ('click', function (event)
+		{
+			event.stopPropagation ();
+			this.showMenu ();
+		}.bind (this));
+
+		this.$('left-panel').addEventListener ('click', function (event)
+		{
+			event.stopPropagation ();
+		});
+
+		this.parent (props);
+	}
+	
+	,show: function ()
+	{
+		if (this._shown)
+			return;
+	
+		this._shown = true;
+	
+		Vn.includeCss ('js/hedera/gui.css');
+		document.body.appendChild (this.node);
+		
+		if (Vn.isMobile ())
+		{
+			this._onScrollHandler = this._onScroll.bind (this);
+			window.addEventListener ('scroll', this._onScrollHandler );
+		}
+
+		this.hash = Vn.Hash;
+		this.formParam = new Vn.HashParam ({key: 'form'});
+		this.formParam.on ('changed', this._onFormChange, this);
+		
+		if (!Vn.Cookie.check ('hedera_cookies'))
+		{
+			Vn.Cookie.set ('hedera_cookies', true);
+			Htk.Toast.showWarning (_('By using this site you accept cookies'));
+		}
+	}
+	
+	,hide: function ()
+	{
+		if (!this._shown)
+			return;
+	
+		this._shown = false;
+
+		if (Vn.isMobile ())
+			window.removeEventListener ('scroll', this._onScrollHandler);
+
+		this.formParam.unref ();
+		this.closeForm ();
+		this.hideMenu ();
+		Vn.Node.remove (this.node);
+		Vn.excludeCss ('js/hedera/gui.css');
+	}
+	
+	,logout: function ()
+	{
+		this.onLogoutClick ();
+	}
+	
+	,onLogoutClick: function ()
+	{
+		this._conn.close (this._onConnClose.bind (this));
+	}
+	
+	,_onConnClose: function ()
+	{
+		this.signalEmit ('logout');
+	}
+
+	,_onConnLoadChange: function (conn, isLoading)
+	{
+		if (isLoading)
+			this.loaderPush ();
+		else
+			this.loaderPop ();
+	}
+
+	,onMainQueryDone: function (resultSet)
+	{
+		// Retrieving configuration parameters
+
+		var res = resultSet.fetchResult ();
+		var columns = res.columns;
+	
+		if (res.next ())
+		for (var i = 0; i < res.columns.length; i++)
+			Vn.Config[columns[i].name] = res.get (columns[i].name);
+
+		// Retrieving configuration parameters
+
+		var res = resultSet.fetchResult ();
+
+		if (res.next () && res.get ('test_domain'))
+		{
+			if (location.host != res.get ('production_domain'))
+			{
+				var linkText = 'ReturnToOldWebsite';
+				var linkField = 'production_domain';
+			}
+			else
+			{
+				var linkText = 'TestTheNewWebsite';
+				var linkField = 'test_domain';
+			}
+			
+			Vn.Node.setText (this.$('test-link'), _(linkText));
+			this.$('test-link').href = '//'+ res.get (linkField);
+		}
+		else
+			Vn.Node.hide (this.$('test-link'));
+
+		// Retrieving the user name
+
+		var userName = resultSet.fetchValue ();
+
+		if (userName)
+		{
+			var span = this.$('user-name');
+			span.appendChild (document.createTextNode (userName));
+		}
+
+		// Retrieving menu sections		
+
+		var res = resultSet.fetchResult ();	
+		var sectionMap = {};
+		
+		if (res)
+		for (var i = 0; res.next (); i++)
+		{
+			var parent = res.get ('parent');
+			
+			if (!sectionMap[parent])
+				sectionMap[parent] = [];
+				
+			sectionMap[parent].push (i);
+		}
+
+		this.createMenu (res, sectionMap, null, this.$('main-menu'));
+
+		// Loading the default form
+
+		this._onFormChange ();
+	}
+
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Navigation bar
+	
+	,_onScroll: function ()
+	{
+		if (this._scrollTimeout === null)
+			this._scrollTimeout = setTimeout (
+				this._scrollTimeoutFunc.bind (this), 150);
+	}
+	
+	,_scrollTimeoutFunc: function ()
+	{
+		if (!this._shown)
+			return;
+		
+		var navbar = this.$('top-bar');
+		var yOffset = Vn.Browser.getPageYOffset ();
+		var showNavbar = this._lastYOffset > yOffset || yOffset < navbar.offsetHeight;
+		
+		if (showNavbar !== this._navbarVisible)
+		{
+			if (showNavbar)
+				var translateY = 0;
+			else
+				var translateY = -navbar.offsetHeight;
+
+			navbar.style.transform =
+				'translateZ(0) translateY('+ translateY +'px)';
+		}
+		
+		this._navbarVisible = showNavbar;
+		this._lastYOffset = yOffset;
+		this._scrollTimeout = null;
+	}
+
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Background
+
+	,showBackground: function ()
+	{
+		Vn.Node.addClass (this.$('background'), 'show');
+	}
+
+	,hideBackground: function ()
+	{
+		Vn.Node.removeClass (this.$('background'), 'show');
+	}
+
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Menu
+
+	,showMenu: function ()
+	{
+		this.showBackground ();
+		Vn.Node.addClass (this.$('left-panel'), 'show');
+		this.menuShown = true;
+
+		this.hideMenuCallback = this.hideMenu.bind (this);
+		document.addEventListener ('click', this.hideMenuCallback);
+	}
+
+	,hideMenu: function ()
+	{
+		if (!this.menuShown)
+			return;
+	
+		this.hideBackground ();
+		Vn.Node.removeClass (this.$('left-panel'), 'show');
+		this.menuShown = false;
+		
+		document.removeEventListener ('click', this.hideMenuCallback);
+		this.hideMenuCallback = null;
+	}
+
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Spinner
+	
+	,loaderPush: function ()
+	{
+		this.loadingCount++;
+
+		if (this.loadingCount == 1)
+			this.$('loader').start ();
+	}
+	
+	,loaderPop: function ()
+	{
+		if (this.loadingCount == 0)
+			return;
+		
+		this.loadingCount--;
+		
+		if (this.loadingCount == 0)
+			this.$('loader').stop ();
+	}
+	
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Menu
+
+	,createMenu: function (res, sectionMap, parent, ul)
+	{
+		var sections = sectionMap[parent];
+
+		for (var i = 0; i < sections.length; i++)
+		{
+			res.row = sections[i];
+		
+			var li = document.createElement ('li');
+			ul.appendChild (li);
+
+			var a = document.createElement ('a');
+			a.href = Vn.Hash.make ({'form': res.get ('path')});
+			this.menuOptions[res.get ('path')] = a;
+			li.appendChild (a);
+
+			var text = document.createTextNode (_(res.get ('description')));
+			a.appendChild (text);
+			
+			var formId = res.get ('id');
+			
+			if (sectionMap[formId])
+			{
+				var submenu = document.createElement ('ul');
+				submenu.className = 'submenu';
+				li.appendChild (submenu);
+
+				li.addEventListener ('mouseover',
+					this._onLiMouseHover.bind (this, submenu, a));
+				li.addEventListener ('mouseout',
+					this._onLiMouseOut.bind (this));
+
+				this.createMenu (res, sectionMap, formId, submenu);
+			}
+		}
+	}
+
+	,_onLiMouseHover: function (submenu, parent)
+	{
+		if (this.menuShown)
+			return;
+
+		this.hideSubmenu ();
+		this.activeSubmenu = submenu;
+
+		var rect = parent.getBoundingClientRect ();
+		Vn.Node.addClass (submenu, 'show');
+		submenu.style.left = rect.right +'px';
+		submenu.style.top = rect.top +'px';
+	}
+	
+	,_onLiMouseOut: function ()
+	{
+		this.timeout = setTimeout (this.hideSubmenu.bind (this), 160);
+	}
+	
+	,hideSubmenu: function ()
+	{
+		var submenu = this.activeSubmenu;
+	
+		if (submenu)
+		{
+			Vn.Node.removeClass (submenu, 'show');
+			submenu.style.left = 'initial';
+			submenu.style.top = 'initial';
+			clearTimeout (this.timeout);
+			this.activeSubmenu = null;
+			this.timeout = 0;
+		}
+	}
+	
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Forms
+	
+	,_onFormChange: function ()
+	{
+		var formPath = this.formParam.value;
+		
+		if (!formPath)
+			formPath = Vn.Config['default_form'];
+		
+		this.openForm (formPath,
+			this._onFormLoad.bind (this));
+	}
+
+	,openForm: function (formPath, callback)
+	{
+		this.hideMenu ();
+		this.loaderPush ();
+		
+		this.closeForm ();
+		this.requestedForm = formPath;
+
+		var newChoosedOption = this.menuOptions[formPath];
+		
+		if (newChoosedOption)
+		{
+			Vn.Node.addClass (newChoosedOption, 'selected');
+			this.choosedOption = newChoosedOption;
+		}
+
+		this.activeCss = 'forms/'+ formPath +'/style.css';
+		Vn.includeCss (this.activeCss);
+
+		var formInfo = this.forms[formPath];
+
+		if (!formInfo)
+		{
+			formInfo = new Vn.Module ('forms', formPath);
+			this.forms[formPath] = formInfo;
+		}
+		
+		formInfo.addCallback (callback);
+	}
+
+	,_onFormLoad: function (formInfo)
+	{
+		this.loaderPop ();
+
+		if (formInfo.error)
+		{	
+			Htk.Toast.showError (_('Error loading form'));
+			return;
+		}
+
+		this.activeForm = new formInfo.klass (this, formInfo);
+		this.activeForm.open ();
+		
+	}
+	
+	,setForm: function (form)
+	{
+		Vn.Node.removeChilds (this.$('form-holder'));
+
+		if (form)
+		{
+			this.$('form-holder').appendChild (form);
+			setTimeout (this._onSetFormTimeout.bind (this), 0);
+		}
+	}
+	
+	,_onSetFormTimeout: function ()
+	{
+		Vn.Node.addClass (this.$('form-holder'), 'show');
+	}
+	
+	,setTitle: function (title)
+	{
+		Vn.Node.removeChilds (this.$('title'));
+	
+		if (title)
+			this.$('title').appendChild (title);
+	}
+	
+	,setActions: function (actions)
+	{
+		Vn.Node.removeChilds (this.$('action-bar'));
+				
+		if (actions)
+			this.$('action-bar').appendChild (actions);
+	}
+	
+	,closeForm: function ()
+	{
+		if (this.activeForm)
+		{
+			Vn.Node.removeClass (this.$('form-holder'), 'show');
+			this.activeForm.close ();
+			this.activeForm.unref ();
+			this.activeForm = null;
+		}
+
+		if (this.activeCss)
+		{
+			Vn.excludeCss (this.activeCss);
+			this.activeCss = null;
+		}
+
+		if (this.choosedOption)
+		{
+			Vn.Node.removeClass (this.choosedOption, 'selected');
+			this.choosedOption = null;
+		}
+	}
+	
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Reports
+	
+	,openReport: function (reportName, batch)
+	{
+		this.loaderPush ();
+
+		var module = new Vn.Module ('reports', reportName);
+		module.addCallback (this._onReportLoad.bind (this, batch));
+	}
+	
+	,_onReportLoad: function (batch, module)
+	{
+		this.loaderPop ();
+
+		if (module.error)
+		{
+			Htk.Toast.showError (_('Error loading report'));
+			return;
+		}
+		
+		var report = new module.klass (module, this);
+		report.open (batch);
+	}
+	
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Supplant
+	
+	,supplantUser: function (userId, callback)
+	{
+		var batch = new Sql.Batch ();
+		batch.addValue ('user', userId);
+	
+		var query = 'UPDATE user_session_view SET user_id = #user;'+
+			'SELECT Cliente FROM vn2008.Clientes WHERE Id_cliente = #user';
+		this._conn.execQuery (query,
+			this._onUserSupplant.bind (this, userId, callback), batch);
+	}
+	
+	,_onUserSupplant: function (userId, callback, resultSet)
+	{
+		this._supplantClear ();
+		Vn.Cookie.set ('hedera_supplant', userId);
+	
+		resultSet.fetchResult ();
+		var userName = resultSet.fetchValue ();
+		
+		Vn.Node.setText (this.$('supplanted'), userName);
+		Vn.Node.show (this.$('supplant'));
+		
+		if (callback)
+			callback ();
+	}
+	
+	,_supplantClear: function ()
+	{
+		if (Vn.Cookie.check ('hedera_supplant'))
+		{
+			Vn.Node.hide (this.$('supplant'));
+			Vn.Cookie.unset ('hedera_supplant');
+		}
+	}
+
+	,onSupplantExitClick: function ()
+	{
+		var query = 'UPDATE user_session_view SET user_id = account.user_get_id ()'
+		this._conn.execQuery (query, this.supplantExit.bind (this));
+	}
+
+	,supplantExit: function ()
+	{
+		this._supplantClear ();
+		this._onFormChange ();
+	}
+	
+	//++++++++++++++++++++++++++++++++++++++++++++++++++++++ Destroy
+
+	,_destroy: function ()
+	{
+		this.hide ();
+		this.parent ();
+	}
+});
+
+});
+
diff --git a/web/js/hedera/gui.xml b/web/js/hedera/gui.xml
new file mode 100755
index 00000000..b2cb8b9f
--- /dev/null
+++ b/web/js/hedera/gui.xml
@@ -0,0 +1,51 @@
+<vn>
+<div id="main" class="vn-gui">
+	<div id="top-bar" class="navbar">
+		<div id="action-bar" class="action-bar"/>
+		<button id="menu-button" class="menu-button">
+			<img src="image/dark/menu.svg" alt="_Menu"/>
+		</button>
+		<div id="title" class="title"/>
+		<htk-spinner id="loader" class="loader dark"/>
+	</div>
+	<div id="left-panel" class="left-panel">
+		<div class="menu-overflow">
+			<div class="menu-header" id="menu-header">
+				<img class="logo" src="image/dark/logo.svg" alt="Verdnatura"/>
+				<div class="user-info">
+					<button class="logout" on-click="onLogoutClick" title="_Exit">
+						<img src="image/dark/exit.svg" alt="_Exit"/>
+					</button>
+					<p id="user-name"/>
+				</div>
+				<div id="supplant" class="supplant user-info">
+					<button class="logout" on-click="onSupplantExitClick" title="_Exit">
+						<img src="image/dark/exit.svg" alt="_Exit"/>
+					</button>
+					<p id="supplanted"/>
+				</div>
+			</div>
+			<a id="test-link" class="test-link" href="#"></a>
+			<ul id="main-menu" class="main-menu"></ul>
+		</div>
+		<div class="links">
+			<a target="_blank" href="https://blog.verdnatura.es/">
+				<img alt="Blogger" src="image/blog.svg" title="Blog"/>
+			</a>
+			<a target="_blank" href="https://plus.google.com/u/0/107516577801959283883/posts">
+				<img alt="Google+" src="image/google-plus.svg" title="Google+"/>
+			</a>
+			<a target="_blank" href="http://www.facebook.com/verdnatura">
+				<img alt="Facebook" src="image/facebook.svg" title="Facebook"/>
+			</a>
+			<a target="_blank" href="http://www.youtube.com/user/verdnatura">
+				<img alt="YouTube" src="image/youtube.svg" title="YouTube"/>
+			</a>
+		</div>
+	</div>
+	<div class="body">
+		<div id="form-holder" class="form-holder"/>
+	</div>
+	<div id="background" class="background"/>
+</div>
+</vn>
diff --git a/web/js/hedera/hedera.js b/web/js/hedera/hedera.js
new file mode 100644
index 00000000..665fe387
--- /dev/null
+++ b/web/js/hedera/hedera.js
@@ -0,0 +1,4 @@
+/**
+ * Namespace
+ **/
+var Hedera = {};
diff --git a/web/js/hedera/login.css b/web/js/hedera/login.css
new file mode 100755
index 00000000..c540860c
--- /dev/null
+++ b/web/js/hedera/login.css
@@ -0,0 +1,199 @@
+
+body
+{
+	overflow: auto;
+	height: 100%;
+}
+
+.vn-login
+{
+	color: #333;
+	font-size: 1.1em;
+	font-weight: normal;
+	height: inherit;
+}
+
+/* Navigation bar */
+
+.vn-login .navbar
+{
+	z-index: 10;
+	position: fixed;
+	background-color: #333;
+	width: 100%;
+	height: 3.5em;
+	top: 0;
+	color: white;
+	
+}
+.vn-login .navbar div
+{
+	margin-top: 1em;
+	text-align: center;
+}
+
+/* Body */
+
+.vn-login .body
+{
+	height: inherit;
+
+}
+.vn-login .column
+{
+	position: relative;
+	margin: 0 auto;
+	max-width: 40em;
+	height: 100%;
+	background-color: white;
+	box-shadow: 0 0.2em 0.2em #DDD;
+}
+
+/* Login */
+
+.vn-login .login
+{
+	position: absolute;
+	margin-top: -16em;
+	padding: 1em;
+	max-width: 45em;
+	top: 50%;
+	left: 0;
+	right: 0;
+	
+}
+@media (max-height: 630px)
+{
+	.vn-login
+	{
+		height: auto;
+	}
+	.vn-login .login
+	{
+		position: relative;
+		top: 0;
+		margin-top: 3.5em;
+		padding: 1.5em 1em;
+	}
+}
+.vn-login .logo img
+{
+	display: block;
+	margin: 0.5em auto;
+	min-width: 20em;
+	width: 75%;
+}
+.vn-login .version-code
+{
+	color: red;
+	text-align: right;
+	margin: 0.2em auto;
+	font-weight: bold;
+	height: 1.4em;
+}
+.vn-login .form-inputs
+{
+	margin: 0 auto;
+	max-width: 15em;
+}
+.vn-login label
+{
+	margin: 0;
+}
+.vn-login .form-group label
+{
+	display: block;
+	font-size: inherit;
+}
+.vn-login input
+{
+	margin: 0.3em;
+}
+.vn-login input[type=text],
+.vn-login input[type=password]
+{
+	margin: .5em 0;
+	margin-bottom: 0.5em;
+	padding: 0 .5em;
+	width: 100%;
+	border: 1px solid #AAA;
+	height: 2.6em;
+}
+.vn-login input[type=text],
+.vn-login input[type=password],
+.vn-login input[type=submit]
+{
+	border-radius: 0.1em;
+	box-shadow: 0 0.1em 0.1em #AAA;
+}
+.vn-login td.entry
+{
+	text-align: left;
+}
+.vn-login .submit
+{
+	text-align: center;
+}
+.vn-login .submit > *
+{
+	display: inline-block;
+	vertical-align: top;
+}
+.vn-login input[type=submit]
+{
+	margin: 0 auto;
+	background-color: #AD4;
+	border: 1px solid #8B2;
+	height: 2.4em;
+	width: 8em;
+	color: #250;
+}
+.vn-login input[type=submit]:hover
+{
+	background-color: #9C3;
+}
+.vn-login .wrapper
+{
+	width: 0;
+	overflow: visible;
+	position: relative;
+}
+.vn-login .htk-spinner
+{
+	margin: .45em 1em;
+	position: absolute;
+}
+.vn-login .bottom
+{
+	text-align: center;
+	padding: 1em;
+}
+
+/* Info */
+
+.vn-login .info
+{
+	margin-top: 2em;
+	text-align: center;
+}
+.vn-login .info p
+{
+	margin: 0.5em;
+}
+.vn-login .links
+{
+	margin: 0 auto;
+	margin-top: 2em;
+	text-align: center;
+}
+.vn-login .links a
+{
+	display: inline-block;
+	margin: 0 .1em;
+}
+.vn-login .links img
+{
+	height: 1.8em;
+	width: 1.8em;
+}
+
diff --git a/web/js/hedera/login.js b/web/js/hedera/login.js
new file mode 100755
index 00000000..25ee22c1
--- /dev/null
+++ b/web/js/hedera/login.js
@@ -0,0 +1,102 @@
+
+Vn.includeCss ('js/hedera/login.css');
+Vn.resource ('js/hedera/login.xml');
+Vn.define (function () {
+
+Vn.Login = new Class
+({
+	Extends: Htk.Widget,
+	Properties:
+	{
+		conn:
+		{
+			type: Db.Conn
+			,set: function (x)
+			{
+				this.link ({_conn: x}, {'loading-changed': this._onConnLoadChange});
+			}
+			,get: function ()
+			{
+				return this._conn;
+			}
+		}
+	}
+
+	,initialize: function (props)
+	{
+		this.builderInit ('js/hedera/login.xml');
+		
+		var self = this;
+		this.$('form').onsubmit = function ()
+		{
+			self._onSubmit ();
+			return false;
+		};
+
+		this.parent (props);
+	}
+	
+	,_onConnLoadChange: function (conn, isLoading)
+	{
+		this._disableUi (isLoading);
+	}
+	
+	,_disableUi: function (disabled)
+	{
+		if (disabled)
+			this.$('spinner').start ();
+		else
+			this.$('spinner').stop ();
+			
+		this.$('user').disabled = disabled;
+		this.$('pass').disabled = disabled;
+		this.$('submit').disabled = disabled;
+	}
+	
+	,show: function ()
+	{
+		document.body.appendChild (this.node);
+
+		if (Vn.Cookie.check ('vn_user'))
+			this.$('user').value = Vn.Cookie.get ('vn_user');
+			
+		this._focusUserInput ();
+	}
+	
+	,hide: function ()
+	{
+		Vn.Node.remove (this.node);
+	}
+	
+	,_focusUserInput: function ()
+	{
+		var userEntry = this.$('user');
+		userEntry.focus ();
+		userEntry.select ();
+	}
+	
+	,_onSubmit: function ()
+	{
+		this._conn.open (
+			this.$('user').value,
+			this.$('pass').value,
+			this.$('remember').value,
+			this._onConnOpen.bind (this)
+		);
+	}
+	
+	,_onConnOpen: function (conn, success, error)
+	{
+		this.$('pass').value = '';
+
+		if (success)
+			this.signalEmit ('login');
+		else
+		if (error instanceof Vn.Error && error.domain === 'Auth')
+			Htk.Toast.showError (_('Invalid login'));
+
+		this._focusUserInput ();
+	}
+});
+
+});
diff --git a/web/js/hedera/login.xml b/web/js/hedera/login.xml
new file mode 100755
index 00000000..8bd6973f
--- /dev/null
+++ b/web/js/hedera/login.xml
@@ -0,0 +1,61 @@
+<vn>
+<div id="main" class="vn-login">
+	<div class="navbar">
+		<div>
+		<a href="#!form=cms/about&amp;guest=true">
+			<t>I want to know more</t>
+		</a>
+		</div>
+	</div>
+	<div class="body">
+		<div class="column">
+		<div class="login">
+		<form id="form">
+			<div class="logo">
+				<img src="image/logo.svg" alt=""/>
+			</div>
+			<div class="version-code"/>
+			<div class="form-inputs">
+				<div class="form-group">
+					<label for="user"><t>User</t></label>
+					<input type="text" id="user" name="user"/>
+				</div>
+				<div class="form-group">
+					<label for="pass"><t>Password</t></label>
+					<input type="password" id="pass" name="password"/>
+				</div>
+			</div>
+			<div class="bottom">
+				<input type="checkbox" id="remember" name="remember"/>
+				<label for="remember"><t>Do not sign out</t></label>
+			</div>
+			<div class="submit">
+				<input id="submit" type="submit" value="_Enter"/>
+				<div class="wrapper">
+					<htk-spinner id="spinner"/>
+				</div>
+			</div>
+			<div class="info">
+				<p><t>Login mail</t></p>
+				<p><t>Login phone</t></p>
+			</div>
+			<div class="links">
+				<a target="_blank" href="https://blog.verdnatura.es/">
+					<img alt="Blogger" src="image/blog.svg" title="Blog"/>
+				</a>
+				<a target="_blank" href="https://plus.google.com/u/0/107516577801959283883/posts">
+					<img alt="Google+" src="image/google-plus.svg" title="Google+"/>
+				</a>
+				<a target="_blank" href="http://www.facebook.com/verdnatura">
+					<img alt="Facebook" src="image/facebook.svg" title="Facebook"/>
+				</a>
+				<a target="_blank" href="http://www.youtube.com/user/verdnatura">
+					<img alt="YouTube" src="image/youtube.svg" title="YouTube"/>
+				</a>
+			</div>
+		</form>
+		</div>
+		</div>
+	</div>
+</div>
+</vn>
diff --git a/web/js/hedera/main.js b/web/js/hedera/main.js
new file mode 100644
index 00000000..f5e540ee
--- /dev/null
+++ b/web/js/hedera/main.js
@@ -0,0 +1,15 @@
+
+Vn.includeCss ('js/hedera/style.css');
+Vn.include ('js/htk/main');
+Vn.includeLib ('hedera', 
+[
+	 'hedera'
+	,'login'
+	,'gui'
+	,'module'
+	,'form'
+	,'report'
+	,'app'
+	,'tpv'
+]);
+
diff --git a/web/js/hedera/module.js b/web/js/hedera/module.js
new file mode 100755
index 00000000..5df67f91
--- /dev/null
+++ b/web/js/hedera/module.js
@@ -0,0 +1,96 @@
+
+Vn.Module = new Class
+({
+	 basePath: null
+	,path: null
+	,moduleName: null
+	,callbacks: []
+	,localeReady: false
+	,jsReady: false
+	,uiReady: false
+	,error: false
+	,ready: false
+
+	,initialize: function (basePath, path)
+	{
+		var absPath = basePath +'/'+ path;
+
+		var aux = path.split ('/');
+		var moduleName = aux[aux.length - 1];
+
+		Vn.Locale.load (absPath,
+			this.onLocaleReady.bind (this));
+		Vn.includeJs (absPath +'/'+ moduleName +'.js',
+			this.onJsReady.bind (this));
+		Vn.loadXml (absPath +'/ui.xml',
+			this.onUiReady.bind (this));
+
+		this.basePath = basePath;
+		this.path = path;
+		this.moduleName = moduleName;
+	}
+	
+	,addCallback: function (callback)
+	{
+		if (!this.ready)
+			this.callbacks.push (callback);
+		else
+			callback (this);
+	}
+
+	,onLocaleReady: function (success)
+	{
+		this.localeReady = true;
+		this.onReady ();
+	}
+
+	,onJsReady: function (success)
+	{
+		this.jsReady = true;
+		this.error = !success;
+		this.onReady ();
+	}
+	
+	,onUiReady: function (success)
+	{
+		this.uiReady = true;
+		this.error = !success;
+		this.onReady ();
+	}
+
+	,onReady: function ()
+	{
+		if (!(this.localeReady && this.jsReady && this.uiReady))
+			return;
+
+		this.ready = true;
+
+		var klassName = this.toCamelCase (this.moduleName);
+		
+		try {
+			this.klass = eval (klassName);
+		}
+		catch (e)
+		{
+			this.error = true;
+			console.error (e);
+		}
+
+		var callbacks = this.callbacks;
+		this.callbacks = null;
+
+		for (var i = 0; i < callbacks.length; i++)	
+			callbacks[i] (this);
+	}
+	
+	,toCamelCase: function (dashedName)
+	{
+		var camelCase = 'Vn.'+ dashedName.charAt (0).toUpperCase ();
+		camelCase += dashedName.substr (1).replace (/\w\-\w/g, function (token)
+		{
+			return token.charAt (0) + token.charAt (2).toUpperCase ();
+		});
+		return camelCase;
+	}
+});
+
diff --git a/web/js/hedera/report.css b/web/js/hedera/report.css
index dac7c6ca..1d4bf275 100755
--- a/web/js/hedera/report.css
+++ b/web/js/hedera/report.css
@@ -1,8 +1,13 @@
 
 @font-face
 {
+<<<<<<< HEAD
     font-family: 'Open Sans';
     src: url('opensans.ttf') format('truetype');
+=======
+    font-family: 'Roboto';
+    src: url('roboto.ttf') format('truetype');
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 }
 @media print
 {
@@ -15,7 +20,11 @@
 		width: 100%;
 		page-break-after: always;
 	}
+<<<<<<< HEAD
 	.print-button
+=======
+	#topbar
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	{
 		display: none;
 	}
@@ -25,6 +34,10 @@
 	body
 	{
 		background-color: #EEE;
+<<<<<<< HEAD
+=======
+		padding-top: 3.9em;
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	}
 	.sheet
 	{
@@ -35,6 +48,7 @@
 		box-shadow: 0 1mm 1mm #CCC;
 		padding: 20mm;
 	}
+<<<<<<< HEAD
 	.print-button
 	{
 		position: fixed;
@@ -52,11 +66,44 @@
 	.print-button:hover
 	{
 		background-color: #00796B;
+=======
+	#topbar
+	{
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 4em;
+		background-color: #009688;
+		z-index: 100;
+		box-shadow: 0 .1em .1em #AAA;
+	}
+	#topbar > button
+	{
+		float: right;
+		background-color: transparent;
+		color: white;
+		padding: .4em;
+		z-index: 100;
+		border: none;
+		cursor: pointer;
+		font-size: 1.15em;
+		height: 100%;
+		padding: 0 1em;
+	}
+	#topbar > button:hover
+	{
+		background-color: rgba(1, 1, 1, 0.2);
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	}
 }
 *
 {
+<<<<<<< HEAD
 	font-family: 'Open Sans';
+=======
+	font-family: 'Roboto';
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 }
 body
 {
@@ -73,3 +120,40 @@ body
 /*	page-break-after: always;*/
 }
 
+<<<<<<< HEAD
+=======
+/* Widgets */
+
+.htk-grid
+{
+	border-collapse: collapse;
+	width: 100%;
+	margin: 0 auto;
+	padding: 0;
+}
+.htk-grid > thead > tr
+{
+	border-bottom: 1px solid #333;
+	height: 10mm;
+}
+.htk-grid > thead th
+{
+	text-align: left;
+	font-weight: normal;
+}
+.htk-grid tr
+{
+	height: 2em;
+}
+.htk-grid > thead th,
+.htk-grid td
+{
+	padding-left: 3mm;
+}
+.htk-grid .cell-spin
+{
+	text-align: right;
+}
+
+
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
diff --git a/web/js/hedera/report.html b/web/js/hedera/report.html
index 951db928..fc369a8f 100755
--- a/web/js/hedera/report.html
+++ b/web/js/hedera/report.html
@@ -10,5 +10,13 @@
 		<link rel="stylesheet" type="text/css" href="report.css"/>
 		<title>Report</title>
 	</head>
+<<<<<<< HEAD
 	<body></body>
+=======
+	<body>
+		<div id="topbar">
+			<button id="print">Print</button>
+		</div>
+	</body>
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 </html>
diff --git a/web/js/hedera/report.js b/web/js/hedera/report.js
index 5bc09125..64244e3d 100755
--- a/web/js/hedera/report.js
+++ b/web/js/hedera/report.js
@@ -3,7 +3,37 @@ Vn.Report = new Class
 ({
 	Extends: Vn.Object
 
+<<<<<<< HEAD
 	,open: function () {}
+=======
+	,initialize: function (moduleInfo, gui)
+	{
+		this.info = moduleInfo;
+		this.gui = gui;
+		this.conn = gui.conn;
+		this.parent (null);
+	}
+
+	/**
+	 * Gets an object from the builder associated to this report.
+	 *
+	 * @param {string} objectId The object identifier
+	 * @return {Object} The object, or %null if not found
+	 **/
+	,$: function (objectId)
+	{
+		if (this.builderResult)
+			return this.builderResult.getById (objectId);
+			
+		return null;
+	}
+
+	,open: function (batch)
+	{
+		this.batch = batch;
+		this.createWindow ();
+	}
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	
 	,print: function ()
 	{
@@ -26,15 +56,26 @@ Vn.Report = new Class
 		head.appendChild (link);
 	}
 
+<<<<<<< HEAD
 	,createWindow: function (reportPath)
 	{
 		var reportWindow = window.open (''/*'js/hedera/report.html'*/, '_blank'/*reportPath*/,
 			'resizable=yes,height=900,width=900,scrollbars=yes,menubar=true');
+=======
+	,createWindow: function ()
+	{
+		var reportWindow = window.open (
+			'js/hedera/report.html', '_blank',
+			'height=650, width=950, resizable=yes, fullscreen=no,'+
+			'titlebar=no, menubar=no, toolbar=no, location=no, scrollbars=yes'
+		);
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 		
 		if (!reportWindow)
 		{
 			Htk.Toast.showError (
 				_('Please unlock popups and try again'));
+<<<<<<< HEAD
 			return null;
 		}
 		
@@ -51,6 +92,42 @@ Vn.Report = new Class
 		this.doc.body.appendChild (printButton);
 		
 		return reportWindow;
+=======
+			return false;
+		}
+		
+		reportWindow.addEventListener ('load', 
+			this._onWindowLoad.bind (this));		
+		this.window = reportWindow;
+		return true;
+	}
+	
+	,_onWindowLoad: function ()
+	{
+		this.doc = this.window.document
+
+		this.includeCss ('reports/'+ this.info.path +'/style.css');
+		
+		var printButton = this.doc.getElementById ('print');
+		printButton.addEventListener ('click', this.print.bind (this));
+		Vn.Node.setText (printButton, _('Print'));
+		
+		this.onWindowCreate ();
+	}
+	
+	,onWindowCreate: function ()
+	{
+		var builder = new Vn.Builder ();
+		builder.signalData = this;
+		builder.add ('batch', this.batch);
+		builder.add ('conn', this.conn);
+		builder.loadXml ('reports/'+ this.info.path +'/ui.xml');
+
+		var res = this.builderResult = builder.load ();
+		res.link ();
+
+		this.doc.body.appendChild (res.$('report'));
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	}
 });
 
diff --git a/web/global/roboto.ttf b/web/js/hedera/roboto.ttf
similarity index 100%
rename from web/global/roboto.ttf
rename to web/js/hedera/roboto.ttf
diff --git a/web/js/hedera/style.css b/web/js/hedera/style.css
new file mode 100755
index 00000000..8ecf6732
--- /dev/null
+++ b/web/js/hedera/style.css
@@ -0,0 +1,470 @@
+
+/* Responsive */
+
+/* Standard */
+@media screen
+{
+	body { font-size: 10pt; }
+}
+
+/* Desktop - Laptop 1360x768 */
+@media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px)
+{
+	body { font-size: 10pt; }
+}
+
+/* Desktop - FHD 1920x1080 */
+@media (max-resolution: 119dpi) and (min-device-width: 1900px)
+{
+	body { font-size: 13pt; }
+}
+
+/* Mobile - Low DPI */
+@media
+	(min-resolution: 120dpi),
+	(-webkit-min-device-pixel-ratio: 1.5)
+{
+	body { font-size: 9pt; }
+}
+@media
+	(min-resolution: 144dpi),
+	(-webkit-min-device-pixel-ratio: 1.5)
+{
+	body { font-size: 11pt; }
+}
+
+/* Mobile - Normal DPI */
+@media
+	(max-device-width: 383px) and (min-resolution: 192dpi),
+	(max-device-width: 383px) and (-webkit-min-device-pixel-ratio: 2)
+{
+	body { font-size: 10pt; }
+}
+@media
+	(min-device-width: 384px) and (min-resolution: 192dpi),
+	(min-device-width: 384px) and (-webkit-min-device-pixel-ratio: 2)
+{
+	body { font-size: 11pt; }
+}
+
+/* Mobile - High DPI */
+@media
+	(max-device-width: 411px) and (min-resolution: 249dpi),
+	(max-device-width: 411px) and (-webkit-min-device-pixel-ratio: 3)
+{
+	body { font-size: 10pt; }
+}
+@media
+	(min-device-width: 412px) and (min-resolution: 249dpi),
+	(min-device-width: 412px) and (-webkit-min-device-pixel-ratio: 3)
+{
+	body { font-size: 11pt; }
+}
+
+/* Global */
+
+body
+{
+	color: #333;
+	font-family: 'Roboto', 'Verdana', 'Sans';
+	margin: 0;
+}
+label,
+button,
+input,
+select,
+textarea,
+option
+{
+	font-size: inherit;
+	font-family: inherit;
+	color: inherit;
+}
+iframe
+{
+	border: none;
+}
+fieldset
+{
+	margin: 0;
+}
+form
+{
+	padding: 0;
+	margin: 0;
+}
+table
+{
+	width: 100%;
+}
+a:link,
+a:visited,
+a:active
+{
+	color: inherit;
+	text-decoration: none;
+}
+a:hover
+{
+	text-decoration: none;
+	cursor: pointer;
+}
+a img
+{
+	padding: 1px;
+}
+a img:hover
+{
+	opacity: 0.9;
+}
+h1, h2, h3, h4, h5, h6
+{
+	margin: 0;
+	padding: .2em 0;
+}
+h1
+{
+	font-size: 1.5em;
+}
+h2
+{
+	font-size: 1.2em;
+}
+p
+{
+	margin: 0.8em 0;
+}
+
+/* Focus outline */
+
+a:focus,
+input:focus,
+button:focus
+{
+	outline: 1px solid rgba(1, 1, 1, 0.15);
+	-moz-outline-radius: .1em;
+}
+button::-moz-focus-inner,
+input[type=submit]::-moz-focus-inner,
+input[type=button]::-moz-focus-inner,
+input[type=reset]::-moz-focus-inner
+{
+	border: none;
+}
+select:-moz-focusring
+{
+/*	color: transparent;
+    text-shadow: 0 0 0 #333;*/
+}
+
+/* Inputs */
+
+input[type=text],
+input[type=password],
+input[type=file],
+input[type=number],
+textarea,
+select,
+.input
+{
+	border: none;
+	border-bottom: 1px solid #999;
+	margin: .2em 0;
+	box-sizing: border-box;
+	color: #333;
+	border-radius: 0;
+	text-align: left;
+	width: 100%;
+}
+input[type=text],
+input[type=password],
+input[type=number],
+textarea,
+.input
+{
+	padding: 0 .2em;
+}
+input[type=text],
+input[type=password],
+input[type=file],
+input[type=number],
+select,
+.input
+{
+	height: 2.2em;
+}
+textarea
+{
+	height: 3.5em;
+	width: 20em;
+}
+input[type=text]:focus,
+input[type=password]:focus,
+input[type=file]:focus,
+input[type=number]:focus,
+textarea:focus,
+.input:focus
+{
+	border-color: #333;
+}
+input[type=checkbox],
+input[type=radio]
+{
+	cursor: pointer;
+	margin: 0.2em;
+	padding: 0.3em;
+	width: 0.8em;
+	height: 0.8em;
+}
+select
+{
+	background-color: white;
+	-moz-appearance: none;
+	appearance: none;
+}
+option
+{
+	padding: .4em;
+	border-width: 0;
+	font-weight: normal;
+	font-size: 1em;
+}
+select,
+option
+{
+	cursor: pointer;
+}
+
+/* Buttons */
+
+button,
+input[type=submit],
+input[type=button],
+input[type=reset]
+{
+	border: none;
+	background-color: transparent;
+	padding: 0.5em;
+	cursor: pointer;
+	border-radius: 0.1em;
+	margin: -0.5em;
+}
+button:hover,
+input[type=submit]:hover,
+input[type=button]:hover,
+input[type=reset]:hover
+{
+	background-color: rgba(1, 1, 1, 0.1);
+}
+
+/* Flat button */
+
+button.flat,
+input.button
+{
+	border: none;
+	border-radius: 0.1em;
+	box-shadow: 0 0.2em 0.2em #DDD;
+	background-color: #AD4;
+	color: black;
+}
+button.flat:hover,
+input.button:hover
+{
+	background-color: #9C3;
+	cursor: pointer;
+}
+button.flat:disabled,
+input.button:disabled
+{
+	color: gray;
+}
+
+/* Thin button */
+
+button.thin
+{
+	color: #008D77;
+	text-transform: uppercase;
+}
+button.thin:disabled
+{
+	color: gray;
+}
+
+/* Image */
+
+img.editable
+{
+	cursor: pointer;
+}
+
+/* Button */
+
+.htk-button img
+{
+	height: 1.5em;
+}
+
+/* Float */
+
+.clear
+{
+	clear: both;
+}
+
+/* Box */
+
+.box
+{
+	background-color: white;
+	margin: 0 auto;
+	border-radius: 0.1em;
+	box-shadow: 0 0.2em 0.2em #CCC;
+}
+.box .header
+{
+	padding: 0.6em 0.8em;
+	margin: 0;
+	background-color: #009688;
+	color: white;
+}
+.box .header > h1
+{
+	color: white;
+	text-align: left;
+	font-size: 1.6em;
+	line-height: 2em;
+	font-weight: normal;
+	display: inline;
+}
+.box .body
+{
+	padding: 2em;
+}
+
+/* Form */
+
+.form
+{
+	margin: 0 auto;
+}
+
+.form-group
+{
+	padding: 0.4em;
+}
+.form-group > label
+{
+	display: block;
+	margin: 0;
+	margin-top: .5em;
+	margin-bottom: .2em;
+	font-size: .9em;
+	color: #222;
+}
+.form-group > input[type=text],
+.form-group > input[type=password],
+.form-group > input[type=file],
+.form-group > input[type=number],
+.form-group > select,
+.form-group > textarea
+{
+	margin: 0;
+	width: 100%;
+}
+
+/* Form */
+
+table.form
+{
+	padding: 1em;
+	border-collapse: separate;
+	border-spacing: 0.3em;
+}
+table.form td.label
+{
+	width: 45%;
+	text-align: right;
+}
+table.form tr
+{
+	height: 2.8em;
+}
+
+/* Icon */
+
+img.icon
+{
+	height: 1.5em;
+}
+
+/* Masonry */
+
+.masonry
+{
+	margin: 0 auto;
+	text-align: left;
+}
+.masonry-box
+{
+	width: 100%;
+	display: inline-block;
+	vertical-align: top;
+}
+@media screen and (min-width: 1000px) and (max-width: 1399px)
+{
+	.masonry-box
+	{
+		width: 50%;
+		display: block;
+		float: left;
+		clear: left;
+	}
+	.masonry-box:nth-child(2n+0)
+	{
+		float: right;
+		clear: right;
+	}
+}
+@media screen and (min-width: 1400px)
+{
+	.masonry-box { width: 33.3%; }
+}
+@media screen and (min-width: 2000px)
+{
+	.masonry-box { width: 25%; }
+}
+
+/* Dialog */
+
+.dialog
+{
+	padding: 1.5em;
+	max-width: 35em;
+	font-weight: normal;
+	color: #555;
+}
+.dialog p
+{
+	margin: 0;
+}
+.dialog img
+{
+	float: left;
+	height: 3em;
+	margin-top: 0;
+	margin-right: 1em;
+}
+.dialog p
+{
+	padding: 0;
+}
+.dialog > button
+{
+	float: right;
+	margin-left: 1em;
+	margin-top: .5em;
+}
+
+
diff --git a/web/js/hedera/tpv.js b/web/js/hedera/tpv.js
new file mode 100755
index 00000000..0f4dee97
--- /dev/null
+++ b/web/js/hedera/tpv.js
@@ -0,0 +1,170 @@
+
+Vn.Tpv = new Class
+({
+	Extends: Vn.Object
+
+	,tpvOrder: null
+	,tpvStatus: null
+
+	,check: function (callback)
+	{
+		this.tpvOrder = Vn.Hash.get ('tpv_order');
+		this.tpvStatus = Vn.Hash.get ('tpv_status');
+
+		if (this.tpvStatus)
+		{
+			var batch = new Sql.Batch ();
+			batch.addValue ('transaction', this.tpvOrder);
+			batch.addValue ('status', this.tpvStatus);
+		
+			var query = 'CALL transaction_end (#transaction, #status)';
+			this.conn.execQuery (query, null, batch);
+		}
+		
+		if (callback)
+			callback (this, this.tpvOrder, this.tpvStatus);
+	}
+
+	,pay: function (amount, company)
+	{
+		this._realPpay (amount * 100, company);
+	}
+
+	,_realPpay: function (amount, company)
+	{	
+		if (amount > 0)
+		{
+			var request = new Vn.HttpRequest ();
+			request.add
+			({
+				 'action': 'tpv'
+				,'amount': parseInt (amount)
+				,'urlOk': this._makeUrl ('ok')
+				,'urlKo': this._makeUrl ('ko')
+				,'company': company
+			});
+		
+			request.send ('rest.php',
+				this._onTransactionStart.bind (this, request));
+		}
+		else if (!isNaN (amount))
+			Htk.Toast.showError (_('AmountError'));
+	}
+	
+	,retryPay: function ()
+	{
+		var batch = new Sql.Batch ();
+		batch.addValue ('transaction', parseInt (this.tpvOrder));
+
+		var query = 'SELECT t.amount, m.company_id '
+			+'FROM tpv_transaction_view t '
+			+'JOIN tpv_merchant m ON t.merchant_id = m.id '
+				+'WHERE t.id = #transaction';
+		this.conn.execQuery (query,
+			this._onRetryPayDone.bind (this), batch);
+	}
+	
+	,_onRetryPayDone: function (resultSet)
+	{
+		var res = resultSet.fetchResult ();
+		
+		if (res.next ())
+			this._realPpay (res.get ('amount'), res.get ('company_id'));
+		else
+			Htk.Toast.showError (_('AmountError'));
+	}
+
+	,_onTransactionStart: function (request, success)
+	{
+		var data = null;
+		var error = null;
+	
+		if (success)
+		try {
+			var json = request.getJson ();
+			var data = json.data;
+			
+			if (json.error)
+				error = new Vn.Error (
+					json.error.domain,
+					json.error.code,
+					json.error.message);
+		}
+		catch (e)
+		{
+			error = e;
+		}
+
+		if (success && data)
+		{
+			var form = document.createElement ('form');
+			form.method = 'post';
+			form.action = data.url;
+			document.body.appendChild (form);
+			
+			var fieldsMap =
+			{
+				 'Ds_SignatureVersion': 'HMAC_SHA256_V1'
+				,'Ds_MerchantParameters': data.params
+				,'Ds_Signature': data.signature
+			};
+
+			for (var field in fieldsMap)
+			{
+				var input = document.createElement ('input');
+				input.type = 'hidden';
+				input.name = field;
+				form.appendChild (input);
+				
+				if (fieldsMap[field])			
+					input.value = fieldsMap[field];
+			}
+			
+			form.submit ();
+		}
+		else
+			Htk.Toast.showWarning (_('PayError'));
+	}
+
+	,_makeUrl: function (status, order)
+	{
+		var path = location.protocol +'//'+ location.host;
+		path += location.port ? ':'+ location.port : '';
+		path += location.pathname;
+		path += location.search ? location.search : '';
+		path += Vn.Hash.make ({
+			'form': 'ecomerce/orders',
+			'tpv_status': status,
+			'tpv_order': '%s'
+		}, true);
+
+		return path;
+	}
+});
+
+Vn.BasketChecker = 
+{
+	check: function (conn, callback)
+	{
+		conn.execQuery ('CALL basket_check ()',
+			this._onBasketCheck.bind (this, callback));
+	}
+	
+	,_onBasketCheck: function (callback, resultSet)
+	{
+		var status = resultSet.fetchValue ();
+		
+		if (!status)
+			return;
+
+		var isOk = status == 'UPDATED' || status == 'OK';
+
+		if (status == 'UPDATED')
+			Htk.Toast.showWarning (_('OrderItemsUpdated'));
+		if (callback)
+			callback (isOk);
+		if (!isOk)
+			Vn.Hash.set ({'form': 'ecomerce/checkout'});
+	}
+};
+
diff --git a/web/js/htk/assistant-bar.js b/web/js/htk/assistant-bar.js
index 9cfc8486..3195bfe4 100644
--- a/web/js/htk/assistant-bar.js
+++ b/web/js/htk/assistant-bar.js
@@ -40,8 +40,6 @@ Htk.AssitantBar = new Class
 	
 	,initialize: function (props)
 	{
-		this.parent (props);
-
 		var bar = this.createElement ('div');
 		bar.className = 'htk-assistant-bar';
 		
@@ -65,6 +63,7 @@ Htk.AssitantBar = new Class
 		this._steps = steps;
 		this._previousButton = previousButton;
 		this._nextButton = nextButton;
+		this.parent (props);
 	}
 
 	,movePrevious: function ()
diff --git a/web/js/htk/column.js b/web/js/htk/column.js
index 7c691d9d..d57ca6f5 100755
--- a/web/js/htk/column.js
+++ b/web/js/htk/column.js
@@ -6,7 +6,6 @@ Htk.Column = new Class
 ({
 	Extends: Vn.Object
 	,Tag: 'htk-column'
-	,Parent: 'grid'
 	,Properties:
 	{
 		value:
@@ -44,31 +43,40 @@ Htk.Column = new Class
 			type: String
 			,set: function (x)
 			{
-				this._class = x;
+				this._userCssClass = x;
+				
+				if (this._cssClass)
+					this._cssClass = x +' '+ this._cssClass;
+				else
+					this._cssClass = x;
 			}
 			,get: function ()
 			{
-				return this._class;
-			}
-		},
-		grid:
-		{
-			type: Htk.Grid
-			,set: function (x)
-			{
-				if (x)
-					x.appendColumn (this);
+				return this._userCssClass;
 			}
 		}
 	}
+	
+	,_cssClass: null
+	,_userCssClass: null
 
 	/**
 	 * Initializes the column.
 	 **/
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.td = document.createElement ('td');
+		this.parent (props);
+	}
+	
+	,renderHeader: function ()
+	{
+		var th = document.createElement ('th');
+		
+		if (this.title)
+			th.appendChild (document.createTextNode (this.title));
+			
+		return th;
 	}
 
 	/**
@@ -81,8 +89,8 @@ Htk.Column = new Class
 	{
 		var td = this.td.cloneNode (true);
 
-		if (this._class)
-			td.className = this._class;
+		if (this._cssClass)
+			td.className = this._cssClass;
 			
 		return td;
 	}
diff --git a/web/js/htk/column/button.js b/web/js/htk/column/button.js
index 49842f4f..8f79b127 100755
--- a/web/js/htk/column/button.js
+++ b/web/js/htk/column/button.js
@@ -15,13 +15,18 @@ Htk.ColumnButton = new Class
 			,value: null
 		}
 	}
+	
+	,initialize: function (props)
+	{
+		this._cssClass = 'cell-button';
+		this.parent (props);
+	}
 
 	,render: function (tr)
 	{
 		var td = this.parent (tr);
 
 		var button = document.createElement ('button');
-		button.className = 'cell-button';
 		button.addEventListener ('click', 
 			this.buttonClicked.bind (this, this.value, tr, button));
 		td.appendChild (button);
diff --git a/web/js/htk/column/check.js b/web/js/htk/column/check.js
index e772dcf7..446a5bd0 100755
--- a/web/js/htk/column/check.js
+++ b/web/js/htk/column/check.js
@@ -3,6 +3,12 @@ Htk.ColumnCheck = new Class
 	Extends: Htk.Column
 	,Tag: 'htk-column-check'
 
+	,initialize: function (props)
+	{
+		this._cssClass = 'cell-check';
+		this.parent (props);
+	}
+
 	,render: function (tr)
 	{
 		var checkButton = document.createElement ('input');
@@ -16,7 +22,6 @@ Htk.ColumnCheck = new Class
 			checkButton.disabled = true;
 
 		var td = this.parent (tr);
-		td.style.textAlign = 'center';
 		td.appendChild (checkButton);
 		return td;
 	}
diff --git a/web/js/htk/column/date.js b/web/js/htk/column/date.js
index 9f45e121..67660b3a 100755
--- a/web/js/htk/column/date.js
+++ b/web/js/htk/column/date.js
@@ -22,13 +22,18 @@ Htk.ColumnDate = new Class
 	}
 
 	,_format: _('%a, %e %b %Y')
+	
+	,initialize: function (props)
+	{
+		this._cssClass = 'cell-date';
+		this.parent (props);
+	}
 
 	,render: function (tr)
 	{
 		var text = Vn.Date.strftime (this.value, this._format);
 
 		var td = this.parent (tr);
-		td.style.textAlign = 'left';
 		td.appendChild (document.createTextNode (text));
 
 		return td;
diff --git a/web/js/htk/column/image.js b/web/js/htk/column/image.js
index 25a95d29..3b97e170 100755
--- a/web/js/htk/column/image.js
+++ b/web/js/htk/column/image.js
@@ -13,7 +13,7 @@ Htk.ColumnImage = new Class
 			,set: function (x)
 			{
 				this._directory = x;
-				this.basedir = Vn.Config['image_dir'] +'/'+ x;
+				this._basedir = Vn.Config['image_dir'] +'/'+ x;
 			}
 			,get: function ()
 			{
@@ -54,24 +54,18 @@ Htk.ColumnImage = new Class
 	}
 	
 	,_directory: null
-	,basedir: null
+	,_basedir: null
 	
 	,initialize: function (props)
 	{
+		this._cssClass = 'cell-image';
+		this._fullImage = new Htk.FullImage ();
 		this.parent (props);
-		this.fullImage = new Htk.FullImage ();
 	}
 
 	,render: function (tr)
 	{
 		var td = this.parent (tr);
-		
-		var className = 'cell-image';
-		
-		if (td.className)
-			className = td.className +' '+ className;
-		
-		td.className = className;
 
 		var img = document.createElement ('img');
 		img.alt = ''
@@ -86,28 +80,28 @@ Htk.ColumnImage = new Class
 			,stamp: null
 		};
 
-		this.setSrc (cell);
+		this._setSrc (cell);
 
 		if (this.showFull)
 		{
-			img.addEventListener ('mouseover', this.onMouseOver.bind (this, cell));
-			img.addEventListener ('mouseout', this.onMouseOut.bind (this));
+			img.addEventListener ('mouseover', this._onMouseOver.bind (this, cell));
+			img.addEventListener ('mouseout', this._onMouseOut.bind (this));
 		}
 		if (this.editable)
 		{
 			img.className = 'editable';
-			img.addEventListener ('dblclick', this.onDoubleClick.bind (this, cell));
-			img.addEventListener ('error', this.onImageError.bind (this, cell));
+			img.addEventListener ('dblclick', this._onDoubleClick.bind (this, cell));
+			img.addEventListener ('error', this._onImageError.bind (this, cell));
 		}
 
 		return td;
 	}
 
-	,setSrc: function (cell)
+	,_setSrc: function (cell)
 	{
 		if (cell.value)
 		{
-			var url = this.basedir +'/';
+			var url = this._basedir +'/';
 
 			if (this.subdir)
 				url += this.subdir +'/';
@@ -120,69 +114,74 @@ Htk.ColumnImage = new Class
 			cell.img.src = url;
 		}
 		else
-			this.onImageError (cell);
+			this._onImageError (cell);
 	}
 
-	,onImageError: function (cell)
+	,_onImageError: function (cell)
 	{
 		if (!cell.error)
 		{
 			cell.error = true;
-			cell.img.src = 'image/empty.png';
+			cell.img.src = 'image/unknown.svg';
 		}
 	}
 	
-	,onMouseOver: function (cell)
+	,_onMouseOver: function (cell)
 	{
+		if (cell.error)
+			return;
+	
 		var src = this._fullDir ? this._fullDir : 'full';
 		src += '/'+ cell.value;
 
 		if (cell.stamp)
 			src += '?'+ cell.stamp;
 	
-		if (!cell.error)
-			this.fullImage.show (this.basedir +'/'+ src);
+		this._fullImage.show (this._basedir +'/'+ src);
 	}
 	
-	,onMouseOut: function ()
+	,_onMouseOut: function ()
 	{
-		this.fullImage.hide ();
+		this._fullImage.hide ();
 	}
 	
-	,onDoubleClick: function (cell)
+	,_onDoubleClick: function (cell)
 	{
 		var editor = new Htk.ImageEditor ();
 		editor.setData (cell.value, this._directory);	
 
-		this.nameChangedHandler = this.onNameChange.bind (this, cell);
+		this.nameChangedHandler = this._onNameChange.bind (this, cell);
 		editor.on ('name-changed', this.nameChangedHandler);
 
-		this.fileUploadedHandler = this.onFileUpload.bind (this, cell);
+		this.fileUploadedHandler = this._onFileUpload.bind (this, cell);
 		editor.on ('file-uploaded', this.fileUploadedHandler);
 
-		this.editorClosedHandler = this.onEditorClose.bind (this);
+		this.editorClosedHandler = this._onEditorClose.bind (this);
 		editor.on ('closed', this.editorClosedHandler);
-		
-		this.popup = new Htk.Popup ();
-		this.popup.setChild (editor);
+
+		this.popup = new Htk.Popup
+		({
+			modal: true,
+			child: editor
+		});
 		this.popup.show (cell.img);
 	}
 
-	,onNameChange: function (cell, editor, value)
+	,_onNameChange: function (cell, editor, value)
 	{
 		cell.value = value;
-		this.setSrc (cell);
+		this._setSrc (cell);
 		this.changed (cell.tr, value);
 	}
 	
-	,onFileUpload: function (cell, editor)
+	,_onFileUpload: function (cell, editor)
 	{
 		cell.stamp = new Date ().getTime ();
-		this.setSrc (cell);
+		this._setSrc (cell);
 		this.popup.hide ();
 	}
 
-	,onEditorClose: function (editor)
+	,_onEditorClose: function (editor)
 	{
 		editor.disconnect ('name-changed', this.nameChangedHandler);
 		editor.disconnect ('file-uploaded', this.fileUploadedHandler);
diff --git a/web/js/htk/column/link.js b/web/js/htk/column/link.js
index 827fe6e2..aa753eb9 100755
--- a/web/js/htk/column/link.js
+++ b/web/js/htk/column/link.js
@@ -33,7 +33,6 @@ Htk.ColumnLink = new Class
 			link.target = this.target;
 		
 		var td = this.parent (tr);
-		td.style.textAlign = 'left';
 		td.appendChild (link);
 		return td;
 	}
diff --git a/web/js/htk/column/radio.js b/web/js/htk/column/radio.js
index 9f9b9306..055bd267 100755
--- a/web/js/htk/column/radio.js
+++ b/web/js/htk/column/radio.js
@@ -16,8 +16,9 @@ Htk.ColumnRadio = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
+		this._cssClass = 'cell-radio';
 		this.radioGroup = new Htk.RadioGroup ();
+		this.parent (props);
 	}
 
 	,render: function (tr)
diff --git a/web/js/htk/column/spin.js b/web/js/htk/column/spin.js
index 790d686a..c9a17207 100755
--- a/web/js/htk/column/spin.js
+++ b/web/js/htk/column/spin.js
@@ -20,11 +20,23 @@ Htk.ColumnSpin = new Class
 			,value: 0
 		}
 	}
+	
+	,initialize: function (props)
+	{
+		this._cssClass = 'cell-spin';
+		this.parent (props);
+	}
+	
+	,renderHeader: function ()
+	{
+		var th = this.parent ();
+		th.className = 'cell-spin';
+		return th;
+	}
 
 	,render: function (tr)
 	{
 		var td = this.parent (tr);
-		td.style.textAlign = 'right';
 		
 		var valueString = null;
 		
@@ -35,7 +47,6 @@ Htk.ColumnSpin = new Class
 		{
 			var entry = document.createElement ('input');
 			entry.type = 'text';
-			entry.className = 'cell-spin';
 			entry.addEventListener ('change', this.inputChanged.bind (this, tr, entry));
 			td.appendChild (entry);
 			
diff --git a/web/js/htk/column/text.js b/web/js/htk/column/text.js
index c8a8e92c..5c69e26f 100755
--- a/web/js/htk/column/text.js
+++ b/web/js/htk/column/text.js
@@ -23,6 +23,12 @@ Htk.ColumnText = new Class
 	
 	,_format: null
 
+	,initialize: function (props)
+	{
+		this._cssClass = 'cell-text';
+		this.parent (props);
+	}
+
 	,render: function (tr)
 	{
 		var node;
@@ -33,7 +39,6 @@ Htk.ColumnText = new Class
 
 			node = document.createElement ('input');
 			node.type = 'text';
-			node.className = 'cell-text';
 			node.value = value;
 			node.addEventListener ('changed',
 				this.inputChanged.bind (this, tr, node));
@@ -43,7 +48,6 @@ Htk.ColumnText = new Class
 				Vn.Value.format (this.value, this._format));
 
 		var td = this.parent (tr);
-		td.style.textAlign = 'left';
 		td.appendChild (node);
 		return td;
 	}
diff --git a/web/js/htk/field.js b/web/js/htk/field.js
index 498da991..3332de35 100755
--- a/web/js/htk/field.js
+++ b/web/js/htk/field.js
@@ -56,7 +56,7 @@ Htk.Field = new Class
 		},
 		form:
 		{
-			type: Vn.Object // Db.Iterator
+			type: Db.Iterator
 			,set: function (x)
 			{
 				this._form = x;
diff --git a/web/js/htk/field/button.js b/web/js/htk/field/button.js
index 5347a4ea..b6f575f8 100755
--- a/web/js/htk/field/button.js
+++ b/web/js/htk/field/button.js
@@ -11,6 +11,7 @@ Htk.Button = new Class
 			{
 				this.img.src = x;
 			}
+			
 		},
 		tip:
 		{
@@ -22,19 +23,54 @@ Htk.Button = new Class
 					this.node.title = _(x);
 					this.img.title = _(x);
 				}
+				
+				this.render ();
+			}
+			,get: function ()
+			{
+				return this.node.title;
+			}
+		},
+		showText:
+		{
+			type: Boolean
+			,set: function (x)
+			{					
+				this._showText = x;
+				this.render ();
+			}
+			,get: function ()
+			{
+				return this._showText;
 			}
 		}
 	}
 	
+	,_showText: false
+	
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('button');
 		this.node.className = 'htk-button';
 		this.node.addEventListener ('click', this.onClick.bind (this));
 	
 		this.img = document.createElement ('img');
 		this.node.appendChild (this.img);
+	
+		this.parent (props);
+	}
+	
+	,render: function ()
+	{
+		if (this._textNode)
+			Vn.Node.remove (this._textNode);
+
+		if (this._showText && this.node.title)
+		{
+			this._textNode = document.createElement ('span');
+			this._textNode.appendChild (document.createTextNode (this.node.title));
+			this.node.appendChild (this._textNode);
+		}
 	}
 
 	,onClick: function ()
diff --git a/web/js/htk/field/calendar.js b/web/js/htk/field/calendar.js
index bf758330..e894b017 100755
--- a/web/js/htk/field/calendar.js
+++ b/web/js/htk/field/calendar.js
@@ -25,7 +25,6 @@ Htk.Calendar = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
 		var len = Vn.Date.WDays.length;
 		
 		this.createElement ('div');
@@ -133,6 +132,7 @@ Htk.Calendar = new Class
 		this.monthNode = monthNode;
 		this.yearNode = yearNode;
 		this.goToCurrentMonth ();
+		this.parent (props);
 	}
 
 	,getMonthDays: function ()
diff --git a/web/js/htk/field/check.js b/web/js/htk/field/check.js
index b2297d9a..313795cc 100755
--- a/web/js/htk/field/check.js
+++ b/web/js/htk/field/check.js
@@ -5,10 +5,11 @@ Htk.Check = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('input');
 		this.node.type = 'checkbox';
 		this.node.addEventListener ('change', this.changed.bind (this));
+
+		this.parent (props);
 	}
 
 	,changed: function ()
diff --git a/web/js/htk/field/date-chooser.js b/web/js/htk/field/date-chooser.js
index 43754d76..1b91b63e 100755
--- a/web/js/htk/field/date-chooser.js
+++ b/web/js/htk/field/date-chooser.js
@@ -10,7 +10,6 @@ Htk.DateChooser = new Class
 	
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('div');
 		this.node.className = 'htk-date-chooser';
 		
@@ -18,6 +17,7 @@ Htk.DateChooser = new Class
 		this.node.appendChild (this.label);
 
 		this.setEditable (this._editable);
+		this.parent (props);
 	}
 
 	,putValue: function (value)
@@ -34,32 +34,36 @@ Htk.DateChooser = new Class
 
 	,setEditable: function (editable)
 	{
+		Vn.Node.remove (this.label);
+		
+		if (this.calendar)
+		{
+			this.node.removeChild (this.button);
+		
+			this.calendar.disconnectByInstance (this);
+			this.calendar = null;
+		}
+
 		if (editable && !this.calendar)
 		{
-			Vn.Node.remove (this.label);
-
 			this.button = document.createElement ('button');
+			this.button.className = 'input';
 			this.button.title = _('ChangeDate');
-			this.button.addEventListener ('click', this.showCalendar.bind (this));
+			this.button.addEventListener ('click', this._onClick.bind (this));
 			this.button.appendChild (this.label);
 			this.node.appendChild (this.button);
 		
 			this.calendar = new Htk.Calendar ();
-			this.calendar.on ('changed', this.calendarChanged.bind (this));
+			this.calendar.on ('changed', this._onCalendarChange.bind (this));
 			
 			this.popup = new Htk.Popup ();
 			this.popup.setChild (this.calendar);
 		}
 		else if (!editable)
-		{
-			Vn.Node.remove (this.label);
 			this.node.appendChild (this.label);
-			this.calendar = null;
-			this.node.removeChild (this.button);
-		}
 	}
 
-	,calendarChanged: function (calendar)
+	,_onCalendarChange: function (calendar)
 	{
 		if (this.ignoreCalendarChange)
 			return;
@@ -71,7 +75,7 @@ Htk.DateChooser = new Class
 		this.valueChanged (newDate);
 	}
 
-	,showCalendar: function (event)
+	,_onClick: function (event)
 	{
 		this.ignoreCalendarChange = true;
 		this.calendar.value = this._value;
diff --git a/web/js/htk/field/entry.js b/web/js/htk/field/entry.js
index 686230a2..01ff2588 100755
--- a/web/js/htk/field/entry.js
+++ b/web/js/htk/field/entry.js
@@ -5,13 +5,14 @@ Htk.Entry = new Class
 	
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('input');
 		this.node.type = 'text';
-		this.node.addEventListener ('change', this.onChange.bind (this));
+		this.node.addEventListener ('change', this._onChange.bind (this));
+
+		this.parent (props);
 	}
 
-	,onChange: function (event)
+	,_onChange: function (event)
 	{
 		var newValue;
 	
diff --git a/web/js/htk/field/html.js b/web/js/htk/field/html.js
index 920bc001..ef7b1eee 100755
--- a/web/js/htk/field/html.js
+++ b/web/js/htk/field/html.js
@@ -5,8 +5,8 @@ Htk.Html = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('div');
+		this.parent (props);
 	}
 
 	,putValue: function (value)
diff --git a/web/js/htk/field/image.js b/web/js/htk/field/image.js
index f7feb798..e2832b93 100755
--- a/web/js/htk/field/image.js
+++ b/web/js/htk/field/image.js
@@ -1,6 +1,11 @@
+/**
+ * Class to display or edit an image. Also it allows to show it's full version.
+ **/
+var fullImage = null;
+ 
 Htk.Image = new Class
 ({
-	Extends: Htk.Entry
+	Extends: Htk.Field
 	,Tag: 'htk-image'
 	,Properties:
 	{
@@ -13,106 +18,202 @@ Htk.Image = new Class
 			,set: function (x)
 			{
 				this._directory = x;
-				this.basedir = Vn.Config['image_dir'] +'/'+ x;
-				this.render (false);
+				this._basedir = Vn.Config['image_dir'] +'/'+ x;
+				this._setSrc ();
 			}
 			,get: function ()
 			{
 				return this._directory;
 			}
+		},
+		/**
+		 * The directory where the images are allocated.
+		 **/
+		subdir:
+		{
+			type: String
+			,set: function (x)
+			{
+				this._subdir = x;
+				this._setSrc ();
+			}
+			,get: function ()
+			{
+				return this._subdir;
+			}
+		},
+		/**
+		 * Whether to show the full image when mouse hover.
+		 **/
+		showFull:
+		{
+			type: Boolean
+			,set: function (x)
+			{
+				if (x && !this._fullImage)
+				{
+					if (!fullImage)
+						fullImage = new Htk.FullImage ();
+				
+					this._fullImage = fullImage;
+					this.node.addEventListener ('mouseover', this._onMouseOver.bind (this));
+					this.node.addEventListener ('mouseout', this._onMouseOut.bind (this));
+				}
+				
+				this._showFull = x;
+			}
+			,get: function ()
+			{
+				return this._showFull;
+			}
+		},
+		/**
+		 * Subdirectory where full images are allocated.
+		 **/
+		fullDir:
+		{
+			type: String
+			,set: function (x)
+			{
+				this._fullDir = x;
+			}
+			,get: function ()
+			{
+				return this._fullDir;
+			}
 		}
 	}
 
 	,_directory: null
-	,basedir: null
-	,empty: false
+	,_subdir: null
+	,_basedir: null
+	,_error: false
+	,_showFull: false
+	,_fullDir: null
+	,_editable: false
 
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('img');
-//		this.node.addEventListener ('error', this.onImageError.bind (this));
-	}
+		this.node.className = 'htk-image';
+		this.node.addEventListener ('error', this._onImageError.bind (this));
 
-	,onImageError: function ()
+		this.setEditable (this._editable);
+		this.parent (props);
+	}
+	
+	,setEditable: function (editable)
 	{
-		if (!this.empty)
+		if (editable)
 		{
-			this.empty = true;
-			this.node.src = 'image/empty.png';
+			Vn.Node.addClass (this.node, 'editable');
+			this.node.addEventListener ('dblclick', this._onDoubleClick.bind (this));
 		}
+		else
+			Vn.Node.removeClass (this.node, 'editable');
+			
+		this._setEmpty ();
 	}
 
-	,render: function (force)
+	,_setSrc: function ()
 	{
 		if (this._value)
 		{
 			var url = '';
 		
-			if (this.basedir)
-				url += this.basedir +'/';
+			if (this._basedir)
+				url += this._basedir +'/';
+
+			if (this._subdir)
+				url += this._subdir +'/';
 
 			url += this._value;
 
-			if (force)
-				url += '?' + (new Date()).getTime ();
+			if (this._stamp)
+				url += '?'+ this._stamp;
 
-			this.empty = false;
+			this._error = false;
 			this.node.src = url;
 			this.node.style.display = '';
 		}
 		else
-		{
+			this._setEmpty ();
+	}
+	
+	,_setEmpty: function ()
+	{
+		if (this._value !== null && this._value !== '')
+			return;
+	
+		if (this._editable)
+			this.node.src = 'image/add-photo.svg';
+		else
 			delete this.node.src;
-			this.node.style.display = 'none';
-		}
 	}
 
 	,putValue: function (value)
 	{
-		this.render (false);
+		this._setSrc ();
 	}
 
-	,setShowFull: function (show)
+	,_onMouseOver: function ()
 	{
-		if (show)
-		{
-			this.fullImage = new Htk.FullImage ();
-			this.node.addEventListener ('mouseover', this.onMouseOver.bind (this));
-			this.node.addEventListener ('mouseout', this.onMouseOut.bind (this));
-		}
-	}
+		if (!this._showFull || !this._value || this._error)
+			return;
+	
+		var src = this._fullDir ? this._fullDir : 'full';
+		src += '/'+ this._value;
 
-	,setEditable: function (editable) 
+		if (this._stamp)
+			src += '?'+ this._stamp;
+	
+		this._fullImage.show (this._basedir +'/'+ src);
+	}
+	
+	,_onMouseOut: function ()
 	{
-		if (editable)
-		{
-			var obj = this;
-			this.style.cursor = 'pointer';
-			this.node.addEventListener ('dblclick',
-				this.onDoubleClick.bind (this));
-		}
+		this._fullImage.hide ();
 	}
 
-	,onDoubleClick: function (event)
+	,_onImageError: function ()
+	{
+		if (this._error)
+			return;
+	
+		this._error = true;
+	}
+	
+	,_onDoubleClick: function ()
 	{
 		var editor = new Htk.ImageEditor ();
-		editor.setData (cell.value, this._directory);
-
-		this.popup = new Htk.Popup ();
-		this.popup.setChild (editor);
+		editor.setData (this.value, this._directory);	
+		editor.on ('name-changed', this._onNameChange, this);
+		editor.on ('file-uploaded', this._onFileUpload, this);
+		editor.on ('closed', this._onEditorClose, this);
+		
+		this.popup = new Htk.Popup
+		({
+			modal: true,
+			child: editor
+		});
 		this.popup.show (this.node);
 	}
 
-	,onMouseOver: function (cell)
+	,_onNameChange: function (editor, value)
 	{
-		if (!cell.empty)
-			this.fullImage.show (this.basedir, cell.value);
+		this.value = value;
 	}
 	
-	,onMouseOut: function ()
+	,_onFileUpload: function (cell, editor)
 	{
-		this.fullImage.hide ();
+		this._stamp = new Date ().getTime ();
+		this.setSrc (cell);
+		this.popup.hide ();
+	}
+
+	,_onEditorClose: function (editor)
+	{
+		editor.disconnectByInstance (this);
 	}
 });
 
diff --git a/web/js/htk/field/label.js b/web/js/htk/field/label.js
index a40a3d39..ef9e0086 100755
--- a/web/js/htk/field/label.js
+++ b/web/js/htk/field/label.js
@@ -26,8 +26,8 @@ Htk.Label = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('label');
+		this.parent (props);
 	}
 
 	,putValue: function (value)
diff --git a/web/js/htk/field/radio-group.js b/web/js/htk/field/radio-group.js
index 789ca437..9fcfec6f 100755
--- a/web/js/htk/field/radio-group.js
+++ b/web/js/htk/field/radio-group.js
@@ -7,9 +7,9 @@ Htk.RadioGroup = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.clear ();
-		this.on ('changed', this.onRadioGroupChange, this); 
+		this.on ('changed', this._onRadioGroupChange, this);
+		this.parent (props);
 	}
 	
 	,clear: function ()
@@ -18,14 +18,14 @@ Htk.RadioGroup = new Class
 		this.buttons = [];
 	}
 
-	,onRadioGroupChange: function ()
+	,_onRadioGroupChange: function ()
 	{
 		for (var i = 0; i < this.buttons.length; i++)
 		if (this.buttons[i].value == this._value)
 			this.buttons[i].checked = true;
 	}
 	
-	,onRadioChange: function (value)
+	,_onRadioChange: function (value)
 	{
 		if (this.radioLock)
 			return;
@@ -40,7 +40,7 @@ Htk.RadioGroup = new Class
 		var radio = Vn.Browser.createRadio (this.name);
 		radio.value = value;
 		radio.checked = value == this.value;
-		radio.addEventListener ('change', this.onRadioChange.bind (this, value));
+		radio.addEventListener ('change', this._onRadioChange.bind (this, value));
 		this.buttons.push (radio);
 		
 		return radio;
diff --git a/web/js/htk/field/radio.js b/web/js/htk/field/radio.js
index ecb059ef..298d2f4f 100755
--- a/web/js/htk/field/radio.js
+++ b/web/js/htk/field/radio.js
@@ -18,9 +18,9 @@ Htk.Radio = new Class
 			type: Htk.RadioGroup
 			,set: function (x)
 			{
-				this.link ({_radioGroup: x}, {'changed': this.onRadioGroupChange});
+				this.link ({_radioGroup: x}, {'changed': this._onRadioGroupChange});
 				this.node.name = x.name
-				this.onRadioGroupChange ();
+				this._onRadioGroupChange ();
 			}
 			,get: function ()
 			{
@@ -33,21 +33,21 @@ Htk.Radio = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
-
 		var radio = Vn.Browser.createRadio ('');
 		radio.checked = false;
-		radio.addEventListener ('change', this.onChange.bind (this));
+		radio.addEventListener ('change', this._onChange.bind (this));
 		this.node = radio;
+
+		this.parent (props);
 	}
 
-	,onChange: function ()
+	,_onChange: function ()
 	{
 		if (this.node.checked && this._radioGroup)
 			this._radioGroup.value = this.value;
 	}
 	
-	,onRadioGroupChange: function ()
+	,_onRadioGroupChange: function ()
 	{
 		if (this._radioGroup.value && this._radioGroup.value == this.value)
 			this.node.checked = true;
diff --git a/web/js/htk/field/search-entry.js b/web/js/htk/field/search-entry.js
new file mode 100755
index 00000000..d4e8fa51
--- /dev/null
+++ b/web/js/htk/field/search-entry.js
@@ -0,0 +1,52 @@
+
+Htk.SearchEntry = new Class
+({
+	Extends: Htk.Field
+	,Tag: 'htk-search-entry'
+	
+	,initialize: function (props)
+	{
+		var div = this.createElement ('div');
+		div.className = 'htk-search-entry';
+		
+		var img = document.createElement ('img');
+		img.alt = _('Search');
+		img.src = 'image/search.svg';
+		div.appendChild (img);
+		
+		var input = document.createElement ('input');
+		input.className = 'entry';
+		input.type = 'text';
+		input.placeholder = _('Search');
+		input.addEventListener ('change', this._onChange.bind (this));
+		div.appendChild (input);
+
+		this._input = input;
+		this.parent (props);
+	}
+
+	,_onChange: function (event)
+	{
+		var newValue;
+	
+		if (this._input.value === '')
+			newValue = undefined;
+		else
+			newValue = this._input.value;
+
+		this.valueChanged (newValue);
+	}
+
+	,putValue: function (value)
+	{
+		if (!value)
+			this._input.value = '';
+		else
+			this._input.value = value;
+	}
+
+	,setEditable: function (editable)
+	{
+		this.node.readOnly = !editable;
+	}
+});
diff --git a/web/js/htk/field/select.js b/web/js/htk/field/select.js
index 1d52ea12..2ff6491a 100755
--- a/web/js/htk/field/select.js
+++ b/web/js/htk/field/select.js
@@ -1,3 +1,4 @@
+
 Htk.Select = new Class
 ({
 	Extends: Htk.Field
@@ -13,8 +14,8 @@ Htk.Select = new Class
 			type: Db.Model
 			,set: function (x)
 			{
-				this.link ({_model: x}, {'status-changed': this.onModelChange});
-				this.onModelChange ();
+				this.link ({_model: x}, {'status-changed-after': this._onModelChange});
+				this._onModelChange ();
 			}
 			,get: function ()
 			{
@@ -64,7 +65,38 @@ Htk.Select = new Class
 			type: Boolean
 			,get: function ()
 			{
-				return this._ready;
+				return this._model && this._model.ready;
+			}
+		},
+		/**
+		 * Checks if the form data is ready.
+		 **/
+		placeholder:
+		{
+			type: String
+			,set: function (x)
+			{
+				this._placeholder = x;
+				this._refreshShowText (x);
+			}
+			,get: function ()
+			{
+				return this._placeholder;
+			}
+		},
+		/**
+		 * Wether to allow null values.
+		 **/
+		notNull:
+		{
+			type: Boolean
+			,set: function (x)
+			{
+				this._notNull = x;
+			}
+			,get: function ()
+			{
+				return this._notNull;
 			}
 		}
 	}
@@ -75,51 +107,136 @@ Htk.Select = new Class
 	,valueColumnName: null
 	,showColumnIndex: 1
 	,showColumnName: null
+	,_notNull: true
+	,_webkitRefresh: false
 
 	,initialize: function (props)
 	{
+		var button = this.createElement ('button');
+		button.className = 'htk-select input';
+		button.addEventListener ('mousedown', this._onButtonMouseDown.bind (this));
+
 		this.parent (props);
-		this.createElement ('select');
-		this.node.addEventListener ('change', this.changed.bind (this));
+	}
+
+	,on: function (id, callback, instance)
+	{
+		switch (id)
+		{
+			case 'click':
+			case 'mousedown':
+			case 'focusout':
+				this.node.addEventListener (id,
+					callback.bind (instance, this));
+				break;
+			default:
+				this.parent (id, callback, instance);
+		}
 	}
 	
-	,setRow: function (row)
+	,_setRow: function (row)
 	{
 		this._row = row;
+		this._refreshShowText ();
 		this.iterChanged ();
 	}
 	
-	,changed: function (event)
+	,_onButtonMouseDown: function (e)
 	{
+		if (this._popup)
+		{
+			this._popup.hide ();
+			return;
+		}
+	
+		var model = this._model;
+
+		var menu = document.createElement ('div');
+		menu.className = 'htk-select-menu';
+		
+		var grid = new Htk.Grid ({showHeader: false});
+		menu.appendChild (grid.getNode ());
+		
+		var gridNode = grid.getNode ();
+		gridNode.addEventListener ('click', this._onGridClicked.bind (this, grid));
+		
+		var column = new Htk.ColumnText ({columnIndex: this.showColumnIndex});
+		grid.appendColumn (column);
+		grid.model = model;
+		
+		var popup = this._popup = new Htk.Popup ({childNode: menu});
+		popup.on ('closed', this._onPopupClose.bind (this));
+		popup.show (this.node);
+
+		this.signalEmit ('menu-show');
+		
+		e.stopPropagation ();
+	}
+	
+	,_onGridClicked: function (grid, e)
+	{
+		var target = e.target;
+		var parentNode = target.parentNode;
+		
+		while (parentNode !== grid.tbody)
+		{
+			target = parentNode;
+			parentNode = parentNode.parentNode;
+		}
+
 		var value;
-		var row = this.node.selectedIndex - 1;
+		var row = target.rowIndex - 1;
 
 		if (row >= 0)
 			value = this._model.getByIndex (row, this.valueColumnIndex);
 		else
 			value = null;
 
+<<<<<<< HEAD
 		this.setRow (row);
 		this.valueChanged (value);
+=======
+		this._setRow (row);
+		this.valueChanged (value);
+		this._popup.hide ();
+		
+		e.stopPropagation ();
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	}
 	
-	,addOption: function (value, text)
+	,_onPopupClose: function ()
 	{
-		var option = document.createElement ('option');
-		option.value = value;
-		option.appendChild (document.createTextNode (text));
-		this.node.appendChild (option);
+		this._popup = null;
+		this.signalEmit ('menu-hide');
 	}
 	
-	,onModelChange: function ()
+	,_refreshShowText: function ()
+	{
+		var model = this._model;
+	
+		if (this._row !== -1)
+			var showText = model.getByIndex (this._row, this.showColumnIndex);
+		else if (model && model.status === Db.Model.Status.LOADING)
+			var showText = _('Loading...');
+		else if (this._placeholder)
+			var showText = this._placeholder;
+		else
+			var showText = '';
+
+		Vn.Node.setText (this.node, showText);
+	}
+	
+	,_onModelChange: function ()
 	{
 		var model = this._model;
 		this.signalEmit ('status-changed');
-	
-		Vn.Node.removeChilds (this.node);
+		
+		if (this._popup)
+			this._popup.reset ();
 
-		switch (model.status)
+		if (model && model.ready)
 		{
+<<<<<<< HEAD
 			case Db.Model.Status.READY:
 			{
 				var data = model.data;
@@ -138,7 +255,13 @@ Htk.Select = new Class
 				this.addOption (null, _('Loading...'));
 			default:
 				this.setRow (-1);
+=======
+			this._selectOption ();
+			this.signalEmit ('ready');
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 		}
+		else
+			this._setRow (-1);
 	}
 	
 	,setEditable: function (editable)
@@ -146,25 +269,20 @@ Htk.Select = new Class
 		this.node.disabled = !editable;
 	}
 
-	,selectOption: function ()
+	,_selectOption: function ()
 	{
 		var row;
 	
-		if (this._model && this._model.status == Db.Model.Status.READY)
-		{
+		if (this._model && this._model.ready)
 			row = this._model.searchByIndex (this.valueColumnIndex, this._value);
-
-			if (row != -1)
-				this.node.selectedIndex = row + 1;
-		}
 		else
 			row = -1;
 
-		this.setRow (row);
+		this._setRow (row);
 	}
 
 	,putValue: function (value)
 	{
-		this.selectOption ();
+		this._selectOption ();
 	}
 });
diff --git a/web/js/htk/field/spin.js b/web/js/htk/field/spin.js
index 28c6f01b..56d4fca6 100755
--- a/web/js/htk/field/spin.js
+++ b/web/js/htk/field/spin.js
@@ -1,40 +1,25 @@
 Htk.Spin = new Class
 ({
-	Extends: Htk.Entry
+	Extends: Htk.Field
 	,Tag: 'htk-spin'
 
 	,initialize: function (props)
 	{
-		this.parent (props);
+		var input = this.createElement ('input');
+		//setInputTypeNumber (input);
+		this.node.type = 'number';
+		input.addEventListener ('change', this._onChange.bind (this));
+
 		this.unit = null;
 		this.digits = 0;
+		this.parent (props);
 	}
 
-	,changed: function ()
+	,_onChange: function ()
 	{
 		var newValue = (this.node.value == '') ? null : parseFloat (this.node.value);
 		this.node.value = newValue;
-		this.realValue = value;
-		this.signalEmit ('changed');
-	}
-
-	,setEditable: function (editable)
-	{
-		if (editable)
-		{
-			var input = document.createElement ('input');
-			input.style.textAlign = 'right';
-			input.style.width = '100%';
-			setInputTypeNumber (input);
-			input.addEventListener ('change', this.changed.bind (this));
-			this.node.appendChild (input);
-			this.entry = input;
-		}
-		else
-		{
-			removeChilds (this.node);
-			this.entry = null;
-		}
+		this.valueChanged (newValue);
 	}
 
 	,putValue: function (value)
@@ -51,9 +36,11 @@ Htk.Spin = new Class
 		else
 			text = '';
 	
-		if (!this.editable)
-			setText (this.node, text);
-		else
-			this.entry.value = text;
+		this.node.value = text;
+	}
+
+	,setEditable: function (editable)
+	{
+		this.node.readOnly = !editable;
 	}
 });
diff --git a/web/js/htk/field/table.js b/web/js/htk/field/table.js
index 4fc8338f..d4525f27 100755
--- a/web/js/htk/field/table.js
+++ b/web/js/htk/field/table.js
@@ -5,8 +5,6 @@ Htk.Table = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
-		
 		var tv = new Htk.TreeView ();
 		this.node.appendChild (tv.getNode ());
 		
@@ -18,6 +16,7 @@ Htk.Table = new Class
 
 		this.treeview = tv;
 		this.rbGroup = rbGroup;
+		this.parent (props);
 	}
 
 	,setModel: function (model)
diff --git a/web/js/htk/field/text-area.js b/web/js/htk/field/text-area.js
index 007c0916..98c41515 100755
--- a/web/js/htk/field/text-area.js
+++ b/web/js/htk/field/text-area.js
@@ -5,9 +5,10 @@ Htk.TextArea = new Class
 	
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.createElement ('textarea');
 		this.node.addEventListener ('change', this.changed.bind (this));
+
+		this.parent (props);
 	}
 
 	,changed: function (event)
diff --git a/web/js/htk/field/text.js b/web/js/htk/field/text.js
index e092d90d..64cb2026 100755
--- a/web/js/htk/field/text.js
+++ b/web/js/htk/field/text.js
@@ -26,8 +26,8 @@ Htk.Text = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
 		this.node = document.createTextNode ('');
+		this.parent (props);
 	}
 
 	,putValue: function (value)
diff --git a/web/js/htk/full-image.js b/web/js/htk/full-image.js
index ca30b63f..5a501027 100755
--- a/web/js/htk/full-image.js
+++ b/web/js/htk/full-image.js
@@ -12,8 +12,6 @@ Htk.FullImage = new Class
 
 	,initialize: function (props)
 	{
-		this.parent (props);
-
 		var div = document.createElement ('div');
 		div.className = 'htk-full-image';
 		div.addEventListener ('mouseover', this.cancelHide.bind (this));
@@ -22,34 +20,34 @@ Htk.FullImage = new Class
 		var loadingBox = document.createElement ('div');
 		loadingBox.className = 'htk-full-image-loader';
 
-		var loadingImg = document.createElement ('img');
-		loadingImg.src = 'image/loader-black.gif';
-		loadingImg.alt = _('Loading');
-		loadingBox.appendChild (loadingImg);
+		var spinner = new Htk.Spinner ();
+		loadingBox.appendChild (spinner.getNode ());
 
 		this.div = div;
 		this.loadingBox = loadingBox;
-		this.loadingImg = loadingImg;
+		this.spinner = spinner;
+		this.parent (props);
 	}
 	
 	,getLeft: function (width)
 	{
-		return parseInt (Vn.Browser.getPageXOffset () + (Vn.Browser.getInnerWidth () - width) / 2) +'px';
+		return parseInt ((Vn.Browser.getInnerWidth () - width) / 2) +'px';
 	}
 	
 	,getTop: function (height)
 	{
-		return parseInt (Vn.Browser.getPageYOffset () + (Vn.Browser.getInnerHeight () - height) / 2) +'px';
+		return parseInt ((Vn.Browser.getInnerHeight () - height) / 2) +'px';
 	}
 	
 	,show: function (src)
 	{		
 		if (this.closed && this.src == src)
+		{
+			this.closed = false;
 			return;
+		}
 	
 		this.cancelHide ();
-		this.loadingBox.style.left = this.getLeft (40);
-		this.loadingBox.style.top = this.getTop (40);
 
 		this.closed = false;
 		this.src = src
@@ -62,6 +60,7 @@ Htk.FullImage = new Class
 		if (!this.img.complete && !this.loading)
 		{
 			document.body.appendChild (this.loadingBox);
+			this.spinner.start ();
 			this.loading = true;
 		}
 	}
@@ -163,6 +162,7 @@ Htk.FullImage = new Class
 		if (this.loading)
 		{
 			document.body.removeChild (this.loadingBox);
+			this.spinner.stop ();
 			this.loading = false;
 		}
 	}
diff --git a/web/js/htk/grid.js b/web/js/htk/grid.js
index efe1ba91..36827778 100755
--- a/web/js/htk/grid.js
+++ b/web/js/htk/grid.js
@@ -1,3 +1,4 @@
+
 Htk.Grid = new Class
 ({
 	Extends: Htk.Widget
@@ -5,6 +6,9 @@ Htk.Grid = new Class
 	,Child: 'model'
 	,Properties:
 	{
+		/**
+		 * The source data model.
+		 **/
 		model:
 		{
 			type: Db.Model
@@ -27,14 +31,20 @@ Htk.Grid = new Class
 			}
 			,get: function ()
 			{
-				this._model;
+				return this._model;
 			}
 		},
+		/**
+		 * Message that should be displayed when source model is not ready.
+		 **/
 		emptyMessage:
 		{
 			type: String
 			,value: _('NoData')
 		},
+		/**
+		 * Wether to display the header with column titles.
+		 **/
 		showHeader:
 		{
 			type: Boolean
@@ -61,8 +71,6 @@ Htk.Grid = new Class
 	
 	,initialize: function (props)
 	{
-		this.parent (props);
-
 		this.table = this.createElement ('table');
 		this.table.className = 'htk-grid';
 
@@ -74,6 +82,13 @@ Htk.Grid = new Class
 		
 		this.tbody = document.createElement ('tbody');
 		this.table.appendChild (this.tbody);
+
+		this.parent (props);
+	}
+	
+	,appendChild: function (child)
+	{
+		this.appendColumn (child);
 	}
 
 	,removeClicked: function (column, value, row)
@@ -151,7 +166,7 @@ Htk.Grid = new Class
 
 	,onUpdatableChange: function ()
 	{
-		if (this._model.updatable)
+		if (this._model && this._model.updatable)
 		{
 			if (!this.internalColumn)
 			{
@@ -194,7 +209,7 @@ Htk.Grid = new Class
 				break;
 			}
 			case Db.Model.Status.LOADING:
-				this.showMessage (_('Loading'), 'loader-black.gif');
+				this.showMessage (_('Loading'), null);
 				break;
 			case Db.Model.Status.CLEAN:
 				this.showMessage (this.emptyMessage, 'refresh.svg');
@@ -226,10 +241,19 @@ Htk.Grid = new Class
 		td.colSpan = this.columns.length;
 		tr.appendChild (td);
 		
-		var img = document.createElement ('img');
-		img.alt = '';
-		img.src = 'image/'+ src;
-		td.appendChild (img);
+		if (src)
+		{
+			var img = document.createElement ('img');
+			img.alt = '';
+			img.src = 'image/'+ src;
+			td.appendChild (img);
+		}
+		else
+		{
+			var spinner = new Htk.Spinner ();
+			spinner.start ();
+			td.appendChild (spinner.getNode ());
+		}
 		
 		var message = document.createTextNode (message);
 		td.appendChild (message);
@@ -278,7 +302,7 @@ Htk.Grid = new Class
 	
 	,addColumn: function (pos, column)
 	{
-		var header = document.createElement ('th');
+		var header = column.renderHeader ();
 
 		if (pos == -1 || pos >= this.columns.length)
 		{
@@ -294,12 +318,6 @@ Htk.Grid = new Class
 		header.addEventListener ('click', 
 			this.sortModel.bind (this, column));
 		header.title = _('Sort');
-		
-		if (column.title)
-		{
-			var title = document.createTextNode (column.title);
-			header.appendChild (title);
-		}
 
 		column.on ('changed', this.columnChanged, this);
 		
@@ -378,3 +396,4 @@ Htk.Grid = new Class
 			this.onModelChange ();
 	}
 });
+
diff --git a/web/js/htk/htk.js b/web/js/htk/htk.js
index f07e8df2..63ad1fd0 100755
--- a/web/js/htk/htk.js
+++ b/web/js/htk/htk.js
@@ -1,36 +1,4 @@
-include ([
-	'js/db/db.js',
-	'js/htk/js/htk/main',
-	'js/htk/widget',
-	'js/htk/popup',
-	'js/htk/toast',
-	'js/htk/repeater',
-	'js/htk/grid',
-	'js/htk/full-image',
-	'js/htk/image-editor',
-	'js/htk/field',
-	'js/htk/field/text',
-	'js/htk/field/html',
-	'js/htk/field/entry',
-	'js/htk/field/radio-group',
-	'js/htk/field/radio',
-	'js/htk/field/label',
-	'js/htk/field/text-area',
-	'js/htk/field/spin',
-	'js/htk/field/check',
-	'js/htk/field/select',
-	'js/htk/field/calendar',
-	'js/htk/field/date-chooser',
-	'js/htk/field/image',
-	'js/htk/field/button',
-	'js/htk/field/table',
-	'js/htk/column',
-	'js/htk/column/button',
-	'js/htk/column/link',
-	'js/htk/column/date',
-	'js/htk/column/image',
-	'js/htk/column/radio',
-	'js/htk/column/spin',
-	'js/htk/column/text',
-	'js/htk/column/check'
-]);
+/**
+ * The namespace.
+ **/ 
+var Htk = {};
diff --git a/web/js/htk/image-editor.js b/web/js/htk/image-editor.js
index bc421995..3ac9d948 100755
--- a/web/js/htk/image-editor.js
+++ b/web/js/htk/image-editor.js
@@ -1,19 +1,37 @@
+
+Vn.resource ('js/htk/image-editor.xml');
+Vn.define (function () {
+
+/**
+ * A form to handle the image database, it allows to add new images or
+ * replace it.
+ **/
 Htk.ImageEditor = new Class
-({	
+({
 	Extends: Htk.Widget
-	,Xml: 'js/htk/image-editor.xml'
 	
-	,initialize: function ()
+	,initialize: function (props)
 	{
-		this.builderInit (Htk.ImageEditor.Xml);
+		this.builderInit (this.constructor.Xml);
+
 		this.$('max-size').value = 10 /* MB */ * 1048576;
 		this.$('form').action =
 			'//'+ Vn.Config['image_host'] +'/rest.php?action=image';
+<<<<<<< HEAD
+=======
+
+		this.parent (props);
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	}
 	
 	,onNameChange: function ()
 	{
-		this.signalEmit ('name-changed', this.$('name').value);
+		var newValue = this.$('name').value;
+		
+		if (!newValue)
+			newValue = null
+	
+		this.signalEmit ('name-changed', newValue);
 	}
 	
 	,onFormSubmit: function ()
@@ -23,7 +41,7 @@ Htk.ImageEditor = new Class
 	}
 	
 	,onIframeLoad: function ()
-	{	
+	{
 		this.$('submit').disabled = false;
 		this.$('loader').style.visibility = 'hidden';
 
@@ -47,5 +65,9 @@ Htk.ImageEditor = new Class
 		this.$('name').value = image;
 		this.$('schema').value = directory;
 	}
+}).extend
+({
+	Xml: 'js/htk/image-editor.xml'
 });
 
+});
diff --git a/web/js/htk/main.js b/web/js/htk/main.js
index 63ad1fd0..37f8eb6c 100755
--- a/web/js/htk/main.js
+++ b/web/js/htk/main.js
@@ -1,4 +1,43 @@
-/**
- * The namespace.
- **/ 
-var Htk = {};
+
+Vn.includeCss ('js/htk/style.css');
+Vn.include ('js/db/main');
+Vn.includeLib ('htk', 
+[
+	 'htk'
+	,'widget'
+	,'popup'
+	,'toast'
+	,'repeater'
+	,'grid'
+	,'spinner'
+	,'full-image'
+	,'image-editor'
+	,'assistant'
+	,'assistant-bar'
+	,'field'
+	,'field/text'
+	,'field/html'
+	,'field/entry'
+	,'field/radio-group'
+	,'field/radio'
+	,'field/label'
+	,'field/text-area'
+	,'field/spin'
+	,'field/check'
+	,'field/select'
+	,'field/calendar'
+	,'field/date-chooser'
+	,'field/image'
+	,'field/button'
+	,'field/table'
+	,'field/search-entry'
+	,'column'
+	,'column/button'
+	,'column/link'
+	,'column/date'
+	,'column/image'
+	,'column/radio'
+	,'column/spin'
+	,'column/text'
+	,'column/check'
+]);
diff --git a/web/js/htk/main.php b/web/js/htk/main.php
deleted file mode 100755
index f01f4c1b..00000000
--- a/web/js/htk/main.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-require_once ('js/db/main.php');
-
-Vn\Hedera\Js::includeLib ('htk'
-	,'main'
-	,'widget'
-	,'popup'
-	,'toast'
-	,'repeater'
-	,'grid'
-	,'full-image'
-	,'image-editor'
-	,'assistant'
-	,'assistant-bar'
-	,'field'
-	,'field/text'
-	,'field/html'
-	,'field/entry'
-	,'field/radio-group'
-	,'field/radio'
-	,'field/label'
-	,'field/text-area'
-	,'field/spin'
-	,'field/check'
-	,'field/select'
-	,'field/calendar'
-	,'field/date-chooser'
-	,'field/image'
-	,'field/button'
-	,'field/table'
-	,'column'
-	,'column/button'
-	,'column/link'
-	,'column/date'
-	,'column/image'
-	,'column/radio'
-	,'column/spin'
-	,'column/text'
-	,'column/check'
-);
-
-?>
diff --git a/web/js/htk/popup.js b/web/js/htk/popup.js
index a7983c65..7d090396 100755
--- a/web/js/htk/popup.js
+++ b/web/js/htk/popup.js
@@ -5,14 +5,68 @@ Htk.Popup = new Class
 ({
 	Extends: Htk.Widget
 	,Tag: 'htk-popup'
-
-	,child: null
-	,parent: null
-
-	,initialize: function ()
+	,Properties:
 	{
-		this.createElement ('div');
-		this.node.className = 'htk-popup';
+		/**
+		 * The popup child.
+		 **/
+		child:
+		{ 
+			type: Htk.Widget
+			,set: function (x)
+			{
+				this._child = x;
+				this.setChildNode (x.getNode ());
+			}
+			,get: function ()
+			{
+				return this._child;
+			}
+		}
+		/**
+		 * The popup child Node.
+		 **/
+		,childNode:
+		{ 
+			type: Object
+			,set: function (x)
+			{
+				this._child = null;
+				this.setChildNode (x);
+			}
+			,get: function ()
+			{
+				return this.node.firstChild;
+			}
+		}
+		/**
+		 * Indicates how the dialog must be displayed.
+		 **/
+		,modal:
+		{ 
+			type: Boolean
+			,set: function (x)
+			{
+				this._modal = x;
+			}
+			,get: function ()
+			{
+				return this._modal;
+			}
+		}
+	}
+
+	,_parent: null
+	,_modal: false
+	,_isOpen: false
+	,_child: null
+
+	,initialize: function (props)
+	{
+		var div = this.createElement ('div');
+		div.className = 'htk-popup';
+		
+		this.parent (props);
 	}
 
 	,setChild: function (child)
@@ -28,78 +82,126 @@ Htk.Popup = new Class
 
 	,show: function (parent)
 	{
+		this._parent = parent;
+		this.open ();
+	}
+
+	,isModal: function ()
+	{
+		return this._modal || Vn.isMobile ();
+	}
+	
+	,open: function ()
+	{
+		this.node.addEventListener ('mousedown', this._stopEvent);
+
+		this._hideHandler = this.hide.bind (this);
+		document.addEventListener ('mousedown', this._hideHandler);
+
+		if (this.isModal ())
+		{
+			this._background = document.createElement ('div');
+			this._background.className = 'htk-background';
+			document.body.appendChild (this._background);
+
+			setTimeout (this._onOpacityTimeout.bind (this), 0);
+
+			Vn.Node.addClass (this.node, 'modal');
+		}
+		
+		this._isOpen = true;
 		document.body.appendChild (this.node);
-		
-		this.node.addEventListener ('mousedown', this.stopEvent);
-		
-		this.hideHandler = this.hide.bind (this);
-		document.addEventListener ('mousedown', this.hideHandler);
-		
-		this.parent = parent;
+		this.reset ();
+		setTimeout (this._onResetTimeout.bind (this), 0);
+	}
+	
+	,_onOpacityTimeout: function ()
+	{
+		if (this._background)
+			this._background.style.opacity = 1;
+	}
+
+	,_onResetTimeout: function ()
+	{
 		this.reset ();
 	}
 	
 	,reset: function ()
 	{
-		if (!this.parent)
+		if (!this._isOpen)
 			return;
-	
-		var spacing = 5;
-		var rect = this.parent.getBoundingClientRect ();
-		var left = rect.left;
-		var top = rect.top + spacing + this.parent.offsetHeight;
 
+		var margin = 20;
+		var dblMargin = margin * 2;
 		var width = this.node.offsetWidth;
 		var height = this.node.offsetHeight;
+		var innerWidth = Vn.Browser.getInnerWidth ();
+		var innerHeight = Vn.Browser.getInnerHeight ();
+		var style = this.node.style;
 
-		if (left + width > Vn.Browser.getInnerWidth ())
-			left -= width - this.parent.offsetWidth;
-		if (top + height > Vn.Browser.getInnerHeight ())
-			top -= height + this.parent.offsetHeight + spacing * 2;
-
-		if (left < 0)
-			left = 0;
-		if (top < 0)
-			top = 0;	
+		if (width + dblMargin > innerWidth)
+		{
+			width = innerWidth - dblMargin;
+			style.width = width +'px';
+		}
+		if (height + dblMargin > innerHeight)
+		{
+			height = innerHeight - dblMargin;
+			style.height = height +'px';
+		}
 		
-		this.node.style.top = (top) +'px';
-		this.node.style.left = (left) +'px';
-	}
-	
-	,showCenter: function ()
-	{
-		this.parent = null;
-	
-		this.background = document.createElement ('div');
-		this.background.className = 'htk-background';
-		document.body.appendChild (this.background);
-	
-		document.body.appendChild (this.node);
-		
-		var width = this.node.offsetWidth;
-		var height = this.node.offsetHeight;
+		if (this.isModal ())
+		{
+			style.top = '50%';
+			style.left = '50%';
 
-		this.node.style.top = '50%';
-		this.node.style.left = '50%';
-		this.node.style.marginLeft = (-this.node.offsetWidth / 2) +'px';
-		this.node.style.marginTop =  (-this.node.offsetHeight / 2) +'px';
+			style.marginLeft = (-this.node.offsetWidth / 2) +'px';
+			style.marginTop =  (-this.node.offsetHeight / 2) +'px';
+		}
+		else
+		{
+			var spacing = 4;
+			var rect = this._parent.getBoundingClientRect ();
+			var left = rect.left;
+			var top = rect.top + spacing + this._parent.offsetHeight;
 
+			if (left + width > innerWidth)
+				left -= (left + width) - Vn.Browser.getInnerWidth () + margin;
+			if (top + height > innerHeight)
+				top -= height + this._parent.offsetHeight + spacing * 2;
+
+			if (left < 0)
+				left = margin;
+			if (top < 0)
+				top = margin;
+
+			style.top = (top) +'px';
+			style.left = (left) +'px';
+		}
 	}
 
 	,hide: function ()
 	{
-		if (this.background)		
-			Vn.Node.remove (this.background);
+		if (!this._isOpen)
+			return;
+
+		if (this._background)		
+		{
+			Vn.Node.remove (this._background);
+			Vn.Node.removeClass (this.node, 'modal');
+		}
 	
-		this.node.removeEventListener ('mousedown', this.stopEvent)
-		document.removeEventListener ('mousedown', this.hideHandler);
+		this.node.removeEventListener ('mousedown', this._stopEvent)
+		document.removeEventListener ('mousedown', this._hideHandler);
 		Vn.Node.remove (this.node);
-		this.parent = null;
+		this._parent = null;
+		this._isOpen = false;
 		this.signalEmit ('closed');
 	}
 	
-	,stopEvent: function (event)
+	,_stopEvent: function (e)
 	{
-		event.stopPropagation ();
+		e.stopPropagation ();
 	}
 });
+
diff --git a/web/js/htk/repeater.js b/web/js/htk/repeater.js
index f88bd92f..bc78e34c 100755
--- a/web/js/htk/repeater.js
+++ b/web/js/htk/repeater.js
@@ -5,6 +5,9 @@ Htk.Repeater = new Class
 	,Child: 'model'
 	,Properties:
 	{
+		/**
+		 * The source data model.
+		 **/
 		model:
 		{
 			type: Db.Model
@@ -12,31 +15,38 @@ Htk.Repeater = new Class
 			{
 				this.link ({_model: x},
 				{
-					 'status-changed': this.onModelChange
-					,'row-deleted': this.onRowDelete
-					,'row-updated': this.onRowUpdate
-					,'row-inserted': this.onRowInsert
+					 'status-changed': this._onModelChange
+					,'row-deleted': this._onRowDelete
+					,'row-updated': this._onRowUpdate
+					,'row-inserted': this._onRowInsert
 				});
 				
-				this.onModelChange ();
+				this._onModelChange ();
 			}
 			,get: function ()
 			{
 				this._model;
 			}
 		}
+		/**
+		 * The identifier for internal iterator.
+		 **/
 		,formId:
 		{
 			type: String
 			,set: function (x)
 			{
-				this._alias = x;
+				this._formId = x;
 			}
 			,get: function ()
 			{
-				this._alias;
+				this._formId;
 			}
 		}
+		/**
+		 * {Function (Vn.BuilderResult, Db.Form)} Function to call after every
+		 * box rendering.
+		 **/
 		,renderer:
 		{
 			type: Function
@@ -49,6 +59,9 @@ Htk.Repeater = new Class
 				this._renderer;
 			}
 		}
+		/**
+		 * Message that should be displayed when source model is not ready.
+		 **/
 		,emptyMessage:
 		{
 			type: String
@@ -56,151 +69,169 @@ Htk.Repeater = new Class
 		}
 	}
 	
-	,xml: null
-	,parentBuilder: null
-	,_alias: 'form'
+	,_builder: null
+	,_formId: 'form'
 	
-	,initialize: function ()
+	,initialize: function (props)
 	{
-		this.createElement ('div');
-		this.node.className = 'htk-repeater';
+		var div = this.createElement ('div');
+		
+		this._container = document.createElement ('div');
+		this._container.className = 'htk-repeater';
+		div.appendChild (this._container);
+		
+		this.parent (props);
 	}
 	
-	,loadXml: function (builder, node)
+	,loadXml: function (builderResult, node)
 	{
-		this.parent (builder, node);
-	
-		var template = node.getElementsByTagName ('template')[0];
-		//var template = node.querySelector ('template:first-of-type');
+		this.parent (builderResult, node);
 
-		if (template)
-		{
-			this.xml = template.firstElementChild;
-			this.parentBuilder = builder;
-			this.onModelChange ();
-		}
+		var builder = this._builder = new Vn.Builder ();
+		builder.setParent (builderResult);
+		builder.loadXmlFromNode (node.firstElementChild);
+
+		this._onModelChange ();
 	}
 	
 	,getChild: function (index)
 	{
-		return this.node.childNodes[index];
+		return this._container.childNodes[index];
 	}
 	
 	,getBuilder: function (index)
 	{
-		return this.childsData[index].builder;
+		return this._childsData[index].builder;
 	}
 	
 	,getForm: function (index)
 	{
-		return this.childsData[index].form;
+		return this._childsData[index].form;
 	}
 	
-	,buildBox: function (index)
+	,_buildBox: function (index)
 	{
-		var builder = new Vn.Builder ();
-		builder.setParent (this.parentBuilder);
+		var form = new Db.Form ({
+			model: this._model,
+			row: index
+		});
+		
+		this._builder.add (this._formId, form);
+		var res = this._builder.load ();
+		res.link ();
 
-		var form = new Db.Form ();
-		form.model = this._model;
-		form.row = index;
-		builder.add (this._alias, form);
-
-		this.childsData.push ({
-			builder: builder,
+		this._childsData.push ({
+			builder: res,
 			form: form
 		});
-	
-		var mainNode = builder.loadXmlFromNode (this.xml);
 		
 		if (this._renderer)
-			this._renderer (builder, form);
-
-		this.node.appendChild (mainNode);
+			this._renderer (res, form);
+			
+		return res.getMain ();
 	}
 
-	,onModelChange: function ()
+	,_onModelChange: function ()
 	{
-		if (!this._model || !this.xml)
+		if (!this._model || !this._builder)
 			return;
-			
-		Vn.Node.removeChilds (this.node);
-		this.freeChildsData ();
-		this.childsData = [];
+
+		this.node.removeChild (this._container);
+		Vn.Node.removeChilds (this._container);
+
+		this._freeChildsData ();
+		this._childsData = [];
 
 		switch (this._model.status)
 		{
 			case Db.Model.Status.READY:
 			{
 				for (var i = 0; i < this._model.numRows; i++)
-					this.buildBox (i);
+					this._container.appendChild (this._buildBox (i));
 
-				this.showNoRecordsFound ();
+				this._showNoRecordsFound ();
 				break;
 			}
 			case Db.Model.Status.LOADING:
-				this.showMessage (_('Loading'), 'loader-black.gif');
+				this._showMessage (_('Loading'), null);
 				break;
 			case Db.Model.Status.CLEAN:
-				this.showMessage (this.emptyMessage, 'refresh.svg');
+				this._showMessage (this.emptyMessage, 'refresh.svg');
 				break;
 			case Db.Model.Status.ERROR:
-				this.showMessage (_('ErrorLoadingData'), 'error.svg');
+				this._showMessage (_('ErrorLoadingData'), 'error.svg');
 				break;
 		}
-		
+	
+		this.node.appendChild (this._container);
 		this.signalEmit ('change');
 	}
 
-	,showNoRecordsFound: function (count)
+	,_showNoRecordsFound: function (count)
 	{
-		if (this._model.numRows == 0)
-			this.showMessage (_('EmptyList'), 'clean.svg');
+		if (this._model.numRows === 0)
+			this._showMessage (_('EmptyList'), 'clean.svg');
 	}
 
-	,showMessage: function (message, src)
+	,_showMessage: function (message, src)
 	{	
 		var div =  document.createElement ('div');
 		div.className = 'message';
-		this.node.appendChild (div);
+		this._container.appendChild (div);
 		
-		var img = document.createElement ('img');
-		img.alt = '';
-		img.src = 'image/'+ src;
-		div.appendChild (img);
+		if (src)
+		{
+			var img = document.createElement ('img');
+			img.alt = '';
+			img.src = 'image/'+ src;
+			div.appendChild (img);
+		}
+		else
+		{
+			var spinner = new Htk.Spinner ();
+			spinner.start ();
+			div.appendChild (spinner.getNode ());
+		}
 		
 		div.appendChild (document.createTextNode (message));
 	}
 
-	,onRowDelete: function (model, row)
+	,_onRowDelete: function (model, row)
 	{
-		Vn.Node.remove (this.node.childNodes[row]);
-		this.showNoRecordsFound ();
+		Vn.Node.remove (this._container.childNodes[row]);
+		this._unrefChildData (row);
+		this._showNoRecordsFound ();
 	}
 
-	,onRowUpdate: function (model, row, columns)
+	,_onRowUpdate: function (model, row, columns)
 	{
 //		this.form[row].signalEmit ('iter-changed');
 	}
 
-	,onRowInsert: function (model, row)
+	,_onRowInsert: function (model, row)
 	{
-		this.buildBox (row);
+		var box = this._buildBox (row);
+		this._container.appendChild (box);
 	}
 	
-	,freeChildsData: function ()
+	,_freeChildsData: function ()
 	{
-		if (this.childsData)
-		for (var i = 0; i < this.childsData.length; i++)
-		{
-			this.childsData[i].form.unref ();
-			this.childsData[i].builder.unref ();
-		}
+		if (this._childsData)
+		for (var i = 0; i < this._childsData.length; i++)
+			this._unrefChildData (i);
+	}
+	
+	,_unrefChildData: function (index)
+	{
+		var childData = this._childsData[index];
+		childData.form.unref ();
+		childData.builder.unref ();
 	}
 	
 	,destroy: function ()
 	{
-		this.freeChildsData ();
+		this._freeChildsData ();
 		this.parent ();
 	}
 });
+
diff --git a/web/js/htk/spinner.js b/web/js/htk/spinner.js
new file mode 100755
index 00000000..2ebc5d5f
--- /dev/null
+++ b/web/js/htk/spinner.js
@@ -0,0 +1,27 @@
+Htk.Spinner = new Class
+({
+	Extends: Htk.Widget
+	,Tag: 'htk-spinner'
+
+	,initialize: function (props)
+	{
+		var loader = this.createElement ('div');
+		loader.className = 'htk-spinner';
+		
+		var spin = document.createElement ('div');
+		loader.appendChild (spin);
+		
+		this.spin = spin;
+		this.parent (props);
+	}
+	
+	,start: function ()
+	{
+		Vn.Node.addClass (this.spin, 'spinner');
+	}
+	
+	,stop: function ()
+	{
+		Vn.Node.removeClass (this.spin, 'spinner');
+	}
+});
diff --git a/web/global/style.css b/web/js/htk/style.css
similarity index 52%
rename from web/global/style.css
rename to web/js/htk/style.css
index eb284c5d..c18f6abd 100755
--- a/web/global/style.css
+++ b/web/js/htk/style.css
@@ -1,419 +1,26 @@
 
-/* Responsive */
-
-@media screen
-{
-	* { font-size: 8pt; }
-}
-@media screen and (min-device-width: 1150px)
-{
-	* { font-size: 10pt; }
-}
-@media screen and (min-device-width: 1850px)
-{
-	* { font-size: 12pt; }
-}
-
-/* Global */
-
-@font-face
-{
-    font-family: 'Open Sans';
-    src: url(opensans.ttf) format('truetype');
-}
-body
-{
-	margin: 0;
-}
-body,
-label,
-button,
-input,
-textarea
-{
-	font-size: 1em;
-	font-family: 'Open Sans', 'Verdana', 'Sans';
-}
-iframe
-{
-	border: 0;
-}
-fieldset,
-div
-{
-	margin: 0;
-}
-form
-{
-	padding: 0;
-	margin: 0;
-}
-table
-{
-	width: 100%;
-}
-a:link,
-a:visited,
-a:active
-{
-	color: #000;
-	text-decoration: none;
-}
-a:hover
-{
-	text-decoration: none;
-}
-a img
-{
-	padding: 1px;
-	border: 1px solid #EEE;
-	border-color: transparent;
-}
-a img:hover
-{
-	border-color: #999;
-}
-h1, h2, h3, h4, h5, h6
-{
-	margin: 0;
-	padding: 0.2em;
-}
-h1
-{
-	font-size: 1.5em;
-}
-h2
-{
-	font-size: 1.3em;
-}
-p
-{
-	margin: 0.8em 0;
-}
-
-/* Inputs */
-
-input[type=text],
-input[type=password],
-input[type=file],
-input[type=number],
-textarea,
-select
-{
-	border: 1px solid #CCD;
-	margin: 0.2em;
-	border-radius: 0.1em;
-	box-shadow: 0 0.1em 0.1em #CCC;
-}
-
-input[type=text],
-input[type=password],
-input[type=file],
-input[type=number],
-textarea
-{
-	padding: 0.3em;
-}
-select
-{
-	background-color: white;
-	font-size: 1.1em;
-	height: 1.8em;
-}
-option
-{
-	padding: 0.3em;
-	border-width: 0;
-	font-weight: normal;
-	font-size: 1em;
-}
-select,
-option
-{
-	cursor: pointer;
-}
-input[type=text],
-input[type=password]
-{
-	height: 1.6em;
-}
-textarea
-{
-	height: 3.5em;
-	width: 20em;
-}
-input[type=text]:focus,
-input[type=password]:focus,
-textarea:focus
-{
-	background-color: #EEF;
-	border-color: #BBC;
-}
-input[type=checkbox],
-input[type=radio]
-{
-	cursor: pointer;
-	margin: 0.2em;
-	padding: 0.3em;
-	width: 0.8em;
-	height: 0.8em;
-}
-
-/* Buttons */
-
-button,
-input[type=submit],
-input[type=button]
-{
-	border: none;
-	background-color: transparent;
-	color: white;
-	padding: 0.5em;
-	cursor: pointer;
-	border-radius: 0.1em;
-}
-button:hover,
-input[type=submit]:hover,
-input[type=button]:hover
-{
-	background-color: rgba(1, 1, 1, 0.1);
-}
-
-/* Flat button */
-
-button.flat,
-input.button
-{
-	border: none;
-	border-radius: 0.1em;
-	box-shadow: 0 0.2em 0.2em #DDD;
-	background-color: #AD4;
-	color: black;
-}
-button.flat:hover,
-input.button:hover
-{
-	background-color: #9C3;
-	cursor: pointer;
-}
-button.flat:disabled,
-input.button:disabled
-{
-	color: gray;
-}
-
-/* Thin button */
-
-button.thin
-{
-	background-color: transparent;
-	border: none;
-	color: #008D77;
-	text-transform: uppercase;
-}
-button.thin:hover
-{
-	background-color: rgba(1,1,1,0.1);
-}
-button.thin:disabled
-{
-	color: gray;
-}
-
-/* Image */
-
-img.editable
-{
-	cursor: pointer;
-}
-
-/* Button */
-
-.htk-button img
-{
-	height: 1.5em;
-}
-
-/* Float */
-
-.clear
-{
-	clear: both;
-}
-
-/* Box */
-
-.box
-{
-	background-color: white;
-	margin: 0 auto;
-	border-radius: 0.1em;
-	box-shadow: 0 0.2em 0.2em #CCC;
-}
-.box .header
-{
-	padding: 0.6em 0.8em;
-	margin: 0;
-	background-color: #009688;
-	color: white;
-}
-.box .header > h1
-{
-	color: white;
-	text-align: left;
-	font-size: 1.6em;
-	line-height: 2em;
-	font-weight: normal;
-	display: inline;
-}
-.box .body
-{
-	padding: 2em;
-}
-
-/* Form */
-
-.form
-{
-	margin: 0 auto;
-}
-
-.form-group
-{
-	padding: 0.4em;
-}
-.form-group > label
-{
-	display: block;
-	margin-bottom: 0.5em;
-}
-.form-group > input[type=text],
-.form-group > input[type=password],
-.form-group > select,
-.form-group > textarea
-{
-	margin: 0;
-	width: 100%;
-}
-
-/* Action bar */
-
-.action-bar
-{
-	float: right;
-	padding: 0;
-	margin-top: 0.3em;
-}
-.action-bar > *
-{
-	float: left;
-	padding: 0.4em;
-}
-.action-bar > button
-{
-	border-left: 1px solid white;
-}
-.action-bar > button:first-child
-{
-	border-left: none;
-}
-.action-bar > button:hover
-{
-	background-color: rgba(1, 1, 1, 0.2);
-}
-.action-bar > button > img
-{
-	vertical-align: middle;
-	margin-right: 0.4em;
-	height: 1.4em;
-}
-
-/* Form */
-
-table.form
-{
-	padding: 1em;
-	border-collapse: separate;
-	border-spacing: 0.3em;
-}
-table.form td.label
-{
-	width: 45%;
-	text-align: right;
-}
-table.form tr
-{
-	height: 2.8em;
-}
-
-/* Icon */
-
-img.icon
-{
-	height: 1.5em;
-}
-
-/* Masonry */
-
-.masonry
-{
-	margin: 0 auto;
-	text-align: left;
-}
-.masonry-box
-{
-	width: 100%;
-	display: inline-block;
-	vertical-align: top;
-}
-@media screen and (min-width: 1000px) and (max-width: 1399px)
-{
-	.masonry-box
-	{
-		width: 50%;
-		display: block;
-		float: left;
-		clear: left;
-	}
-	.masonry-box:nth-child(2n+0)
-	{
-		float: right;
-		clear: right;
-	}
-}
-@media screen and (min-width: 1400px)
-{
-	.masonry-box { width: 33.3%; }
-}
-@media screen and (min-width: 2000px)
-{
-	.masonry-box { width: 25%; }
-}
-
 /* Grid */
 
 .htk-grid
 {
 	margin: auto;
 	border-collapse: collapse;
-	text-align: center;
 }
 .htk-grid > thead > tr,
 .htk-grid > tfoot > tr
 {
 	background-color:  #009688;
 	vertical-align: middle;
-	text-align: center;
 	height: 3em;
 }
-.htk-grid > thead th
+.htk-grid th
 {
 	color: white;
 	cursor: pointer;
 	font-weight: normal;
 	padding: 0 0.4em;
 }
-.htk-grid > thead th:hover
+.htk-grid th:hover
 {
 	background-color: rgba(1, 1, 1, 0.2);
 }
@@ -430,16 +37,6 @@ img.icon
 {
 	background-color: transparent;
 }
-.htk-grid .message
-{
-	height: 5em;
-}
-.htk-grid .message img
-{
-	vertical-align: middle;
-	padding: 0.8em;
-	height: 1.8em;
-}
 .htk-grid > tbody tr
 {
 	border-top: 1px solid #DDD;
@@ -453,22 +50,59 @@ img.icon
 	margin: 0;
 	padding: 0 0.5em;
 }
-.htk-grid > tbody td:first-child,
-.htk-grid > thead th:first-child
+.htk-grid th,
+.htk-grid td
+{
+	text-align: left;
+}
+.htk-grid td:first-child,
+.htk-grid th:first-child
 {
 	padding-left: 1em;
 }
-.htk-grid > tbody td:last-child,
-.htk-grid > thead th:last-child
+.htk-grid td:last-child,
+.htk-grid th:last-child
 {
 	padding-right: 1em;
 }
-.cell-spin
+.htk-grid .message
+{
+	padding: 1.5em;
+	text-align: center;
+}
+.htk-grid .message > *
+{
+	display: inline-block;
+	vertical-align: middle;
+	padding-right: 0.8em;
+}
+.htk-grid .message > img
+{
+	height: 1.8em;
+}
+
+/* Grid cells */
+
+th.cell-spin
+{
+	text-align: right;
+}
+td.cell-spin
 {
 	width: 2.5em;
 	text-align: right;
 }
-.cell-button
+th.cell-check,
+th.cell-radio
+{
+	text-align: center;
+}
+td.cell-button
+{
+	max-width: 2em;
+	text-align: center;
+}
+td.cell-button > button
 {
 	margin: 0;
 	padding: 0.5em;
@@ -476,17 +110,21 @@ img.icon
 	background-color: transparent;
 	border-radius: 0.1em;
 }
-.cell-button:hover
+td.cell-button > button:hover
 {
 	background-color: rgba(1, 1, 1, 0.1);
 }
-.cell-button img
+td.cell-button img
 {
 	height: 1.5em;
 	display: block;
 	margin: auto;
 }
-.cell-image > img
+td.cell-image
+{
+	text-align: center;
+}
+td.cell-image img
 {
 	max-width: 2.5em;
 	max-height: 2.5em;
@@ -494,21 +132,66 @@ img.icon
 	margin: auto;
 }
 
+/* Select */
+
+.htk-select
+{
+	width: 100%;
+	height: 2em;
+	text-align: left;
+}
+.htk-select-menu
+{
+	height: 100%;
+	max-height: 80em;
+	overflow: auto;
+	min-width: 14em;
+}
+.htk-select-menu tbody > tr
+{
+	border-top: none;
+	height: 2.5em;
+}
+.htk-select-menu td.message
+{
+	padding: 1em;
+}
+.htk-select-menu tr:hover
+{
+	background-color: rgba(1, 1, 1, 0.1);
+	cursor: pointer;
+}
+.htk-select-menu td
+{
+	max-width: 11em;
+	overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+/* Button */
+
+.htk-button > span
+{
+	margin-left: .5em;
+}
+
 /* Repater */
 
 .htk-repeater > .message
 {
-	padding: 1em 0;
+	padding: 1.5em;
 	text-align: center;
 }
 .htk-repeater > .message > *
 {
 	vertical-align: middle;
 }
-.htk-repeater > .message > img
+.htk-repeater > .message > img,
+.htk-repeater > .message > .htk-spinner
 {
-	padding: 0.8em;
-	padding-left: 0;
+	display: inline-block;
+	padding-right: .8em;
 	height: 1.8em;
 }
 
@@ -595,20 +278,12 @@ img.icon
 	color: white;
 }
 
-/* Date chooser */
+/* Image */
 
-.htk-date-chooser > button
+.htk-image.editable:hover
 {
-	margin: 0.2em;
-	padding: 0.3em;
-	background-color: white;
-	color: black;
-	text-align: left;
-	min-width: 9em;
-	min-height: 2.3em;
-	border: 1px solid #CCD;
-	border-radius: 0.1em;
-	box-shadow: 0 0.1em 0.1em #CCC;
+	cursor: pointer;
+	opacity: 0.85;
 }
 
 /* Full image */
@@ -619,20 +294,24 @@ img.icon
 	position: fixed;
 	background-color: #FFF;
 	text-align: center;
-	border: 1px solid #999;
-	border-radius: 2px;
+	box-shadow: 0 0 0.4em #666;
+	border-radius: .2em;
+	overflow: hidden;
 }
 .htk-full-image-loader
 {
 	z-index: 110;
 	position: fixed;
+	top: 50%;
+	left: 50%;
+	margin-top: -1.6em;
+	margin-left: -1.6em;
 	background-color: #FFF;
-	border: 1px solid #999;
-	border-radius: 0.1em;
-}
-.htk-full-image-loader img
-{
-	padding: 1em;
+	padding: .7em;
+	box-shadow: 0 0 0.4em #666;
+	height: 1.8em;
+	border-radius: 50%;
+	overflow: hidden;
 }
 
 /* Toast */
@@ -645,7 +324,7 @@ img.icon
 	left: 50%;
 	top: 4em;
 	width: 21em;
-	margin-left: -11em;
+	margin-left: -10.5em;
 	text-align: center;
 	overflow: auto;
 	max-height: 40em;
@@ -660,15 +339,18 @@ img.icon
 }
 .htk-toast > .message
 {
-	background-color: #BFB;
+	background-color: #B3E5FC;
+	color: #037;
 }
 .htk-toast > .warning
 {
-	background-color: #FFB;
+	background-color: #FFE0B2;
+	color: #C30;
 }
 .htk-toast > .error
 {
-	background-color: #FBB;
+	background-color: #FFCDD2;
+	color: #A00;
 }
 
 /* Popup */
@@ -678,10 +360,21 @@ img.icon
 	z-index: 200;
 	display: block;
 	position: fixed;
+	overflow: hidden;
 	background-color: white;
-	border-radius: 0.1em;
-	box-shadow: 0 0 0.4em #666;
+	border-radius: 0.15em;
+	box-shadow: 0 0 0.4em rgba(1, 1, 1, 0.6);
+	box-sizing: content-box;
 }
+.htk-popup > *
+{
+	border-radius: 0.1em;
+}
+.htk-popup.modal
+{
+	font-size: 1.2em;
+}
+
 .htk-background
 {
 	position: fixed;
@@ -691,6 +384,8 @@ img.icon
 	bottom: 0;
 	z-index: 190;
 	background-color: rgba(1, 1, 1, 0.7);
+	opacity: 0;
+	transition: opacity 200ms ease-in-out;
 }
 
 /* Image editor */
@@ -820,3 +515,78 @@ img.icon
 	opacity: .7;
 }
 
+/* Search entry */
+
+.htk-search-entry
+{
+	background-color: white;
+	height: 2.2em;
+}
+.htk-search-entry > *
+{
+	display: inline-block;
+	vertical-align: middle;
+}
+.htk-search-entry > img
+{
+	margin: 0;
+	height: 1.5em;
+	margin: 0 .4em;
+}
+.htk-search-entry > .entry
+{
+	margin: 0;
+	border: none;
+	width: 8em;
+	box-shadow: none;
+}
+.htk-search-entry > .entry:focus
+{
+	background-color: initial;
+}
+
+/* Loader */
+
+.htk-spinner
+{
+	position: relative;
+	display: inline-block;
+	box-sizing: border-box;
+}
+.htk-spinner > .spinner
+{
+	width: 1.8em;
+	height: 1.8em;
+}
+.htk-spinner > .spinner:before
+{
+	content: 'Loading…';
+	position: absolute;
+	left: 0;
+	width: 1.2em;
+	height: 1.2em;
+}
+.htk-spinner > .spinner:not(:required):before
+{
+	content: '';
+	border-radius: 50%;
+	border: .3em solid transparent;
+	border-top-color: #666;
+	border-left-color: #666;
+	animation: spinner 1s linear infinite;
+	-webkit-animation: spinner 1s linear infinite;
+}
+.htk-spinner.dark > .spinner:not(:required):before
+{
+	border-top-color: white;
+	border-left-color: white;
+}
+@keyframes spinner
+{
+	to {transform: rotate(360deg);}
+}
+@-webkit-keyframes spinner
+{
+	to {-webkit-transform: rotate(360deg);}
+}
+
diff --git a/web/js/htk/widget.js b/web/js/htk/widget.js
index 4ffcc3c3..45ec4b5c 100755
--- a/web/js/htk/widget.js
+++ b/web/js/htk/widget.js
@@ -23,10 +23,13 @@ Htk.Widget = new Class
 	
 	,builderInit: function (path)
 	{
-		this.builder = new Vn.Builder ();
-		this.builder.signalData = this;
-		this.builder.loadXml (Vn.getXml (path));
-		this.node = this.builder.get ('main');
+		var builder = new Vn.Builder ();
+		builder.signalData = this;
+		builder.loadXml (path);
+
+		var res = this.builder = builder.load ();
+		this.node = res.$('main');
+		res.link ();
 	}
 	
 	,createElement: function (tagName)
@@ -43,7 +46,7 @@ Htk.Widget = new Class
 	,$: function (id)
 	{
 		if (this.builder)
-			return this.builder.get (id);
+			return this.builder.getById (id);
 			
 		return null;
 	}
@@ -52,4 +55,12 @@ Htk.Widget = new Class
 	{
 		Vn.Node.remove (this.node);
 	}
+
+	,_destroy: function ()
+	{
+		if (this.builder)
+			this.builder.unref ();
+
+		this.parent ();
+	}
 });
diff --git a/web/js/misc/main.js b/web/js/misc/main.js
new file mode 100755
index 00000000..d6fc5bd0
--- /dev/null
+++ b/web/js/misc/main.js
@@ -0,0 +1,3 @@
+
+Vn.include ('js/misc/mootools');
+
diff --git a/web/js/misc/main.php b/web/js/misc/main.php
deleted file mode 100755
index e5344785..00000000
--- a/web/js/misc/main.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use Vn\Hedera\Js;
-
-Js::includeFile ('js/misc/tinymce/tinymce.min.js');
-Js::includeFile ('js/misc/mootools.js');
-
-?>
diff --git a/web/js/sql/batch.js b/web/js/sql/batch.js
index 27d5f3ec..d3dcf170 100755
--- a/web/js/sql/batch.js
+++ b/web/js/sql/batch.js
@@ -38,9 +38,9 @@ Sql.Batch = new Class
 
 			if (id)
 			{
-				if (object = builder.get (childs[i].getAttribute ('param')))
+				if (object = builder.getById (childs[i].getAttribute ('param')))
 					this.addParam (id, object);
-				else if (object = builder.get (childs[i].getAttribute ('object')))
+				else if (object = builder.getById (childs[i].getAttribute ('object')))
 					this.addObject (id, object);
 			}
 		}
@@ -78,6 +78,12 @@ Sql.Batch = new Class
 		this._addObject (id,
 			new Sql.Value ({value: value}));
 	}
+	
+	,addValues: function (values)
+	{
+		for (var id in values)
+			this.addValue (id, values[id]);
+	}
 
 	,addParam: function (id, param)
 	{
@@ -85,6 +91,22 @@ Sql.Batch = new Class
 			new Sql.Value ({param: param}));
 	}
 	
+	,getValue: function (id)
+	{
+		var object = this.objects[id];
+		
+		if (object instanceof Sql.Value)
+			return object.value;
+			
+		return null;
+	}
+	
+	,addParams: function (params)
+	{
+		for (var id in params)
+			this.addParam (id, params[id]);
+	}
+	
 	,remove: function (id)
 	{
 		if (this.objects[id])
diff --git a/web/js/sql/expr.js b/web/js/sql/expr.js
index 57d0f540..99f76d19 100755
--- a/web/js/sql/expr.js
+++ b/web/js/sql/expr.js
@@ -5,17 +5,5 @@ Sql.Expr = new Class
 ({
 	Extends: Sql.Object
 	,Tag: 'sql-expr'
-	,Parent: 'operation'
-	,Properties:
-	{
-		operation:
-		{
-			type: Sql.Operation
-			,set: function (x)
-			{
-				x.exprs.add (this);
-			}
-		}
-	}
 });
 
diff --git a/web/js/sql/filter-item.js b/web/js/sql/filter-item.js
index 62a18aad..bfb6d075 100755
--- a/web/js/sql/filter-item.js
+++ b/web/js/sql/filter-item.js
@@ -5,12 +5,13 @@ Sql.FilterItem = new Class
 ({
 	Extends: Sql.Operation
 	,Tag: 'sql-filter-item'
-
-	,render: function (batch)
+	,Properties:
 	{
-		if (!this.isReady ())
-			return 'TRUE';
-			
-		return this.parent (batch);
+		primary:
+		{
+			type: Boolean
+		}
 	}
+	
+	,primary: true
 });
diff --git a/web/js/sql/filter.js b/web/js/sql/filter.js
index c296f989..d308465d 100755
--- a/web/js/sql/filter.js
+++ b/web/js/sql/filter.js
@@ -5,15 +5,43 @@ Sql.Filter = new Class
 ({
 	Extends: Sql.Operation
 	,Tag: 'sql-filter'
+	,Properties:
+	{
+		alwaysReady:
+		{
+			type: Boolean
+		}
+	}
 
 	,isReady: function ()
 	{
-		var e = this.exprs.getArray ();
+		if (this.alwaysReady)
+			return true;
 	
+		var e = this.exprs.getArray ();
 		for (var i = 0; i < e.length; i++)
-		if (e[i].isReady ())
+		if (e[i].isReady () && e[i].primary)
 			return true;
 				
 		return false;
 	}
+
+	,render: function (batch)
+	{
+		var isReady = false;
+		var newOp = new Sql.Operation ({type: this.type});
+	
+		var e = this.exprs.getArray ();
+		for (var i = 0; i < e.length; i++)
+		if (e[i].isReady ())
+		{
+			newOp.exprs.add (e[i]);
+			isReady = true;
+		}
+			
+		if (!isReady)
+			return 'TRUE';
+			
+		return newOp.render (batch);
+	}
 });
diff --git a/web/js/sql/main.js b/web/js/sql/main.js
index 21358f87..ddc042ce 100755
--- a/web/js/sql/main.js
+++ b/web/js/sql/main.js
@@ -1,5 +1,29 @@
-/**
- * The namespace.
- **/
-var Sql = {};
+
+Vn.include ('js/vn/main');
+Vn.includeLib ('sql',
+[
+	 'sql'
+	,'object'
+	,'holder'
+	,'batch'
+	,'list'
+	,'expr'
+	,'value'
+	,'field'
+	,'function'
+	,'operation'
+	,'target'
+	,'table'
+	,'stmt'
+	,'dml'
+	,'string'
+	,'delete'
+	,'insert'
+	,'select'
+	,'update'
+	,'multi-stmt'
+	,'filter'
+	,'filter-item'
+	,'search-tags'
+]);
 
diff --git a/web/js/sql/main.php b/web/js/sql/main.php
deleted file mode 100755
index 03f69755..00000000
--- a/web/js/sql/main.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-require_once ('js/vn/main.php');
-
-Vn\Hedera\Js::includeLib ('sql'
-	,'main'
-	,'object'
-	,'holder'
-	,'batch'
-	,'list'
-	,'expr'
-	,'value'
-	,'field'
-	,'function'
-	,'operation'
-	,'target'
-	,'table'
-	,'stmt'
-	,'dml'
-	,'string'
-	,'delete'
-	,'insert'
-	,'select'
-	,'update'
-	,'multi-stmt'
-	,'filter'
-	,'filter-item'
-	,'search-tags'
-);
-
-?>
diff --git a/web/js/sql/operation.js b/web/js/sql/operation.js
index 10f7dfa6..597f1093 100755
--- a/web/js/sql/operation.js
+++ b/web/js/sql/operation.js
@@ -8,10 +8,11 @@ Sql.Operation = new Class ().extend
 ({
 	Type:
 	{
-		 EQUAL : 0
-		,LIKE  : 1
-		,AND   : 2
-		,OR    : 3
+		 EQUAL  : 0
+		,LIKE   : 1
+		,AND    : 2
+		,OR     : 3
+		,REGEXP : 4
 	}
 	,Operators:
 	[
@@ -19,6 +20,7 @@ Sql.Operation = new Class ().extend
 		,'LIKE'
 		,'AND'
 		,'OR'
+		,'REGEXP'
 	]
 });
 
@@ -40,6 +42,11 @@ Sql.Operation.implement
 		this.parent (props);
 		this.link ({exprs: new Sql.List ()}, {'changed': this.onListChange});
 	}
+	
+	,appendChild: function (child)
+	{
+		this.exprs.add (child);
+	}
 
 	,onListChange: function ()
 	{
diff --git a/web/js/sql/search-tags.js b/web/js/sql/search-tags.js
index 27f80b74..df7d81e8 100755
--- a/web/js/sql/search-tags.js
+++ b/web/js/sql/search-tags.js
@@ -10,7 +10,7 @@ Sql.SearchTags = new Class
 	{
 		if (typeof this._value == 'string')
 		{
-			var value = this._value.replace (/^| +|$/g, '%');
+			var value = this._value.replace (/^|\s+|$/g, '%');
 			return "'" + value.replace (this.regexp, this.replaceFunc) + "'";
 		}
 		else
diff --git a/web/js/sql/sql.js b/web/js/sql/sql.js
new file mode 100755
index 00000000..21358f87
--- /dev/null
+++ b/web/js/sql/sql.js
@@ -0,0 +1,5 @@
+/**
+ * The namespace.
+ **/
+var Sql = {};
+
diff --git a/web/js/sql/string.js b/web/js/sql/string.js
index 2a7ac8ce..e253d685 100755
--- a/web/js/sql/string.js
+++ b/web/js/sql/string.js
@@ -29,12 +29,14 @@ Sql.String = new Class
 		return this.query.replace (this.regexp, this.replaceFunc.bind (this, batch));
 	}
 
-	,findHolders: function (batch)
+	,findHolders: function ()
 	{
 		var ids = this.query.match (this.regexp);
 		
 		if (ids)
 		for (var i = 0; i < ids.length; i++)
-			batch.add (ids[i].substr (1));
+			ids[i] = ids[i].substr (1);
+			
+		return ids;
 	}
 });
diff --git a/web/js/vn/builder.js b/web/js/vn/builder.js
index c23f641b..1560f086 100755
--- a/web/js/vn/builder.js
+++ b/web/js/vn/builder.js
@@ -4,161 +4,527 @@
 Vn.Builder = new Class
 ({
 	 Extends: Vn.Object
-	,objectMap: {}
-	,tags: {}
-
-	,loadXml: function (xmlDoc)
+	,_addedMap: {}
+	,_contexts: null
+	
+	,add: function (id, object)
 	{
+		this._addedMap[id] = object;
+	}
+	
+	,setParent: function (parentResult)
+	{
+		this._parentResult = parentResult;
+		
+		if (parentResult && !this.signalData)
+			this.signalData = parentResult.builder.signalData;
+	}
+	
+	,getMain: function (result)
+	{
+		return result.objects[this._mainContext];
+	}
+	
+	,getById: function (result, objectId)
+	{
+		var index = this._contextMap[objectId];
+		
+		if (index !== undefined)
+			return result.objects[index];
+		else if (this._parentResult)
+			return this._parentResult.getById (objectId);
+
+		return null;
+	}
+	
+	,getByTagName: function (result, tagName)
+	{	
+		var tags = this._tags[tagName];
+	
+		if (tags)
+		{
+			var arr = new Array (tags.length);
+			
+			for (var i = 0; i < tags.length; i++)
+				arr[i] = result.objects[tags[i]];
+
+			return arr;
+		}
+		
+		return [];
+	}
+
+	/**
+	 * Compiles an XML file.
+	 *
+	 * @path String The XML path
+	 * @dstDocument Document The document used to create the nodes
+	 * @return %true on success, %false othersise
+	 **/
+	,loadXml: function (path, dstDocument)
+	{
+		var xmlDoc = Vn.getXml (path);
+	
 		if (!xmlDoc)
 			return false;
 
+		this._compileInit (dstDocument);
+		this._path = path;
+
 		var docElement = xmlDoc.documentElement;
 		
 		if (docElement.tagName !== 'vn')
+		{
+			this._showError ('Malformed XML');
+			this._contexts = null;
 			return false;
+		}
 
-		this.contexts = [];
 		var childs = docElement.childNodes;
 
 		if (childs)
 		for (var i = 0; i < childs.length; i++)
-			this.loadNode (childs[i], null);
+			this._compileNode (childs[i]);
 
-		this.resolveProperties ();
-		delete this.contexts;
+		this._compileEnd ();
 		return true;
 	}
 	
-	,loadXmlFromNode: function (node)
+	/**
+	 * Compiles a single DOM node.
+	 *
+	 * @path Node The DOM node
+	 * @dstDocument Document The document used to create the nodes
+	 * @return %true on success, %false othersise
+	 **/
+	,loadXmlFromNode: function (node, dstDocument)
 	{
-		this.contexts = [];
-		var mainNode = this.loadNode (node);
-		this.resolveProperties ();
-		delete this.contexts;
-		return mainNode;
+		this._compileInit (dstDocument);
+		this._mainContext = this._compileNode (node).id;
+		this._compileEnd ();
+		return true;
 	}
 	
-	,add: function (id, object)
+	,load: function ()
 	{
-		this.objectMap[id] = object;
-	}
-
-	,loadNode: function (node)
-	{
-		var customNode;
-		var htmlNode = null;
-		var tagName = null;
-
-		if (node.tagName)
-			tagName = node.tagName.toLowerCase ();
-		
-		if (tagName === 't')
-		{
-			htmlNode = document.createTextNode (_(node.firstChild.textContent));
-		}
-		else if (!tagName)
-		{
-			htmlNode = document.importNode (node, false);
-		}
-		else if ((customNode = this.loadCustomNode (node, null)))
-		{
-			if (customNode instanceof Htk.Widget)
-				htmlNode = customNode.getNode ();
-		}
-		else
-		{
-			htmlNode = document.createElement (tagName);
-
-			var a = node.attributes;
-
-			for (var i = 0; i < a.length; i++)
-			{
-				var nodeName = a[i].nodeName;
-				var nodeValue = a[i].nodeValue;
-				
-				if (/^on-\w+/.test (nodeName))
-				{
-					var method = this.getMethod (nodeValue);
-					htmlNode.addEventListener (
-						nodeName.substr (3), method.bind (this.signalData));
-				}			
-				else if (nodeName === 'id')
-				{
-					this.objectMap[nodeValue] = htmlNode;
-				}
-				else
-					htmlNode.setAttribute (nodeName,
-						this.translateValue (nodeValue));
-			}
-
-			var childs = node.childNodes;
-	
-			if (childs)
-			for (var i = 0; i < childs.length; i++)
-			{
-				var htmlChild = this.loadNode (childs[i]);
-				
-				if (htmlChild)
-					htmlNode.appendChild (htmlChild);
-			}
-		}
-
-		return htmlNode;
-	}
-	
-	,loadCustomNode: function (node, parentContext)
-	{
-		if (!node.tagName)
+		if (this._contexts === null)
 			return null;
 	
-		var tagName = node.tagName.toLowerCase ();
+		var contexts = this._contexts;
+		var len = contexts.length;
+		var objects = new Array (len);
+	
+		for (var i = 0; i < len; i++)
+		{
+			var context = contexts[i];
+			
+			if (context.tagName)
+				objects[i] = this.elementInstantiate (context);
+			else if (context.klass)
+				objects[i] = this.objectInstantiate (context);
+			else
+				objects[i] = this.textInstantiate (context);
+		}
+		
+		return new BuilderResult (this, objects);
+	}
+	
+	,link: function (result)
+	{
+		var objects = result.objects;
+	
+		for (var i = this._links.length - 1; i >= 0; i--)
+		{
+			var l = this._links[i];
+			var addedObject = this._addedMap[l.objectId];
+			
+			if (addedObject)
+				if (l.prop)
+					objects[l.context.id][l.prop] = addedObject;
+				else
+					objects[l.context.id].appendChild (addedObject);
+			else
+				this._showError ('Referenced unexistent object with id \'%s\'',
+					l.objectId);
+		}
+
+		var contexts = this._contexts;
+		for (var i = 0; i < contexts.length; i++)
+		{
+			var context = contexts[i];
+			var object = objects[i];
+
+			if (context.tagName)
+				this.elementLink (context, object, objects, result);
+			else if (context.klass)
+				this.objectLink (context, object, objects, result);
+		}
+	}
+	
+	,_compileInit: function (dstDocument)
+	{
+		this._path = null;
+		this._tags = {};
+		this._contexts = [];
+		this._contextMap = {};
+		this._links = [];
+		this._mainContext = null;
+		this._document = dstDocument ? dstDocument : document;
+	}
+	
+	,_compileEnd: function (node)
+	{
+		for (var i = this._links.length - 1; i >= 0; i--)
+		{
+			var l = this._links[i];
+			var contextId = this._contextMap[l.objectId]
+			
+			if (contextId != undefined)
+			{
+				if (l.prop)
+					l.context.objectProps[l.prop] = contextId;
+				else
+					l.context.childs.push (contextId);
+				
+				this._links.splice (i, 1);
+			}
+			else
+			{
+				var object = this._addedMap[l.objectId];
+				
+				if (!object && this._parentResult)
+					object = this._parentResult.getById (l.objectId);
+			
+				if (object)
+				{
+					l.context.props[l.prop] = object;
+					this._links.splice (i, 1);
+				}
+			}
+		}
+	}
+
+	,_compileNode: function (node)
+	{
+		var context = null;
+		var tagName = null;
+
+		if (node.nodeType === Node.ELEMENT_NODE)
+			tagName = node.tagName.toLowerCase ();
+		else if (node.nodeType !== Node.TEXT_NODE
+		|| /^[\n\r\t]*$/.test (node.textContent))
+			return null;
+			
+		var context = 
+			   this.textCompile (node, tagName)
+			|| this.objectCompile (node, tagName)
+			|| this.elementCompile (node, tagName);
+
+		context.id = this._contexts.length;
+
+		if (tagName)
+		{
+			var nodeId = node.getAttribute ('id');
+	
+			if (nodeId)
+				this._contextMap[nodeId] = context.id;
+
+			var tags = this._tags[tagName];
+		
+			if (!tags)
+				this._tags[tagName] = tags = [];
+			
+			tags.push (context.id);
+		}
+
+		this._contexts.push (context);
+		return context;
+	}
+
+	/**
+	 * Creates a text node context.
+	 **/
+	,textCompile: function (node, tagName)
+	{
+		if (!tagName)
+			var text = node.textContent;
+		else if (tagName === 't')
+			var text = _(node.firstChild.textContent); 
+		else
+			return null;
+
+		return {text: text};
+	}
+	
+	,textInstantiate: function (context)
+	{
+		return this._document.createTextNode (context.text);
+	}
+	
+	/**
+	 * Creates a object context.
+	 **/
+	,objectCompile: function (node, tagName)
+	{
 		var klass = Vn.customTags[tagName];
 		
 		if (!klass)
 			return null;
 
-		var customNode = new klass ();
-		
-		if (!this.tags[tagName])
-			this.tags[tagName] = [];
-		
-		this.tags[tagName].push (customNode);
-
-		var context = {
-			 node: node
-			,parent: parentContext
-			,object: customNode
-			,klass: klass
-		};
-		this.contexts.push (context);
-		
-		var nodeId = node.getAttribute ('id');
-		
-		if (nodeId)
-			this.objectMap[nodeId] = customNode;
-		
-		var childs = node.childNodes;
-	
-		if (childs)
-		for (var i = 0; i < childs.length; i++)
-			this.loadCustomNode (childs[i], context);
+		var props = {};
+		var objectProps = {};
+		var childs = [];
+		var events = {};
 			
-		return customNode;
+		var context = {
+			klass: klass,
+			props: props,
+			objectProps: objectProps,
+			childs: childs,
+			events: events,
+			custom: null
+		};
+
+		var a = node.attributes;
+
+		for (var i = 0; i < a.length; i++)
+		{
+			var attribute = a[i].nodeName;
+			var value = a[i].nodeValue;
+
+			if (this._isEvent (attribute))
+			{
+				var handler = this._getMethod (value)
+				
+				if (handler)
+					events[attribute.substr (3)] = handler;
+			}
+			else if (!/^(id|property)$/.test (attribute))
+			{
+				this.propCompile (context, klass, props,
+					node, attribute, value);
+			}
+		}
+		
+		var childNodes = node.childNodes;
+
+		if (childNodes)
+		for (var i = 0; i < childNodes.length; i++)
+		{
+			var child = childNodes[i];
+			
+			if (child.nodeType !== Node.ELEMENT_NODE)
+				continue;
+
+			var childContext;
+			var childTagName = child.tagName.toLowerCase ();
+			
+			if (childTagName === 'pointer')
+			{
+				this._addLink (context, null, child.getAttribute ('object'));
+			}
+			else if (childTagName === 'custom')
+			{
+				context.custom = child;
+			}
+			else if (childContext = this._compileNode (child))
+			{
+				var prop = child.getAttribute ('property');
+	
+				if (prop)
+				{
+					prop = prop.replace (/-./g, this._replaceFunc); 
+					objectProps[prop] = childContext.id;
+				}
+				else
+					childs.push (childContext.id);
+			}
+		}
+
+		return context;
 	}
 
-	,translateValue: function (value)
+	,propCompile: function (context, klass, props, node, attribute, value)
+	{
+		var isLink = false;
+		var newValue = null;
+		var propName = attribute.replace (/-./g, this._replaceFunc);
+		var propInfo = klass.Properties[propName];
+
+		if (!propInfo)
+		{
+			this._showError ('Attribute \'%s\' not valid for tag \'%s\'',
+				attribute, node.tagName);
+			return;
+		}
+		if (!value)
+		{
+			this._showError ('Attribute \'%s\' empty on tag \'%s\'',
+				attribute, node.tagName);
+			return;
+		}
+
+		switch (propInfo.type)
+		{
+			case Boolean:
+				newValue = (/^(true|1)$/i).test (value);
+				break;
+			case Number:
+				newValue = 0 + new Number (value);
+				break;
+			case String:
+				newValue = this._translateValue (value);
+				break;
+			case Function:
+				var method = this._getMethod (value);
+				newValue = method ? method.bind (this.signalData) : null;
+				break;
+			default:
+			if (propInfo.enumType)
+				newValue = propInfo.enumType[value];
+			else if (propInfo.type instanceof Function)
+				isLink = true;
+		}
+		
+		if (isLink)
+			this._addLink (context, propName, value);
+		else if (newValue !== null && newValue !== undefined)
+			props[propName] = newValue;
+		else
+			this._showError ('Attribute \'%s\' invalid for tag \'%s\'',
+				attribute, node.tagName);
+	}
+	
+	,objectInstantiate: function (context)
+	{
+		return new context.klass ();
+	}
+	
+	,objectLink: function (context, object, objects, res)
+	{
+		object.setProperties (context.props);
+	
+		var objectProps = context.objectProps;
+		for (var prop in objectProps)
+			object[prop] = objects[objectProps[prop]];
+
+		var childs = context.childs;
+		for (var i = 0; i < childs.length; i++)
+			object.appendChild (objects[childs[i]]);
+		
+		var events = context.events;
+		for (var event in events)
+			object.on (event, events[event], this.signalData);
+
+		if (context.custom)
+			object.loadXml (res, context.custom);
+	}
+	
+	/**
+	 * Creates a HTML node context.
+	 **/
+	,elementCompile: function (node, tagName)
+	{
+		var attributes = {};
+		var childs = [];
+		var events = {};
+		var handler;
+
+		var a = node.attributes;
+
+		for (var i = 0; i < a.length; i++)
+		{
+			var attribute = a[i].nodeName;
+			var value = a[i].nodeValue;
+
+			if (this._isEvent (attribute))
+			{
+				var handler = this._getMethod (value);
+				
+				if (handler)
+					events[attribute.substr (3)] = handler;
+			}
+			else if (attribute !== 'id')
+				attributes[attribute] = this._translateValue (value);
+		}
+
+		var childContext;
+		var childNodes = node.childNodes;
+
+		if (childNodes)
+		for (var i = 0; i < childNodes.length; i++)
+		if (childContext = this._compileNode (childNodes[i]))
+				childs.push (childContext.id);
+
+		return {
+			tagName: tagName,
+			attributes: attributes,
+			childs: childs,
+			events: events
+		};
+	}
+	
+	,elementInstantiate: function (context)
+	{
+		return this._document.createElement (context.tagName);
+	}
+	
+	,elementLink: function (context, object, objects)
+	{
+		var attributes = context.attributes;
+		for (var attribute in attributes)
+			object.setAttribute (attribute, attributes[attribute]);
+
+		var childs = context.childs;
+		for (var i = 0; i < childs.length; i++)
+		{
+			var child = objects[childs[i]];
+		
+			if (child instanceof Htk.Widget)
+				child = child.getNode ();
+			if (child instanceof Node)
+				object.appendChild (child);
+		}
+		
+		var events = context.events;
+		for (var event in events)
+			object.addEventListener (event,
+				events[event].bind (this.signalData));
+	}
+	
+	,_showError: function (error)
+	{
+		var path = this._path ? this._path : 'Node';		
+		var logArgs = ['Vn.Builder: %s: '+ error, path];
+
+		for (var i = 1; i < arguments.length; i++)
+			logArgs.push (arguments[i]);
+	
+		console.warn.apply (null, logArgs);
+	}
+	
+	,_addLink: function (context, prop, objectId)
+	{
+		this._links.push ({
+			 context: context
+			,prop: prop
+			,objectId: objectId
+		});
+	}
+
+	,_translateValue: function (value)
 	{
 		var chr = value.charAt (0);
 
-		if (chr == '_')
+		if (chr === '_')
 			return _(value.substr (1));
-		else if (chr == '\\' && value.charAt (1) == '_')
+		else if (chr === '\\' && value.charAt (1) === '_')
 			return value.substr (1);
 			
 		return value;		
 	}
 	
-	,getMethod: function (value)
+	,_getMethod: function (value)
 	{	
 		if (this.signalData)
 			var methodName = 'this.signalData.'+ value;
@@ -172,157 +538,69 @@ Vn.Builder = new Class
 		}
 		catch (e)
 		{
-			method = null;
+			method = undefined;
 		}
 		
-		if (method == null)
-			console.warn ('Vn.Builder: Function \'%s\' not found',
-				value);
+		if (method === undefined)
+			this._showError ('Function \'%s\' not found', value);
 
 		return method;
 	}
 	
-	,replaceFunc: function (token)
+	,_isEvent: function (attribute)
+	{
+		return /^on-\w+/.test (attribute);
+	}
+	
+	,_replaceFunc: function (token)
 	{
 		return token.charAt(1).toUpperCase ();
 	}
-	
-	,resolveProperties: function ()
+});
+
+var BuilderResult = new Class
+({
+	Extends: Vn.Object
+
+	,initialize: function (builder, objects)
 	{
-		for (var i = 0; i < this.contexts.length; i++)
-		{
-			var c = this.contexts[i];
-			var a = c.node.attributes;
-
-			for (var j = 0; j < a.length; j++)
-				this.setAttribute (c, a[j].nodeName, a[j].nodeValue);
-
-			if (c.parent)
-			{
-				var parentProperty = c.node.getAttribute ('property');
-			
-				if (!parentProperty)
-					parentProperty = c.parent.klass.Child;
-	
-				if (parentProperty)
-					this.setProperty (c.parent, parentProperty, c.object);
-				
-				if (c.klass.Parent)
-					this.setProperty (c, c.klass.Parent, c.parent.object);
-			}
-
-			c.object.loadXml (this, c.node);
-		}
-	}
-	
-	,setAttribute: function (c, attribute, value)
-	{
-		if (/^on-\w+/.test (attribute))
-		{
-			var method = this.getMethod (value);
-			
-			if (method)
-				c.object.on (attribute.substr (3), method, this.signalData);
-		}
-		else if (!/^(id|property)$/.test (attribute))
-		{
-			this.setProperty (c, attribute, value)
-		}
+		this.builder = builder;
+		this.objects = objects;
 	}
 
-	,setProperty: function (c, attribute, value)
+	,getMain: function ()
 	{
-		var propName = attribute.replace (/-./g, this.replaceFunc);
-		var prop = c.klass.Properties[propName];
-
-		if (!prop)
-		{
-			console.warn ('Vn.Builder: Attribute \'%s\' not valid for tag \'%s\'',
-				attribute, c.node.tagName);
-			return;
-		}
-		if (!value)
-			return;
-
-		switch (prop.type)
-		{
-			case Boolean:
-				value = (/^(true|1)$/i).test (value);
-				break;
-			case Number:
-				value = 0 + new Number (value);
-				break;
-			case String:
-				value = this.translateValue (value);
-				break;
-			case Function:
-			{
-				var method = this.getMethod (value);		
-				value = method ? method.bind (this.signalData) : null;
-				break;
-			}
-			default:
-			if (prop.type instanceof Function)
-			{
-				if (typeof value == 'string')
-					value = this.get (value);
-				if (!(value instanceof prop.type))
-					return;
-			}
-			else if (prop.enumType)
-				value = prop.enumType[value];
-		}
-
-		if (value !== undefined)
-			c.object[propName] = value;
-		else
-			console.warn ('Vn.Builder: Empty attribute \'%s\' on tag \'%s\'',
-				attribute, c.node.tagName);
-	}
-	
-	,setParent: function (parentBuilder)
-	{
-		this.parentBuilder = parentBuilder;
-		
-		if (parentBuilder)
-			this.signalData = parentBuilder.signalData;
+		return this.builder.getMain (this);
 	}
 	
 	,$: function (objectId)
 	{
-		return this.get (objectId);
-	}
-
-	,get: function (objectId)
-	{
-		var object = this.objectMap[objectId];
-		
-		if (object)
-			return object;
-		if (this.parentBuilder)
-			return this.parentBuilder.get (objectId);
-			
-		return null;
+		return this.builder.getById (this, objectId);
 	}
 	
-	,getObjects: function (tagName)
+	,getById: function (objectId)
 	{
-		if (this.tags[tagName])
-			return this.tags[tagName];
-			
-		return [];
+		return this.builder.getById (this, objectId);
+	}
+	
+	,getByTagName: function (tagName)
+	{
+		return this.builder.getByTagName (this, tagName);
+	}
+	
+	,link: function ()
+	{
+		this.builder.link (this);
 	}
 	
 	,_destroy: function ()
 	{
-		for (var tag in this.tags)
-		{
-			var objects = this.tags[tag];
+		var objects = this.objects;
+	
+		for (var i = 0; i < objects.length; i++)
+		if (objects[i] instanceof Vn.Object)
+			objects[i].unref ();
 
-			for (var i = 0; i < objects.length; i++)
-				objects[i].unref ();
-		}
-		
 		this.parent ();
 	}
 });
diff --git a/web/js/vn/date.js b/web/js/vn/date.js
index 07bf5e64..a8fef359 100755
--- a/web/js/vn/date.js
+++ b/web/js/vn/date.js
@@ -60,6 +60,8 @@ Vn.Date =
 		,_('Dec')
 	]
 	
+	,tokenD: _('%A, %B %e')
+	
 	,regexp: new RegExp ('%[a-zA-Z]', 'g')
 
 	,pad: function (number)
@@ -106,6 +108,9 @@ Vn.Date =
 
 			// Year with 4 digits
 			case 'Y': return d.getFullYear ();
+
+			// Complete date without year
+			case 'D': return this.tokenD.replace (this.regexp, this.regexpFunc.bind (this, d));
 		}
 		
 		return token;
diff --git a/web/js/vn/hash-param.js b/web/js/vn/hash-param.js
index e0a7655b..cc5655d6 100755
--- a/web/js/vn/hash-param.js
+++ b/web/js/vn/hash-param.js
@@ -3,7 +3,7 @@ Vn.HashParam = new Class
 ({
 	Extends: Vn.Object
 	,Tag: 'vn-hash-param'
-	,Parent: 'param'
+	,Child: 'param'
 	,Properties:
 	{
 		param:
@@ -31,12 +31,39 @@ Vn.HashParam = new Class
 			{
 				return this._key;
 			}
+		},
+		value:
+		{
+			type: Object
+			,set: function (x)
+			{
+				this._setValue (x, true);
+			}
+			,get: function ()
+			{
+				return this._value;
+			}
+		},
+		type:
+		{
+			type: Object
+			,set: function (x)
+			{
+				this._type = x;
+				this._onHashChange ();
+			}
+			,get: function ()
+			{
+				return this._type;
+			}
 		}
 	}
 	
-	,lock: false
-	,value: undefined
+	,_hashLock: false
+	,_paramLock: false
+	,_value: undefined
 	,_key: null
+	,_type: null
 	
 	,initialize: function (props)
 	{
@@ -48,40 +75,72 @@ Vn.HashParam = new Class
 
 	,_onHashChange: function ()
 	{	
-		if (!this._key || !this._listener)
+		if (this._hashLock || !this._key || !this._listener)
 			return;
 
 		var newValue = Vn.Hash.get (this._key);
-
-		if (this.value != newValue)
+		
+		if (newValue === '')
+			newValue = null;
+		
+		if (this._type && newValue !== undefined && newValue !== null)
+		switch (this._type)
 		{
-			this.value = newValue;
-			this.signalEmit ('changed');
-			this._refreshParam ();
+			case Boolean:
+				newValue = (/^(true|1)$/i).test (newValue);
+				break;
+			case Number:
+				newValue = 0 + new Number (newValue);
+				break;
 		}
+
+		this._hashLock = true;
+		this._setValue (newValue, true);
+		this._hashLock = false;
 	}
 	
+	,_setValue: function (newValue, signal)
+	{
+		if (newValue == this._value)
+			return;
+
+		this._value = newValue;
+
+		if (this._key && !this._hashLock)
+		{
+			this._hashLock = true;
+
+			var map = {};
+			map[this._key] = newValue;
+			Vn.Hash.add (map);
+
+			this._hashLock = false;
+		}
+		
+		this._refreshParam ();
+		
+		if (signal)
+			this.signalEmit ('changed', newValue);
+	}
+
 	,_refreshParam: function ()
 	{
-		if (this._param && !this.lock)
+		if (this._param && !this._paramLock)
 		{
-			this.lock = true;
-			this._param.value = this.value;
-			this.lock = false;
+			this._paramLock = true;
+			this._param.value = this._value;
+			this._paramLock = false;
 		}
 	}
 	
 	,_onParamChange: function ()
 	{
-		if (this.lock)
+		if (this._paramLock)
 			return;
 
-		var map = {};
-		map[this.key] = this._param.value;
-
-		this.lock = true;
-		Vn.Hash.add (map);
-		this.lock = false;
+		this._paramLock = true;
+		this._setValue (this._param.value);
+		this._paramLock = false;
 	}
 });
 
diff --git a/web/js/vn/hash.js b/web/js/vn/hash.js
index 3c47d40b..4826769b 100755
--- a/web/js/vn/hash.js
+++ b/web/js/vn/hash.js
@@ -58,12 +58,16 @@ Vn.Hash =
 	 **/
 	,set: function (map)
 	{
+		if (map)
 		for (var key in map)
 		if (map[key] === null || map[key] === undefined)
 			delete map[key];
 
 		var newHash = this.make (map);
 
+		if (!map)
+			map = {};
+
 		if (newHash !== this._hash)
 		{
 			this._hashMap = map;
@@ -88,7 +92,7 @@ Vn.Hash =
 	{
 		var hash = '#!';
 		
-		if (add)
+		if (add && map)
 		for (var key in this._hashMap)
 		if (!map[key])
 			map[key] = this._hashMap[key];
diff --git a/web/js/vn/locale.js b/web/js/vn/locale.js
index dd865869..ce298c3a 100755
--- a/web/js/vn/locale.js
+++ b/web/js/vn/locale.js
@@ -7,22 +7,32 @@ Vn.Locale =
 	
 	,language: null
 	
-	,load: function (path, callback)
+	,init: function ()
 	{
 		if (!this.language)
 		{
 			var language = navigator.language.substr (0, 2);
-			this.language = language ? language : 'es';
+			this.language = language ? language : 'en';
 		}
+	}
 	
-		var file = 'locale/'+ this.language +'/'+ path +'.json'
-			+'?'+ Vn.Cookie.get ('hedera_version');
+	,load: function (path, callback)
+	{
+		this.init ();
+	
+		var file = 'locale/'+ this.language +'/'+ path +'.json'+ Vn.getVersion ();
 
 		var request = new XMLHttpRequest ();
 		request.open ('get', file, true);
 		request.onreadystatechange = this.loadDone.bind (this, request, callback);
 		request.send ();
 	}
+	
+	,loadScript: function (path, callback)
+	{
+		this.init ();
+		Vn.includeJs ('locale/'+ this.language +'/'+ path, callback);
+	}
 
 	,loadDone: function (request, callback)
 	{
diff --git a/web/js/vn/main.js b/web/js/vn/main.js
old mode 100755
new mode 100644
index c1c323e5..58bebc0a
--- a/web/js/vn/main.js
+++ b/web/js/vn/main.js
@@ -1,16 +1,5 @@
-/**
- * The main namespace.
- **/
-var Vn =
-{
-	Config: {}
-	,jsIncludes: {}
-	,cssIncludes: {}
-	,xmlIncludes: {}
-	,customTags: {}
-	,head: document.getElementsByTagName ('head')[0]
-	,isMobileCached: null
 
+<<<<<<< HEAD
 	,getVersion: function ()
 	{
 		if (this._version === undefined)
@@ -196,4 +185,25 @@ var Vn =
 		return document.getElementById (id);
 	}
 };
+=======
+Vn.include ('js/misc/main');
+Vn.includeLib ('vn', 
+[
+	 'browser'
+	,'cookie'
+	,'date'
+	,'value'
+	,'error'
+	,'url'
+	,'mutators'
+	,'object'
+	,'param'
+	,'hash-listener'
+	,'hash'
+	,'hash-param'
+	,'node'
+	,'builder'
+	,'http-request'
+]);
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 
diff --git a/web/js/vn/main.php b/web/js/vn/main.php
deleted file mode 100755
index d8198cb3..00000000
--- a/web/js/vn/main.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-require_once ('js/misc/main.php');
-
-use Vn\Hedera\Js;
-
-Js::includeFile ('js/vn/main.js');
-Js::includeFile ('js/vn/locale.js');
-
-if (strpos ($_SERVER['HTTP_USER_AGENT'], 'MSIE'))
-	Js::includeFile ('js/vn/ie.js');
-else
-	Js::includeFile ('js/vn/browser.js');
-
-Js::includeLib ('vn'
-	,'date'
-	,'value'
-	,'error'
-	,'cookie'
-	,'url'
-	,'mutators'
-	,'object'
-	,'param'
-	,'hash-listener'
-	,'hash'
-	,'hash-param'
-	,'node'
-	,'builder'
-	,'http-request'
-);
-
-?>
diff --git a/web/js/vn/mutators.js b/web/js/vn/mutators.js
index ce2fece3..bd42db9c 100755
--- a/web/js/vn/mutators.js
+++ b/web/js/vn/mutators.js
@@ -43,12 +43,3 @@ Class.Mutators.Child = function (propName)
 	this.extend ({Child: propName});
 };
 
-Class.Mutators.Xml = function (path)
-{
-	if (path)
-	{
-		Vn.loadXml (path);
-		this.extend ({Xml: path});
-	}
-}
-
diff --git a/web/js/vn/node.js b/web/js/vn/node.js
index f785f474..e3452883 100755
--- a/web/js/vn/node.js
+++ b/web/js/vn/node.js
@@ -11,7 +11,7 @@ Vn.Node =
 	}
 
 	,remove: function (node)
-	{
+	{	
 		if (node.parentNode)
 			node.parentNode.removeChild (node);
 	}
@@ -55,10 +55,7 @@ Vn.Node =
 	
 	,show: function (node)
 	{
-		var style = window.getComputedStyle (node);
-	
-		if (style.display === 'none')
-			node.style.display = 'initial';
+		node.style.display = 'block';
 	}
 };
 
diff --git a/web/js/vn/object.js b/web/js/vn/object.js
index 0927f0ea..3b07d275 100755
--- a/web/js/vn/object.js
+++ b/web/js/vn/object.js
@@ -8,11 +8,15 @@ Vn.Object = new Class
 	Tag: 'vn-object'
 	,Properties: {}
 
-	,signals: {}
-	,links: {}
-	,refCount: 1
+	,_refCount: 1
+	,_signalData: null
 
 	,initialize: function (props)
+	{
+		this.setProperties (props);
+	}
+	
+	,setProperties: function (props)
 	{
 		for (var prop in props)
 			this[prop] = props[prop];
@@ -20,21 +24,28 @@ Vn.Object = new Class
 	
 	,ref: function ()
 	{
-		this.refCount++;
+		this._refCount++;
 		return this;
 	}
 	
 	,unref: function ()
 	{
-		this.refCount--;
+		this._refCount--;
 		
-		if (this.refCount === 0)
+		if (this._refCount === 0)
 			this._destroy ();
 	}
 	
-	,loadXml: function (builder, node)
+	,loadXml: function (builder, node) {}
+	,appendChild: function (child) {}
+	
+	,_signalInit: function ()
 	{
-		return null;
+		if (!this._signalData)
+			this._signalData = {
+				signals: {},
+				links: {}
+			};
 	}
 
 	/**
@@ -50,12 +61,15 @@ Vn.Object = new Class
 		{
 			console.warn ('Vn.Object: Invalid callback for signal \'%s\'', id);
 			return;
-		}			
-	
-		if (!this.signals[id])
-			this.signals[id] = [];
+		}
+		
+		this._signalInit ();
+		var callbacks = this._signalData.signals[id];
+
+		if (!callbacks)
+			callbacks = this._signalData.signals[id] = [];
 			
-		this.signals[id].push
+		callbacks.push
 		({
 			 blocked: false
 			,callback: callback
@@ -72,7 +86,10 @@ Vn.Object = new Class
 	 **/
 	,blockSignal: function (id, callback, block, instance)
 	{
-		var callbacks = this.signals[id];
+		if (!this._signalData)
+			return;
+
+		var callbacks = this._signalData.signals[id];
 		
 		if (!callbacks)
 			return;
@@ -90,7 +107,10 @@ Vn.Object = new Class
 	 **/
 	,signalEmit: function (id)
 	{
-		var callbacks = this.signals[id];
+		if (!this._signalData)
+			return;
+
+		var callbacks = this._signalData.signals[id];
 		
 		if (!callbacks)
 			return;
@@ -115,7 +135,10 @@ Vn.Object = new Class
 	 **/
 	,disconnect: function (id, callback, instance)
 	{
-		var callbacks = this.signals[id];
+		if (!this._signalData)
+			return;
+
+		var callbacks = this._signalData.signals[id];
 		
 		if (!callbacks)
 			return;
@@ -133,9 +156,14 @@ Vn.Object = new Class
 	 **/
 	,disconnectByInstance: function (instance)
 	{
-		for (var signalId in this.signals)
+		if (!this._signalData)
+			return;
+	
+		var signals = this._signalData.signals;
+
+		for (var signalId in signals)
 		{
-			var callbacks = this.signals[signalId];
+			var callbacks = signals[signalId];
 
 			for (var i = 0; i < callbacks.length; i++)
 			if (callbacks[i].instance == instance)
@@ -149,17 +177,22 @@ Vn.Object = new Class
 	 **/
 	,_destroy: function ()
 	{
-		var links = this.links;
+		if (!this._signalData)
+			return;
+	
+		var links = this._signalData.links;
 	
 		for (var key in links)
 			links[key].disconnectByInstance (this);
 		
-		delete this.links;
-		delete this.signals;
+		this._signalData = null;
 	}
 	
 	,link: function (prop, handlers)
 	{
+		this._signalInit ();
+		var links = this._signalData.links;
+	
 		for (var key in prop)
 		{
 			var newObject = prop[key];
@@ -175,13 +208,16 @@ Vn.Object = new Class
 
 			if (newObject)
 			{
-				this.links[key] = newObject.ref ();
+				links[key] = newObject.ref ();
 
 				for (var signal in handlers)
 					newObject.on (signal, handlers[signal], this);
 			}
 			else if (oldObject)
-				delete this.links[key];
+				delete links[key];
 		}
 	}
 });
+
+Vn.Enum = function () {};
+
diff --git a/web/js/vn/param.js b/web/js/vn/param.js
index a62df1b1..f8311b29 100755
--- a/web/js/vn/param.js
+++ b/web/js/vn/param.js
@@ -27,7 +27,7 @@ Vn.Param = new Class
 					this.masterLock = false;
 				}
 
-				this.signalEmit ('changed');
+				this.signalEmit ('changed', this._value);
 			}
 			,get: function ()
 			{
diff --git a/web/js/vn/url.js b/web/js/vn/url.js
index 5371b8bd..6b9a44d5 100755
--- a/web/js/vn/url.js
+++ b/web/js/vn/url.js
@@ -62,9 +62,11 @@ Vn.Url =
 		
 			if (post.length > 2)
 				post += '&';
-
+				
+			if (value === null || value === undefined)
+				continue;
 			if (typeof value == 'boolean')
-				value = new Number (value);
+				value = value ? '1' : '0';
 
 			post += key +'='+ encodeURIComponent (value);
 		}
diff --git a/web/js/vn/vn.js b/web/js/vn/vn.js
new file mode 100755
index 00000000..ebfd652a
--- /dev/null
+++ b/web/js/vn/vn.js
@@ -0,0 +1,401 @@
+/**
+ * The main namespace.
+ **/
+var Vn =
+{
+	 Config: {}
+	,includes: {}
+	,cssIncludes: {}
+	,currentDeps: []
+	,currentCallback: null
+	,customTags: {}
+	,head: document.getElementsByTagName ('head')[0]
+	,isMobileCached: null
+	
+	,getVersion: function ()
+	{
+		if (this._version === undefined)
+		{
+			var re = /[; ]hedera_version=([^\\s;]*)/;
+			var sMatch = (' '+ document.cookie).match (re);
+			this._version = (sMatch) ? '?'+ unescape (sMatch[1]) : '';
+		}
+		
+		return this._version;
+	}
+
+	/**
+	 * Includes a new CSS stylesheet in the current document, if the stylesheet
+	 * is already included, does nothing.
+	 *
+	 * @param {string} fileName The stylesheet file name
+	 **/
+	,includeCss: function (fileName)
+	{	
+		var cssData = this.cssIncludes[fileName];
+
+		if (!cssData)
+		{
+			var link = document.createElement ('link');
+			link.rel = 'stylesheet';
+			link.type = 'text/css';
+			link.href = fileName + this.getVersion ();
+			this.head.appendChild (link);
+			
+			this.cssIncludes[fileName] = 
+			{
+				 included: true
+				,link: link
+			};
+		}
+		else if (!cssData.included)
+		{
+			cssData.link.disabled = false;
+			cssData.included = true;
+		}
+	}
+	
+	/**
+	 * Excludes a CSS stylesheet from the current document.
+	 *
+	 * @param {string} fileName The stylesheet file name
+	 **/
+	,excludeCss: function (fileName)
+	{
+		var cssData = this.cssIncludes[fileName];
+	
+		if (cssData && cssData.included)
+		{
+			cssData.link.disabled = true;
+			cssData.included = false;
+		}		
+	}
+	
+	,_createIncludeData: function (path)
+	{
+		var includeData = {
+			 depCount: 0
+			,success: false
+			,loaded: false
+			,callbacks: []
+			,dependants: []
+		};
+
+		this.includes[path] = includeData;
+		return includeData;
+	}
+	
+	,_handleCallback: function (includeData, callback)
+	{
+		if (!callback)
+			return;
+	
+		if (includeData.success)
+			callback (includeData.loaded);
+		else
+			includeData.callbacks.push (callback);
+	}
+	
+	,_resolveDeps: function (includeData)
+	{
+		includeData.success = true;
+
+		var callbacks = includeData.callbacks;
+	
+		if (callbacks)		
+		for (var i = 0; i < callbacks.length; i++)
+			callbacks[i] (includeData.loaded);
+
+		var dependants = includeData.dependants;
+
+		if (dependants)
+		for (var i = 0; i < dependants.length; i++)
+		{
+			var dependant = dependants[i];
+			dependant.depCount--;
+			
+			if (dependant.depCount == 0)
+				this._resolveDeps (dependant);
+		}
+
+		delete includeData.callbacks;
+		delete includeData.dependants;
+		delete includeData.depCount;
+	}
+
+	/**
+	 * Initializes the library and calls the passed function when all
+	 * includes and its dependencies are resolved.
+	 * Should be called on the last statically incuded script.
+	 *
+	 * @param {Function} callback The main function
+	 **/
+	,main: function (callback)
+	{
+		if (this.mainCalled)
+		{
+			Vn.warning ("Vn: main method should be called only once");
+			return;
+		}
+	
+		this.mainCalled = true;
+		this.mainCallback = callback;
+
+		var basePath = location.protocol +'//'+ location.host;
+		basePath += location.port ? ':'+ location.port : '';
+		basePath += location.pathname;
+
+		var scripts = this.head.getElementsByTagName ('script');
+		var includes = this.currentDeps;
+
+		for (var i = 0; i < scripts.length; i++)
+		{
+			var path = scripts[i].src.substr (basePath.length);
+			path = path.substr (0, path.indexOf ('.js')) +'.js';
+
+			var includeData = this.includes[path];
+			
+			if (includeData === undefined)
+			{
+				this.currentDeps = includes;
+				var includeData = this._createIncludeData (path);
+				this._onScriptLoad (includeData, true);
+			}
+		}
+
+		includeData.callbacks.push (this._onMainDepsLoad.bind (this));
+		window.addEventListener ('load', this._onWindowLoad.bind (this));
+	}
+	
+	,_onMainDepsLoad: function ()
+	{
+		this.mainDepsLoaded = true;
+		this._callMain ();
+	}
+	
+	,_onWindowLoad: function ()
+	{
+		this.windowReady = true;
+		this._callMain ();
+	}
+	
+	,_callMain: function ()
+	{
+		if (this.mainCallback && this.windowReady && this.mainDepsLoaded)
+			this.mainCallback ();
+	}
+	
+	/**
+	 * Includes a set of javascript files and sets it as dependecies of the
+	 * current script.
+	 *
+	 * @param {...} The list of files as function arguments
+	 **/
+	,include: function ()
+	{
+		for (var i = 0; i < arguments.length; i++)
+		{
+			var includeData = this._realIncludeJs (arguments[i] +'.js');
+			
+			if (!includeData.success)
+				this.currentDeps.push (includeData);
+		}
+	}
+
+	/**
+	 * Downloads a set of resources and sets it as dependecies of the
+	 * current script.
+	 *
+	 * @param {...} The list of files as function arguments
+	 **/
+	,resource: function ()
+	{
+		for (var i = 0; i < arguments.length; i++)
+		{
+			var includeData = this._realLoadXml (arguments[i]);
+			
+			if (!includeData.success)
+				this.currentDeps.push (includeData);
+		}
+	}
+	
+	/**
+	 * Sets the function that will be called when current script dependencies
+	 * are resolved.
+	 *
+	 * @param {Function} callback The callback function
+	 **/
+	,define: function (callback)
+	{
+		this.currentCallback = callback;
+	}
+	
+	/**
+	 * Includes an entire Javascript library including it's localized file.
+	 *
+	 * @param {string} libName The folder of the library
+	 * @param {Array<string>} files Array with every library file name
+	 **/
+	,includeLib: function (libName, files)
+	{
+		Vn.Locale.loadScript ('js/'+ libName +'.js');
+
+		for (var i = 0; i < files.length; i++)
+			this.include ('js/'+ libName +'/'+ files[i]);
+	}
+
+	/**
+	 * Includes a new Javascript in the current document, if the script
+	 * is already included, does nothing and calls the callback.
+	 *
+	 * @param {string} fileName The script file name
+	 * @param {Function} callback The function to call when script is
+	 * downloaded and included
+	 **/
+	,includeJs: function (fileName, callback, skipVersion)
+	{
+		var includeData = this._realIncludeJs (fileName, skipVersion);
+		this._handleCallback (includeData, callback);
+	}
+	 
+	,_realIncludeJs: function (fileName, skipVersion)
+	{
+		var includeData = this.includes[fileName];
+	
+		if (includeData === undefined)
+		{
+			includeData = this._createIncludeData (fileName);
+
+			var src = fileName;
+
+			if (!skipVersion)
+				src = src + this.getVersion ();
+
+			var script = document.createElement ('script');
+			script.type = 'text/javascript';
+			script.async = false;
+			script.src = src;
+
+			script.onload =
+				this._onScriptLoad.bind (this, includeData, true);
+			script.onerror =
+				this._onScriptLoad.bind (this, includeData, false);
+			script.onreadystatechange =
+				this._onScriptStateChange.bind (this, includeData, script);
+
+			this.head.appendChild (script);
+		}
+
+		return includeData;
+	}
+
+	,_onScriptStateChange: function (includeData, script)
+	{
+		if (script.readyState == 'complete')
+			this._onScriptLoad (includeData, true);
+	}
+
+	,_onScriptLoad: function (includeData, loaded)
+	{
+		includeData.loaded = loaded;
+
+		if (loaded)
+		{			
+			if (this.currentCallback)
+				includeData.callbacks.unshift (this.currentCallback);
+
+			var includes = this.currentDeps;
+			
+			if (includes && includes.length > 0)
+			{
+				includeData.depCount = includes.length;
+
+				for (var i = 0; i < includes.length; i++)
+					includes[i].dependants.push (includeData);
+			}
+			else
+				this._resolveDeps (includeData);
+		}
+		else
+			this._resolveDeps (includeData);
+		
+		this.currentDeps = [];
+		this.currentCallback = null;
+	}
+
+	/**
+	 * Request an XML file.
+	 *
+	 * @param {string} path The file path
+	 * @param {Function} callback The function to call when file is downloaded
+	 **/
+	,loadXml: function (path, callback)
+	{
+		var includeData = this._realLoadXml (path);
+		this._handleCallback (includeData, callback);
+	}
+
+	,_realLoadXml: function (path)
+	{
+		var includeData = this.includes[path];
+	
+		if (includeData === undefined)
+		{
+			includeData = this._createIncludeData (path);
+
+			var request = new XMLHttpRequest ();
+			request.onreadystatechange =
+				this._onXmlReady.bind (this, includeData, request);
+			request.open ('get', path + this.getVersion (), true);
+			request.send ();
+		}
+
+		return includeData;
+	}
+	
+	,_onXmlReady: function (includeData, request)
+	{
+		if (request.readyState != 4)
+			return;
+			
+		includeData.loaded = request.status == 200;
+
+		if (includeData.loaded)
+			includeData.xml = request.responseXML;
+			
+		this._resolveDeps (includeData);
+	}
+	
+	/**
+	 * Gets the DOM object from an included XML file.
+	 *
+	 * @param {string} path The file path
+	 * @return {Object} The DOM object
+	 **/
+	,getXml: function (path)
+	{
+		var includeData = this.includes[path];
+		
+		if (!(includeData && includeData.success))
+			return null;
+			
+		return includeData.xml;
+	}
+
+	/**
+	 * Checks if user is using a mobile browser.
+	 *
+	 * return {boolean} %true if is mobile, %false otherwise.
+	 **/
+	,isMobile: function ()
+	{
+		if (this.isMobileCached === null)
+		{
+			var regExp = /(Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone)/i;
+			this.isMobileCached =  navigator.userAgent.match (regExp);
+		}
+
+		return this.isMobileCached;
+	}
+};
+
diff --git a/web/locale/ca/forms/admin/connections.json b/web/locale/ca/forms/admin/connections.json
new file mode 100755
index 00000000..58201417
--- /dev/null
+++ b/web/locale/ca/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+	 "Connections": "Connexions"
+
+	,"Refresh": "Actualitzar"
+	,"Visits": "Visites"
+	
+	,"connections": "connexions"
+}
diff --git a/web/locale/ca/forms/admin/queries.json b/web/locale/ca/forms/admin/queries.json
new file mode 100755
index 00000000..d98cc882
--- /dev/null
+++ b/web/locale/ca/forms/admin/queries.json
@@ -0,0 +1,11 @@
+{
+	 "Queries": "Consultes"
+
+	,"Execute": "Executar"
+	,"Clean": "Netejar"
+
+	,"SQL query": "Consulta SQL"
+	,"Updatable": "Actualitzable"
+	
+	,"Query executed!": "Consulta executada!"
+}
diff --git a/web/locale/ca/forms/admin/visits.json b/web/locale/ca/forms/admin/visits.json
index 92ee32b4..6d8747ee 100755
--- a/web/locale/ca/forms/admin/visits.json
+++ b/web/locale/ca/forms/admin/visits.json
@@ -1,31 +1,14 @@
 {
 	 "Visits": "Visites"
-	,"VisitsManagement": "Gestió de visites"
-	 
-	,"ActiveSessions": "Usuaris conectats"
-	,"VisitsQuery": "Consulta de visites"
+
 	,"Refresh": "Actualitzar"
+	,"Connections": "Connexions"
 
-	,"ActiveSessions:": "Usuaris conectats:"
-	,"NewVisitsTotal:": "Noves visites:"
+	,"From": "Desde"
+	,"To": "Fins"
+	,"Select date interval": "Selecciona un interval de dates"
 
-	,"SessionNumber": "N sessió"
-	,"User": "Usuari"
-	,"Login": "Hora d'accés"
-	,"LastActivity": "Última activitat"
-	,"SO": "Sistema Operatiu"
-	,"Version": "Versió"
-	,"NewVisit": "Nova visita"
-
-	,"SelectDateInterval": "Selecciona un intèrval de dates"
-	,"FromDate:": "Des de el dia:"
-	,"ToDate:": "Fins el dia:"
-	,"VisitsTotal:": "Total visites:"
-
-	,"Browser": "Navegador"
-	,"MinVersion": "Versió mínima"
-	,"MaxVersion": "Versió màxima"
-	,"LastVisit": "Última visita"
-	,"NewVisits": "Noves visites"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
+	,"visits": "visites"
+	,"news": "noves"
+	,"%a, %e %b %Y at %T": "%a, %e %b %Y a les %T"
 }
diff --git a/web/locale/ca/forms/cms/about.json b/web/locale/ca/forms/cms/about.json
index 8267a217..e3e3942a 100755
--- a/web/locale/ca/forms/cms/about.json
+++ b/web/locale/ca/forms/cms/about.json
@@ -17,7 +17,7 @@
 
 	,"BuyersAndTraders": "9 compradors especialitzats i els nostres 20 comercials t'assessoraran en tot el que necessitis."
 	
-	,"Training": "Verdnatura formació"
+	,"Verdnatura training": "Verdnatura formació"
 
 	,"GoodTraining": "En Verdnatura sabem que una bona formació és imprescindible per al desenvolupament òptim de qualsevol activitat, i com no, també la de florista."
 	,"SpecialTrainingPrices": "Perquè el pressupost d'una escola no repercuteixi en la qualitat de la teva formació, col·laborem amb una política de preus especials per a totes aquelles escoles que ho sol·licitin realitzar cursos a les nostres instal·lacions de Verdnatura Silla."
diff --git a/web/locale/ca/forms/cms/home.json b/web/locale/ca/forms/cms/home.json
index eabe79eb..ec7b073e 100755
--- a/web/locale/ca/forms/cms/home.json
+++ b/web/locale/ca/forms/cms/home.json
@@ -1,5 +1,7 @@
 {
-	 "Sent": "Enviat"
+	 "Start order": "Començar comanda"
+
+	,"Sent": "Enviat"
 	,"Author": "Autor"
 	,"votes": "vots"
 	,"NoAnswerSelected": "No has seleccionat cap resposta"
diff --git a/web/locale/ca/forms/ecomerce/catalog.json b/web/locale/ca/forms/ecomerce/catalog.json
index 9ff5806a..7596224e 100755
--- a/web/locale/ca/forms/ecomerce/catalog.json
+++ b/web/locale/ca/forms/ecomerce/catalog.json
@@ -3,11 +3,15 @@
 	,"SearchResults": "Resultats de cerca"
 
 	,"SelectFamily": "Selecciona una família"
-	,"SelectSubtype": "Selecciona un subtipus en el menú de la dreta"
+	,"Choose filter from right menu": "Tria un filtre en el menú de la dreta"
+	,"Choose a realm": "Tria un regne"
 	,"ArticleNotFound": "Artcle no trobat"
 	,"ArticleNotAvailable": "Article no disponible"
 
-	,"StartOrder": "Començar encàrrec"
+	,"List view": "Vista de lista"
+	,"Grid view": "Vista de reixeta"
+	,"Switch view": "Canviar vista"
+	,"StartOrder": "Començar comanda"
 	,"ShoppingBasket": "Cistella de la compra"
 
 	,"StartOrder": "Començar encàrrec"
@@ -21,22 +25,43 @@
 	,"Warehouse": "Magatzem"
 	,"Agency": "Agència"
 	
+<<<<<<< HEAD
 	,"Realm": "Família"
 	,"Subtype": "Subtipus"
 	,"Search:": "Cercar:"
 	,"GeneralSearch": "Cerca general"
-
-	,"Amount": "Quant"
-	,"Aval": "Disp"
-	,"Name": "Nom"
-	,"S1": "Mes"
-	,"S2": "S2"
-	,"Stems": "Tiges"
-	,"Cat": "Cat"
-	,"Pack": "Pack"
-	,"Origin": "Origen"
-	,"Price": "Preu"
+=======
+	,"%A, %e of %B": "%A, %e de %B"
+	,"Agency": "Agència"
+	,"Warehouse": "Magatzem"
 	
+	,"Filter by": "Filtrar per"
+	,"Order by": "Ordenar per"
+	
+	,"Search": "Cercar"
+	,"Change": "Cambiar"
+	,"Available": "Displonible"
+	,"Size": "Mida"
+	,"Realm": "Regne"
+	,"Family": "Família"
+	,"Color": "Color"
+	,"Producer": "Productor"
+	,"Origin": "Origen"
+	,"Category": "Categoria"
+	,"Remove filters": "Esborrar filtres"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
+
+	,"Price": "Precio"
+	,"Amount": "Quantitat"
+	,"Name": "Nom"
+	,"Pack": "Pack"
+	,"Lower price": "Preu més baix"
+	,"Higher price": "Preu més alt"
+	,"Lower size": "Mida més petita"
+	,"Higher size": "Mida més gran"
+	,", %.0d Units": ", %.0d Unitats"
+	
+	,"from": "des de"
 	,"from %.2d€": "des de %.2d€"
 	,"AddToBasket": "Afegir article"
 	,"Add": "Afegir"
diff --git a/web/locale/ca/forms/ecomerce/confirm.json b/web/locale/ca/forms/ecomerce/confirm.json
index 4f0ff42f..23040006 100755
--- a/web/locale/ca/forms/ecomerce/confirm.json
+++ b/web/locale/ca/forms/ecomerce/confirm.json
@@ -1,25 +1,37 @@
 {
 	 "Checkout": "Finalitzar comanda"
 
-	,"OrderSummary": "Resum de la comanda"
-	,"Arrival": "Arribada"
-	,"%A, %e of %B": "%A, %e de %B"
+	,"Order summary": "Resum de la comanda"
+	,"Delivery at": "Lliurament el"
 	,"Agency": "Agència"
 	,"Warehouse": "Magatzem"
+	
+	,"Previous balance": "Saldo anterior"
+	,"Order total": "Total comanda"
+	,"Order VAT": "IVA comanda"
+	,"Total debt": "Total deute"
+	,"Credit": "Crèdit"
+	,"Exceeded credit": "Crèdit excedit"
+	
+	,"Amount to pay": "Quantitat a pagar"
+	,"Pay method": "Mètode de pagament"
 
-	,"DeliveryAddress": "Adreça d'enviament"
+	,"Use my balance": "Utilitzar el meu saldo"
+	,"You have a favorable balance.": "No necessites pagar res, tens un saldo favorable."
+	,"Use my credit": "Utilitzar el meu crèdit"
+	,"You have a favorable credit.": "No necessites pagar res, tens crèdit favorable."
+	,"Credit card": "Targeta de crèdit"
+	,"You will be redirected to the payment.": "En confirmar la comanda seràs redirigit a la plataforma de pagament."
+	,"Bank Transfer": "Transferència bancària"
+	,"Make a transfer to one account.": "Fer una transferecia a una de les següents comptes i envia el justificant al teu comercial."
+	,"Pay later": "Pagar més tard"
 
-	,"Import": "Import"
-	,"TaxBase": "Base imposable"
-	,"VAT": "IVA"
-	,"Total": "Total"
-
-	,"Cancel": "Cancel"
 	,"Modify": "Modificar"
 	,"Confirm": "Confirmar"
-
-	,"OrderPlacedSuccessfully": "La teva comanda ha estat realitzat amb èxit"
-	,"OrderReserved": "Hem reservat la teva comanda però sembla que hi ha hagut problemes amb el pagament. Contacta amb el teu comercial."
+	
+	,"Order confirmed successfully": "La teva comanda ha estat realitzat amb èxit"
 	,"Accept": "D'acord"
-	,"PayNow": "Pagar ara"
+	
+	,"You have exceeded your credit.": "Has excedit el teu crèdit, si us plau realitza el pagament perquè puguem preparar la teva comanda."
 }
+
diff --git a/web/locale/ca/forms/ecomerce/orders.json b/web/locale/ca/forms/ecomerce/orders.json
index 1732efab..d17fe4fd 100755
--- a/web/locale/ca/forms/ecomerce/orders.json
+++ b/web/locale/ca/forms/ecomerce/orders.json
@@ -10,8 +10,8 @@
 
 	,"LastOrders": "Últimes comandes"
 
-	,"PendingBalance:": "Saldo pendent:"
-	,"PaymentInfo": "Per realitzar una entrega a compte fes clic al botó de la dreta i fes el pagament a l'empresa corresponent. La quantitat que apareix és el saldo pendent a dia d'avui, no té en compte comandes del futur. Pots realitzar un lliurament a compte de la quantitat que desitgis. Si vols pagar una comanda en concret pots prémer directament el botó de pagament de la comanda."
+	,"Balance:": "Saldo:"
+	,"PaymentInfo": "La quantitat mostrada és el teu saldo pendent (negatiu) o favorable a dia d'avui, no té en compte comandes del futur. Perquè la teva comanda sigui enviat, aquesta quantitat ha de ser igual o més gran que 0. Si vols fer un lliurament a compte, prem el botó de pagament, esborra la quantitat suggerida e introdueix la quantitat que vulguis."
 	,"MakePayment": "Realitzar pagament"
 	,"Company": "Empresa"
 	,"Pending": "Pendent"
@@ -20,6 +20,7 @@
 	,"ShoppingBasket": "Cistella de la compra"
 
 	,"SeeOrder": "Mostrar detall de l'encàrrec"
+	,"Delivery": "Lliurament"
 	,"TicketNumber": "N ticket"
 	,"SentAddress": "Adreça d'enviament"
 	,"Consignee": "Consignatari"
@@ -32,5 +33,7 @@
 	,"AmountError": "La quantitat ha de ser un nombre positiu i inferior o igual a l'import pendent"
 	,"PayError": "Error al realitzar el pagament"
 	
-	,"%A, %e of %B": "%A, %e de %B"
+	,"An error has been in the payment": "Sembla que hi ha hagut un error en el pagament"
+	,"Retry": "Reintenta"
+	,"Accept": "Acceptar"
 }
diff --git a/web/locale/ca/forms/ecomerce/ticket.json b/web/locale/ca/forms/ecomerce/ticket.json
index 20681739..4c450fa0 100755
--- a/web/locale/ca/forms/ecomerce/ticket.json
+++ b/web/locale/ca/forms/ecomerce/ticket.json
@@ -1,20 +1,13 @@
 {
 	 "OrderDetail": "Detall de l'encarrec"
 
-	,"Print": "Imprimir albarà"
+	,"%A, %e of %B %Y": "%A, %e de %B %Y"
+	,"Print delivery note": "Imprimir albarà"
 
-	,"TicketNumber:": "N ticket:"
-	,"DateExit:": "Data d'enviament:"
-	,"SendMethod:": "Forma d'enviament:"
-	,"Notes:": "Notes:"
-	,"TicketTotal:": "Total encàrrec:"
-	,"(VATIncluded)": "(IVA inclós)"
-
-	,"PC": "Codi postal"
-	,"City": "Ciutat"
-	,"Province": "Província"
-	,"Address": "Domicili"
-	,"Consignee": "Consignatari"
+	,"Delivery": "Entrega"
+	,"Total": "Total"
+	,"Tax base": "Base imposable"
+	,"VAT": "IVA"
 
 	,"ItemNumber": "N article"
 	,"Amount": "Quant"
diff --git a/web/locale/ca/js/db.js b/web/locale/ca/js/db.js
index 1542f2c2..d85d620f 100755
--- a/web/locale/ca/js/db.js
+++ b/web/locale/ca/js/db.js
@@ -1,7 +1,6 @@
 Vn.Locale.add
 ({
 	 "ConnError": "Error en la conexió"
-	,"InternalError": "S'ha produït un error intern"
 	,"BadServerReply": "Resposta del servidor incorrecta"
 	,"ModelNotUpdatable": "Aquest model no és actualitzable"
 	,"RowNotExists": "El registre no existeix o ha sigut esborrat"
diff --git a/web/locale/ca/js/hedera.js b/web/locale/ca/js/hedera.js
new file mode 100755
index 00000000..c7a7bcaf
--- /dev/null
+++ b/web/locale/ca/js/hedera.js
@@ -0,0 +1,59 @@
+Vn.Locale.add
+({
+	 "User": "Usuari"
+	,"Password": "Contrasenya"
+	,"Beta": "Beta"
+	,"Do not sign out": "No tancar sessió"
+	,"I want to know more": "Vull saber-ne més!"
+	,"Enter": "Entrar"
+	,"Login mail": "clientes@verdnatura.es"
+	,"Login phone": "+34 607 562 391"
+	
+	,"You've been too idle": "Has estat massa temps inactiu i la sessió ha expirat"
+	,"Invalid login": "Usuari o contrasenya incorrectes, recorda que s'hi distingeix entre majúscula i minúscula"
+	,"There was an internal error": "S'ha produït un error intern"	
+
+	,"Menu": "Menú"
+	,"Exit": "Sortir"
+	,"Test the new website": "Prova la nova web!"
+	,"Old website": "Web antiga"
+	,"Recent changes": "Canvis recents"
+
+	,"Print": "Imprimir"
+	,"Please unlock popups and try again":
+		"Si us plau, desbloqueja els popups i torna-ho a intentar"
+
+	,"Error loading form": "Error al carregar formulari"
+	,"Error loading report": "Error en carregar l'informe"
+	,"By using this site you accept cookies": "En utilitzar aquest lloc web acceptes l'ús de cookies per a la personalització de continguts i anàlisi."
+	,"New version available": "Hi ha una nova actualització, la pàgina recarregarà automàticament per descarregar-la"
+
+	,"AppName": "Verdnatura"
+
+	,"Home": "Inici"
+	,"Orders": "Encàrrecs"
+		,"Basket": "Cistella"
+		,"Last orders": "Últims comandes"
+		,"Invoices": "Factures"
+	,"Catalog": "Catàleg"
+	,"About": "Coneix-nos"
+		,"About us": "Quant a"
+		,"Why": "Per què?"
+	,"Location": "Localització"
+	,"Administration": "Administració"
+		,"Control panel": "Panell de control"
+		,"Users": "Usuaris"
+		,"Connections": "Conexions"
+		,"Visits": "Visites"
+		,"News": "Noticies"
+		,"Photos": "Fotos"
+	,"Reports": "Informes"
+		,"Shelves": "Estanterías"
+		,"Items list": "Llistat articles"
+	,"Contact": "Vull ser client"
+	,"Training": "Formació"
+	,"Agencies": "Agències"
+	,"Configuration": "Configuració"
+		,"Account": "Compte"
+		,"Addresses": "Direccions"
+});
diff --git a/web/locale/ca/js/htk.js b/web/locale/ca/js/htk.js
index ac9f9338..5103c94b 100755
--- a/web/locale/ca/js/htk.js
+++ b/web/locale/ca/js/htk.js
@@ -26,4 +26,6 @@ Vn.Locale.add
 	,"Close": "Tancar"
 	,"Previous": "Anterior"
 	,"Next": "Següent"
+	,"Search": "Cercar"
+	,"Search...": "Cercar..."
 });
diff --git a/web/locale/ca/js/vn.js b/web/locale/ca/js/vn.js
index e9a69e0c..fdba2cf9 100755
--- a/web/locale/ca/js/vn.js
+++ b/web/locale/ca/js/vn.js
@@ -41,6 +41,7 @@ Vn.Locale.add
 	,"Oct": "Oct"
 	,"Nov": "Nov"
 	,"Dec": "Des"
+<<<<<<< HEAD
 
 	,"AppName": "Verdnatura"
 	,"Beta": "Beta"
@@ -86,7 +87,8 @@ Vn.Locale.add
 	,"Configuration": "Configuració"
 		,"Account": "Compte"
 		,"Addresses": "Direccions"
+=======
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	
-	,"SessionExpired": "Has estat massa temps inactiu i la sessió ha expirat."
-	,"InvalidLogin": "Usuari o contrasenya incorrectes. Recorda que s'hi distingeix entre majúscula i minúscula."
+	,"%A, %B %e": "%A, %e de %B"
 });
diff --git a/web/locale/ca/pages/login.json b/web/locale/ca/pages/login.json
deleted file mode 100755
index 02719668..00000000
--- a/web/locale/ca/pages/login.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "User": "Usuari"
-	,"Password": "Contrasenya"
-	,"NotCloseSession": "No tancar sessió"
-	,"IWantToKnowMore": "Vull saber-ne més!"
-	,"Enter": "Entrar"
-	,"LoginMail": "clientes@verdnatura.es"
-	,"LoginPhone": "+34 607 562 391"
-}
diff --git a/web/locale/ca/pages/web.json b/web/locale/ca/pages/web.json
deleted file mode 100755
index 42bc0f69..00000000
--- a/web/locale/ca/pages/web.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	  "Welcome": "Benvingut/da"
-	 ,"Exit": "Eixir"
-}
diff --git a/web/locale/en/forms/account/address-list.json b/web/locale/en/forms/account/address-list.json
new file mode 100755
index 00000000..8d531c98
--- /dev/null
+++ b/web/locale/en/forms/account/address-list.json
@@ -0,0 +1,11 @@
+{
+	 "Addresses": "Addresses"
+	
+	,"Return": "Return"
+	,"AddAddress": "Add address"
+	
+	,"SetAsDefault": "Set as default"
+	,"RemoveAddress": "Remove address"
+	,"EditAddress": "Edit address"
+	,"AreYouSureDeleteAddress": "Are you sure you want to delete the address?"
+}
diff --git a/web/locale/en/forms/account/address.json b/web/locale/en/forms/account/address.json
new file mode 100755
index 00000000..a807bb5f
--- /dev/null
+++ b/web/locale/en/forms/account/address.json
@@ -0,0 +1,15 @@
+{
+	"AddEditAddress": "Add or edit address"
+
+	,"Name": "Consignee"
+	,"Address": "Address"
+	,"City": "City"
+	,"ZipCode": "Zip code"
+	,"Country": "Country"
+	,"Province": "Province"
+
+	,"Return": "Return"
+	,"Accept": "Accept"
+	
+	,"AddressChangedSuccessfully": "Address changed successfully"
+}
diff --git a/web/locale/en/forms/account/conf.json b/web/locale/en/forms/account/conf.json
new file mode 100755
index 00000000..af7261c4
--- /dev/null
+++ b/web/locale/en/forms/account/conf.json
@@ -0,0 +1,19 @@
+{
+	"Configuration": "Configuration"
+
+	,"UserNumber": "User number"
+	,"UserName": "Username"
+	,"Password": "Password"
+	,"Email": "Email"
+	,"Billing": "Billing"
+	,"ReceiveInvoicesByEmail": "Receive invoices by email"
+	
+	,"NewPassword": "New password"
+	,"RepeatPassword": "Repeat password"
+
+	,"MustReloginIfChange": "To change your username you must login again"
+	,"PasswordsChanged": "Password changed!"
+	,"PasswordsDoesntMatch": "Passwords do not match!"
+	
+	,"Addresses": "Addresses"
+}
diff --git a/web/locale/en/forms/admin/access-log.json b/web/locale/en/forms/admin/access-log.json
new file mode 100644
index 00000000..d0b38f3c
--- /dev/null
+++ b/web/locale/en/forms/admin/access-log.json
@@ -0,0 +1,15 @@
+{
+	 "AccessLog": "Access log"
+
+	,"UserNumber:": "User Number:"
+	,"User:": "User:"
+	,"Phone:": "Phone:"
+	,"Mobile:": "Mobile:"
+
+	,"Access": "Access"
+	,"OS": "OS"
+	,"Browser": "Browser"
+	,"Version": "Version"
+	,"Javascript": "Javascript"
+	,"Cookies": "Cookies"
+}
diff --git a/web/locale/en/forms/admin/connections.json b/web/locale/en/forms/admin/connections.json
new file mode 100755
index 00000000..11a75f5b
--- /dev/null
+++ b/web/locale/en/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+	 "Connections": "Connections"
+
+	,"Refresh": "Refresh"
+	,"Visits": "Visits"
+	
+	,"connections": "connections"
+}
diff --git a/web/locale/en/forms/admin/items.json b/web/locale/en/forms/admin/items.json
new file mode 100644
index 00000000..53a2579c
--- /dev/null
+++ b/web/locale/en/forms/admin/items.json
@@ -0,0 +1,9 @@
+{
+	 "Item list": "Item list"
+
+	,"Store": "Store"
+	,"Realm": "Realm"
+	,"Rate": "Rate"
+
+	,"Preview": "Preview"
+}
diff --git a/web/locale/en/forms/admin/links.json b/web/locale/en/forms/admin/links.json
new file mode 100755
index 00000000..cfe8bb34
--- /dev/null
+++ b/web/locale/en/forms/admin/links.json
@@ -0,0 +1,6 @@
+{
+	 "ControlPanel": "Control panel"
+
+	,"Module": "Module"
+	,"Description": "Description"
+}
diff --git a/web/locale/en/forms/admin/photos.json b/web/locale/en/forms/admin/photos.json
new file mode 100755
index 00000000..39489077
--- /dev/null
+++ b/web/locale/en/forms/admin/photos.json
@@ -0,0 +1,12 @@
+{
+	 "Photos": "Photos"
+
+	,"Schema": "Schema"
+	,"ImageName": "Image name"
+	,"Id": "Id"
+	,"ImageFile": "Image file"
+
+	,"Upload": "Upload"
+
+	,"ImageUploaded": "Image uploaded successfully"
+}
diff --git a/web/locale/en/forms/admin/queries.json b/web/locale/en/forms/admin/queries.json
new file mode 100755
index 00000000..37175281
--- /dev/null
+++ b/web/locale/en/forms/admin/queries.json
@@ -0,0 +1,11 @@
+{
+	 "Queries": "Queries"
+
+	,"Execute": "Execute"
+	,"Clean": "Clean"
+
+	,"SQL query": "SQL query"
+	,"Updatable": "Updatable"
+	
+	,"Query executed!": "Query executed!"
+}
diff --git a/web/locale/en/forms/admin/shelves.json b/web/locale/en/forms/admin/shelves.json
new file mode 100644
index 00000000..7fb6f425
--- /dev/null
+++ b/web/locale/en/forms/admin/shelves.json
@@ -0,0 +1,21 @@
+{
+	 "Configuration": "Configuration"
+	,"Select config": "Select config"
+	,"Reign": "Reign"
+	,"Family": "Family"
+	,"Store": "Store"
+	,"Date": "Date"
+	,"Shelf": "Shelf"
+	,"Name prefix": "Name prefix"
+	,"Limit amount per item": "Limit amount per item"
+	,"Title": "Title"
+	,"Show packing": "Show packing"
+	,"Stack different items": "Stack different items"
+	 
+	,"Preview": "Preview"
+
+	,"Pallets": "Pallets"
+	 
+	,"No items found, check that all fields are correct":
+		"No items found, check that all fields are correct"
+}
diff --git a/web/locale/en/forms/admin/users.json b/web/locale/en/forms/admin/users.json
new file mode 100755
index 00000000..58aa9663
--- /dev/null
+++ b/web/locale/en/forms/admin/users.json
@@ -0,0 +1,12 @@
+{
+	 "UserManagement": "User management"
+
+	,"UserName:": "Username:"
+
+	,"UserNumber": "User number"
+	,"UserName": "Username"
+	,"Alias": "Alias"
+	
+	,"AccessAsUser": "Impersonate user"
+	,"AccessLog": "Access log"
+}
diff --git a/web/locale/en/forms/admin/visits.json b/web/locale/en/forms/admin/visits.json
new file mode 100755
index 00000000..cdb52a6e
--- /dev/null
+++ b/web/locale/en/forms/admin/visits.json
@@ -0,0 +1,14 @@
+{
+	 "Visits": "Visits"
+
+	,"Refresh": "Refresh"
+	,"Connections": "Connections"
+
+	,"From": "From"
+	,"To": "To"
+	,"Select date interval": "Select date interval"
+
+	,"visits": "visits"
+	,"news": "news"
+	,"%a, %e %b %Y at %T": "%a, %e %b %Y at %T"
+}
diff --git a/web/locale/en/forms/agencies/packages.json b/web/locale/en/forms/agencies/packages.json
new file mode 100755
index 00000000..d023aa49
--- /dev/null
+++ b/web/locale/en/forms/agencies/packages.json
@@ -0,0 +1,9 @@
+{
+	 "ListByAgency": "Bundles by agency"
+
+	,"ShowByProvince": "Show breakdown by province"
+	,"Agency": "Agency"
+	,"Exps": "Exps."
+	,"Bundles": "Bundles"
+	,"Prevision": "Prev."
+}
diff --git a/web/locale/en/forms/agencies/provinces.json b/web/locale/en/forms/agencies/provinces.json
new file mode 100755
index 00000000..77b81126
--- /dev/null
+++ b/web/locale/en/forms/agencies/provinces.json
@@ -0,0 +1,10 @@
+{
+	 "ByProvince": "Breakdown by province"
+
+	,"Return": "Return"
+	
+	,"SelectAgency": "Select an agency"
+	,"Province": "Province"
+	,"Expeditions": "Exps."
+	,"Left": "Left"
+}
diff --git a/web/locale/en/forms/cms/about.json b/web/locale/en/forms/cms/about.json
new file mode 100755
index 00000000..00f38993
--- /dev/null
+++ b/web/locale/en/forms/cms/about.json
@@ -0,0 +1,47 @@
+{
+	"QualityAndVariety": "Quality, variety and service"
+
+	,"MaximumFreshness": "Verdnatura offers a product guarantee maximum freshness thanks to their daily flowers and plants from Holland, South America, or from the same producer receptions."
+	,"SquareMeters": "Over facilities 13,000m"
+	,"AboutRealms": "With cut flowers, green, artificial and accessories"
+	,"AboutLocation": "Settled in Valencia, Madrid, Barcelona, Holland and France, we offer direct sales in our facilities and distribution throughout Spain by own service or agency."
+	,"PurchaseThroughWeb": "Purchase through our website and receive your order comfortably in your florist.In less than 24 hours!"
+
+	,"WhatMakeUsDifferent": "What makes us different?"
+
+	,"DesignVariety": "The variety in design, quality of materials used and our service delivery, will provide a showcase of dynamic genre, always fresh and appealing."
+	,"AdaptToYourNeeds": "Verdnatura adapts to the needs of each customer by offering a wide range of products, always guaranteed."
+	,"TheBestQuality": "The best quality at the best price. Without forgetting the design."
+
+	,"AtYourService": "We are at your service"
+
+	,"BuyersAndTraders": "9 specialized trade buyers and our 20 advise you on everything you need."
+	
+	,"Verdnatura training": "Verdnatura training"
+
+	,"GoodTraining": "In Verdnatura we know that a good education is essential for the optimal development of any activity, and of course, also the florist."
+	,"SpecialTrainingPrices": "For the school budget does not affect the quality of your training, we work with special pricing policy for all schools that request it take courses in our facilities Verdnatura chair."
+	,"YoutubeChannel": "And do not miss Verdnatura videos on Youtube Channel. Where you'll find plenty of interesting tips on handling of the flower."
+	
+	,"HowWeWork": "How we work?"
+
+	,"FirstQualityControl": "First quality control"
+	,"SecondQualityControl": "Second quality control"
+	,"ThirdQualityControl": "Third quality control"
+	,"FourthQualityControl": "Fourth quality control"
+
+	,"AalsmeerAuction": "At 5: 00h, our purchasing managers acquire, in the auction of Aalsmeer and Noaldwijk, gender, the producer has reaped the previous day."
+	,"BeforeAuction": "After purchase, the genre quickly enters Verdnatura Holland BV, our company Flora Holland in Aalsmeer."
+	,"DirectlyFromProviders": "Besides buying through the Dutch auction, we buy directly from producers Colombia, Ecuador, Thailand, Malaysia, Africa and Australia. These products are directly supervised by our delegates Purchase located in each area. This merchandise will travel to Amsterdam, subjected to a process Vaacum and in less than two hours after landing, you will be at our facility in Aalsmeer."
+	,"GoodsDischarge": "At 7: 00h our fellow Aalsmeer start receiving the purchased goods, having a first quality control, and creating it in stock. Now available for our customers on the web."
+	,"GoodsTravel": "The goods travel for a day and a half trucks watertight compartments at different temperatures, so that the cold chain is not broken trip in the best conditions."
+	,"GoodsReception": "Upon receipt of the merchandise responsible for the purchase reviewed state that arrives, accepting or rejecting it as appropriate, it discharged cold and quickly enters our camera."
+	,"CustomerOrders": "Our customers can place their orders via the web, by phone or coming directly to our facilities. We have a team of specialized commercial advise you on your purchase and inform you the latest news and articles that may be of interest, so that your purchase meets your needs and stay totally satisfied."
+	,"AfterOrder": "Once placed the order, turn to the production department. During the preparation of this new quality control (third) in which the poor will be discarded merchandise it is made."
+	,"BuyerControl": "As the preparation is completed, a new control (fourth) where a specialist account is made and check the status of products. If they do not meet the quality standards required rejects and replaces the right."
+	,"EmbeddedSection": "Then takes embedded section, where the order is suitable for proper delivery. Each type of delivery requires a method suitable for embedded gender protected books and reaches the customer in perfect condition."
+	,"AfterEmbedAgency": "Once the product has been fitted it is stored again in the chamber until they leave by agency or own deal, receiving the customer within 24 hours in the case of the agency or the same day for the cast, comfortably at home ."
+	,"FreshnessGuaranteed": "This way of working ensures freshness by rapid processes and maintaining the cold chain from purchase to receipt by our customer."
+
+	,"AboutSummary": "75 people spread over almost everybody so that our client has the broadest portfolio in the industry, coolest flower, plant newest, latest accessories, and fastest service possible."
+}
diff --git a/web/locale/en/forms/cms/contact.json b/web/locale/en/forms/cms/contact.json
new file mode 100755
index 00000000..b8c61ac0
--- /dev/null
+++ b/web/locale/en/forms/cms/contact.json
@@ -0,0 +1,20 @@
+{
+	 "IWantCustomer": "I want to be a customer!"	
+	
+	,"FillFormData": "Fill the form with your details and we will contact you soon."
+	,"OrCallUs": "Or if you prefer, call us at 963 242 100."
+	,"AllFieldsMandatory": "* All fields are mandatory."
+	
+	,"Name": "Name"
+	,"Surname": "Surname"
+	,"EMail": "Email"
+	,"Message": "Message"
+	,"Address": "Address"
+	,"PC": "Zip code"
+	,"City": "City"
+	,"Phone": "Phone"
+	,"Send": "Send"
+
+	,"DataSentSuccess": "Your details have been sent successfully. Shortly we will contact you."
+	,"ErrorSendingData": "Failed to send the data. Please check that you have filled in all the fields and you entered the anti-spam code correctly."
+}
diff --git a/web/locale/en/forms/cms/home.json b/web/locale/en/forms/cms/home.json
new file mode 100755
index 00000000..3179c27e
--- /dev/null
+++ b/web/locale/en/forms/cms/home.json
@@ -0,0 +1,15 @@
+{
+	 "Start order": "Start order"
+
+	,"Sent": "Sent"
+	,"Author": "Author"
+	,"votes": "votes"
+	,"NoAnswerSelected": "No answer selected"
+	,"ThanksForVote": "Thanks for your vote!"
+	,"Vote": "Vote"
+	,"Total": "Total"
+	,"BrownserRecommend":
+		 "Verdnatura recommend using the Mozilla Firefox web browser for full functionality of our website."
+	,"PressHere": "Click here to download Firefox"
+}
+
diff --git a/web/locale/en/forms/cms/location.json b/web/locale/en/forms/cms/location.json
new file mode 100755
index 00000000..ca65d3a6
--- /dev/null
+++ b/web/locale/en/forms/cms/location.json
@@ -0,0 +1,3 @@
+{
+	 "ShowMap": "Show map"
+}
diff --git a/web/locale/en/forms/cms/training.json b/web/locale/en/forms/cms/training.json
new file mode 100755
index 00000000..0967ef42
--- /dev/null
+++ b/web/locale/en/forms/cms/training.json
@@ -0,0 +1 @@
+{}
diff --git a/web/locale/en/forms/cms/why.json b/web/locale/en/forms/cms/why.json
new file mode 100755
index 00000000..2cef3a58
--- /dev/null
+++ b/web/locale/en/forms/cms/why.json
@@ -0,0 +1,25 @@
+{
+	 "AboutCompany": "Why Verdnatura?"
+	,"StorePhoto": "Store photo"
+
+	,"BecauseOurBigCatalog": "Because we have the largest catalog in the sector, renewed daily."
+	,"BecauseThisWeb": "Because this website, with real time stock always at your disposal."
+	,"BecauseOurShoppingDep": "For our purchasing department with 9 specialized buyers."
+	,"BecauseOrderIsEasy": "Because it is very easy to place your order by web, phone or coming."
+	,"BecauseOurPlant": "Because our premises, come and visit us. You'll love."
+	,"BecauseOurSalesDep": "For our commercial department, with professionals who will always find a solution to your needs."
+	,"BecauseOurWorkShop": "Because we have a sewing shop to help you."
+	,"BecauseWeHaveWhatYouNeed": "Because we have what you need when you need it ..."
+
+	,"AboutDesc":
+		 "We are a company engaged in the wholesale and distribution of a wide range of accessories, greens and flowers to florists or other wholesalers."
+	
+	,"AboutService":
+		 "We have home delivery service with our vehicles throughout the province of Valencia and limited areas of Castellón, Alicante, Murcia, Albacete and Madrid send the rest of the peninsula by transportation agencies with 24/48 hours service (Zeleris, via express) . We also do direct sales to florists in any of our facilities."
+	
+	,"AboutDisp":
+		 "Our company has over 50 employees and several branches. The main is located in Valencia and has more than 8000 m2. We also have a warehouse located in Mercaflor - Mercavalencia (Valencia) that perform direct sales only."
+	
+	,"AboutOrder":
+		 "You can make your orders and reservations by telephone at 96 324 21 00, online through our website or directly in our facilities."
+}
diff --git a/web/locale/en/forms/ecomerce/basket.json b/web/locale/en/forms/ecomerce/basket.json
new file mode 100755
index 00000000..1ed95850
--- /dev/null
+++ b/web/locale/en/forms/ecomerce/basket.json
@@ -0,0 +1,29 @@
+{
+	 "ShoppingBasket": "Shopping basket"
+
+	,"Delete": "Delete order"
+	,"GoToCatalog": "Go to catalog"
+	,"ConfigureOrder": "Configure order"
+	,"Checkout": "Checkout"
+
+	,"OrderNumber": "Order number"
+	,"DateExit": "Shipping date"
+	,"Warehouse": "Store"
+	,"OrderTotal": "Total"
+
+	,"Amount": "Amount"
+	,"Pack": "Pack"
+	,"Stems": "Stems"
+	,"Avail": "Avail"
+	,"Item": "Item"
+	,"Cat": "Cat"
+	,"S1": "Siz"
+	,"Color": "Color"
+	,"Origin": "Origin"
+	,"Price": "Price"
+	,"Disc": "Desc"
+	,"Subtotal": "Subtotal"
+	
+	,"OrderItemsUpdated": "Your order takes too long and has been updated, prices or quantities of your items may have changed"
+	,"RememberReconfiguringImpact": "Remember that if you reconfigure your order prices or quantities of your items may change"
+}
diff --git a/web/locale/en/forms/ecomerce/catalog.json b/web/locale/en/forms/ecomerce/catalog.json
new file mode 100755
index 00000000..8096ada0
--- /dev/null
+++ b/web/locale/en/forms/ecomerce/catalog.json
@@ -0,0 +1,57 @@
+{
+	 "Catalog": "Catalog"
+	,"SearchResults": "Search results"
+
+	,"SelectFamily": "Select family"
+	,"Choose filter from right menu": "Choose a filter from the right menu"
+	,"Choose a realm": "Choose a realm"
+	,"ArticleNotFound": "Item not found"
+	,"ArticleNotAvailable": "Item not available"
+
+	,"List view": "List view"
+	,"Grid view": "Grid view"
+	,"Switch view": "Switch view"
+	,"StartOrder": "Start order"
+	,"ShoppingBasket": "Shopping basket"
+	
+	,"%A, %e of %B": "%A, %e of %B"
+	,"Agency": "Agency"
+	,"Warehouse": "Warehouse"
+	
+	,"Filter by": "Filter by"
+	,"Order by": "Order by"
+
+	,"Search": "Search"
+	,"Change": "Change"
+	,"Available": "Available"
+	,"Size": "Size"
+	,"Realm": "Realm"
+	,"Family": "Family"
+	,"Color": "Color"
+	,"Producer": "Producer"
+	,"Origin": "Origin"
+	,"Category": "Category"
+	,"Remove filters": "Remove filters"
+
+	,"Price": "Price"
+	,"Amount": "Amount"
+	,"Name": "Name"
+	,"Pack": "Pack"
+	,"Lower price": "Lower price"
+	,"Higher price": "Higher price"
+	,"Lower size": "Lower size"
+	,"Higher size": "Higher size"
+	,", %.0d Units": ", %.0d Units"
+	
+	,"from": "from"
+	,"from %.2d€": "from %.2d€"
+	,"AddToBasket": "Add to basket"
+	,"Add": "Add"
+	,"Erase": "Remove"
+	,"Confirm": "Confirm"
+
+	,"IndicativePhotos": "* Photos are indicative"
+	
+	,"Added%dOf%s": "Added %d of %s"
+	,"NoMoreAmountAvailable": "No more amount available"
+}
diff --git a/web/locale/en/forms/ecomerce/checkout.json b/web/locale/en/forms/ecomerce/checkout.json
new file mode 100755
index 00000000..2ee47c1b
--- /dev/null
+++ b/web/locale/en/forms/ecomerce/checkout.json
@@ -0,0 +1,31 @@
+{
+	 "ConfigureOrder": "Configure order"
+
+	,"Cancel": "Cancel"
+	,"Next": "Next"
+	
+	,"DeliveryOrPickupQuestion": "Do you want to receive or pickup the order?"
+	,"ReceiveThroughtAgency": "Receive by agency"
+	,"ReceiveThroughtRoute": "Verdnatura delivery"
+	,"PickupInStore": "Store pickup"
+	
+	,"OrderDateDeliveryQuestion": "What day you want to receive the order?"
+	,"OrderDatePickupQuestion": "What day you want to pickup your order?"
+	,"AddressQuestion": "Where do you want to receive the order?"
+	,"AgencyQuestion": "By wich agency you want to receive the order?"
+	,"PickupWarehouseQuestion": "What store you want to pickup your order?"
+
+	,"ConfirmToAccessCatalog": "Confirm the data to access the catalog"
+	,"Arrival": "Arrival"
+	,"Pickup": "Pickup"
+	,"%A, %e of %B": "%A, %e of %B"
+	,"Agency": "Agency"
+	,"Warehouse": "Store"
+	,"Confirm": "Confirm"
+
+	,"OrderStarted": "Order started"
+	,"OrderUpdated": "Order updated"
+	
+	,"NoAgeciesAvailableForDate": "No agencies available for the selected date and consignee, change the shipping date of your order"
+	,"NoWarehousesAvailableForDate": "No stores available for the selected date, change the pickup date of you order"
+}
diff --git a/web/locale/en/forms/ecomerce/confirm.json b/web/locale/en/forms/ecomerce/confirm.json
new file mode 100755
index 00000000..3348d945
--- /dev/null
+++ b/web/locale/en/forms/ecomerce/confirm.json
@@ -0,0 +1,36 @@
+{
+	 "Checkout": "Checkout"
+
+	,"Order summary": "Order summary"
+	,"Delivery at": "Delivery at"
+	,"Agency": "Agency"
+	,"Warehouse": "Store"
+	
+	,"Previous balance": "Previous balance"
+	,"Order total": "Order total"
+	,"Order VAT": "Order VAT"
+	,"Total debt": "Total debt"
+	,"Credit": "Credit"
+	,"Exceeded credit": "Exceeded credit"
+	
+	,"Amount to pay": "Amount to pay"
+	,"Pay method": "Pay method"
+
+	,"Use my balance": "Use my balance"
+	,"You have a favorable balance.": "You do not need to perform any payment, you have a favorable balance."
+	,"Use my credit": "Use my credit"
+	,"You have a favorable credit.": "You do not need to pay now, you have a favorable credit."
+	,"Credit card": "Credit card"
+	,"You will be redirected to the payment.": "By confirming the order you will be redirected to the payment platform."
+	,"Bank Transfer": "Bank Transfer"
+	,"Make a transfer to one account.": "Make a transfer to one of the following accounts and send the receipt to your salesperson."
+	,"Pay later": "Pay later"
+
+	,"Modify": "Modify"
+	,"Confirm": "Confirm"
+	
+	,"Order confirmed successfully": "Your order has been confirmed successfully"
+	,"Accept": "Accept"
+	
+	,"You have exceeded your credit.": "You have exceeded your credit, in order to prepare your order please pay your debt."
+}
diff --git a/web/locale/en/forms/ecomerce/invoices.json b/web/locale/en/forms/ecomerce/invoices.json
new file mode 100755
index 00000000..c599ed62
--- /dev/null
+++ b/web/locale/en/forms/ecomerce/invoices.json
@@ -0,0 +1,8 @@
+{
+	 "Invoices": "Invoices"
+
+	,"Serial": "Serial"
+	,"Date": "Date"
+	,"Import": "Import"
+	,"Download PDF": "Download PDF"
+}
diff --git a/web/locale/en/forms/ecomerce/orders.json b/web/locale/en/forms/ecomerce/orders.json
new file mode 100755
index 00000000..49ea44b6
--- /dev/null
+++ b/web/locale/en/forms/ecomerce/orders.json
@@ -0,0 +1,39 @@
+{
+	 "OpenOrders": "Open orders"
+
+	,"StartOrder": "Start order"
+	,"ContinueOrder": "Continue order"
+	,"OrderNumber": "Order number"
+	,"DateMake": "Creation date"
+	,"DateExit": "Shipping date"
+	,"SendMethod": "Delivery method"
+
+	,"LastOrders": "Last orders"
+
+	,"Balance:": "Balance:"
+	,"PaymentInfo": "The amount shown is your slope (negative) or favorable balance today, it disregards future orders. For get your order shipped, this amount must be equal to or greater than 0. If you want to make a down payment, click the payment button, delete the suggested amount and enter the amount you want."
+	,"MakePayment": "Make payment"
+	,"Company": "Company"
+	,"Pending": "Pending"
+	,"Pay": "Pay"
+	,"Basket": "Basket"
+	,"ShoppingBasket": "Shopping basket"
+
+	,"SeeOrder": "Show details of the order"
+	,"Delivery": "Delivery"
+	,"TicketNumber": "Ticket number"
+	,"SentAddress": "Delivery address"
+	,"Consignee": "Consignee"
+	,"Boxes": "Bundles"
+	,"TotalWithVAT": "Total with VAT"
+	,"Pending": "Pending"
+	,"PayOrder": "Pay order"
+
+	,"AmountToPay:": "Amount to pay (€):"
+	,"AmountError": "The amount must be a positive number less than or equal to the outstanding amount"
+	,"PayError": "Failed to make the payment"
+	
+	,"An error has been in the payment": "It seems that there has been an error in the payment"
+	,"Retry": "Retry"
+	,"Accept": "Accept"
+}
diff --git a/web/locale/en/forms/ecomerce/ticket.json b/web/locale/en/forms/ecomerce/ticket.json
new file mode 100755
index 00000000..ccb4cd01
--- /dev/null
+++ b/web/locale/en/forms/ecomerce/ticket.json
@@ -0,0 +1,23 @@
+{
+	 "OrderDetail": "Order detail"
+
+	,"%A, %e of %B %Y": "%A, %e of %B %Y"
+	,"Print delivery note": "Print delivery note"
+
+	,"Delivery": "Delivery"
+	,"Total": "Total"
+	,"Tax base": "Tax base"
+	,"VAT": "VAT"
+
+	,"ItemNumber": "Item number"
+	,"Amount": "Amount"
+	,"Item": "Item"
+	,"Category": "Category"
+	,"S1": "Siz"
+	,"Stems": "Stems"
+	,"Color": "Color"
+	,"Origin": "Origin"
+	,"Price": "Price"
+	,"Disc": "Disc"
+	,"Subtotal": "Subtotal"
+}
diff --git a/web/locale/en/forms/news/new.json b/web/locale/en/forms/news/new.json
new file mode 100755
index 00000000..0213d99a
--- /dev/null
+++ b/web/locale/en/forms/news/new.json
@@ -0,0 +1,12 @@
+{
+	 "AddEditNew": "Add or edit new"
+
+	,"Title": "Title"
+	,"NewBody": "New body"
+	,"Tag": "Tag"
+
+	,"Return": "Return"
+	,"Accept": "Accept"
+	
+	,"NewChangedSuccessfully": "New changed successfully"
+}
diff --git a/web/locale/en/forms/news/news.json b/web/locale/en/forms/news/news.json
new file mode 100755
index 00000000..b263c5d0
--- /dev/null
+++ b/web/locale/en/forms/news/news.json
@@ -0,0 +1,12 @@
+{
+	 "NewsManagement": "News management"
+
+	,"AddNew": "Add new"
+	,"EditNew": "Edit new"
+
+	,"NewNum": "New number"
+	,"Date": "Date"
+	,"Author": "Author"
+	,"Title": "Title"
+	,"Priority": "Priority"
+}
diff --git a/web/locale/en/js/db.js b/web/locale/en/js/db.js
new file mode 100755
index 00000000..591d711f
--- /dev/null
+++ b/web/locale/en/js/db.js
@@ -0,0 +1,8 @@
+Vn.Locale.add
+({
+	 "ConnError": "Connection failed"
+	,"BadServerReply": "Bad server reply"
+	,"ModelNotUpdatable": "Model not updatable"
+	,"RowNotExists": "The record does not exist or has been deleted"
+	,"ColNotExists": "The column does not exist"
+});
diff --git a/web/locale/en/js/hedera.js b/web/locale/en/js/hedera.js
new file mode 100755
index 00000000..65df8ac5
--- /dev/null
+++ b/web/locale/en/js/hedera.js
@@ -0,0 +1,59 @@
+Vn.Locale.add
+({
+	 "User": "User"
+	,"Password": "Password"
+	,"Beta": "Beta"
+	,"Do not sign out": "Do not sign out"
+	,"I want to know more": "I want to know more"
+	,"Enter": "Enter"
+	,"Login mail": "clientes@verdnatura.es"
+	,"Login phone": "+34 607 562 391"
+
+	,"You've been too idle": "You have been idle too long and your session has expired"
+	,"Invalid login": "Username or password incorrect, remember that it is case-sensitive"
+	,"There was an internal error": "There was an internal error"
+
+	,"Menu": "Menu"
+	,"Exit": "Exit"
+	,"Test the new website": "Test the new website!"
+	,"Old website": "Old website"
+	,"Recent changes": "Recent changes"
+
+	,"Print": "Print"
+	,"Please unlock popups and try again":
+		"Please unlock popups and try again"
+
+	,"Error loading form": "Error while loading form"
+	,"Error loading report": "Error loading report"
+	,"By using this site you accept cookies": "By using this website you accept the use of cookies for customization of content and analysis."
+	,"New version available": "There is a new update, the page will automatically recharge to download it"
+	
+	,"AppName": "Verdnatura"
+
+	,"Home": "Home"
+	,"Orders": "Orders"
+		,"Basket": "Basket"
+		,"Last orders": "Last orders"
+		,"Invoices": "Invoices"
+	,"Catalog": "Catalog"
+	,"About": "About"
+		,"About us": "About us"
+		,"Why": "Why"
+	,"Location": "Location"
+	,"Administration": "Administration"
+		,"Control panel": "Control panel"
+		,"Users": "Users"
+		,"Connections": "Connections"
+		,"Visits": "Visits"
+		,"News": "News"
+		,"Photos": "Photos"
+	,"Reports": "Reports"
+		,"Shelves": "Shelves"
+		,"Items list": "Items list"
+	,"Contact": "Contact"
+	,"Training": "Training"
+	,"Agencies": "Agencies"
+	,"Configuration": "Configuration"
+		,"Account": "Account"
+		,"Addresses": "Addresses"
+});
diff --git a/web/locale/en/js/htk.js b/web/locale/en/js/htk.js
new file mode 100755
index 00000000..d468f283
--- /dev/null
+++ b/web/locale/en/js/htk.js
@@ -0,0 +1,31 @@
+Vn.Locale.add
+({
+	 "True": "True"
+	,"False": "False"
+	,"Null": "Null"
+	,"ChangeDate": "Change date"
+	,"Sort": "Sort"
+	,"At": "at"
+	,"Of": "of"
+	,"OfThe": "of the"
+	,"Remove": "Remove"
+	,"Loading": "Loading"
+	,"Loading...": "Loading..."
+	,"ReallyDelete": "Are you sure you want to delete the line?"
+	,"YouMustBeLoggedIn": "You must be a registered user"
+	,"EmptyList": "Empty list"
+	,"NoData": "No data"
+	,"ErrorLoadingData": "Error"
+	,"Error": "Error"
+	,"Image": "Image"
+	,"File": "File"
+	,"FileName": "File name"
+	,"UpdateImage": "Add or update an image"
+	,"UploadFile": "Upload file"
+	,"ImageAdded": "Image added successfully"
+	,"Close": "Close"
+	,"Previous": "Previous"
+	,"Next": "Next"
+	,"Search": "Search"
+	,"Search...": "Search..."
+});
diff --git a/web/locale/en/js/vn.js b/web/locale/en/js/vn.js
new file mode 100755
index 00000000..673b252a
--- /dev/null
+++ b/web/locale/en/js/vn.js
@@ -0,0 +1,46 @@
+Vn.Locale.add
+({
+	 "Sunday": "Sunday"
+	,"Monday": "Monday"
+	,"Tuesday": "Tuesday"
+	,"Wednesday": "Wednesday"
+	,"Thursday": "Thursday"
+	,"Friday": "Friday"
+	,"Saturday": "Saturday"
+
+	,"Su": "Su"
+	,"Mo": "Mo"
+	,"Tu": "Tu"
+	,"We": "We"
+	,"Th": "Th"
+	,"Fr": "Fr"
+	,"Sa": "Sa"
+
+	,"January": "January"
+	,"February": "February"
+	,"March": "March"
+	,"April": "April"
+	,"May": "May"
+	,"June": "June"
+	,"July": "June"
+	,"August": "August"
+	,"September": "September"
+	,"October": "October"
+	,"November": "November"
+	,"December": "December"
+
+	,"Jan": "Jan"
+	,"Feb": "Feb"
+	,"Mar": "Mar"
+	,"Apr": "Apr"
+	,"May": "May"
+	,"Jun": "Jun"
+	,"Jul": "Jul"
+	,"Ago": "Ago"
+	,"Sep": "Sep"
+	,"Oct": "Oct"
+	,"Nov": "Nov"
+	,"Dec": "Dic"
+	
+	,"%A, %B %e": "%A, %B %e"
+});
diff --git a/web/locale/en/pages/tpv.json b/web/locale/en/pages/tpv.json
new file mode 100755
index 00000000..4e04b791
--- /dev/null
+++ b/web/locale/en/pages/tpv.json
@@ -0,0 +1,4 @@
+{
+	  "PaymentComplete": "Payment completed, you can return to our website."
+	  ,"ReturnToWeb": "Back to Verdnatura"
+}
diff --git a/web/locale/en/pages/update-browser.json b/web/locale/en/pages/update-browser.json
new file mode 100755
index 00000000..1735de56
--- /dev/null
+++ b/web/locale/en/pages/update-browser.json
@@ -0,0 +1,4 @@
+{
+	 "UpdateYourBrowser": "Upgrade your browser"
+	,"ContinueAnyway": "Continue anyway"
+}
diff --git a/web/locale/en/pages/version-menu.json b/web/locale/en/pages/version-menu.json
new file mode 100755
index 00000000..fa6ddf49
--- /dev/null
+++ b/web/locale/en/pages/version-menu.json
@@ -0,0 +1,8 @@
+{
+	"Welcome to Verdnatura, where are you going?": "Welcome to Verdnatura, where are you going?"
+
+	,"New website": "New website"
+	,"(Fantastic)": "(Fantastic)"
+	,"Old website": "Old website"
+	,"(Best choose new)": "(Best choose new)"
+}
diff --git a/web/locale/en/rest/query.json b/web/locale/en/rest/query.json
new file mode 100755
index 00000000..75f9e384
--- /dev/null
+++ b/web/locale/en/rest/query.json
@@ -0,0 +1,5 @@
+{
+	 "InvalidAction": "Invalid action"
+
+	,"EmptyQuery": "Empty query"
+}
diff --git a/web/locale/es/forms/admin/connections.json b/web/locale/es/forms/admin/connections.json
new file mode 100755
index 00000000..4ef5a84a
--- /dev/null
+++ b/web/locale/es/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+	 "Connections": "Conexiones"
+
+	,"Refresh": "Actualizar"
+	,"Visits": "Visitas"
+	
+	,"connections": "conexiones"
+}
diff --git a/web/locale/es/forms/admin/items.json b/web/locale/es/forms/admin/items.json
new file mode 100644
index 00000000..68eee4ef
--- /dev/null
+++ b/web/locale/es/forms/admin/items.json
@@ -0,0 +1,9 @@
+{
+	 "Item list": "Listado de artículos"
+
+	,"Store": "Almacén"
+	,"Realm": "Reino"
+	,"Rate": "Tarifa"
+
+	,"Preview": "Mostrar"
+}
diff --git a/web/locale/es/forms/admin/queries.json b/web/locale/es/forms/admin/queries.json
new file mode 100755
index 00000000..420d4384
--- /dev/null
+++ b/web/locale/es/forms/admin/queries.json
@@ -0,0 +1,11 @@
+{
+	 "Queries": "Consultas"
+
+	,"Execute": "Ejecutar"
+	,"Clean": "Limpiar"
+
+	,"SQL query": "Consulta SQL"
+	,"Updatable": "Actualizable"
+	
+	,"Query executed!": "¡Consulta ejecutada!"
+}
diff --git a/web/locale/es/forms/admin/visits.json b/web/locale/es/forms/admin/visits.json
index e2cf749b..26d18c86 100755
--- a/web/locale/es/forms/admin/visits.json
+++ b/web/locale/es/forms/admin/visits.json
@@ -1,31 +1,14 @@
 {
 	 "Visits": "Visitas"
-	,"VisitsManagement": "Gestión de visitas"
-	 
-	,"ActiveSessions": "Usuarios conectados"
-	,"VisitsQuery": "Consulta de visitas"
+
 	,"Refresh": "Actualizar"
+	,"Connections": "Conexiones"
 
-	,"ActiveSessions:": "Usuarios conectados:"
-	,"NewVisitsTotal:": "Nuevas visitas:"
+	,"From": "Desde"
+	,"To": "Hasta"
+	,"Select date interval": "Selecciona un intérvalo de fechas"
 
-	,"SessionNumber": "Nº sesión"
-	,"User": "Usuario"
-	,"Login": "Hora de acceso"
-	,"LastActivity": "Última actividad"
-	,"SO": "Sistema Operativo"
-	,"Version": "Versión"
-	,"NewVisit": "Nueva visita"
-
-	,"SelectDateInterval": "Selecciona un intérvalo de fechas"
-	,"FromDate:": "Desde el día:"
-	,"ToDate:": "Hasta el día:"
-	,"VisitsTotal:": "Total visitas:"
-
-	,"Browser": "Navegador"
-	,"MinVersion": "Versión mínima"
-	,"MaxVersion": "Versión máxima"
-	,"LastVisit": "Última visita"
-	,"NewVisits": "Nuevas visitas"
+	,"visits": "visitas"
+	,"news": "nuevas"
 	,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
 }
diff --git a/web/locale/es/forms/cms/about.json b/web/locale/es/forms/cms/about.json
index 7517512a..ce9fad98 100755
--- a/web/locale/es/forms/cms/about.json
+++ b/web/locale/es/forms/cms/about.json
@@ -17,7 +17,7 @@
 
 	,"BuyersAndTraders": "9 compradores especializados y nuestros 20 comerciales te asesorarán en todo lo que necesites."
 	
-	,"Training": "Verdnatura formación"
+	,"Verdnatura training": "Verdnatura formación"
 
 	,"GoodTraining": "En Verdnatura sabemos que una buena formación es imprescindible para el desarrollo óptimo de cualquier actividad, y cómo no, también la de florista."
 	,"SpecialTrainingPrices": "Para que el presupuesto de una escuela no repercuta en la calidad de tu formación, colaboramos con una política de precios especiales para todas aquellas escuelas que lo soliciten realizar cursos en nuestras instalaciones de Verdnatura Silla."
diff --git a/web/locale/es/forms/cms/home.json b/web/locale/es/forms/cms/home.json
index d440f483..3da49277 100755
--- a/web/locale/es/forms/cms/home.json
+++ b/web/locale/es/forms/cms/home.json
@@ -1,5 +1,7 @@
 {
-	 "Sent": "Enviado"
+	 "Start order": "Empezar pedido"
+
+	,"Sent": "Enviado"
 	,"Author": "Autor"
 	,"votes": "votos"
 	,"NoAnswerSelected": "No has seleccionado ninguna respuesta"
diff --git a/web/locale/es/forms/ecomerce/catalog.json b/web/locale/es/forms/ecomerce/catalog.json
index c184c5df..a45ec641 100755
--- a/web/locale/es/forms/ecomerce/catalog.json
+++ b/web/locale/es/forms/ecomerce/catalog.json
@@ -3,10 +3,14 @@
 	,"SearchResults": "Resultados de búsqueda"
 
 	,"SelectFamily": "Selecciona una familia"
-	,"SelectSubtype": "Selecciona un subtipo en el menú de la derecha"
+	,"Choose filter from right menu": "Elige un filtro en el menú de la derecha"
+	,"Choose a realm": "Elige un reino"
 	,"ArticleNotFound": "Artículo no encontrado"
 	,"ArticleNotAvailable": "Artículo no disponible"
 
+	,"List view": "Vista de lista"
+	,"Grid view": "Vista de rejilla"
+	,"Switch view": "Cambiar vista"
 	,"StartOrder": "Empezar pedido"
 	,"Basket": "Cesta"
 	,"Shopping basket": "Cesta de la compra"
@@ -18,22 +22,43 @@
 	,"Warehouse": "Almacén"
 	,"Agency": "Agencia"
 	
+<<<<<<< HEAD
 	,"Realm": "Familia"
 	,"Subtype": "Subtipo"
 	,"Search:": "Buscar:"
 	,"GeneralSearch": "Búsqueda general"
-
-	,"Amount": "Cant"
-	,"Aval": "Disp"
-	,"Name": "Nombre"
-	,"S1": "Med"
-	,"S2": "S2"
-	,"Stems": "Tallos"
-	,"Cat": "Cat"
-	,"Pack": "Pack"
-	,"Origin": "Origen"
-	,"Price": "Precio"
+=======
+	,"%A, %e of %B": "%A, %e de %B"
+	,"Agency": "Agencia"
+	,"Warehouse": "Almacén"
 	
+	,"Filter by": "Filtrar por"
+	,"Order by": "Ordenar por"
+	
+	,"Search": "Buscar"
+	,"Change": "Cambiar"
+	,"Available": "Disponible"
+	,"Size": "Medida"
+	,"Realm": "Reino"
+	,"Family": "Familia"
+	,"Color": "Color"
+	,"Producer": "Productor"
+	,"Origin": "Origen"
+	,"Category": "Categoría"
+	,"Remove filters": "Quitar filtros"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
+
+	,"Price": "Precio"
+	,"Amount": "Cantidad"
+	,"Name": "Nombre"
+	,"Pack": "Pack"
+	,"Lower price": "Precio más bajo"
+	,"Higher price": "Precio más alto"
+	,"Lower size": "Medida más pequeña"
+	,"Higher size": "Medida más grande"
+	,", %.0d Units": ", %.0d Unidades"
+	
+	,"from": "desde"
 	,"from %.2d€": "desde %.2d€"
 	,"AddToBasket": "Añadir artículo"
 	,"Add": "Añadir"
diff --git a/web/locale/es/forms/ecomerce/confirm.json b/web/locale/es/forms/ecomerce/confirm.json
index 5bd7c389..5fac0a00 100755
--- a/web/locale/es/forms/ecomerce/confirm.json
+++ b/web/locale/es/forms/ecomerce/confirm.json
@@ -1,25 +1,36 @@
 {
 	 "Checkout": "Finalizar pedido"
 
-	,"OrderSummary": "Resumen del pedido"
-	,"Arrival": "Llegada"
-	,"%A, %e of %B": "%A, %e de %B"
+	,"Order summary": "Resumen del pedido"
+	,"Delivery at": "Entrega el"
 	,"Agency": "Agencia"
 	,"Warehouse": "Almacén"
 	
-	,"DeliveryAddress": "Dirección de envío"
-
-	,"Import": "Importe"
-	,"TaxBase": "Base imponible"
-	,"VAT": "IVA"
-	,"Total": "Total"
+	,"Previous balance": "Saldo anterior"
+	,"Order total": "Total pedido"
+	,"Order VAT": "IVA pedido"
+	,"Total debt": "Total deuda"
+	,"Credit": "Crédito"
+	,"Exceeded credit": "Crédito excedido"
 	
-	,"Cancel": "Cancelar"
+	,"Amount to pay": "Cantidad a pagar"
+	,"Pay method": "Método de pago"
+
+	,"Use my balance": "Usar mi saldo"
+	,"You have a favorable balance.": "No necesitas pagar nada, tienes un saldo favorable."
+	,"Use my credit": "Usar mi crédito"
+	,"You have a favorable credit.": "No necesitas pagar nada, tienes crédito favorable."
+	,"Credit card": "Tarjeta de crédito"
+	,"You will be redirected to the payment.": "Al confirmar el pedido serás redirigido a la plataforma de pago."
+	,"Bank Transfer": "Transferencia bancaria"
+	,"Make a transfer to one account.": "Haz una transferecia a una de las siguientes cuentas y envía el justificante a tu comercial."
+	,"Pay later": "Pagar más tarde"
+
 	,"Modify": "Modificar"
 	,"Confirm": "Confirmar"
 	
-	,"OrderPlacedSuccessfully": "Tu pedido ha sido realizado con éxito"
-	,"OrderReserved": "Hemos reservado tu pedido pero parece que ha habido problemas con el pago. Contacta con tu comercial."
+	,"Order confirmed successfully": "Tu pedido ha sido realizado con éxito"
 	,"Accept": "Aceptar"
-	,"PayNow": "Pagar ahora"
+	
+	,"You have exceeded your credit.": "Has excedido tu crédito, por favor realiza el pago para que podamos preparar tu pedido."
 }
diff --git a/web/locale/es/forms/ecomerce/orders.json b/web/locale/es/forms/ecomerce/orders.json
index cf543ce0..edf69c75 100755
--- a/web/locale/es/forms/ecomerce/orders.json
+++ b/web/locale/es/forms/ecomerce/orders.json
@@ -10,8 +10,8 @@
 
 	,"LastOrders": "Últimos pedidos"
 
-	,"PendingBalance:": "Saldo pendiente:"
-	,"PaymentInfo": "Para realizar una entrega a cuenta pulsa en el botón de la derecha y haz el pago en la empresa correspondiente. La cantidad que aparece es el saldo pendiente a día de hoy, no tiene en cuenta pedidos del futuro. Puedes realizar una entrega a cuenta de la cantidad que desees."
+	,"Balance:": "Saldo:"
+	,"PaymentInfo": "La cantidad mostrada es tu saldo pendiente (negativa) o favorable a día de hoy, no tiene en cuenta pedidos del futuro. Para que tu pedido sea enviado, esta cantidad debe ser igual o mayor que 0. Si quieres realizar una entrega a cuenta, pulsa el botón de pago, borra la cantidad sugerida e introduce la cantidad que desees."
 	,"MakePayment": "Realizar pago"
 	,"Company": "Empresa"
 	,"Pending": "Pendiente"
@@ -20,6 +20,7 @@
 	,"ShoppingBasket": "Cesta de la compra"
 
 	,"SeeOrder": "Mostrar detalle del pedido"
+	,"Delivery": "Entrega"
 	,"TicketNumber": "Nº ticket"
 	,"SentAddress": "Dirección de envío"
 	,"Consignee": "Consignatario"
@@ -32,5 +33,7 @@
 	,"AmountError": "La cantidad debe ser un número positivo e inferior o igual al importe pendiente"
 	,"PayError": "Error al realizar el pago"
 	
-	,"%A, %e of %B": "%A, %e de %B"
+	,"An error has been in the payment": "Parece que ha habido un error en el pago"
+	,"Retry": "Reintentar"
+	,"Accept": "Aceptar"
 }
diff --git a/web/locale/es/forms/ecomerce/ticket.json b/web/locale/es/forms/ecomerce/ticket.json
index f57b72fc..ef5acf3e 100755
--- a/web/locale/es/forms/ecomerce/ticket.json
+++ b/web/locale/es/forms/ecomerce/ticket.json
@@ -1,20 +1,13 @@
 {
 	 "OrderDetail": "Detalle del pedido"
 
-	,"Print": "Imprimir albarán"
+	,"%A, %e of %B %Y": "%A, %e de %B %Y"
+	,"Print delivery note": "Imprimir albarán"
 
-	,"TicketNumber:": "Nº ticket:"
-	,"DateExit:": "Fecha de envío:"
-	,"SendMethod:": "Forma de envío:"
-	,"Notes:": "Notas:"
-	,"TicketTotal:": "Total pedido:"
-	,"(VATIncluded)": "(IVA incluído)"
-
-	,"PC": "Código postal"
-	,"City": "Ciudad"
-	,"Province": "Provincia"
-	,"Address": "Domicilio"
-	,"Consignee": "Consignatario"
+	,"Delivery": "Entrega"
+	,"Total": "Total"
+	,"Tax base": "Base imponible"
+	,"VAT": "IVA"
 
 	,"ItemNumber": "Nº artículo"
 	,"Amount": "Cant"
diff --git a/web/locale/es/js/db.js b/web/locale/es/js/db.js
index 55637078..52788c6d 100755
--- a/web/locale/es/js/db.js
+++ b/web/locale/es/js/db.js
@@ -1,7 +1,6 @@
 Vn.Locale.add
 ({
 	 "ConnError": "Error en la conexión"
-	,"InternalError": "Se ha producido un error interno"
 	,"BadServerReply": "Respuesta del servidor incorrecta"
 	,"ModelNotUpdatable": "Este modelo no es actualizable"
 	,"RowNotExists": "El registro no existe o a sido borrado"
diff --git a/web/locale/es/js/hedera.js b/web/locale/es/js/hedera.js
new file mode 100755
index 00000000..af7aa771
--- /dev/null
+++ b/web/locale/es/js/hedera.js
@@ -0,0 +1,59 @@
+Vn.Locale.add
+({
+	 "User": "Usuario"
+	,"Password": "Contraseña"
+	,"Beta": "Beta"
+	,"Do not sign out": "No cerrar sesión"
+	,"I want to know more": "¡Quiero saber más!"
+	,"Enter": "Entrar"
+	,"Login mail": "clientes@verdnatura.es"
+	,"Login phone": "+34 963 242 100"
+
+	,"You've been too idle": "Has estado demasiado tiempo inactivo y la sesión ha expirado"
+	,"Invalid login": "Usuario o contraseña incorrectos, recuerda que se hace distinción entre mayúsculas y minúsculas"
+	,"There was an internal error": "Se ha producido un error interno"
+
+	,"Menu": "Menú"
+	,"Exit": "Salir"
+	,"Test the new website": "¡Prueba la nueva web!"
+	,"Old website": "Web antigua"
+	,"Recent changes": "Cambios recientes"
+
+	,"Print": "Imprimir"
+	,"Please unlock popups and try again":
+		"Por favor, desbloquea los popups y vuélvelo a intentar"
+
+	,"Error loading form": "Error al cargar formulario"
+	,"Error loading report": "Error al cargar el informe"
+	,"By using this site you accept cookies": "Al utilizar este sitio web aceptas el uso de cookies para la personalización de contenidos y análisis."
+	,"New version available": "Hay una nueva actualización, la página se recargará automaticamente para descargarla"
+	
+	,"AppName": "Verdnatura"
+
+	,"Home": "Inicio"
+	,"Orders": "Pedidos"
+		,"Basket": "Cesta"
+		,"Last orders": "Últimos pedidos"
+		,"Invoices": "Facturas"
+	,"Catalog": "Catálogo"
+	,"About": "Conócenos"
+		,"About us": "Sobre nosotros"
+		,"Why": "¿Por qué?"
+	,"Location": "Localización"
+	,"Administration": "Administración"
+		,"Control panel": "Panel de control"
+		,"Users": "Usuarios"
+		,"Connections": "Conexiones"
+		,"Visits": "Visitas"
+		,"News": "Noticias"
+		,"Photos": "Fotos"
+	,"Reports": "Informes"
+		,"Shelves": "Estanterías"
+		,"Items list": "Listado artículos"
+	,"Contact": "Quiero ser cliente"
+	,"Training": "Formación"
+	,"Agencies": "Agencias"
+	,"Configuration": "Configuración"
+		,"Account": "Cuenta"
+		,"Addresses": "Direcciones"
+});
diff --git a/web/locale/es/js/htk.js b/web/locale/es/js/htk.js
index fad8c3a5..83d56af6 100755
--- a/web/locale/es/js/htk.js
+++ b/web/locale/es/js/htk.js
@@ -26,4 +26,6 @@ Vn.Locale.add
 	,"Close": "Cerrar"
 	,"Previous": "Anterior"
 	,"Next": "Siguiente"
+	,"Search": "Buscar"
+	,"Search...": "Buscar..."
 });
diff --git a/web/locale/es/js/vn.js b/web/locale/es/js/vn.js
index 450b3fb1..c4937c0a 100755
--- a/web/locale/es/js/vn.js
+++ b/web/locale/es/js/vn.js
@@ -3,7 +3,7 @@ Vn.Locale.add
 	 "Sunday": "Domingo"
 	,"Monday": "Lunes"
 	,"Tuesday": "Martes"
-	,"Wednesday": "Miercoles"
+	,"Wednesday": "Miércoles"
 	,"Thursday": "Jueves"
 	,"Friday": "Viernes"
 	,"Saturday": "Sábado"
@@ -41,6 +41,7 @@ Vn.Locale.add
 	,"Oct": "Oct"
 	,"Nov": "Nov"
 	,"Dec": "Dic"
+<<<<<<< HEAD
 
 	,"AppName": "Verdnatura"
 	,"Beta": "Beta"
@@ -86,7 +87,8 @@ Vn.Locale.add
 	,"Configuration": "Configuración"
 		,"Account": "Cuenta"
 		,"Addresses": "Direcciones"
+=======
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	
-	,"SessionExpired": "Has estado demasiado tiempo inactivo y la sesión ha expirado."
-	,"InvalidLogin": "Usuario o contraseña incorrectos. Recuerda que se hace distinción entre mayúsculas y minúsculas."
+	,"%A, %B %e": "%A, %e de %B"
 });
diff --git a/web/locale/es/pages/login.json b/web/locale/es/pages/login.json
deleted file mode 100755
index aee401e2..00000000
--- a/web/locale/es/pages/login.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "User": "Usuario"
-	,"Password": "Contraseña"
-	,"NotCloseSession": "No cerrar sesión"
-	,"IWantToKnowMore": "¡Quiero saber más!"
-	,"Enter": "Entrar"
-	,"LoginMail": "clientes@verdnatura.es"
-	,"LoginPhone": "+34 963 242 100"
-}
diff --git a/web/locale/es/pages/web.json b/web/locale/es/pages/web.json
deleted file mode 100755
index c8651115..00000000
--- a/web/locale/es/pages/web.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	 "Welcome": "Bienvenido/a"
-	,"Exit": "Salir"
-}
diff --git a/web/locale/es/rest/query.json b/web/locale/es/rest/query.json
index 445312b5..dae2d046 100755
--- a/web/locale/es/rest/query.json
+++ b/web/locale/es/rest/query.json
@@ -1,5 +1,5 @@
 {
 	 "InvalidAction": "Acción inválida"
 
-	,"EmptyQuery": "Consulta vacia"
+	,"EmptyQuery": "Consulta vacía"
 }
diff --git a/web/locale/fr/forms/account/address-list.json b/web/locale/fr/forms/account/address-list.json
index 21195c97..2f380f0c 100755
--- a/web/locale/fr/forms/account/address-list.json
+++ b/web/locale/fr/forms/account/address-list.json
@@ -7,5 +7,5 @@
 	,"SetAsDefault": "Définir par défaut"
 	,"RemoveAddress": "Supprimer l'adresse"
 	,"EditAddress": "Changement d'adresse"
-	,"AreYouSureDeleteAddress": "Êtes-vous sûr de vouloir supprimer l'adresse?"
+	,"AreYouSureDeleteAddress": "Souhaitez-vous vraiment supprier l'adresse?"
 }
diff --git a/web/locale/fr/forms/account/address.json b/web/locale/fr/forms/account/address.json
index 5ab93913..58b54eb0 100755
--- a/web/locale/fr/forms/account/address.json
+++ b/web/locale/fr/forms/account/address.json
@@ -2,7 +2,7 @@
 	"AddEditAddress": "Ajouter ou modifier l'adresse"
 
 	,"Name": "Destinataire"
-	,"Address": "Adresse De La Rue"
+	,"Address": "Numéro Rue"
 	,"City": "Ville"
 	,"ZipCode": "Code postal"
 	,"Country": "Pays"
diff --git a/web/locale/fr/forms/account/conf.json b/web/locale/fr/forms/account/conf.json
index 589191c9..db22049c 100755
--- a/web/locale/fr/forms/account/conf.json
+++ b/web/locale/fr/forms/account/conf.json
@@ -4,14 +4,14 @@
 	,"UserNumber": "Numéro utilisateur"
 	,"UserName": "Utilisateur"
 	,"Password": "Mot de passe"
-	,"Email": "Courrier électronique"
+	,"Email": "Courriel"
 	,"Billing": "Facturation"
 	,"ReceiveInvoicesByEmail": "Recevoir des factures par e-mail"
 	
 	,"NewPassword": "Nouveau mot de passe"
 	,"RepeatPassword": "Répéter le mot de passe"
 	
-	,"MustReloginIfChange": "Pour changer votre nom d'utilisateur que vous devrez vous identifier"
+	,"MustReloginIfChange": "Vous devrez vous identifier à nouveau pour changer votre nom d'utilisateur"
 	,"PasswordsChanged": "Mot de passe modifié!"
 	,"PasswordsDoesntMatch": "Les mots de passe ne correspondent pas!"
 	
diff --git a/web/locale/fr/forms/admin/access-log.json b/web/locale/fr/forms/admin/access-log.json
index 01921439..bcaeaba6 100644
--- a/web/locale/fr/forms/admin/access-log.json
+++ b/web/locale/fr/forms/admin/access-log.json
@@ -4,7 +4,7 @@
 	,"UserNumber:": "Numéro utilisateur:"
 	,"User:": "Utilisateur:"
 	,"Phone:": "Téléphone:"
-	,"Mobile:": "Mobile:"
+	,"Mobile:": "Portable:"
 
 	,"Access": "Accès"
 	,"OS": "OS"
diff --git a/web/locale/fr/forms/admin/connections.json b/web/locale/fr/forms/admin/connections.json
new file mode 100755
index 00000000..f8e16b3b
--- /dev/null
+++ b/web/locale/fr/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+	 "Connections": "Connexions"
+
+	,"Refresh": "Actualiser"
+	,"Visits": "Visites"
+	
+	,"connections": "connexions"
+}
diff --git a/web/locale/fr/forms/admin/links.json b/web/locale/fr/forms/admin/links.json
index c2f13c02..522f747b 100755
--- a/web/locale/fr/forms/admin/links.json
+++ b/web/locale/fr/forms/admin/links.json
@@ -1,5 +1,5 @@
 {
-	 "ControlPanel": "Panneau de commande"
+	 "ControlPanel": "Panneau de configuration"
 
 	,"Module": "Module"
 	,"Description": "Description"
diff --git a/web/locale/fr/forms/admin/photos.json b/web/locale/fr/forms/admin/photos.json
index e0e2b2c6..cf3a0511 100755
--- a/web/locale/fr/forms/admin/photos.json
+++ b/web/locale/fr/forms/admin/photos.json
@@ -1,12 +1,12 @@
 {
 	 "Photos": "Photos"
 
-	,"Schema": "Programme"
+	,"Schema": "Schéma"
 	,"ImageName": "Nom de l'image"
 	,"Id": "Id"
 	,"ImageFile": "Fichier image"
 
-	,"Upload": "Envoyer"
+	,"Upload": "Télécharger"
 
-	,"ImageUploaded": "Uploader correctement"
+	,"ImageUploaded": "téléchargement correct"
 }
diff --git a/web/locale/fr/forms/admin/queries.json b/web/locale/fr/forms/admin/queries.json
new file mode 100755
index 00000000..37175281
--- /dev/null
+++ b/web/locale/fr/forms/admin/queries.json
@@ -0,0 +1,11 @@
+{
+	 "Queries": "Queries"
+
+	,"Execute": "Execute"
+	,"Clean": "Clean"
+
+	,"SQL query": "SQL query"
+	,"Updatable": "Updatable"
+	
+	,"Query executed!": "Query executed!"
+}
diff --git a/web/locale/fr/forms/admin/users.json b/web/locale/fr/forms/admin/users.json
index 03148fed..60f93d58 100755
--- a/web/locale/fr/forms/admin/users.json
+++ b/web/locale/fr/forms/admin/users.json
@@ -1,12 +1,12 @@
-{
+{
 	 "UserManagement": "Gestion des utilisateurs"
 
 	,"UserName:": "Nom d'utilisateur:"
 
-	,"UserNumber": "No. utilisateurs"
+	,"UserNumber": "Numéro utilisateurs"
 	,"UserName": "Nom d'utilisateur"
 	,"Alias": "Alias"
 
-	,"AccessAsUser": "Identité de l'utilisateur"
-	,"AccessLog": "Fiche d'accès"
+	,"AccessAsUser": "Accès utilisateur"
+	,"AccessLog": "Journal des accès"
 }
diff --git a/web/locale/fr/forms/admin/visits.json b/web/locale/fr/forms/admin/visits.json
index 580ddd89..c9ff95de 100755
--- a/web/locale/fr/forms/admin/visits.json
+++ b/web/locale/fr/forms/admin/visits.json
@@ -1,31 +1,14 @@
 {
-	 "Visits": "Visitas"
-	,"VisitsManagement": "Gestión de visitas"
-	 
-	,"ActiveSessions": "Usuarios conectados"
-	,"VisitsQuery": "Consulta de visitas"
-	,"Refresh": "Actualizar"
+	 "Visits": "Visites"
 
-	,"ActiveSessions:": "Usuarios conectados:"
-	,"NewVisitsTotal:": "Nuevas visitas:"
+	,"Refresh": "Actualiser"
+	,"Connections": "Connexions"
 
-	,"SessionNumber": "Nº sesión"
-	,"User": "Usuario"
-	,"Login": "Hora de acceso"
-	,"LastActivity": "Última actividad"
-	,"SO": "Sistema Operativo"
-	,"Version": "Versión"
-	,"NewVisit": "Nueva visita"
+	,"From": "À partir de"
+	,"To": "À"
+	,"Select date interval": "Sélectionnez une plage de dates"
 
-	,"SelectDateInterval": "Sélectionnez une plage de dates"
-	,"FromDate:": "Desde el día:"
-	,"ToDate:": "Hasta el día:"
-	,"VisitsTotal:": "Total visitas:"
-
-	,"Browser": "Navegador"
-	,"MinVersion": "Versión mínima"
-	,"MaxVersion": "Versión máxima"
-	,"LastVisit": "Última visita"
-	,"NewVisits": "Nuevas visitas"
-	,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
+	,"visits": "visites"
+	,"news": "nouvelles"
+	,"%a, %e %b %Y at %T": "%a, %e %b %Y à %T"
 }
diff --git a/web/locale/fr/forms/agencies/packages.json b/web/locale/fr/forms/agencies/packages.json
index a566c0a0..ac44fd36 100755
--- a/web/locale/fr/forms/agencies/packages.json
+++ b/web/locale/fr/forms/agencies/packages.json
@@ -1,9 +1,9 @@
-{
-	 "ListByAgency": "Agence de morceaux"
+{
+	 "ListByAgency": "Liste par agence"
 
-	,"ShowByProvince": "Afficher la répartition par province"
+	,"ShowByProvince": "Montrer par province"
 	,"Agency": "Agence"
-	,"Exps": "Expéd."
-	,"Bundles": "Bundles"
-	,"Prevision": "Prév."
+	,"Exps": "Expéditeur"
+	,"Bundles": "Cartons"
+	,"Prevision": "Prévision"
 }
diff --git a/web/locale/fr/forms/agencies/provinces.json b/web/locale/fr/forms/agencies/provinces.json
index ea047cc5..38a88f27 100755
--- a/web/locale/fr/forms/agencies/provinces.json
+++ b/web/locale/fr/forms/agencies/provinces.json
@@ -1,10 +1,10 @@
-{
-	 "ByProvince": "Répartition par province"
+{
+	 "ByProvince": "Par province"
 
 	,"Return": "Retour"
 	
 	,"SelectAgency": "Sélectionnez une agence"
 	,"Province": "Province"
-	,"Expeditions": "Expéd."
-	,"Left": "Manquant"
+	,"Expeditions": "Expéditions"
+	,"Left": "Restant"
 }
diff --git a/web/locale/fr/forms/cms/about.json b/web/locale/fr/forms/cms/about.json
index 84677e0d..16b95654 100755
--- a/web/locale/fr/forms/cms/about.json
+++ b/web/locale/fr/forms/cms/about.json
@@ -17,7 +17,7 @@
 
 	,"BuyersAndTraders": "9 acheteurs commerciaux spécialisés et notre 20 conseillera dans tout ce que vous avez besoin."
 	
-	,"Training": "Formation Verdnatura"
+	,"Verdnatura training": "Formation Verdnatura"
 
 	,"GoodTraining": "Dans Verdnatura sait qu'une bonne éducation est essentielle pour le développement optimal de toute activité, et bien sûr, aussi le fleuriste."
 	,"SpecialTrainingPrices": "Pour le budget d'une école n'a aucun effet sur la qualité de votre formation, travailler avec la politique de tarification spéciale pour toutes les écoles qui le demandent de suivre des cours dans nos installations chaise Verdnatura."
diff --git a/web/locale/fr/forms/cms/contact.json b/web/locale/fr/forms/cms/contact.json
index b36e85d1..7310573a 100755
--- a/web/locale/fr/forms/cms/contact.json
+++ b/web/locale/fr/forms/cms/contact.json
@@ -1,11 +1,11 @@
-{
-	 "IWantCustomer": "Je veux être un client!"	
+{
+	 "IWantCustomer": "Je veux devenir client!"	
 	
-	,"FillFormData": "Remplissez le formulaire avec vos coordonnées et nous prendrons contact avec vous sous peu."
+	,"FillFormData": "Remplissez le formulaire avec vos coordonnées et nous prendrons contact avec vous."
 	,"OrCallUs": "Ou si vous préférez nous appeler au 0033 781 533 900."
 	,"AllFieldsMandatory": "* Tous les champs sont obligatoires."
 	
-	,"Name": "Nom"
+	,"Name": "Prénom"
 	,"Surname": "Nom"
 	,"EMail": "Email"
 	,"Message": "Message"
@@ -15,6 +15,6 @@
 	,"Phone": "Téléphone"
 	,"Send": "Envoyer des données"
 
-	,"DataSentSuccess": "Vos détails ont été envoyés avec succès. Peu de temps nous vous contacterons."
-	,"ErrorSendingData": "Échec de l'envoi de vos données. S'il vous plaît vérifiez que vous avez rempli tous les champs et a mis en place le code anti-spam correctement."
+	,"DataSentSuccess": "Vos détails ont été envoyés avec succès. Rapidement nous vous contacterons."
+	,"ErrorSendingData": "Échec de l'envoi de vos données. S'il vous plaît vérifiez que vous avez rempli tous les champs et mis en place le code anti-spam correctement."
 }
diff --git a/web/locale/fr/forms/cms/home.json b/web/locale/fr/forms/cms/home.json
index ccd47e75..3aef63d2 100755
--- a/web/locale/fr/forms/cms/home.json
+++ b/web/locale/fr/forms/cms/home.json
@@ -1,5 +1,7 @@
 {
-	 "Sent": "Envoyé"
+	 "Start order": "Lancer commande"
+
+	,"Sent": "Envoyé"
 	,"Author": "Auteur"
 	,"votes": "votes"
 	,"NoAnswerSelected": "Vous avez pas sélectionné de réponse"
diff --git a/web/locale/fr/forms/cms/location.json b/web/locale/fr/forms/cms/location.json
index 9d40117c..34d64d35 100755
--- a/web/locale/fr/forms/cms/location.json
+++ b/web/locale/fr/forms/cms/location.json
@@ -1,3 +1,3 @@
 {
-	 "ShowMap": "Voir la carte"
+	 "ShowMap": "Montrer la carte"
 }
diff --git a/web/locale/fr/forms/cms/why.json b/web/locale/fr/forms/cms/why.json
index 56554a31..ccec5a16 100755
--- a/web/locale/fr/forms/cms/why.json
+++ b/web/locale/fr/forms/cms/why.json
@@ -1,4 +1,4 @@
-{
+{
 	 "AboutCompany": "Pourquoi Verdnatura?"
 	,"StorePhoto": "Magasin de photo"
 
@@ -15,10 +15,10 @@
 		 "Nous sommes une société spécialisée dans le commerce de gros et de la distribution d'une large gamme d'accessoires, des verts et des fleurs à des fleuristes ou des autres grossistes."
 	
 	,"AboutService":
-		 "Nous avons un service de livraison à domicile avec nos véhicules dans la province de Valence et des zones limitées de Castellón, Alicante, Murcie, Albacete et Madrid envoyer le reste de la péninsule par les agences de transport avec le service 24/48 heures (Zeleris, Viaexpress). Nous faisons également des ventes directes aux fleuristes dans aucun de nos installations."
+		 "Nous avons un service de livraison à domicile avec nos véhicules dans la province de Valence et des zones limitées de Castellón, Alicante, Murcie, Albacete et Madrid envoyer le reste de la péninsule par les agences de transport avec le service 24/48 heures (Zeleris, Viaexpress). Nous faisons également des ventes directes aux fleuristes dans la totalité de nos installations."
 	
 	,"AboutDisp":
-		 "Notre société a plus de 50 employés et plusieurs branches. Le principal est situé à Valence et a plus de 8000 m2. Nous avons aussi un entrepôt situé à Mercaflor - Mercavalencia (Valencia) qui effectuent des ventes directes seulement."
+		 "Notre société a plus de 100 employés et plusieurs branches. Le principal est situé à Valence et a plus de 8000 m2. Nous avons aussi un entrepôt situé à Mercaflor - Mercavalencia (Valencia) qui effectuent des ventes directes seulement."
 	
 	,"AboutOrder":
 		 "Vous pouvez faire vos commandes et réservations par téléphone au +33 781 533 900, en ligne grâce à notre site Internet ou directement dans nos installations."
diff --git a/web/locale/fr/forms/ecomerce/basket.json b/web/locale/fr/forms/ecomerce/basket.json
index b8d706fc..52c4c56d 100755
--- a/web/locale/fr/forms/ecomerce/basket.json
+++ b/web/locale/fr/forms/ecomerce/basket.json
@@ -1,4 +1,4 @@
-{
+{
 	 "ShoppingBasket": "Panier"
 
 	,"Delete": "Effacer"
@@ -21,9 +21,9 @@
 	,"Color": "Couleur"
 	,"Origin": "Origine"
 	,"Price": "* Prix"
-	,"Disc": "Desc"
+	,"Disc": "Remise"
 	,"Subtotal": "Sous-total"
 	
-	,"OrderItemsUpdated": "Ouvrez votre commande prend trop de temps et a été mis à jour, les prix ou les quantités de vos articles peuvent avoir changé"
+	,"OrderItemsUpdated": "Ouvrir votre commande prend trop de temps et a été mis à jour, les prix ou les quantités de vos articles peuvent avoir changé"
 	,"RememberReconfiguringImpact": "Rappelez-vous que si jamais vous commandez des prix fixés ou les quantités de vos articles pourraient changer"
 }
diff --git a/web/locale/fr/forms/ecomerce/catalog.json b/web/locale/fr/forms/ecomerce/catalog.json
index b803a502..09747a33 100755
--- a/web/locale/fr/forms/ecomerce/catalog.json
+++ b/web/locale/fr/forms/ecomerce/catalog.json
@@ -1,8 +1,9 @@
-{
+{
 	 "Catalog": "Catalogue"
 	,"SearchResults": "Résultats de la recherche"
 
 	,"SelectFamily": "Choisissez une famille"
+<<<<<<< HEAD
 	,"SelectSubtype": "Sélectionnez le sous-menu sur la droite"
 	,"ArticleNotFound": "Article pas trouvé"
 	,"ArticleNotAvailable": "Article pas disponible"
@@ -18,27 +19,49 @@
 	,"Warehouse": "Entrepôt"
 	,"Agency": "Agence"
 
+=======
+	,"Choose filter from right menu": "Choisissez un filtre dans le menu de droite"
+	,"Choose a realm": "Choisissez un royaume"
+	,"ArticleNotFound": "Article non trouvé"
+	,"ArticleNotAvailable": "Article non disponible"
+
+	,"List view": "Liste voir"
+	,"Grid view": "Grille voir"
+	,"Switch view": "Changer vue"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	,"StartOrder": "Acheter"
 	,"ShoppingBasket": "Mon panier"
 	
-	,"Realm": "Famille"
-	,"Subtype": "Sous-genre"
-	,"Date:": "Date:"
-	,"Warehouse:": "Magasin:"
-	,"Search:": "Recherche:"
-	,"GeneralSearch": "Recherche générale"
-
-	,"Amount": "Quant"
-	,"Aval": "Disp"
-	,"Name": "Nom"
-	,"S1": "Mes"
-	,"S2": "S2"
-	,"Stems": "Tige"
-	,"Cat": "Cat"
-	,"Pack": "Pack"
-	,"Origin": "Origine"
-	,"Price": "Prix"
+	,"%A, %e of %B": "%A, %e de %B"
+	,"Agency": "Agence"
+	,"Warehouse": "Entrepôt"
 	
+	,"Filter by": "Filtrer par"
+	,"Order by": "Trier par"
+	
+	,"Search": "Recherche"
+	,"Change": "Modifier"
+	,"Available": "Displonible"
+	,"Size": "Mesure"
+	,"Realm": "Famille"
+	,"Family": "Sous-genre"
+	,"Color": "Couleur"
+	,"Producer": "Producteur"
+	,"Origin": "Origine"
+	,"Category": "Catégorie"
+	,"Remove filters": "Retirer les filtres"
+
+	,"Price": "Prix"
+	,"Amount": "Quantité"
+	,"Name": "Nom"
+	,"Pack": "Pack"
+	,"Lower price": "Prix le plus bas"
+	,"Higher price": "Prix le plus élevé"
+	,"Lower size": "Taille le plus bas"
+	,"Higher size": "Taille le plus élevé"
+	,", %.0d Units": ", %.0d Unités"
+	
+	,"from": "pour"
 	,"from %.2d€": "pour %.2d€"
 	,"AddToBasket": "Ajouter article"
 	,"Add": "Ajouter"
@@ -48,5 +71,5 @@
 	,"IndicativePhotos": "* Photos sont indicatifs"
 	
 	,"Added%dOf%s": "Ajouté %d %s"
-	,"NoMoreAmountAvailable": "Pas plus de quantité disponible"
+	,"NoMoreAmountAvailable": "Pas plus disponible"
 }
diff --git a/web/locale/fr/forms/ecomerce/checkout.json b/web/locale/fr/forms/ecomerce/checkout.json
index e0accb8d..03cab275 100755
--- a/web/locale/fr/forms/ecomerce/checkout.json
+++ b/web/locale/fr/forms/ecomerce/checkout.json
@@ -1,31 +1,36 @@
-{
-	 "ConfigureOrder": "Set pour"
+{
+	 "ConfigureOrder": "Définir les types d'ordres"
 
 	,"Cancel": "Annuler"
-	,"Next": "Prochaine"
+	,"Next": "Suivant"
 	
-	,"DeliveryOrPickupQuestion": "Voulez-vous recevoir ou percevoir l'ordre?"
+	,"DeliveryOrPickupQuestion": "Voulez-vous recevoir ou récuperer l'ordre?"
 	,"ReceiveThroughtAgency": "Recevez par l'agence"
-	,"ReceiveThroughtRoute": "Moulage par Verdnatura"
+	,"ReceiveThroughtRoute": "Livraison par Verdnatura"
 	,"PickupInStore": "Livraison en magasin"
 	
-	,"OrderDateDeliveryQuestion": "Quel jour vous voulez recevoir l'ordre?"
-	,"OrderDatePickupQuestion": "Quel jour vous voulez retirer votre commande?"
-	,"AddressQuestion": "Où voulez-vous livré?"
-	,"AgencyQuestion": "Pourquoi agence vous souhaitez recevoir l'ordre?"
-	,"PickupWarehouseQuestion": "Quel magasin vous voulez retirer votre commande?"
+	,"OrderDateDeliveryQuestion": "Date de livraison?"
+	,"OrderDatePickupQuestion": "Date retrait commande?"
+	,"AddressQuestion": "Adresse livraison?"
+	,"AgencyQuestion": "Pour quelle agence vous souhaitez recevoir la commande?"
+	,"PickupWarehouseQuestion": "Dans quel magasin vuoulez-vous retirer votre commande?"
 
-	,"ConfirmToAccessCatalog": "Confirme les données pour accéder au catalogue"
+	,"ConfirmToAccessCatalog": "Confirme les coordonnées pour accéder au catalogue"
 	,"Arrival": "Arrivée"
-	,"Pickup": "Collection"
+	,"Pickup": "Retrait"
 	,"%A, %e of %B": "%A, %e %B"
 	,"Agency": "Agence"
-	,"Warehouse": "Entrepôt"
+	,"Warehouse": "MAgasin"
 	,"Confirm": "Confirmer"
 
-	,"OrderStarted": "Ordre a commencé"
-	,"OrderUpdated": "Mise à jour Ordre"
+	,"OrderStarted": "Commande a commencé"
+	,"OrderUpdated": "Mise à jour commande"
 	
+<<<<<<< HEAD
 	,"NoAgeciesAvailableForDate": "Aucun agences disponibles pour la date et le destinataire sélectionné, changer la date de réception de l'ordre"
 	,"NoWarehousesAvailableForDate": "Pas de magasins disponibles à la date sélectionnée, changer la date de la collecte de l'ordre"
+=======
+	,"NoAgeciesAvailableForDate": "Aucune agence disponibles pour la date et le destinataire sélectionné, changer la date d'envoi de la commande"
+	,"NoWarehousesAvailableForDate": "Pas de magasins disponibles à la date sélectionnée, changer la date de retrait"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 }
diff --git a/web/locale/fr/forms/ecomerce/confirm.json b/web/locale/fr/forms/ecomerce/confirm.json
index 11c893d8..31c202f1 100755
--- a/web/locale/fr/forms/ecomerce/confirm.json
+++ b/web/locale/fr/forms/ecomerce/confirm.json
@@ -1,25 +1,36 @@
 {
-	 "Checkout": "Terminer la commande"
+	 "Checkout": "Finir la commande"
 
-	,"OrderSummary": "Résumé de la commande"
-	,"Arrival": "Arrivée"
-	,"%A, %e of %B": "%A %e %B"
+	,"Order summary": "Résumé de la commande"
+	,"Delivery at": "Livraison à"
 	,"Agency": "Agence"
 	,"Warehouse": "Entrepôt"
 	
-	,"DeliveryAddress": "Adresse de livraison"
-
-	,"Import": "Montant"
-	,"TaxBase": "Imposable"
-	,"VAT": "TVA"
-	,"Total": "Total"
+	,"Previous balance": "Solde précédent"
+	,"Order total": "Total de la commande"
+	,"Order VAT": "TVA de la commande"
+	,"Total debt": "Total de la dette"
+	,"Credit": "Crédit"
+	,"Exceeded credit": "Crédit dépassée"
 	
-	,"Cancel": "Annuler"
+	,"Amount to pay": "Montant à payer"
+	,"Pay method": "Mode de paiement"
+
+	,"Use my balance": "Utiliser mon équilibre"
+	,"You have a favorable balance.": "Pas besoin de payer quoi que ce soit, vous avez un solde favorable."
+	,"Use my credit": "Utiliser mon crédit"
+	,"You have a favorable credit.": "Pas besoin de payer quoi que ce soit, vous favorable crédit."
+	,"Credit card": "Carte de crédit"
+	,"You will be redirected to the payment.": "En confirmant la commande, vous serez redirigé vers la plateforme de paiement."
+	,"Bank Transfer": "Virement bancaire"
+	,"Make a transfer to one account.": "Faire Transféré à l'un des comptes suivants et envoyer le coupon à votre entreprise."
+	,"Pay later": "Payer plus tard"
+
 	,"Modify": "Modifier"
 	,"Confirm": "Confirmer"
 	
-	,"OrderPlacedSuccessfully": "Votre commande a été complété avec succès"
-	,"OrderReserved": "Nous avons réservé votre commande, mais il semble qu'il ya eu des problèmes avec le paiement Contactez vos ventes."
+	,"Order confirmed successfully": "Votre commande a été complété avec succès"
 	,"Accept": "OK"
-	,"PayNow": "Payer maintenant"
+	
+	,"You have exceeded your credit.": "Vous avez dépassé votre crédit, s'il vous plaît effectuer le paiement afin que nous puissions préparer votre commande."
 }
diff --git a/web/locale/fr/forms/ecomerce/orders.json b/web/locale/fr/forms/ecomerce/orders.json
index bcac297a..dcb046d3 100755
--- a/web/locale/fr/forms/ecomerce/orders.json
+++ b/web/locale/fr/forms/ecomerce/orders.json
@@ -10,8 +10,8 @@
 
 	,"LastOrders": "Les dernières commandes"
 
-	,"PendingBalance:": "Balance:"
-	,"PaymentInfo": "Pour effectuer un paiement vers le bas, cliquez sur le bouton à droite et effectuer le paiement par la société. Le montant indiqué est le solde aujourd'hui, ne prend pas en compte les commandes futures. Vous pouvez faire un acompte sur le montant que vous voulez. Si vous voulez payer un ordre spécifique, vous pouvez cliquer directement sur le bouton de paiement Ordre."
+	,"Balance:": "Balance:"
+	,"PaymentInfo": "Le montant indiqué est votre pente (négative) ou balance favorable aujourd'hui, ne tient pas compte pour les commandes futures. Obtenir votre commande est expédiée, ce montant doit être égal ou supérieur à 0. Si vous voulez faire un versement, le montant suggéré effacé et entrez le montant que vous souhaitez."
 	,"MakePayment": "Effectuer un paiement"
 	,"Company": "Entreprise"
 	,"Pending": "Pente"
@@ -20,6 +20,7 @@
 	,"ShoppingBasket": "Panier"
 
 	,"SeeOrder": "Votre panier"
+	,"Delivery": "Accouchement"
 	,"TicketNumber": "Numéro ticket"
 	,"SentAddress": "Adresse de livraison"
 	,"Consignee": "Destinataire"
@@ -32,5 +33,7 @@
 	,"AmountError": "La quantité doit être un neméro positif et inférieur ou égal  à la somme restant à payer"
 	,"PayError": "Impossible d'effectuer le paiement"
 	
-	,"%A, %e of %B": "%A, %e %B"
+	,"An error has been in the payment": "Il semble qu'il ya eu une erreur dans le paiement"
+	,"Retry": "Réessayez"
+	,"Accept": "Accepter"
 }
diff --git a/web/locale/fr/forms/ecomerce/ticket.json b/web/locale/fr/forms/ecomerce/ticket.json
index 94114d44..89fc71d6 100755
--- a/web/locale/fr/forms/ecomerce/ticket.json
+++ b/web/locale/fr/forms/ecomerce/ticket.json
@@ -1,20 +1,13 @@
 {
 	 "OrderDetail": "Détails de la commande"
 
-	,"Print": "Imprimer bulletin de livraison"
+	,"%A, %e of %B %Y": "%A, %e de %B %Y"
+	,"Print delivery note": "Imprimer bulletin de livraison"
 
-	,"TicketNumber:": "Num ticket:"
-	,"DateExit:": "Date d'envoi:"
-	,"SendMethod:": "Mode d'envoi:"
-	,"Notes:": "Notes:"
-	,"TicketTotal:": "Total:"
-	,"(VATIncluded)": "(TVA comprise)"
-
-	,"PC": "Code postal"
-	,"City": "Ville"
-	,"Province": "Province"
-	,"Address": "Maison"
-	,"Consignee": "Destinataire"
+	,"Delivery": "Accouchement"
+	,"Total": "Total"
+	,"Tax base": "Imposable"
+	,"VAT": "TVA"
 
 	,"ItemNumber": "Num article"
 	,"Amount": "Quant"
diff --git a/web/locale/fr/js/db.js b/web/locale/fr/js/db.js
index 40fd84b5..3bee647e 100755
--- a/web/locale/fr/js/db.js
+++ b/web/locale/fr/js/db.js
@@ -1,7 +1,6 @@
 Vn.Locale.add
 ({
 	 "ConnError": "Échec de la connexion"
-	,"InternalError": "Il y avait une erreur interne"
 	,"BadServerReply": "Réponse du serveur incorrecte"
 	,"ModelNotUpdatable": "Ce modèle n'est pas modifiable"
 	,"RowNotExists": "Le dossier n'existe pas ou a été supprimée"
diff --git a/web/locale/fr/js/hedera.js b/web/locale/fr/js/hedera.js
new file mode 100755
index 00000000..cb913dd4
--- /dev/null
+++ b/web/locale/fr/js/hedera.js
@@ -0,0 +1,59 @@
+Vn.Locale.add
+({
+	 "User": "Utilisateur"
+	,"Password": "Mot de passe"
+	,"Beta": "Beta"
+	,"Do not sign out": "Garder ma session active"
+	,"I want to know more": "En savoir plus!"
+	,"Enter": "Entrer"
+	,"Login mail": "ruben@verdnatura.es"
+	,"Login phone": "+33 781 533 900"
+
+	,"You've been too idle": "Il a eu le temps de trop paresseux et votre session a expiré"
+	,"Invalid login": "Utilisateur ou mot de passe incorrect, n'oubliez pas de distinction entre majuscules et minuscules"
+	,"There was an internal error": "Il ya eu une erreur interne"
+
+	,"Menu": "Menu"
+	,"Exit": "Laisser"
+	,"Test the new website": "Testez le nouveau site!"
+	,"Old website": "Ancien site web"
+	,"Recent changes": "Modifications récentes"
+	
+	,"Print": "Imprimir"
+	,"Please unlock popups and try again":
+		"S'il vous plaît déverrouiller pop ups et essayez à nouveau"
+
+	,"Error loading form": "Forme erreur de chargement"
+	,"Error loading report": "Rapport erreur de chargement"
+	,"By using this site you accept cookies": "En utilisant ce site, vous acceptez l'utilisation de cookies pour personnaliser le contenu et l'analyse."
+	,"New version available": "Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour télécharger"
+	
+	,"AppName": "Verdnatura"
+	
+	,"Home": "Accueil"
+	,"Orders": "Commandes"
+		,"Basket": "Panier"
+		,"Last orders": "Dernières commandes"
+		,"Invoices": "Facturas"
+	,"Catalog": "Catalogue"
+	,"About": "Nous"
+		,"About us": "A propos de nous"
+		,"Why": "Pourquoi?"
+	,"Location": "Emplacement"
+	,"Administration": "Administration"
+		,"Control panel": "Panneau de contrôle"
+		,"Users": "Utilisateurs"
+	 	,"Connections": "Connexions"
+		,"Visits": "Visites"
+		,"News": "Nouvelles"
+		,"Photos": "Photos"
+	,"Reports": "Rapport"
+		,"Shelves": "Etagères"
+		,"Items list": "Liste des articles"
+	,"Contact": "Je veux être client"
+	,"Training": "Formation"
+	,"Agencies": "Agences"
+	,"Configuration": "Configuration"
+		,"Account": "Compte"
+		,"Addresses": "Adresses"
+});
diff --git a/web/locale/fr/js/htk.js b/web/locale/fr/js/htk.js
index 88d614b6..9b871c88 100755
--- a/web/locale/fr/js/htk.js
+++ b/web/locale/fr/js/htk.js
@@ -26,4 +26,6 @@ Vn.Locale.add
 	,"Close": "Croche"
 	,"Previous": "Précédent"
 	,"Next": "Suivant"
+	,"Search": "Recherche"
+	,"Search...": "Recherche..."
 });
diff --git a/web/locale/fr/js/vn.js b/web/locale/fr/js/vn.js
index b514c744..54bb20ee 100755
--- a/web/locale/fr/js/vn.js
+++ b/web/locale/fr/js/vn.js
@@ -41,6 +41,7 @@ Vn.Locale.add
 	,"Oct": "Oct"
 	,"Nov": "Nov"
 	,"Dec": "Déc"
+<<<<<<< HEAD
 
 	,"AppName": "Verdnatura"
 	,"Beta": "Beta"
@@ -86,4 +87,8 @@ Vn.Locale.add
 
 	,"SessionExpired": "Il a eu le temps de trop paresseux et votre session a expiré."
 	,"InvalidLogin": "Utilisateur ou mot de passe incorrect. N'oubliez pas de distinction entre majuscules et minuscules."
+=======
+	
+	,"%A, %B %e": "%A, %B %e"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 });
diff --git a/web/locale/fr/pages/login.json b/web/locale/fr/pages/login.json
deleted file mode 100755
index 1fd9db08..00000000
--- a/web/locale/fr/pages/login.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	 "User": "Utilisateur"
-	,"Password": "Mot de passe"
-	,"NotCloseSession": "Garder ma session active"
-	,"IWantToKnowMore": "En savoir plus!"
-	,"Enter": "Entrer"
-	,"LoginMail": "ruben@verdnatura.es"
-	,"LoginPhone": "+33 781 533 900"
-}
diff --git a/web/locale/fr/pages/tpv.json b/web/locale/fr/pages/tpv.json
index d87f4ce7..46c0940c 100755
--- a/web/locale/fr/pages/tpv.json
+++ b/web/locale/fr/pages/tpv.json
@@ -1,4 +1,4 @@
 {
-	  "PaymentComplete": "Le paiement terminé, vous pouvez maintenant revenir à notre site."
+	  "PaymentComplete": "Paiement terminé, merci par votre confiance, maintenant vous pouvez revenir à notre site."
 	  ,"ReturnToWeb": "Retour au Verdnatura"
 }
diff --git a/web/locale/fr/pages/version-menu.json b/web/locale/fr/pages/version-menu.json
index 6b8f80be..17aa6376 100755
--- a/web/locale/fr/pages/version-menu.json
+++ b/web/locale/fr/pages/version-menu.json
@@ -4,5 +4,5 @@
 	,"New website": "Nouveau site web"
 	,"(Fantastic)": "(Fantastique)"
 	,"Old website": "Vieux web"
-	,"(Best choose new)": "(Meilleur choisir nouveau)"
+	,"(Best choose new)": "(Mieux choisir le nouveau)"
 }
diff --git a/web/locale/fr/pages/web.json b/web/locale/fr/pages/web.json
deleted file mode 100755
index dff01b04..00000000
--- a/web/locale/fr/pages/web.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	  "Welcome": "Bienvenue"
-	 ,"Exit": "Sortir"
-}
diff --git a/web/locale/fr/rest/query.json b/web/locale/fr/rest/query.json
index 445312b5..a9a18625 100755
--- a/web/locale/fr/rest/query.json
+++ b/web/locale/fr/rest/query.json
@@ -1,5 +1,5 @@
 {
-	 "InvalidAction": "Acción inválida"
+	 "InvalidAction": "Action non valide"
 
-	,"EmptyQuery": "Consulta vacia"
+	,"EmptyQuery": "Requête vide"
 }
diff --git a/web/locale/mn/forms/account/address-list.json b/web/locale/mn/forms/account/address-list.json
new file mode 100755
index 00000000..8d531c98
--- /dev/null
+++ b/web/locale/mn/forms/account/address-list.json
@@ -0,0 +1,11 @@
+{
+	 "Addresses": "Addresses"
+	
+	,"Return": "Return"
+	,"AddAddress": "Add address"
+	
+	,"SetAsDefault": "Set as default"
+	,"RemoveAddress": "Remove address"
+	,"EditAddress": "Edit address"
+	,"AreYouSureDeleteAddress": "Are you sure you want to delete the address?"
+}
diff --git a/web/locale/mn/forms/account/address.json b/web/locale/mn/forms/account/address.json
new file mode 100755
index 00000000..a807bb5f
--- /dev/null
+++ b/web/locale/mn/forms/account/address.json
@@ -0,0 +1,15 @@
+{
+	"AddEditAddress": "Add or edit address"
+
+	,"Name": "Consignee"
+	,"Address": "Address"
+	,"City": "City"
+	,"ZipCode": "Zip code"
+	,"Country": "Country"
+	,"Province": "Province"
+
+	,"Return": "Return"
+	,"Accept": "Accept"
+	
+	,"AddressChangedSuccessfully": "Address changed successfully"
+}
diff --git a/web/locale/mn/forms/account/conf.json b/web/locale/mn/forms/account/conf.json
new file mode 100755
index 00000000..3e011fe7
--- /dev/null
+++ b/web/locale/mn/forms/account/conf.json
@@ -0,0 +1,19 @@
+{
+	"Configuration": "ТОХИРГОО"
+
+	,"UserNumber": "ХЭРЭГЛЭГЧИЙН ТОО:"
+	,"UserName": "НЭВТРЭХ НЭР"
+	,"Password": "НУУЦ ҮГ"
+	,"Email": "И-МЭЙЛ"
+	,"Billing": "НЭХЭМЖЛЭЛ"
+	,"ReceiveInvoicesByEmail": "И-МЭЙЛ НЭХЭМЖЛЭЛ"
+	
+	,"NewPassword": "ШИНЭ НУУЦ ҮГ"
+	,"RepeatPassword": "НУУЦ ҮГ ДАВТАХ"
+
+	,"MustReloginIfChange": "To change your username you must login again"
+	,"PasswordsChanged": "Password changed!"
+	,"PasswordsDoesntMatch": "Passwords do not match!"
+	
+	,"Addresses": "Addresses"
+}
diff --git a/web/locale/mn/forms/admin/access-log.json b/web/locale/mn/forms/admin/access-log.json
new file mode 100644
index 00000000..d0b38f3c
--- /dev/null
+++ b/web/locale/mn/forms/admin/access-log.json
@@ -0,0 +1,15 @@
+{
+	 "AccessLog": "Access log"
+
+	,"UserNumber:": "User Number:"
+	,"User:": "User:"
+	,"Phone:": "Phone:"
+	,"Mobile:": "Mobile:"
+
+	,"Access": "Access"
+	,"OS": "OS"
+	,"Browser": "Browser"
+	,"Version": "Version"
+	,"Javascript": "Javascript"
+	,"Cookies": "Cookies"
+}
diff --git a/web/locale/mn/forms/admin/connections.json b/web/locale/mn/forms/admin/connections.json
new file mode 100755
index 00000000..76c41fc0
--- /dev/null
+++ b/web/locale/mn/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+	 "Connections": "холболт"
+
+	,"Refresh": "Сэргээх"
+	,"Visits": "уулзалт"
+	
+	,"connections": "холболт"
+}
diff --git a/web/locale/mn/forms/admin/items.json b/web/locale/mn/forms/admin/items.json
new file mode 100644
index 00000000..53a2579c
--- /dev/null
+++ b/web/locale/mn/forms/admin/items.json
@@ -0,0 +1,9 @@
+{
+	 "Item list": "Item list"
+
+	,"Store": "Store"
+	,"Realm": "Realm"
+	,"Rate": "Rate"
+
+	,"Preview": "Preview"
+}
diff --git a/web/locale/mn/forms/admin/links.json b/web/locale/mn/forms/admin/links.json
new file mode 100755
index 00000000..cfe8bb34
--- /dev/null
+++ b/web/locale/mn/forms/admin/links.json
@@ -0,0 +1,6 @@
+{
+	 "ControlPanel": "Control panel"
+
+	,"Module": "Module"
+	,"Description": "Description"
+}
diff --git a/web/locale/mn/forms/admin/photos.json b/web/locale/mn/forms/admin/photos.json
new file mode 100755
index 00000000..39489077
--- /dev/null
+++ b/web/locale/mn/forms/admin/photos.json
@@ -0,0 +1,12 @@
+{
+	 "Photos": "Photos"
+
+	,"Schema": "Schema"
+	,"ImageName": "Image name"
+	,"Id": "Id"
+	,"ImageFile": "Image file"
+
+	,"Upload": "Upload"
+
+	,"ImageUploaded": "Image uploaded successfully"
+}
diff --git a/web/locale/mn/forms/admin/queries.json b/web/locale/mn/forms/admin/queries.json
new file mode 100755
index 00000000..37175281
--- /dev/null
+++ b/web/locale/mn/forms/admin/queries.json
@@ -0,0 +1,11 @@
+{
+	 "Queries": "Queries"
+
+	,"Execute": "Execute"
+	,"Clean": "Clean"
+
+	,"SQL query": "SQL query"
+	,"Updatable": "Updatable"
+	
+	,"Query executed!": "Query executed!"
+}
diff --git a/web/locale/mn/forms/admin/shelves.json b/web/locale/mn/forms/admin/shelves.json
new file mode 100644
index 00000000..7fb6f425
--- /dev/null
+++ b/web/locale/mn/forms/admin/shelves.json
@@ -0,0 +1,21 @@
+{
+	 "Configuration": "Configuration"
+	,"Select config": "Select config"
+	,"Reign": "Reign"
+	,"Family": "Family"
+	,"Store": "Store"
+	,"Date": "Date"
+	,"Shelf": "Shelf"
+	,"Name prefix": "Name prefix"
+	,"Limit amount per item": "Limit amount per item"
+	,"Title": "Title"
+	,"Show packing": "Show packing"
+	,"Stack different items": "Stack different items"
+	 
+	,"Preview": "Preview"
+
+	,"Pallets": "Pallets"
+	 
+	,"No items found, check that all fields are correct":
+		"No items found, check that all fields are correct"
+}
diff --git a/web/locale/mn/forms/admin/users.json b/web/locale/mn/forms/admin/users.json
new file mode 100755
index 00000000..58aa9663
--- /dev/null
+++ b/web/locale/mn/forms/admin/users.json
@@ -0,0 +1,12 @@
+{
+	 "UserManagement": "User management"
+
+	,"UserName:": "Username:"
+
+	,"UserNumber": "User number"
+	,"UserName": "Username"
+	,"Alias": "Alias"
+	
+	,"AccessAsUser": "Impersonate user"
+	,"AccessLog": "Access log"
+}
diff --git a/web/locale/mn/forms/admin/visits.json b/web/locale/mn/forms/admin/visits.json
new file mode 100755
index 00000000..201867e5
--- /dev/null
+++ b/web/locale/mn/forms/admin/visits.json
@@ -0,0 +1,14 @@
+{
+	 "Visits": "уулзалт"
+
+	,"Refresh": "Сэргээх"
+	,"Connections": "холболт"
+
+	,"From": "эхлэн"
+	,"To": "нь"
+	,"Select date interval": "Сонгох огноо интервал"
+
+	,"visits": "уулзалт"
+	,"news": "мэдээ"
+	,"%a, %e %b %Y at %T": "%a, %e %b %Y нь %T"
+}
diff --git a/web/locale/mn/forms/agencies/packages.json b/web/locale/mn/forms/agencies/packages.json
new file mode 100755
index 00000000..d023aa49
--- /dev/null
+++ b/web/locale/mn/forms/agencies/packages.json
@@ -0,0 +1,9 @@
+{
+	 "ListByAgency": "Bundles by agency"
+
+	,"ShowByProvince": "Show breakdown by province"
+	,"Agency": "Agency"
+	,"Exps": "Exps."
+	,"Bundles": "Bundles"
+	,"Prevision": "Prev."
+}
diff --git a/web/locale/mn/forms/agencies/provinces.json b/web/locale/mn/forms/agencies/provinces.json
new file mode 100755
index 00000000..77b81126
--- /dev/null
+++ b/web/locale/mn/forms/agencies/provinces.json
@@ -0,0 +1,10 @@
+{
+	 "ByProvince": "Breakdown by province"
+
+	,"Return": "Return"
+	
+	,"SelectAgency": "Select an agency"
+	,"Province": "Province"
+	,"Expeditions": "Exps."
+	,"Left": "Left"
+}
diff --git a/web/locale/mn/forms/cms/about.json b/web/locale/mn/forms/cms/about.json
new file mode 100755
index 00000000..00f38993
--- /dev/null
+++ b/web/locale/mn/forms/cms/about.json
@@ -0,0 +1,47 @@
+{
+	"QualityAndVariety": "Quality, variety and service"
+
+	,"MaximumFreshness": "Verdnatura offers a product guarantee maximum freshness thanks to their daily flowers and plants from Holland, South America, or from the same producer receptions."
+	,"SquareMeters": "Over facilities 13,000m"
+	,"AboutRealms": "With cut flowers, green, artificial and accessories"
+	,"AboutLocation": "Settled in Valencia, Madrid, Barcelona, Holland and France, we offer direct sales in our facilities and distribution throughout Spain by own service or agency."
+	,"PurchaseThroughWeb": "Purchase through our website and receive your order comfortably in your florist.In less than 24 hours!"
+
+	,"WhatMakeUsDifferent": "What makes us different?"
+
+	,"DesignVariety": "The variety in design, quality of materials used and our service delivery, will provide a showcase of dynamic genre, always fresh and appealing."
+	,"AdaptToYourNeeds": "Verdnatura adapts to the needs of each customer by offering a wide range of products, always guaranteed."
+	,"TheBestQuality": "The best quality at the best price. Without forgetting the design."
+
+	,"AtYourService": "We are at your service"
+
+	,"BuyersAndTraders": "9 specialized trade buyers and our 20 advise you on everything you need."
+	
+	,"Verdnatura training": "Verdnatura training"
+
+	,"GoodTraining": "In Verdnatura we know that a good education is essential for the optimal development of any activity, and of course, also the florist."
+	,"SpecialTrainingPrices": "For the school budget does not affect the quality of your training, we work with special pricing policy for all schools that request it take courses in our facilities Verdnatura chair."
+	,"YoutubeChannel": "And do not miss Verdnatura videos on Youtube Channel. Where you'll find plenty of interesting tips on handling of the flower."
+	
+	,"HowWeWork": "How we work?"
+
+	,"FirstQualityControl": "First quality control"
+	,"SecondQualityControl": "Second quality control"
+	,"ThirdQualityControl": "Third quality control"
+	,"FourthQualityControl": "Fourth quality control"
+
+	,"AalsmeerAuction": "At 5: 00h, our purchasing managers acquire, in the auction of Aalsmeer and Noaldwijk, gender, the producer has reaped the previous day."
+	,"BeforeAuction": "After purchase, the genre quickly enters Verdnatura Holland BV, our company Flora Holland in Aalsmeer."
+	,"DirectlyFromProviders": "Besides buying through the Dutch auction, we buy directly from producers Colombia, Ecuador, Thailand, Malaysia, Africa and Australia. These products are directly supervised by our delegates Purchase located in each area. This merchandise will travel to Amsterdam, subjected to a process Vaacum and in less than two hours after landing, you will be at our facility in Aalsmeer."
+	,"GoodsDischarge": "At 7: 00h our fellow Aalsmeer start receiving the purchased goods, having a first quality control, and creating it in stock. Now available for our customers on the web."
+	,"GoodsTravel": "The goods travel for a day and a half trucks watertight compartments at different temperatures, so that the cold chain is not broken trip in the best conditions."
+	,"GoodsReception": "Upon receipt of the merchandise responsible for the purchase reviewed state that arrives, accepting or rejecting it as appropriate, it discharged cold and quickly enters our camera."
+	,"CustomerOrders": "Our customers can place their orders via the web, by phone or coming directly to our facilities. We have a team of specialized commercial advise you on your purchase and inform you the latest news and articles that may be of interest, so that your purchase meets your needs and stay totally satisfied."
+	,"AfterOrder": "Once placed the order, turn to the production department. During the preparation of this new quality control (third) in which the poor will be discarded merchandise it is made."
+	,"BuyerControl": "As the preparation is completed, a new control (fourth) where a specialist account is made and check the status of products. If they do not meet the quality standards required rejects and replaces the right."
+	,"EmbeddedSection": "Then takes embedded section, where the order is suitable for proper delivery. Each type of delivery requires a method suitable for embedded gender protected books and reaches the customer in perfect condition."
+	,"AfterEmbedAgency": "Once the product has been fitted it is stored again in the chamber until they leave by agency or own deal, receiving the customer within 24 hours in the case of the agency or the same day for the cast, comfortably at home ."
+	,"FreshnessGuaranteed": "This way of working ensures freshness by rapid processes and maintaining the cold chain from purchase to receipt by our customer."
+
+	,"AboutSummary": "75 people spread over almost everybody so that our client has the broadest portfolio in the industry, coolest flower, plant newest, latest accessories, and fastest service possible."
+}
diff --git a/web/locale/mn/forms/cms/contact.json b/web/locale/mn/forms/cms/contact.json
new file mode 100755
index 00000000..b8c61ac0
--- /dev/null
+++ b/web/locale/mn/forms/cms/contact.json
@@ -0,0 +1,20 @@
+{
+	 "IWantCustomer": "I want to be a customer!"	
+	
+	,"FillFormData": "Fill the form with your details and we will contact you soon."
+	,"OrCallUs": "Or if you prefer, call us at 963 242 100."
+	,"AllFieldsMandatory": "* All fields are mandatory."
+	
+	,"Name": "Name"
+	,"Surname": "Surname"
+	,"EMail": "Email"
+	,"Message": "Message"
+	,"Address": "Address"
+	,"PC": "Zip code"
+	,"City": "City"
+	,"Phone": "Phone"
+	,"Send": "Send"
+
+	,"DataSentSuccess": "Your details have been sent successfully. Shortly we will contact you."
+	,"ErrorSendingData": "Failed to send the data. Please check that you have filled in all the fields and you entered the anti-spam code correctly."
+}
diff --git a/web/locale/mn/forms/cms/home.json b/web/locale/mn/forms/cms/home.json
new file mode 100755
index 00000000..40b2b3f7
--- /dev/null
+++ b/web/locale/mn/forms/cms/home.json
@@ -0,0 +1,15 @@
+{
+	 "Start order": "Захиалга эхлэх"
+
+	,"Sent": "Sent"
+	,"Author": "Author"
+	,"votes": "votes"
+	,"NoAnswerSelected": "No answer selected"
+	,"ThanksForVote": "Thanks for your vote!"
+	,"Vote": "Vote"
+	,"Total": "Total"
+	,"BrownserRecommend":
+		 "Verdnatura recommend using the Mozilla Firefox web browser for full functionality of our website."
+	,"PressHere": "Click here to download Firefox"
+}
+
diff --git a/web/locale/mn/forms/cms/location.json b/web/locale/mn/forms/cms/location.json
new file mode 100755
index 00000000..ca65d3a6
--- /dev/null
+++ b/web/locale/mn/forms/cms/location.json
@@ -0,0 +1,3 @@
+{
+	 "ShowMap": "Show map"
+}
diff --git a/web/locale/mn/forms/cms/training.json b/web/locale/mn/forms/cms/training.json
new file mode 100755
index 00000000..0967ef42
--- /dev/null
+++ b/web/locale/mn/forms/cms/training.json
@@ -0,0 +1 @@
+{}
diff --git a/web/locale/mn/forms/cms/why.json b/web/locale/mn/forms/cms/why.json
new file mode 100755
index 00000000..2cef3a58
--- /dev/null
+++ b/web/locale/mn/forms/cms/why.json
@@ -0,0 +1,25 @@
+{
+	 "AboutCompany": "Why Verdnatura?"
+	,"StorePhoto": "Store photo"
+
+	,"BecauseOurBigCatalog": "Because we have the largest catalog in the sector, renewed daily."
+	,"BecauseThisWeb": "Because this website, with real time stock always at your disposal."
+	,"BecauseOurShoppingDep": "For our purchasing department with 9 specialized buyers."
+	,"BecauseOrderIsEasy": "Because it is very easy to place your order by web, phone or coming."
+	,"BecauseOurPlant": "Because our premises, come and visit us. You'll love."
+	,"BecauseOurSalesDep": "For our commercial department, with professionals who will always find a solution to your needs."
+	,"BecauseOurWorkShop": "Because we have a sewing shop to help you."
+	,"BecauseWeHaveWhatYouNeed": "Because we have what you need when you need it ..."
+
+	,"AboutDesc":
+		 "We are a company engaged in the wholesale and distribution of a wide range of accessories, greens and flowers to florists or other wholesalers."
+	
+	,"AboutService":
+		 "We have home delivery service with our vehicles throughout the province of Valencia and limited areas of Castellón, Alicante, Murcia, Albacete and Madrid send the rest of the peninsula by transportation agencies with 24/48 hours service (Zeleris, via express) . We also do direct sales to florists in any of our facilities."
+	
+	,"AboutDisp":
+		 "Our company has over 50 employees and several branches. The main is located in Valencia and has more than 8000 m2. We also have a warehouse located in Mercaflor - Mercavalencia (Valencia) that perform direct sales only."
+	
+	,"AboutOrder":
+		 "You can make your orders and reservations by telephone at 96 324 21 00, online through our website or directly in our facilities."
+}
diff --git a/web/locale/mn/forms/ecomerce/basket.json b/web/locale/mn/forms/ecomerce/basket.json
new file mode 100755
index 00000000..1ed95850
--- /dev/null
+++ b/web/locale/mn/forms/ecomerce/basket.json
@@ -0,0 +1,29 @@
+{
+	 "ShoppingBasket": "Shopping basket"
+
+	,"Delete": "Delete order"
+	,"GoToCatalog": "Go to catalog"
+	,"ConfigureOrder": "Configure order"
+	,"Checkout": "Checkout"
+
+	,"OrderNumber": "Order number"
+	,"DateExit": "Shipping date"
+	,"Warehouse": "Store"
+	,"OrderTotal": "Total"
+
+	,"Amount": "Amount"
+	,"Pack": "Pack"
+	,"Stems": "Stems"
+	,"Avail": "Avail"
+	,"Item": "Item"
+	,"Cat": "Cat"
+	,"S1": "Siz"
+	,"Color": "Color"
+	,"Origin": "Origin"
+	,"Price": "Price"
+	,"Disc": "Desc"
+	,"Subtotal": "Subtotal"
+	
+	,"OrderItemsUpdated": "Your order takes too long and has been updated, prices or quantities of your items may have changed"
+	,"RememberReconfiguringImpact": "Remember that if you reconfigure your order prices or quantities of your items may change"
+}
diff --git a/web/locale/mn/forms/ecomerce/catalog.json b/web/locale/mn/forms/ecomerce/catalog.json
new file mode 100755
index 00000000..8096ada0
--- /dev/null
+++ b/web/locale/mn/forms/ecomerce/catalog.json
@@ -0,0 +1,57 @@
+{
+	 "Catalog": "Catalog"
+	,"SearchResults": "Search results"
+
+	,"SelectFamily": "Select family"
+	,"Choose filter from right menu": "Choose a filter from the right menu"
+	,"Choose a realm": "Choose a realm"
+	,"ArticleNotFound": "Item not found"
+	,"ArticleNotAvailable": "Item not available"
+
+	,"List view": "List view"
+	,"Grid view": "Grid view"
+	,"Switch view": "Switch view"
+	,"StartOrder": "Start order"
+	,"ShoppingBasket": "Shopping basket"
+	
+	,"%A, %e of %B": "%A, %e of %B"
+	,"Agency": "Agency"
+	,"Warehouse": "Warehouse"
+	
+	,"Filter by": "Filter by"
+	,"Order by": "Order by"
+
+	,"Search": "Search"
+	,"Change": "Change"
+	,"Available": "Available"
+	,"Size": "Size"
+	,"Realm": "Realm"
+	,"Family": "Family"
+	,"Color": "Color"
+	,"Producer": "Producer"
+	,"Origin": "Origin"
+	,"Category": "Category"
+	,"Remove filters": "Remove filters"
+
+	,"Price": "Price"
+	,"Amount": "Amount"
+	,"Name": "Name"
+	,"Pack": "Pack"
+	,"Lower price": "Lower price"
+	,"Higher price": "Higher price"
+	,"Lower size": "Lower size"
+	,"Higher size": "Higher size"
+	,", %.0d Units": ", %.0d Units"
+	
+	,"from": "from"
+	,"from %.2d€": "from %.2d€"
+	,"AddToBasket": "Add to basket"
+	,"Add": "Add"
+	,"Erase": "Remove"
+	,"Confirm": "Confirm"
+
+	,"IndicativePhotos": "* Photos are indicative"
+	
+	,"Added%dOf%s": "Added %d of %s"
+	,"NoMoreAmountAvailable": "No more amount available"
+}
diff --git a/web/locale/mn/forms/ecomerce/checkout.json b/web/locale/mn/forms/ecomerce/checkout.json
new file mode 100755
index 00000000..2ee47c1b
--- /dev/null
+++ b/web/locale/mn/forms/ecomerce/checkout.json
@@ -0,0 +1,31 @@
+{
+	 "ConfigureOrder": "Configure order"
+
+	,"Cancel": "Cancel"
+	,"Next": "Next"
+	
+	,"DeliveryOrPickupQuestion": "Do you want to receive or pickup the order?"
+	,"ReceiveThroughtAgency": "Receive by agency"
+	,"ReceiveThroughtRoute": "Verdnatura delivery"
+	,"PickupInStore": "Store pickup"
+	
+	,"OrderDateDeliveryQuestion": "What day you want to receive the order?"
+	,"OrderDatePickupQuestion": "What day you want to pickup your order?"
+	,"AddressQuestion": "Where do you want to receive the order?"
+	,"AgencyQuestion": "By wich agency you want to receive the order?"
+	,"PickupWarehouseQuestion": "What store you want to pickup your order?"
+
+	,"ConfirmToAccessCatalog": "Confirm the data to access the catalog"
+	,"Arrival": "Arrival"
+	,"Pickup": "Pickup"
+	,"%A, %e of %B": "%A, %e of %B"
+	,"Agency": "Agency"
+	,"Warehouse": "Store"
+	,"Confirm": "Confirm"
+
+	,"OrderStarted": "Order started"
+	,"OrderUpdated": "Order updated"
+	
+	,"NoAgeciesAvailableForDate": "No agencies available for the selected date and consignee, change the shipping date of your order"
+	,"NoWarehousesAvailableForDate": "No stores available for the selected date, change the pickup date of you order"
+}
diff --git a/web/locale/mn/forms/ecomerce/confirm.json b/web/locale/mn/forms/ecomerce/confirm.json
new file mode 100755
index 00000000..3348d945
--- /dev/null
+++ b/web/locale/mn/forms/ecomerce/confirm.json
@@ -0,0 +1,36 @@
+{
+	 "Checkout": "Checkout"
+
+	,"Order summary": "Order summary"
+	,"Delivery at": "Delivery at"
+	,"Agency": "Agency"
+	,"Warehouse": "Store"
+	
+	,"Previous balance": "Previous balance"
+	,"Order total": "Order total"
+	,"Order VAT": "Order VAT"
+	,"Total debt": "Total debt"
+	,"Credit": "Credit"
+	,"Exceeded credit": "Exceeded credit"
+	
+	,"Amount to pay": "Amount to pay"
+	,"Pay method": "Pay method"
+
+	,"Use my balance": "Use my balance"
+	,"You have a favorable balance.": "You do not need to perform any payment, you have a favorable balance."
+	,"Use my credit": "Use my credit"
+	,"You have a favorable credit.": "You do not need to pay now, you have a favorable credit."
+	,"Credit card": "Credit card"
+	,"You will be redirected to the payment.": "By confirming the order you will be redirected to the payment platform."
+	,"Bank Transfer": "Bank Transfer"
+	,"Make a transfer to one account.": "Make a transfer to one of the following accounts and send the receipt to your salesperson."
+	,"Pay later": "Pay later"
+
+	,"Modify": "Modify"
+	,"Confirm": "Confirm"
+	
+	,"Order confirmed successfully": "Your order has been confirmed successfully"
+	,"Accept": "Accept"
+	
+	,"You have exceeded your credit.": "You have exceeded your credit, in order to prepare your order please pay your debt."
+}
diff --git a/web/locale/mn/forms/ecomerce/invoices.json b/web/locale/mn/forms/ecomerce/invoices.json
new file mode 100755
index 00000000..c599ed62
--- /dev/null
+++ b/web/locale/mn/forms/ecomerce/invoices.json
@@ -0,0 +1,8 @@
+{
+	 "Invoices": "Invoices"
+
+	,"Serial": "Serial"
+	,"Date": "Date"
+	,"Import": "Import"
+	,"Download PDF": "Download PDF"
+}
diff --git a/web/locale/mn/forms/ecomerce/orders.json b/web/locale/mn/forms/ecomerce/orders.json
new file mode 100755
index 00000000..3e194aff
--- /dev/null
+++ b/web/locale/mn/forms/ecomerce/orders.json
@@ -0,0 +1,39 @@
+{
+	 "OpenOrders": "Open orders"
+
+	,"StartOrder": "Start order"
+	,"ContinueOrder": "Continue order"
+	,"OrderNumber": "Order number"
+	,"DateMake": "Creation date"
+	,"DateExit": "Shipping date"
+	,"SendMethod": "Delivery method"
+
+	,"LastOrders": "Last orders"
+
+	,"Balance:": "Balance:"
+	,"PaymentInfo": "Үзүүлсэн хэмжээ цаашид захиалга эзэлж биш, таны налуу (сөрөг), эсвэл тааламжтай тэнцвэр нь өнөөдөр юм. Хэрэв та дүн арилгаж гэж хэлж байсан нь доош нь төлбөр хийж, өөрийн хүссэн хэмжээгээр орж хүсэж байгаа бол таны захиалга ирдэг бол авах, энэ хэмжээ тэнцүү буюу 0-ээс их байх ёстой."
+	,"MakePayment": "Make payment"
+	,"Company": "Company"
+	,"Pending": "Pending"
+	,"Pay": "Pay"
+	,"Basket": "Basket"
+	,"ShoppingBasket": "Shopping basket"
+
+	,"SeeOrder": "Show details of the order"
+	,"Delivery": "Delivery"
+	,"TicketNumber": "Ticket number"
+	,"SentAddress": "Delivery address"
+	,"Consignee": "Consignee"
+	,"Boxes": "Bundles"
+	,"TotalWithVAT": "Total with VAT"
+	,"Pending": "Pending"
+	,"PayOrder": "Pay order"
+
+	,"AmountToPay:": "Amount to pay (€):"
+	,"AmountError": "The amount must be a positive number less than or equal to the outstanding amount"
+	,"PayError": "Failed to make the payment"
+	
+	,"An error has been in the payment": "It seems that there has been an error in the payment"
+	,"Retry": "Retry"
+	,"Accept": "Accept"
+}
diff --git a/web/locale/mn/forms/ecomerce/ticket.json b/web/locale/mn/forms/ecomerce/ticket.json
new file mode 100755
index 00000000..ccb4cd01
--- /dev/null
+++ b/web/locale/mn/forms/ecomerce/ticket.json
@@ -0,0 +1,23 @@
+{
+	 "OrderDetail": "Order detail"
+
+	,"%A, %e of %B %Y": "%A, %e of %B %Y"
+	,"Print delivery note": "Print delivery note"
+
+	,"Delivery": "Delivery"
+	,"Total": "Total"
+	,"Tax base": "Tax base"
+	,"VAT": "VAT"
+
+	,"ItemNumber": "Item number"
+	,"Amount": "Amount"
+	,"Item": "Item"
+	,"Category": "Category"
+	,"S1": "Siz"
+	,"Stems": "Stems"
+	,"Color": "Color"
+	,"Origin": "Origin"
+	,"Price": "Price"
+	,"Disc": "Disc"
+	,"Subtotal": "Subtotal"
+}
diff --git a/web/locale/mn/forms/news/new.json b/web/locale/mn/forms/news/new.json
new file mode 100755
index 00000000..0213d99a
--- /dev/null
+++ b/web/locale/mn/forms/news/new.json
@@ -0,0 +1,12 @@
+{
+	 "AddEditNew": "Add or edit new"
+
+	,"Title": "Title"
+	,"NewBody": "New body"
+	,"Tag": "Tag"
+
+	,"Return": "Return"
+	,"Accept": "Accept"
+	
+	,"NewChangedSuccessfully": "New changed successfully"
+}
diff --git a/web/locale/mn/forms/news/news.json b/web/locale/mn/forms/news/news.json
new file mode 100755
index 00000000..b263c5d0
--- /dev/null
+++ b/web/locale/mn/forms/news/news.json
@@ -0,0 +1,12 @@
+{
+	 "NewsManagement": "News management"
+
+	,"AddNew": "Add new"
+	,"EditNew": "Edit new"
+
+	,"NewNum": "New number"
+	,"Date": "Date"
+	,"Author": "Author"
+	,"Title": "Title"
+	,"Priority": "Priority"
+}
diff --git a/web/locale/mn/js/db.js b/web/locale/mn/js/db.js
new file mode 100755
index 00000000..591d711f
--- /dev/null
+++ b/web/locale/mn/js/db.js
@@ -0,0 +1,8 @@
+Vn.Locale.add
+({
+	 "ConnError": "Connection failed"
+	,"BadServerReply": "Bad server reply"
+	,"ModelNotUpdatable": "Model not updatable"
+	,"RowNotExists": "The record does not exist or has been deleted"
+	,"ColNotExists": "The column does not exist"
+});
diff --git a/web/locale/mn/js/hedera.js b/web/locale/mn/js/hedera.js
new file mode 100755
index 00000000..cda44b2c
--- /dev/null
+++ b/web/locale/mn/js/hedera.js
@@ -0,0 +1,59 @@
+Vn.Locale.add
+({
+	 "User": "Хэрэглэгчийн"
+	,"Password": "нууц үг"
+	,"Beta": "Бета"
+	,"Do not sign out": "Гаргаж гарын үсэг зураагүй байна"
+	,"I want to know more": "Би илүү ихийг мэдэхийг хүсч байна"
+	,"Enter": "энд бичнэ үү"
+	,"Login mail": "clientes@verdnatura.es"
+	,"Login phone": "+34 607 562 391"
+
+	,"You've been too idle": "Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна"
+	,"Invalid login": "Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай"
+	,"There was an internal error": "Дотоод алдаа гарлаа"
+
+	,"Menu": "Цэс"
+	,"Exit": "гарах"
+	,"Test the new website": "Шинэ вэб шалгана!"
+	,"Old website": "Хуучин вэб сайт"
+	,"Recent changes": "Сүүлийн өөрчлөлтүүд"
+
+	,"Print": "Хэвлэх"
+	,"Please unlock popups and try again":
+		"Поп өгсөх түгжээ дахин оролдоно уу"
+
+	,"Error loading form": "Алдаа бол ачих хэлбэр"
+	,"Error loading report": "Алдаа ачих тайлан"
+	,"By using this site you accept cookies": "Энэ вэб сайтыг ашиглан та агуулга, дүн шинжилгээ хийх тохиргоонууд жигнэмэг хэрэглэхийг хүлээн зөвшөөрдөг."
+	,"New version available": "Шинэ шинэчлэх байна, хуудас автоматаар татаж авах цэнэглэж болно"
+	
+	,"AppName": "Verdnatura"
+
+	,"Home": "Нүүр хуудас"
+	,"Orders": "захиалга"
+		,"Basket": "сагс"
+		,"Last orders": "Өнгөрсөн захиалга"
+		,"Invoices": "Нэхэмжлэх"
+	,"Catalog": "Каталог"
+	,"About": "тухай"
+		,"About us": "бидний тухай"
+		,"Why": "яагаад"
+	,"Location": "Байрлал"
+	,"Administration": "захиргаа"
+		,"Control panel": "хяналтын самбар"
+		,"Users": "Хэрэглэгчид нь"
+	 	,"Connections": "холболт"
+		,"Visits": "уулзалт"
+		,"News": "мэдээ"
+		,"Photos": "Фото зураг"
+	,"Reports": "мэдээ"
+		,"Shelves": "тавиур"
+		,"Items list": "зүйлс жагсаалт"
+	,"Contact": "Холбоо барих"
+	,"Training": "сургалт"
+	,"Agencies": "байгууллагууд"
+	,"Configuration": "Тохиргоо"
+		,"Account": "Дансны"
+		,"Addresses": "хаягууд"
+});
diff --git a/web/locale/mn/js/htk.js b/web/locale/mn/js/htk.js
new file mode 100755
index 00000000..a3a262fd
--- /dev/null
+++ b/web/locale/mn/js/htk.js
@@ -0,0 +1,31 @@
+Vn.Locale.add
+({
+	 "True": "True"
+	,"False": "False"
+	,"Null": "Null"
+	,"ChangeDate": "Change date"
+	,"Sort": "Sort"
+	,"At": "at"
+	,"Of": "of"
+	,"OfThe": "of the"
+	,"Remove": "Remove"
+	,"Loading": "Loading"
+	,"Loading...": "Loading..."
+	,"ReallyDelete": "Are you sure you want to delete the line?"
+	,"YouMustBeLoggedIn": "You must be a registered user"
+	,"EmptyList": "Empty list"
+	,"NoData": "No data"
+	,"ErrorLoadingData": "Error"
+	,"Error": "Error"
+	,"Image": "Image"
+	,"File": "File"
+	,"FileName": "File name"
+	,"UpdateImage": "Add or update an image"
+	,"UploadFile": "Upload file"
+	,"ImageAdded": "Image added successfully"
+	,"Close": "Close"
+	,"Previous": "Previous"
+	,"Next": "Next"
+	,"Search": "хайх"
+	,"Search...": "хайх..."
+});
diff --git a/web/locale/mn/js/vn.js b/web/locale/mn/js/vn.js
new file mode 100755
index 00000000..7c6e8dfa
--- /dev/null
+++ b/web/locale/mn/js/vn.js
@@ -0,0 +1,46 @@
+Vn.Locale.add
+({
+	 "Sunday": "Ням гараг"
+	,"Monday": "Даваа гариг"
+	,"Tuesday": "Мягмар"
+	,"Wednesday": "Лхагва"
+	,"Thursday": "Пүрэв"
+	,"Friday": "Баасан гариг"
+	,"Saturday": "Бямба"
+
+	,"Su": "Ня"
+	,"Mo": "Да"
+	,"Tu": "Мя"
+	,"We": "Лх"
+	,"Th": "Пү"
+	,"Fr": "Ба"
+	,"Sa": "Бя"
+
+	,"January": "оны нэгдүгээр сарын"
+	,"February": "хоёрдугаар сар"
+	,"March": "Гуравдугаар сарын"
+	,"April": "Дөрөвдүгээр сар"
+	,"May": "May"
+	,"June": "June"
+	,"July": "June"
+	,"August": "Наймдугаар сар"
+	,"September": "Есдүгээр"
+	,"October": "Аравдугаар сар"
+	,"November": "Арваннэгдүгээр"
+	,"December": "Арванхоёрдугаар сар"
+
+	,"Jan": "оны"
+	,"Feb": "хоё"
+	,"Mar": "Гур"
+	,"Apr": "Дөр"
+	,"May": "May"
+	,"Jun": "Jun"
+	,"Jul": "Jul"
+	,"Ago": "Най"
+	,"Sep": "Есд"
+	,"Oct": "Ара"
+	,"Nov": "Арв"
+	,"Dec": "Арв"
+	
+	,"%A, %B %e": "%A, %B %e"
+});
diff --git a/web/locale/mn/pages/tpv.json b/web/locale/mn/pages/tpv.json
new file mode 100755
index 00000000..4e04b791
--- /dev/null
+++ b/web/locale/mn/pages/tpv.json
@@ -0,0 +1,4 @@
+{
+	  "PaymentComplete": "Payment completed, you can return to our website."
+	  ,"ReturnToWeb": "Back to Verdnatura"
+}
diff --git a/web/locale/mn/pages/update-browser.json b/web/locale/mn/pages/update-browser.json
new file mode 100755
index 00000000..1735de56
--- /dev/null
+++ b/web/locale/mn/pages/update-browser.json
@@ -0,0 +1,4 @@
+{
+	 "UpdateYourBrowser": "Upgrade your browser"
+	,"ContinueAnyway": "Continue anyway"
+}
diff --git a/web/locale/mn/pages/version-menu.json b/web/locale/mn/pages/version-menu.json
new file mode 100755
index 00000000..fa6ddf49
--- /dev/null
+++ b/web/locale/mn/pages/version-menu.json
@@ -0,0 +1,8 @@
+{
+	"Welcome to Verdnatura, where are you going?": "Welcome to Verdnatura, where are you going?"
+
+	,"New website": "New website"
+	,"(Fantastic)": "(Fantastic)"
+	,"Old website": "Old website"
+	,"(Best choose new)": "(Best choose new)"
+}
diff --git a/web/locale/mn/rest/query.json b/web/locale/mn/rest/query.json
new file mode 100755
index 00000000..75f9e384
--- /dev/null
+++ b/web/locale/mn/rest/query.json
@@ -0,0 +1,5 @@
+{
+	 "InvalidAction": "Invalid action"
+
+	,"EmptyQuery": "Empty query"
+}
diff --git a/web/locale/pt/forms/admin/connections.json b/web/locale/pt/forms/admin/connections.json
new file mode 100755
index 00000000..62244264
--- /dev/null
+++ b/web/locale/pt/forms/admin/connections.json
@@ -0,0 +1,8 @@
+{
+	 "Connections": "Conexões"
+
+	,"Refresh": "actualização"
+	,"Visits": "Visualizações"
+	
+	,"connections": "conexões"
+}
diff --git a/web/locale/pt/forms/admin/queries.json b/web/locale/pt/forms/admin/queries.json
new file mode 100755
index 00000000..37175281
--- /dev/null
+++ b/web/locale/pt/forms/admin/queries.json
@@ -0,0 +1,11 @@
+{
+	 "Queries": "Queries"
+
+	,"Execute": "Execute"
+	,"Clean": "Clean"
+
+	,"SQL query": "SQL query"
+	,"Updatable": "Updatable"
+	
+	,"Query executed!": "Query executed!"
+}
diff --git a/web/locale/pt/forms/admin/visits.json b/web/locale/pt/forms/admin/visits.json
index 519e2919..518f9745 100644
--- a/web/locale/pt/forms/admin/visits.json
+++ b/web/locale/pt/forms/admin/visits.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	 "Visits": "Visitas"
 	,"VisitsManagement": "Gestão de visitas"
 	 
@@ -28,4 +29,18 @@
 	,"LastVisit": "Última visita"
 	,"NewVisits": "Novas visitas"
 	,"%a, %e %b %Y at %T": "%a, %e %b %Y a las %T"
+=======
+	 "Visits": "Visualizações"
+
+	,"Refresh": "Actualização"
+	,"Connections": "Conexões"
+
+	,"From": "Desde"
+	,"To": "Até"
+	,"Select date interval": "Selecciona un intérvalo de datas"
+
+	,"visits": "Visualizações"
+	,"news": "novas"
+	,"%a, %e %b %Y at %T": "%a, %e %b %Y em %T"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 }
diff --git a/web/locale/pt/forms/cms/about.json b/web/locale/pt/forms/cms/about.json
index 3368992c..3f443c15 100644
--- a/web/locale/pt/forms/cms/about.json
+++ b/web/locale/pt/forms/cms/about.json
@@ -17,7 +17,11 @@
 
 	,"BuyersAndTraders": "9 compradores especializados e nossos 20 comerciais te asessorarão em tudo o que necessites."
 	
+<<<<<<< HEAD
 	,"Training": "Verdnatura formação"
+=======
+	,"Verdnatura training": "Verdnatura formação"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 
 	,"GoodTraining": "Em Verdnatura sabemos que uma boa formação é imprescindível para o desenvolvimento ótimo de qualqer atividade, e como não, também a de florista."
 	,"SpecialTrainingPrices": "Para que o orçamento de uma escola não repercuta na qualidade da sua formação, colaboramos com uma política de preços especiais para todas aquelas escolas que solicitem realizar cursos em nossas instalações de Verdnatura Silla."
diff --git a/web/locale/pt/forms/cms/home.json b/web/locale/pt/forms/cms/home.json
index 8849ee17..296de2ff 100644
--- a/web/locale/pt/forms/cms/home.json
+++ b/web/locale/pt/forms/cms/home.json
@@ -1,5 +1,11 @@
 {
+<<<<<<< HEAD
 	 "Sent": "Enviado"
+=======
+	 "Start order": "Comece uma ordem"
+
+	,"Sent": "Enviado"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	,"Author": "Autor"
 	,"votes": "votos"
 	,"NoAnswerSelected": "Não seleccionou nenhuma resposta"
diff --git a/web/locale/pt/forms/ecomerce/catalog.json b/web/locale/pt/forms/ecomerce/catalog.json
index 3a26c213..245efcae 100644
--- a/web/locale/pt/forms/ecomerce/catalog.json
+++ b/web/locale/pt/forms/ecomerce/catalog.json
@@ -3,16 +3,38 @@
 	,"SearchResults": "Resultados de busca"
 
 	,"SelectFamily": "Seleccione uma família"
+<<<<<<< HEAD
 	,"Select filter from right menu": "Seleccione um filtro no menú da direita"
 	,"ArticleNotFound": "Ítem não encontrado"
 	,"ArticleNotAvailable": "Ítem não disponível"
 
+=======
+	,"Choose filter from right menu": "Escolha um filtro no menú da direita"
+	,"Choose a realm": "Escolha um reino"
+	,"ArticleNotFound": "Ítem não encontrado"
+	,"ArticleNotAvailable": "Ítem não disponível"
+
+	,"List view": "Ver como lista"
+	,"Grid view": "Vista em modo de grade"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	,"Switch view": "Modificar vista"
 	,"StartOrder": "Iniciar pedido"
 	,"ShoppingBasket": "Cesta da compra"
 	
+<<<<<<< HEAD
 	,"Search": "Buscar"
 	,"Order by": "Organizar"
+=======
+	,"%A, %e of %B": "%A, %e of %B"
+	,"Agency": "Agência"
+	,"Warehouse": "Armazém"
+	
+	,"Filter by": "Filtrar por"
+	,"Order by": "Ordenar por"
+	
+	,"Search": "Buscar"
+	,"Change": "Modificar"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	,"Available": "Disponível"
 	,"Size": "Medida"
 	,"Realm": "Reino"
@@ -23,6 +45,7 @@
 	,"Category": "Categoria"
 	,"Remove filters": "Eliminar filtros"
 
+<<<<<<< HEAD
 	,"Amount": "Qtde"
 	,"Aval": "Disp"
 	,"Name": "Nome"
@@ -34,6 +57,17 @@
 	,"Origin": "Orígem"
 	,"Price": "Preço"
 	,"%.0d Units": "%.0d Unidades "
+=======
+	,"Price": "Preço"
+	,"Amount": "Quantidade"
+	,"Name": "Nome"
+	,"Pack": "Pack"
+	,"Lower price": "Menor preço"
+	,"Higher price": "Maior preço"
+	,"Lower size": "Tamanho menor"
+	,"Higher size": "Tamanho maior"
+	,", %.0d Units": ", %.0d Unidades"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	
 	,"from": "desde"
 	,"from %.2d€": "desde %.2d€"
diff --git a/web/locale/pt/forms/ecomerce/confirm.json b/web/locale/pt/forms/ecomerce/confirm.json
index d06a0230..034c9fda 100644
--- a/web/locale/pt/forms/ecomerce/confirm.json
+++ b/web/locale/pt/forms/ecomerce/confirm.json
@@ -1,6 +1,7 @@
 {
 	 "Checkout": "Finalizar pedido"
 
+<<<<<<< HEAD
 	,"OrderSummary": "Resumo do pedido"
 	,"Arrival": "Chegada"
 	,"%A, %e of %B": "%A, %e de %B"
@@ -22,4 +23,38 @@
 	,"OrderReserved": "Seu pedido foi reservado mas parece que houve um problema com o pagamento. Contacte com seu comercial."
 	,"Accept": "Aceitar"
 	,"PayNow": "Pagar agora"
+=======
+	,"Order summary": "Resumo do pedido"
+	,"Delivery at": "Entrega na"
+	,"Agency": "Agência"
+	,"Warehouse": "Armazém"
+	
+	,"Previous balance": "Equilíbrio anterior"
+	,"Order total": "Total pedido"
+	,"Order VAT": "IVA pedido"
+	,"Total debt": "Total deuda"
+	,"Credit": "Crédito"
+	,"Exceeded credit": "Crédito excedido"
+	
+	,"Amount to pay": "Valor devido"
+	,"Pay method": "Método de pagamento"
+
+	,"Use my balance": "Use o meu equilíbrio"
+	,"You have a favorable balance.": "Não há necessidade de pagar qualquer coisa, você tem um saldo favorável."
+	,"Use my credit": "Use o meu crédito"
+	,"You have a favorable credit.": "Não há necessidade de pagar nada, você favorável de crédito."
+	,"Credit card": "Cartão de crédito"
+	,"You will be redirected to the payment.": "Ao confirmar o pedido, você será redirecionado para a plataforma de pagamento."
+	,"Bank Transfer": "Transferência bancária"
+	,"Make a transfer to one account.": "Faça Transferido para uma das seguintes contas e enviar o comprovante para o seu negócio."
+	,"Pay later": "Pagar mais tarde"
+
+	,"Modify": "Modificar"
+	,"Confirm": "Confirmar"
+	
+	,"Order confirmed successfully": "Seu pedido foi realizado com êxito"
+	,"Accept": "Aceitar"
+	
+	,"You have exceeded your credit.": "Você ultrapassou o seu crédito, por favor, fazer o pagamento para que possamos preparar a sua ordem."
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 }
diff --git a/web/locale/pt/forms/ecomerce/orders.json b/web/locale/pt/forms/ecomerce/orders.json
index cc645f6e..f51818ce 100644
--- a/web/locale/pt/forms/ecomerce/orders.json
+++ b/web/locale/pt/forms/ecomerce/orders.json
@@ -11,7 +11,11 @@
 	,"LastOrders": "Últimos pedidos"
 
 	,"Balance:": "Saldo:"
+<<<<<<< HEAD
 	,"PaymentInfo": "A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à conta, apague a quantidade sugerida e introduza a quantidade que deseje."
+=======
+	,"PaymentInfo": "A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à conta, clique no botão de pagamento, apague a quantidade sugerida e introduza a quantidade que deseje."
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	,"MakePayment": "Realizar pagamento"
 	,"Company": "Empresa"
 	,"Pending": "Pendente"
@@ -20,6 +24,10 @@
 	,"ShoppingBasket": "Cesta da compra"
 
 	,"SeeOrder": "Mostrar detalhe do pedido"
+<<<<<<< HEAD
+=======
+	,"Delivery": "Entrega"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	,"TicketNumber": "Nº ticket"
 	,"SentAddress": "Endereço de envío"
 	,"Consignee": "Consignatario"
@@ -32,5 +40,11 @@
 	,"AmountError": "A quantidade deve ser um número positivo e inferior ou igual ao importe pendiente"
 	,"PayError": "Erro ao realizar o pagamento"
 	
+<<<<<<< HEAD
 	,"%A, %e of %B": "%A, %e de %B"
+=======
+	,"An error has been in the payment": "Parece que não houve um erro no pagamento"
+	,"Retry": "Tentar novamente"
+	,"Accept": "Aceitar"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 }
diff --git a/web/locale/pt/forms/ecomerce/ticket.json b/web/locale/pt/forms/ecomerce/ticket.json
index 3d1e5a76..acd4d1ae 100644
--- a/web/locale/pt/forms/ecomerce/ticket.json
+++ b/web/locale/pt/forms/ecomerce/ticket.json
@@ -1,6 +1,7 @@
 {
 	 "OrderDetail": "Detalhe do pedido"
 
+<<<<<<< HEAD
 	,"Print delivery note": "Imprimir guía de remessa"
 
 	,"TicketNumber:": "Nº ticket:"
@@ -15,6 +16,15 @@
 	,"Province": "Distrito"
 	,"Address": "Endereço"
 	,"Consignee": "Consignatario"
+=======
+	,"%A, %e of %B %Y": "%A, %e de %B %Y"
+	,"Print delivery note": "Imprimir guía de remessa"
+
+	,"Delivery": "Entrega"
+	,"Total": "Total"
+	,"Tax base": "Tributável"
+	,"VAT": "IVA"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 
 	,"ItemNumber": "Nº artículo"
 	,"Amount": "Qtde"
diff --git a/web/locale/pt/js/hedera.js b/web/locale/pt/js/hedera.js
index de6c3f61..15a469b2 100644
--- a/web/locale/pt/js/hedera.js
+++ b/web/locale/pt/js/hedera.js
@@ -10,7 +10,11 @@ Vn.Locale.add
 	,"Login phone": "+34 963 242 100"
 
 	,"You've been too idle": "Muito tempo de inatividade, a sessão foi finalizada"
+<<<<<<< HEAD
 	,"Invalid login": "Usuário ou Palavra-Passe incorreto. Lembre-se de diferenciar maiusculas e minusculas."
+=======
+	,"Invalid login": "Usuário ou Palavra-Passe incorreto, lembre-se de diferenciar maiusculas e minusculas"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 	,"There was an internal error": "Houve um erro interno"
 
 	,"Menu": "Menú"
@@ -43,9 +47,17 @@ Vn.Locale.add
 	,"Administration": "Administração"
 		,"Control panel": "Painel de controle"
 		,"Users": "Usuarios"
+<<<<<<< HEAD
 		,"Visits": "Visitas"
 		,"News": "Noticias"
 		,"Photos": "Fotos"
+=======
+		,"Connections": "Conexões"
+		,"Visits": "Visitas"
+		,"News": "Noticias"
+		,"Photos": "Fotos"
+	,"Reports": "Relatórios"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 		,"Shelves": "Estantes"
 		,"Items list": "Lista de Itens"
 	,"Contact": "Quero ser cliente"
diff --git a/web/locale/pt/js/vn.js b/web/locale/pt/js/vn.js
index be30e2a6..e2d3d5c6 100644
--- a/web/locale/pt/js/vn.js
+++ b/web/locale/pt/js/vn.js
@@ -41,4 +41,9 @@ Vn.Locale.add
 	,"Oct": "Out"
 	,"Nov": "Nov"
 	,"Dec": "Dez"
+<<<<<<< HEAD
+=======
+	
+	,"%A, %B %e": "%A, %B %e"
+>>>>>>> 5f64002b1d4eebc7fcfd7ff1916d7658fbaf57fb
 });
diff --git a/web/pages/login/head.php b/web/pages/login/head.php
deleted file mode 100755
index 21855b37..00000000
--- a/web/pages/login/head.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once ('global/metatags.php');
-require_once ('js/vn/main.php');
-
-use Vn\Hedera\Js;
-
-Js::includeFile ('pages/login/login.js');
-
-Js::includeCss ('global/style.css');
-Js::includeCss ('pages/login/style.css');
-
-if (Js::isMobile ())
-{
-	Js::includeCss ('global/mobile.css');
-	Js::includeCss ('pages/login/mobile.css');
-}
-
-?>
diff --git a/web/pages/login/html.php b/web/pages/login/html.php
deleted file mode 100755
index 6861c554..00000000
--- a/web/pages/login/html.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<meta name="viewport" content="user-scalable=no"/>
-	<?php include ('pages/login/head.php') ?>
-
-	<link rel="shortcut icon" type="image/x-icon" href="image/favicon.ico"/>
-	<title>Login - Verdnatura</title>
-</head>
-<body>
-	<div id="header">
-		<div>
-		<a href="?page=web&amp;guest=true#!form=cms/about"><?=s('IWantToKnowMore')?></a>
-		</div>
-	</div>
-	<div id="body">
-		<div id="column">
-		<div id="login">
-		<form id="form" action="?page=login&amp;login" method="post">
-			<div id="logo">
-				<img src="image/logo.svg" alt=""/>
-			</div>
-			<div id="version-code">
-			</div>
-			<div id="form-inputs">
-				<div class="form-group">
-					<label for="user"><?=s('User')?></label>
-					<input type="text" id="user" name="user"/>
-				</div>
-				<div class="form-group">
-					<label for="pass"><?=s('Password')?></label>
-					<input type="password" id="pass" name="password"/>
-				</div>
-			</div>
-			<div id="bottom">
-				<input type="checkbox" id="remember" name="remember"/>
-				<label for="remember"><?=s("NotCloseSession")?></label>
-			</div>
-			<div>
-				<input type="submit" value="<?=s('Enter')?>"/>
-			</div>
-			<div id="info">
-				<p><?=s("LoginMail")?></p>
-				<p><?=s("LoginPhone")?></p>
-			</div>
-			<div id="links">
-				<a target="_blank" href="http://verdnaturacomunicacion.blogspot.com.es/">
-					<img alt="Blogger" src="image/blogger.svg" title="Blogger"/>
-				</a>
-				<a target="_blank" href="https://plus.google.com/u/0/107516577801959283883/posts">
-					<img alt="Google+" src="image/google-plus.svg" title="Google+"/>
-				</a>
-				<a target="_blank" href="http://www.facebook.com/verdnatura">
-					<img alt="Facebook" src="image/facebook.svg" title="Facebook"/>
-				</a>
-				<a target="_blank" href="http://www.youtube.com/user/verdnatura">
-					<img alt="YouTube" src="image/youtube.svg" title="YouTube"/>
-				</a>
-			</div>
-		</form>
-		</div>
-		</div>
-	</div>
-</body>
-</html>
diff --git a/web/pages/login/login.js b/web/pages/login/login.js
deleted file mode 100755
index 42eff70a..00000000
--- a/web/pages/login/login.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-window.addEventListener ('load',
-	function () { Vn.Login.initialize (); });
-
-Vn.Login = 
-{
-	initialize: function ()
-	{
-		Vn.Hash.initialize ();
-	
-		switch (Vn.Hash.get ('error'))
-		{
-			case 'badLogin':
-				alert (_('InvalidLogin'));
-				break;
-			case 'sessionExpired':
-				alert (_('SessionExpired'));
-				break;
-		}
-
-		var userEntry = document.getElementById ('user');
-
-		if (Vn.Cookie.check ('vn_user'))
-			userEntry.value = Vn.Cookie.get ('vn_user');
-
-		userEntry.focus ();
-		userEntry.select ();
-	}
-};
-
diff --git a/web/pages/login/login.php b/web/pages/login/login.php
deleted file mode 100755
index 6792e06c..00000000
--- a/web/pages/login/login.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-use Vn\Hedera\Web;
-
-if (isset ($_GET['logout']))
-try
-{
-	Web::login ();
-	Web::logout ();
-}
-catch (Exception $e) {}
-
-if (Web::login ())
-{
-	header ('Location: ?page=web');
-	exit;
-}
-elseif (isset ($_GET['login']))
-{
-	header ('Location: ?page=login#!error=badLogin');
-	exit;
-}
-
-?>
diff --git a/web/pages/login/style.css b/web/pages/login/style.css
deleted file mode 100755
index e5f4b1aa..00000000
--- a/web/pages/login/style.css
+++ /dev/null
@@ -1,166 +0,0 @@
-body
-{
-	position: absolute;
-	margin: 0;
-	height: 100%;
-	width: 100%;
-	z-index: -2;
-	background-color: #EEE;
-}
-body,
-label,
-button,
-input,
-textarea,
-p,
-a
-{
-	font-size: 1.2em;
-	font-weight: normal;
-	color: #333;
-/*	text-shadow: 0 0.2em 0.2em #AAA; */
-}
-
-/* Header */
-
-#header
-{
-	z-index: 10;
-	position: absolute;
-	background-color: #333;
-	width: 100%;
-	height: 3.5em;
-	
-}
-#header div
-{
-	margin-top: 1em;
-	text-align: center;
-}
-#header a
-{
-	color: white;
-}
-
-/* Body */
-
-#body
-{
-	position: absolute;
-	top: 3.5em;
-	left: 0;
-	right: 0;
-	bottom: 0;
-/*	background-image: url("background.png");
-    background-repeat: repeat;
-*/
-}
-#column
-{
-	position: relative;
-	margin: 0 auto;
-	overflow: auto;
-	max-width: 40em;
-	height: 100%;
-	background-color: white;
-	box-shadow: 0 0.2em 0.2em #DDD;
-}
-
-/* Login */
-
-#login
-{
-	position: absolute;
-	margin-top: -17em;
-	padding: 1em;
-	max-width: 45em;
-	top: 50%;
-	left: 0;
-	right: 0;
-	
-}
-#logo img
-{
-	display: block;
-	margin: 0.5em auto;
-	min-width: 24em;
-	width: 75%;
-}
-#version-code
-{
-	color: red;
-	text-align: right;
-	margin: 0.2em auto;
-	font-weight: bold;
-	height: 2em;
-}
-#form-inputs
-{
-	margin: 0 auto;
-	max-width: 16em;
-}
-div.form-group label
-{
-	display: block;
-}
-input
-{
-	border-radius: 0.1em;
-	box-shadow: 0 0.1em 0.1em #AAA;
-	margin: 0.3em;
-}
-input[type=text],
-input[type=password]
-{
-	margin: 0.5em 0;
-	margin-bottom: 0.5em;
-	padding: 0.5em;
-	width: 100%;
-	border: 1px solid #AAA;
-}
-td.entry
-{
-	text-align: left;
-}
-input[type=submit]
-{
-	display: block;
-	margin: 0 auto;
-	background-color: #AD4;
-	border: 1px solid #8B2;
-	height: 2.4em;
-	width: 8em;
-	color: #250;
-}
-input[type=submit]:hover
-{
-	background-color: #9C3;
-}
-#bottom
-{
-	text-align: center;
-	padding: 1em;
-}
-
-/* Info */
-
-#info
-{
-	margin-top: 2.5em;
-	text-align: center;
-}
-#info p
-{
-	margin: 0.5em;
-}
-#links
-{
-	margin: 0 auto;
-	margin-top: 2em;
-	text-align: center;
-}
-#links img
-{
-	height: 1.8em;
-}
-
diff --git a/web/global/analytics.php b/web/pages/main/analytics.php
similarity index 100%
rename from web/global/analytics.php
rename to web/pages/main/analytics.php
diff --git a/web/global/metatags.php b/web/pages/main/head.php
similarity index 70%
rename from web/global/metatags.php
rename to web/pages/main/head.php
index 2eab5d07..b25f3cac 100755
--- a/web/global/metatags.php
+++ b/web/pages/main/head.php
@@ -1,15 +1,19 @@
 <?php
 
 use Vn\Hedera\Web;
+use Vn\Hedera\Js;
 
 if ($result = Web::$sysConn->query ('SELECT name, content FROM metatag'))
 {
-	echo '<meta name="content-language" content="'.$_SESSION['lang'].'"/>'."\n\t";
+	echo '<meta name="content-language" content="'.$_SESSION['lang'].'"/>'."\n\t\t";
 
 	while ($row = $result->fetch_assoc ())
-		echo '<meta name="'.$row['name'].'" content="'.$row['content'].'"/>'."\n\t";
+		echo '<meta name="'.$row['name'].'" content="'.$row['content'].'"/>'."\n\t\t";
 
 	$result->free ();
 }
 
+Js::includeFile ('js/vn/vn.js');
+Js::includeFile ('pages/main/main.js');
+
 ?>
diff --git a/web/pages/main/html.php b/web/pages/main/html.php
new file mode 100755
index 00000000..59bcd6c1
--- /dev/null
+++ b/web/pages/main/html.php
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=no"/>
+		<meta name="mobile-web-app-capable" content="yes">
+		<link rel="shortcut icon" type="image/x-icon" href="image/favicon.ico"/>
+		<?php include ('pages/main/head.php') ?>
+
+		<title>Verdnatura</title>
+	</head>
+	<body></body>
+</html>
diff --git a/web/pages/main/main.js b/web/pages/main/main.js
new file mode 100755
index 00000000..8fa63693
--- /dev/null
+++ b/web/pages/main/main.js
@@ -0,0 +1,15 @@
+
+Vn.includeCss ('pages/main/style.css');
+
+Vn.include ('js/misc/main');
+Vn.include ('js/vn/locale');
+Vn.include ('js/vn/main');
+Vn.include ('js/sql/main');
+Vn.include ('js/db/main');
+Vn.include ('js/htk/main');
+Vn.include ('js/hedera/main');
+
+Vn.main (function ()
+{
+	(new Vn.App ()).run ();
+});
diff --git a/web/global/opensans.ttf b/web/pages/main/opensans.ttf
similarity index 100%
rename from web/global/opensans.ttf
rename to web/pages/main/opensans.ttf
diff --git a/web/pages/main/roboto.ttf b/web/pages/main/roboto.ttf
new file mode 100644
index 00000000..8c082c8d
Binary files /dev/null and b/web/pages/main/roboto.ttf differ
diff --git a/web/pages/main/style.css b/web/pages/main/style.css
new file mode 100755
index 00000000..c0fa2228
--- /dev/null
+++ b/web/pages/main/style.css
@@ -0,0 +1,18 @@
+
+@font-face
+{
+    font-family: 'Roboto';
+    src: url('roboto.ttf') format('truetype');
+}
+
+body
+{
+	position: absolute;
+	margin: 0;
+	height: 100%;
+	width: 100%;
+	z-index: -2;
+	background-color: #EEE;
+	overflow: hidden;
+}
+
diff --git a/web/pages/version-menu/style.css b/web/pages/version-menu/style.css
index 0aa06615..6410c894 100755
--- a/web/pages/version-menu/style.css
+++ b/web/pages/version-menu/style.css
@@ -1,18 +1,9 @@
-/*
-@media
-	(min-resolution: 120dpi) and (min-width: 800px),
-	(max-resolution: 119dpi) and (max-width: 800px)
-{
-	
-}
-*/
-@media
-	(min-resolution: 120dpi) and (orientation: portrait)
+
+@media (min-resolution: 120dpi) and (orientation: portrait)
 {
 	* { font-size: 18pt; }
 }
-@media
-	(min-resolution: 120dpi) and (orientation: landscape)
+@media (min-resolution: 120dpi) and (orientation: landscape)
 {
 	* { font-size: 10pt; }
 }
diff --git a/web/pages/web/html.php b/web/pages/web/html.php
deleted file mode 100755
index d702b1b4..00000000
--- a/web/pages/web/html.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-	<meta name="viewport" content="user-scalable=no"/>
-	<?php include ('pages/web/head.php') ?>
-
-	<link rel="shortcut icon" type="image/x-icon" href="image/favicon.ico"/>
-	<title>Verdnatura</title>
-</head>
-<body>
-	<div id="header">
-		<div id="header-bar">
-			<button id="menu-button">
-				<img src="image/dark/menu.svg" alt="<?=s('Menu')?>"/>
-			</button>
-			<a id="exit" href="?page=login&amp;logout">
-				<span id="exit-text"><?=s('Exit')?></span>
-			</a>
-			<img id="logo" src="image/dark/logo.svg" alt="Verdnatura"/>
-			<img id="loader" src="image/loader.gif" alt="Loading"/>
-			<div id="welcome">
-				<?=s('Welcome')?><span id="user-name"></span>
-			</div>
-		</div>
-	</div>
-	<div id="body">
-	<div id="content">
-		<div id="menu-box">
-			<div id="menu-overflow">
-				<a id="test-link" href="#"></a>
-				<ul id="menu"></ul>
-			</div>
-			<div id="links">
-				<a target="_blank" href="http://verdnaturacomunicacion.blogspot.com.es/">
-					<img alt="Blogger" src="image/blogger.svg" title="Blogger"/>
-				</a>
-				<a target="_blank" href="https://plus.google.com/u/0/107516577801959283883/posts">
-					<img alt="Google+" src="image/google-plus.svg" title="Google+"/>
-				</a>
-				<a target="_blank" href="http://www.facebook.com/verdnatura">
-					<img alt="Facebook" src="image/facebook.svg" title="Facebook"/>
-				</a>
-				<a target="_blank" href="http://www.youtube.com/user/verdnatura">
-					<img alt="YouTube" src="image/youtube.svg" title="YouTube"/>
-				</a>
-			</div>
-		</div>
-		<div id="background">
-		</div>
-		<div id="form-holder">
-		</div>
-	</div>
-	</div>
-</body>
-</html>
diff --git a/web/pages/web/mobile.css b/web/pages/web/mobile.css
deleted file mode 100755
index 6b2c72fc..00000000
--- a/web/pages/web/mobile.css
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#menu-button
-{
-	display: block;
-}	
-#menu-box
-{
-	display: none;
-}
-#form-holder
-{
-	left: 0;
-}
-ul.submenu
-{
-	display: block;
-	position: relative;
-	border: none;
-	border-radius: 0;
-	background-color: white;
-	box-shadow: none;
-}
-.htk-toast
-{
-	margin-left: -11em;
-}
diff --git a/web/pages/web/module.js b/web/pages/web/module.js
deleted file mode 100755
index dae182b7..00000000
--- a/web/pages/web/module.js
+++ /dev/null
@@ -1,81 +0,0 @@
-
-Vn.Module = new Class
-({
-	Extends: Vn.Object
-
-	,initialize: function (gui, formInfo)
-	{
-		this.gui = gui;
-		this.conn = gui.conn;
-		this.hash = gui.hash;
-		this.formInfo = formInfo;
-	}
-
-	/**
-	 * Gets an object from the builder associated to this form.
-	 *
-	 * @param {string} objectId The object identifier
-	 * @return {Object} The object, or %null if not found
-	 **/
-	,$: function (objectId)
-	{
-		if (this.builder)
-			return this.builder.get (objectId);
-			
-		return null;
-	}
-
-	/**
-	 * Called when the form is opened.
-	 **/
-	,open: function ()
-	{
-		this.close ();
-	
-		this.builder = new Vn.Builder ();
-		this.builder.signalData = this;
-		this.builder.loadXml (Vn.getXml ('forms/'+ this.formInfo.path +'/ui.xml'));
-		this.node = this.builder.get ('form');
-
-		var models = this.builder.getObjects ('db-model');
-
-		for (var i = 0; i < models.length; i++)
-			models[i].conn = this.conn;
-
-		var queries = this.builder.getObjects ('db-query');
-
-		for (var i = 0; i < queries.length; i++)
-			queries[i].conn = this.conn;
-			
-		this.gui.formHolder.appendChild (this.node);
-	}
-	
-	/**
-	 * Called when the form is activated.
-	 **/
-	,activate: function () {}
-
-	/**
-	 * Called when the form is closed.
-	 **/
-	,close: function ()
-	{
-		if (this.node)
-		{
-			Vn.Node.remove (this.node);
-			this.node = null;
-		}
-		if (this.builder)
-		{
-			this.builder.unref ();
-			this.builder = null;
-		}
-	}
-
-	,_destroy: function ()
-	{
-		this.close ();
-		this.parent ();
-	}
-});
-
diff --git a/web/pages/web/style.css b/web/pages/web/style.css
deleted file mode 100755
index ca2ad951..00000000
--- a/web/pages/web/style.css
+++ /dev/null
@@ -1,282 +0,0 @@
-
-body
-{
-	position: absolute;
-	margin: 0;
-	height: 100%;
-	width: 100%;
-	background-color: #EEE;
-
-}
-
-/* Font */
-
-#welcome,
-#exit span,
-#menu-title,
-#menu a
-{
-	font-size: 1.1em;
-}
-
-/* Header */
-
-#header,
-#exit
-{
-	height: 4.2em;
-}
-#header
-{
-	position: relative;
-	background-color: #333;
-	width: 100%;
-	z-index: 1;
-}
-#header *
-{
-	color: white;
-}
-#header-bar
-{
-	position: relative;
-	height: 100%;
-	overflow: hidden;
-}
-#logo
-{
-	width: 16em;
-	float: left;
-	padding: 1em;
-	padding-top: 1.2em;
-}
-#loader
-{
-	float: left;
-	margin-left: 0.4em;
-	margin-top: 1.4em;
-	visibility: hidden;
-}
-#welcome
-{
-	float: right;
-	padding: 0 1.5em;
-}
-#welcome span
-{
-	font-size: 1em;
-}
-#welcome,
-#exit span
-{
-	margin-top: 2em;
-}
-#exit
-{
-	float: right;
-	background-color: #FC9900;
-	width: 4em;
-	text-align: center;
-}
-#exit:hover
-{
-	background-color: #FCA910;
-}
-#exit span
-{
-	display: block;
-}
-#header,
-#content
-{
-	margin: auto;
-	width: 100%;
-}
-
-/* Body */
-
-#body
-{
-	position: absolute;
-	top: 4.2em;
-	bottom: 0;
-	left: 0;
-	right: 0;
-}
-#content
-{
-	position: relative;
-	height: 100%;
-}
-
-/* Top bar */
-
-#top-bar
-{
-	height: 3em;
-	overflow: hidden;
-	background-color: #CE8;
-}
-
-/* Left panel */
-
-#menu-button
-{
-	display: none;
-	float: left;
-	border: none;
-	background-color: transparent;
-	padding: 0;
-	margin: 0;
-	margin-left: 0.6em;
-	height: 4.2em;
-}
-#menu-button img
-{
-	height: 2em;
-}
-#background
-{
-	z-index: 10;
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: rgba(10, 10, 10, 0.6);
-	display: none;
-}
-#menu-box,
-#menu > li,
-ul.submenu
-{
-	width: 15em;
-}
-#menu-box
-{
-	z-index: 20;
-	position: absolute;
-	left: 0;
-	bottom: 0;
-	top: 0;
-	background-color: white;
-	z-index: 20;
-	box-shadow: 0 0.2em 0.2em #AAA;
-}
-#menu-overflow
-{
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 4em;
-	overflow: auto;
-}
-
-/* Test link */
-
-#test-link
-{
-	display: block;
-	margin: 1em auto;
-	max-width: 70%;
-	background-color: #3f51b5;
-	color: white;
-	padding: 0 1em;
-	line-height: 2em;
-	border-radius: 0.1em;
-	text-align: center;
-}
-#test-link:hover
-{
-	background-color: #4f61c5;
-}
-
-/* Menu */
-
-#menu
-{
-	list-style-type: none;
-	padding: 0;
-	margin: 0;
-}
-#menu > li
-{
-	display: block;
-	float: left;
-	clear: both;
-	padding: 0;
-}
-#menu > li > a
-{
-	line-height: 2.8em;
-	width: 70%;
-	padding: 0 15%;
-}
-#menu a
-{
-	float: left;
-}
-#menu a:hover
-{
-	background-color: #DDD /* #AC6 */;
-}
-#menu a.selected
-{
-	background-color: #EEE;
-}
-ul.submenu
-{
-	display: none;
-	position: fixed;
-	border: none;
-	border-radius: 1px;
-	background-color: white;
-	box-shadow: 0 0.2em 0.2em #CCC;
-	z-index: 50;
-	list-style-type: none;
-	padding-left: 0;
-}
-ul.submenu a
-{
-	width: 60%;
-	padding: 0.7em 20%;
-}
-
-/* Links */
-
-#links
-{
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	padding: 0.8em;
-}
-#links a
-{
-	padding: 0.1em;
-	display: block;
-	float: left;
-	max-width: 2.2em;
-}
-#links img
-{
-	height: 1.8em;
-}
-
-/* Form holder */
-
-#form-holder
-{
-	position: absolute;
-	top: 0em;
-	bottom: 0;
-	right: 0;
-	left: 15em;
-	overflow: auto;
-}
-.htk-toast
-{
-	margin-left: -3em;
-}
-
diff --git a/web/pages/web/tpv.js b/web/pages/web/tpv.js
deleted file mode 100755
index 562e6380..00000000
--- a/web/pages/web/tpv.js
+++ /dev/null
@@ -1,124 +0,0 @@
-
-Vn.Tpv =
-{
-	check: function (conn)
-	{
-		var tpvStatus = Vn.Hash.get ('tpv_status');
-
-		if (tpvStatus)
-		{
-			var batch = new Sql.Batch ();
-			batch.addValue ('transaction', Vn.Hash.get ('tpv_order'));
-			batch.addValue ('status', tpvStatus);
-		
-			var query = 'CALL transaction_end (#transaction, #status)';
-		
-			conn.execQuery (query, null, batch);
-		}
-	}
-
-	,pay: function (conn, amount, company)
-	{	
-		if (amount > 0)
-		{
-			var query = 'CALL transaction_start (#company, #amount)';
-
-			var batch = new Sql.Batch ();
-			batch.addValue ('company', company);
-			batch.addValue ('amount', parseInt (amount * 100));
-			
-			conn.execQuery (query,
-				this._onTransactionStart.bind (this), batch);
-		}
-		else if (!isNaN (amount))
-			Htk.Toast.showError (_('AmountError'));
-	}
-
-	,_onTransactionStart: function (resultSet)
-	{
-		var res = resultSet.fetchResult ();
-
-		if (res && res.next ())
-		{
-			var form = document.createElement ('form');
-			form.method = 'post';
-			form.action = res.get ('url');
-			document.body.appendChild (form);
-			
-			var fieldsMap =
-			{
-				 'Ds_Merchant_Amount': 'amount'
-				,'Ds_Merchant_Order': 'ds_order'
-				,'Ds_Merchant_MerchantCode': 'id'
-				,'Ds_Merchant_Currency': 'currency'
-				,'Ds_Merchant_TransactionType': 'transaction_type'
-				,'Ds_Merchant_Terminal': 'terminal'
-				,'Ds_Merchant_MerchantURL': 'merchant_url'
-				,'Ds_Merchant_MerchantSignature': 'signature'
-				,'Ds_Merchant_UrlOK': null
-				,'Ds_Merchant_UrlKO': null
-			};
-
-			for (var field in fieldsMap)
-			{
-				var input = document.createElement ('input');
-				input.type = 'hidden';
-				input.name = field;
-				form.appendChild (input);
-				
-				if (fieldsMap[field])			
-					input.value = res.get (fieldsMap[field]);
-			}
-
-			var transactionId = res.get ('ds_order');
-			form['Ds_Merchant_UrlOK'].value = this._makeUrl ('ok', transactionId);
-			form['Ds_Merchant_UrlKO'].value = this._makeUrl ('ko', transactionId);
-			
-			form.submit ();
-		}
-		else
-			Htk.Toast.showWarning (_('PayError'));
-	}
-
-	,_makeUrl: function (status, order)
-	{
-		var path = location.protocol +'//'+ location.host;
-		path += location.port ? ':'+ location.port : '';
-		path += location.pathname;
-		path += location.search ? location.search : '';
-		path += Vn.Hash.make ({
-			'form': 'ecomerce/orders',
-			'tpv_status': status,
-			'tpv_order': order
-		}, true);
-
-		return path;
-	}
-};
-
-Vn.BasketChecker = 
-{
-	check: function (conn, callback)
-	{
-		conn.execQuery ('CALL basket_check ()',
-			this._onBasketCheck.bind (this, callback));
-	}
-	
-	,_onBasketCheck: function (callback, resultSet)
-	{
-		var status = resultSet.fetchValue ();
-		
-		if (!status)
-			return;
-
-		var isOk = status == 'UPDATED' || status == 'OK';
-
-		if (status == 'UPDATED')
-			Htk.Toast.showWarning (_('OrderItemsUpdated'));
-		if (callback)
-			callback (isOk);
-		if (!isOk)
-			Vn.Hash.set ({'form': 'ecomerce/checkout'});
-	}
-};
-
diff --git a/web/pages/web/web.php b/web/pages/web/web.php
deleted file mode 100755
index d227eb57..00000000
--- a/web/pages/web/web.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-use Vn\Hedera\Web;
-
-if (!Web::login ())
-{
-	header ('Location: ?page=login#!error=sessionExpired');
-	exit;
-}
-
-?>
diff --git a/web/reports/delivery-note/delivery-note.js b/web/reports/delivery-note/delivery-note.js
new file mode 100755
index 00000000..ac2279a0
--- /dev/null
+++ b/web/reports/delivery-note/delivery-note.js
@@ -0,0 +1,21 @@
+
+Vn.DeliveryNote = new Class
+({
+	Extends: Vn.Report
+	
+	,subtotalRenderer: function (column, form)
+	{
+		column.value = this.subtotal (form);
+	}
+
+	,subtotal: function (form)
+	{
+		var price = form.get ('price');
+		var discount = form.get ('discount');
+	
+		if (price && form.get ('fixed'))
+			return form.get ('amount') * price * ((100 - discount) / 100);
+		else
+			return null;
+	}
+});
diff --git a/web/reports/delivery-note/style.css b/web/reports/delivery-note/style.css
new file mode 100644
index 00000000..3c96c9af
--- /dev/null
+++ b/web/reports/delivery-note/style.css
@@ -0,0 +1,33 @@
+*
+{
+	font-size: 4mm;
+}
+.sheet
+{
+	height: auto;
+}
+h2
+{
+	font-size: 1.2em;
+	margin-bottom: 8mm;
+	font-weight: bold;
+}
+.header
+{
+	margin-bottom: 2em;
+}
+.header > p
+{
+	text-align: right;
+	margin: .1em 0;
+}
+.footer
+{
+	font-size: 1.2em;
+	font-weight: bold;
+	margin-top: .2em;
+	border-top: 1px solid #333;
+	padding-top: .3em;
+	text-align: right;
+}
+
diff --git a/web/reports/delivery-note/ui.xml b/web/reports/delivery-note/ui.xml
new file mode 100755
index 00000000..5b5ae0f8
--- /dev/null
+++ b/web/reports/delivery-note/ui.xml
@@ -0,0 +1,67 @@
+<vn>
+<vn-group>
+	<db-form id="ticket">
+		<db-model property="model" id="ticket-data" conn="conn" batch="batch">
+			<custom>
+				SELECT t.id, date, a.Agencia, note, p.name province,
+				zip_code, city, c.name, consignee, invoice
+					FROM ticket_view t
+					JOIN address_view c ON t.address_id = c.id
+					JOIN vn2008.Agencias a ON t.agency_id = a.Id_Agencia
+					JOIN vn2008.province p ON c.province_id = p.province_id
+						WHERE t.id = #ticket
+			</custom>
+		</db-model>
+	</db-form>
+</vn-group>
+<div id="report" class="sheet">
+	<h2>
+		<htk-text column="id" form="ticket"/>
+	</h2>
+	<div class="header">
+		<p>
+			<htk-text form="ticket" column="consignee"/>
+		</p>
+		<p>
+			<htk-text form="ticket" column="date" format="%A, %e of %B %Y"/>
+		</p>
+		<p>
+			<htk-text form="ticket" column="name"/>
+		</p>
+		<p>
+			<htk-text form="ticket" column="zip_code"/> 
+			<htk-text form="ticket" column="city"/> 
+			(<htk-text form="ticket" column="province"/>)
+		</p>
+		<p>
+			<t>Delivery</t> <htk-text form="ticket" column="Agencia"/>
+		</p>
+	</div>
+	<htk-grid>
+		<db-model property="model" id="movements" conn="conn" batch="batch">
+			<custom>
+				SELECT m.item_id, amount, concept, Categoria, Medida, Tallos, Color,
+				Abreviatura, IF(fixed != FALSE, price, NULL) price, fixed, discount
+					FROM ticket_row_view m
+					INNER JOIN vn2008.Articles a
+						ON m.item_id = a.Id_Article AND ticket_id = #ticket 
+					LEFT JOIN vn2008.Origen o
+						ON a.id_origen = o.id
+						ORDER BY concept
+			</custom>
+		</db-model>
+		<htk-column-spin title="_Ref" column="item_id"/>
+		<htk-column-spin title="_Amount" column="amount"/>
+		<htk-column-text title="_Item" column="concept"/>
+		<htk-column-text title="_S1" column="Medida"/>
+		<htk-column-text title="_Cat" column="Categoria"/>
+		<htk-column-spin title="_Price" column="price" unit="€" digits="2"/>
+		<htk-column-spin title="_Subtotal" unit="€" digits="2" renderer="subtotalRenderer"/>
+	</htk-grid>
+	<p class="footer">
+		<htk-text format="%.2d€">
+			<db-calc-sum property="param" func="subtotal" model="movements"/>
+		</htk-text>
+	</p>
+</div>
+</vn>
diff --git a/web/reports/items-report/items-report.js b/web/reports/items-report/items-report.js
new file mode 100755
index 00000000..28a274f0
--- /dev/null
+++ b/web/reports/items-report/items-report.js
@@ -0,0 +1,5 @@
+
+Vn.ItemsReport = new Class
+({
+	Extends: Vn.Report
+});
diff --git a/web/reports/items-report/style.css b/web/reports/items-report/style.css
new file mode 100644
index 00000000..08419bfb
--- /dev/null
+++ b/web/reports/items-report/style.css
@@ -0,0 +1,45 @@
+*
+{
+	font-size: 4mm;
+}
+.sheet
+{
+	height: auto;
+}
+h1
+{
+	font-weight: normal;
+	font-size: 200%;
+	text-align: center;
+	margin: 0 auto;
+	margin-bottom: 8mm;
+}
+.htk-grid
+{
+	border-collapse: collapse;
+	width: 100%;
+	margin: 0 auto;
+	padding: 0;
+}
+thead > tr
+{
+	border-bottom: 1px solid #333;
+	height: 10mm;
+}
+th
+{
+	font-weight: normal;
+}
+td
+{
+	padding-left: 2mm;
+}
+tbody > tr
+{
+	height: 18mm;
+}
+.cell-image > img
+{
+	width: 15mm;
+}
+
diff --git a/web/reports/items-report/ui.xml b/web/reports/items-report/ui.xml
new file mode 100755
index 00000000..84010b2d
--- /dev/null
+++ b/web/reports/items-report/ui.xml
@@ -0,0 +1,53 @@
+<vn>
+<div id="report" class="items sheet">
+	<h1>
+		<t>Item list</t>
+	</h1>
+	<htk-grid>
+		<db-model
+			property="model"
+			batch="batch"
+			conn="conn">
+			<custom>
+				CALL item_list (#warehouse, CURDATE(), #realm, #rate)
+			</custom>
+		</db-model>
+		<htk-column-image
+			column="Foto"
+			directory="catalog"
+			subdir="200x200"/>
+		<htk-column-spin
+			title="_Id"
+			column="Id_Article"/>
+		<htk-column-text
+			title="_Item"
+			column="Article"/>
+		<htk-column-text
+			title="_Cat"
+			column="Categoria"/>
+		<htk-column-text
+			title="_Siz"
+			column="Medida"/>
+		<htk-column-text
+			title="_Ste"
+			column="Tallos"/>
+		<htk-column-spin
+			title="_Pack"
+			column="grouping"/>
+		<htk-column-spin
+			title="_Aval"
+			column="available"/>
+		<htk-column-text
+			title="_Col"
+			column="Color"/>
+		<htk-column-text
+			title="_Ori"
+			column="Abreviatura"/>
+		<htk-column-text
+			title="_Price"
+			column="price"
+			format="%.2d€"
+			class="price"/>
+	</htk-grid>
+</div>
+</vn>
diff --git a/web/reports/shelves-report/shelves-report.js b/web/reports/shelves-report/shelves-report.js
new file mode 100755
index 00000000..8ca24635
--- /dev/null
+++ b/web/reports/shelves-report/shelves-report.js
@@ -0,0 +1,365 @@
+
+Vn.ShelvesReport = new Class
+({
+	Extends: Vn.Report
+
+	,nItem: -1
+	,nColors: 5
+	
+	,open: function (batch)
+	{
+		this.batch = batch;
+		this.title = batch.getValue ('title');
+		this.maxAmount = batch.getValue ('max-amount');
+		this.showPacking = batch.getValue ('show-packing');
+		this.stack = batch.getValue ('stack');
+	
+		var query =
+			'SELECT id, name, width, height, depth, max_height, tray_height, '+
+			'first_tray_elevation, tray_density, vspacing, hspacing '+
+				'FROM shelf WHERE id = #shelf; '+
+			'CALL item_organizer (#wh, #date, #family, #filter)';
+		
+		this.conn.execQuery (query, this.onQueryExec.bind (this), this.batch);
+	}
+	
+	,onQueryExec: function (resultSet)
+	{
+		// Fetch query data
+
+		var res = resultSet.fetchResult ();
+		res.next ();
+		
+		var maxWidth = 170;
+		var maxHeight = 200;
+		
+		var scale = maxWidth / res.get ('width');
+		
+		if (res.get ('max_height') * scale > maxHeight)
+			scale = maxHeight / res.get ('max_height');
+		
+		var shelf = this.shelf =
+		{
+			 width: res.get ('width') * scale
+			,height: res.get ('height') * scale
+			,depth: res.get ('depth') * scale
+			,maxHeight: res.get ('max_height') * scale
+			,trayHeight: res.get ('tray_height') * scale
+			,firstTrayElevation: res.get ('first_tray_elevation') * scale
+			,trayDensity: res.get ('tray_density') * scale
+			,vspacing: res.get ('vspacing') * scale
+			,hspacing: res.get ('hspacing') * scale
+		};
+		
+		var items = this.items = [];
+		var remainings = this.remainings = [];
+		var res = resultSet.fetchResult ();
+		
+		if (res.data.length == 0)
+		{
+			Htk.Toast.showError (_('No items found, check that all fields are correct'));
+			return;
+		}
+		
+		var boxScale = scale * 10;
+		
+		while (res.next ())
+		if (!this.maxAmount || res.get ('etiquetas') <= this.maxAmount)
+		{
+			items.push ({
+				 id: res.get ('Id_Article')
+				,name: res.get ('Article')
+				,packing: res.get ('packing')
+				,amount: res.get ('etiquetas')
+				,boxHeight: res.get ('z') * boxScale
+				,boxWidth: res.get ('x') * boxScale
+				,boxDepth: res.get ('y') * boxScale
+			});
+		}
+		else
+		{
+			remainings.push ({
+				 id: res.get ('Id_Article')
+				,name: res.get ('Article')
+				,packing: res.get ('packing')
+				,amount: res.get ('etiquetas')
+			});
+		}
+
+		// Intializes the allocator
+			
+		alloc = this.alloc = new Vn.Allocator ();
+		alloc.items = items;
+		alloc.shelfFunc = this.drawShelf.bind (this);
+		alloc.boxFunc = this.drawBox.bind (this);
+		alloc.stack = this.stack;
+		alloc.nTrays = Math.ceil (
+			(shelf.height - shelf.firstTrayElevation) /
+			(shelf.trayHeight + shelf.trayDensity)
+		);
+		alloc.width = shelf.width - shelf.hspacing * 2;
+		alloc.depth = shelf.depth;
+		alloc.trayHeight = shelf.trayHeight - shelf.vspacing;
+		alloc.topTrayHeight = shelf.maxHeight - shelf.vspacing
+			- shelf.firstTrayElevation - (alloc.nTrays - 1) * shelf.trayHeight;
+		
+		// Opens the report
+		
+		this.createWindow ();
+	}
+	
+	,onWindowCreate: function ()
+	{	
+		// Remaining amount
+		
+		var remainings = this.remainings;
+		
+		if (remainings.length > 0)
+		{
+			var sheet = this.doc.createElement ('div');
+			sheet.className = 'sheet';
+			this.doc.body.appendChild (sheet);
+			
+			var title = this.doc.createElement ('h1');
+			title.className = 'title';
+			title.appendChild (this.doc.createTextNode (this.title));
+			sheet.appendChild (title);
+		
+			var subtitle = this.doc.createElement ('h2');
+			subtitle.className = 'subtitle';
+			subtitle.appendChild (this.doc.createTextNode (_('Pallets')));
+			sheet.appendChild (subtitle);
+			
+			var ul = this.doc.createElement ('ul');
+			sheet.appendChild (ul);
+	
+			for (var i = 0; i < remainings.length; i++)
+			{
+				var li = this.doc.createElement ('li');
+				ul.appendChild (li);
+
+				var span = this.doc.createElement ('span');
+				span.className = 'item-id';
+				span.appendChild (this.doc.createTextNode (remainings[i].id.toLocaleString ()));
+				li.appendChild (span);
+			
+				var span = this.doc.createElement ('span');
+				span.className = 'item';
+				span.appendChild (this.doc.createTextNode (remainings[i].name));
+				li.appendChild (span);
+				
+				if (this.showPacking)
+					span.appendChild (this.doc.createTextNode (' '+ remainings[i].packing));
+
+				var span = this.doc.createElement ('span');
+				span.className = 'amount';
+				span.appendChild (this.doc.createTextNode (remainings[i].amount));
+				li.appendChild (span);
+			}
+		}
+		
+		// Draws the shelves
+
+		this.alloc.run ();
+		this.drawShelfEnding ();
+	}
+
+	,drawShelf: function (allocator, item)
+	{
+		var shelf = this.shelf;
+
+		var sheet = this.doc.createElement ('div');
+		sheet.className = 'sheet';
+		this.doc.body.appendChild (sheet);
+		
+		// Draws the title
+		
+		var pageNumber = this.doc.createElement ('h1');
+		pageNumber.className = 'page-number';
+		pageNumber.appendChild (this.doc.createTextNode (allocator.currentShelf + 1));
+		sheet.appendChild (pageNumber);
+		
+		var title = this.doc.createElement ('h1');
+		title.className = 'title';
+		title.appendChild (this.doc.createTextNode (this.title));
+		sheet.appendChild (title);
+		
+		var subtitle = this.doc.createElement ('h2');
+		subtitle.className = 'subtitle';
+		subtitle.appendChild (this.doc.createTextNode (item.id.toLocaleString ()));
+		sheet.appendChild (subtitle);
+		
+		this.drawShelfEnding ();
+		this.lastSubtitle = subtitle;
+
+		// Draws the shelf
+		
+		var shelfDiv = this.shelfDiv = this.doc.createElement ('div');
+		shelfDiv.className = 'shelf';
+		shelfDiv.style.width = this.mm (shelf.width);
+		shelfDiv.style.height = this.mm (shelf.maxHeight);
+		sheet.appendChild (shelfDiv);
+
+		// Draws trays
+
+		var lastTrayY = shelf.firstTrayElevation;
+
+		if (shelf.trayHeight > 0)
+		while (lastTrayY + shelf.trayDensity < shelf.height)
+		{
+			var tray = this.doc.createElement ('div');
+			tray.className = 'tray';
+			tray.style.width = this.mm (shelf.width);
+			tray.style.height = this.mm (shelf.trayDensity);
+			tray.style.bottom = this.mm (lastTrayY);
+			shelfDiv.appendChild (tray);
+
+			lastTrayY += shelf.trayHeight + shelf.trayDensity;
+		}
+	}
+	
+	,drawShelfEnding: function ()
+	{
+		if (this.lastSubtitle)
+			this.lastSubtitle.appendChild (
+				this.doc.createTextNode (' - '+ this.lastItem.id.toLocaleString ()));
+	}
+	
+	,mm: function (size)
+	{
+		return size.toFixed (2) +'mm';
+	}
+
+	,drawBox: function (allocator, item, amount)
+	{
+		if (item.boxWidth == 0 || item.boxHeight == 0)
+			return;
+
+		var shelf = this.shelf;
+
+		var x = allocator.trayX + shelf.hspacing;
+		var y = allocator.trayY
+			+ shelf.firstTrayElevation + shelf.trayDensity
+			+ allocator.currentTray * (shelf.trayHeight + shelf.trayDensity);
+
+		var box = this.doc.createElement ('div');
+		box.className = 'box';
+		this.shelfDiv.appendChild (box);
+		
+		box.style.left = this.mm (x);
+		box.style.bottom = this.mm (y);
+		box.style.width = this.mm (item.boxWidth);
+		box.style.height = this.mm (item.boxHeight);
+	
+		if (amount == 0)
+			this.nItem++;
+
+		var nColor = this.nItem % this.nColors;
+		Vn.Node.addClass (box, 'color'+ nColor);
+
+		if (amount == 0 || allocator.firstShelfBox)
+		{
+			var fontSize = item.boxWidth / 5.2;
+			
+			if (fontSize > item.boxHeight - 1)
+				fontSize = item.boxHeight - 1;
+		
+			var boxLabel = this.doc.createElement ('div');
+			boxLabel.className = 'box-label';
+			boxLabel.style.fontSize = this.mm (fontSize);
+			boxLabel.appendChild (this.doc.createTextNode (item.id.toLocaleString ()));
+			box.appendChild (boxLabel);
+		}
+
+		this.lastItem = item;
+	}
+});
+
+Vn.Allocator = new Class
+({
+	addShelf: function (item)
+	{
+		this.currentShelf++;
+		this.firstShelfBox = true;
+	
+		if (this.shelfFunc)
+			this.shelfFunc (this, item);
+	}
+
+	,addTray: function (item)
+	{
+		if (this.currentTray <= 0)
+		{
+			this.addShelf (item);
+			this.currentTray = this.nTrays - 1;
+		}
+		else
+			this.currentTray--;
+		
+		this.trayX = 0;
+	}
+
+	,addColumn: function (item)
+	{
+		if (this.trayX + this.columnWidth + item.boxWidth > this.width
+		|| this.currentTray == -1)
+			this.addTray (item);
+		else
+			this.trayX += this.columnWidth;
+
+		this.trayY = 0;
+		this.columnWidth = item.boxWidth;
+		this.lastBoxWidth = item.boxWidth;
+	}
+
+	,addBox: function (item, amount)
+	{
+		var trayHeight = this.trayHeight;
+	
+		if (this.currentTray == this.nTrays - 1)
+			trayHeight = this.topTrayHeight;
+
+		if (this.trayY + item.boxHeight > trayHeight
+		|| item.boxWidth > this.lastBoxWidth
+		|| (!this.stack && amount == 0))
+			this.addColumn (item);
+
+		if (this.boxFunc)
+			this.boxFunc (this, item, amount);
+
+		this.trayY += item.boxHeight;
+	
+		if (item.boxWidth < this.lastBoxWidth)
+			this.lastBoxWidth = item.boxWidth;
+	}
+
+	,run: function ()
+	{
+		this.firstShelfBox = false;
+		this.currentShelf = -1;
+		this.currentTray = -1;
+		this.columnWidth = 0;
+		this.lastBoxWidth = 0;
+		this.trayX = 0;
+		this.trayY = 0;
+		this.remaining = false;
+
+		for (var i = 0; i < this.items.length; i++)
+		{
+			var item = this.items[i];
+			var boxIncrement = Math.floor (this.depth / item.boxDepth);
+			
+			if (boxIncrement < 1)
+				boxIncrement = 1;
+		
+			for (var amount = 0; amount < item.amount; amount += boxIncrement)
+			{
+				this.addBox (item, amount);
+				this.firstShelfBox = false;
+			}
+		}
+	
+		return this.currentShelf + 1;
+	}
+	
+});
diff --git a/web/reports/shelves-report/style.css b/web/reports/shelves-report/style.css
new file mode 100644
index 00000000..9b140684
--- /dev/null
+++ b/web/reports/shelves-report/style.css
@@ -0,0 +1,109 @@
+
+/* Shelves */
+
+h1
+{
+	font-weight: normal;
+	font-size: 500%;
+	margin: 0;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+h2.subtitle
+{
+	margin: 0;
+	font-size: 400%;
+	font-weight: normal;
+	color: #333;
+}
+h1.page-number
+{
+	padding-left: 4mm;
+	float: right;
+	text-align: right;
+}
+.shelf
+{
+	position: relative;
+	margin: 0 auto;
+	padding-top: 10mm;
+}
+.edge,
+.tray
+{
+	position: absolute;
+	border-top: 2px solid black;
+	box-sizing: border-box;
+}
+.edge
+{
+	width: 0;
+}
+.box
+{
+	position: absolute;
+	border: 1px solid black;
+	border-bottom: 0;
+	box-sizing: border-box;
+}
+.box .box-label
+{
+	text-align: right;
+	font-size: 55%;
+	word-wrap: break-word;
+	box-sizing: border-box;
+	padding: 0 4%;
+}
+.color0
+{
+	background-color: #FDD !important;
+}
+.color1
+{
+	background-color: #DFD !important;
+}
+.color2
+{
+	background-color: #DDF !important;
+}
+.color3
+{
+	background-color: #DFF !important;
+}
+.color4
+{
+	background-color: #FFD !important;
+}
+
+/* Remaining amounts*/
+
+ul
+{
+	list-style-type: none;
+}
+li *
+{
+	font-size: 200%;
+	line-height: 200%;
+}
+.item-id
+{
+	display: inline-block;
+	text-align: right;
+	margin: 0 5mm;
+	width: 30mm;
+}
+.item
+{
+	display: inline-block;
+	width: 80mm;
+}
+.amount
+{
+	color: #666;
+	width: 10mm;
+	text-align: right;
+	padding-right: 1mm;
+}
+
diff --git a/web/reports/shelves-report/ui.xml b/web/reports/shelves-report/ui.xml
new file mode 100755
index 00000000..4874b410
--- /dev/null
+++ b/web/reports/shelves-report/ui.xml
@@ -0,0 +1,10 @@
+<vn>
+<div id="report" class="shelves">
+	<h1>
+		<htk-text id="title"/>
+	</h1>
+	<div>
+		<htk-text id="page-number"/>
+	</div>
+</div>
+</vn>
diff --git a/web/rest.php b/web/rest.php
index f20207f3..3f4754fe 100755
--- a/web/rest.php
+++ b/web/rest.php
@@ -56,9 +56,7 @@ Rest\Service::init ();
 
 try {
 	Web::init ();
-
-	if (!Web::login ())
-		throw new Rest\Exception ('Auth', 'sessionExpired', s('SessionExpired'));
+	Web::login ();
 
 	// Checking the client version
 
@@ -100,9 +98,17 @@ try {
 			Rest\Service::setData ($module->run ());
 		}
 		else
-			throw new Rest\Exception ('Rest', 'invalidAction', s('InvalidAction'));
+			throw new Rest\Exception ('Rest', 'invalidAction', s('Invalid action'));
 	}
 }
+catch (Vn\Web\SessionExpiredException $e)
+{
+	Rest\Service::setError ('Auth', 'sessionExpired', s('The session has expired'));
+}
+catch (Vn\Web\BadLoginException $e)
+{
+	Rest\Service::setError ('Auth', 'badLogin', s('Invalid login'));
+}
 catch (Rest\Exception $e)
 {
 	Rest\Service::setError ($e->getDomain (), $e->getCode (), $e->getMessage ());
diff --git a/web/rest/tpv.php b/web/rest/tpv.php
new file mode 100755
index 00000000..e4ce989b
--- /dev/null
+++ b/web/rest/tpv.php
@@ -0,0 +1,36 @@
+<?php
+
+require_once ('vn/tpv/tpv.php');
+
+use Vn\Rest;
+use Vn\Tpv;
+
+class RestMod extends Rest\Module
+{
+	function run ()
+	{		
+		if (empty ($_REQUEST['amount']))
+			throw new Rest\Exception  ('Tpv', 'badRequest', s('Bad request'));
+
+
+		$params = Tpv::transactionStart (
+			  $this->conn
+			 ,(int) $_REQUEST['amount']
+			 ,empty ($_REQUEST['urlOk']) ? NULL : $_REQUEST['urlOk'] 
+			 ,empty ($_REQUEST['urlKo']) ? NULL : $_REQUEST['urlKo']
+			 ,empty ($_REQUEST['company']) ? NULL : $_REQUEST['company']
+			 ,$url
+			 ,$signature
+		);
+		
+		$result = [
+			 'url'       => $url
+			,'params'    => $params
+			,'signature' => $signature
+		];
+
+		return $result;
+	}
+}
+
+?>
diff --git a/web/rest/visits-sync.php b/web/rest/visits-sync.php
new file mode 100644
index 00000000..35fcdd0b
--- /dev/null
+++ b/web/rest/visits-sync.php
@@ -0,0 +1,57 @@
+<?php
+
+use Vn\Rest;
+
+class RestMod extends Rest\Module
+{
+	function run ()
+	{	
+		$conn = $this->conn;
+		$result = $conn->query ("SELECT id, agent FROM visit_agent "
+			."WHERE version = '0.0' OR platform = 'unknown' OR cookies IS NULL ORDER BY id DESC");
+
+		$stmt = $conn->prepare (
+			'UPDATE visit_agent SET platform = ?, browser = ?, version = ?, javascript = ?, cookies = ? WHERE id = ?');
+
+		if ($result && $stmt)
+		{
+			set_time_limit (0);
+
+			$stmt->bind_param('sssiii'
+				,$platform
+				,$browser
+				,$version
+				,$javascript
+				,$cookies
+				,$id
+			);
+
+			// Update the visit info using browscap
+
+			while ($row = $result->fetch_assoc ())
+			{
+				$info = get_browser ($row['agent']);
+				$platform   = $info->platform;
+				$browser    = $info->browser;
+				$version    = $info->version;
+				$javascript = $info->javascript;
+				$cookies    = $info->cookies;
+				$id         = $row['id'];
+				$stmt->execute ();
+			}
+			
+			$result = TRUE;
+		}
+		else
+			$result = FALSE;	
+
+		if ($stmt)
+			$stmt->close ();
+		if ($result)
+			$result->free ();
+
+		return $result;
+	}
+}
+
+?>
diff --git a/web/visits-sync.php b/web/visits-sync.php
deleted file mode 100755
index 26baca41..00000000
--- a/web/visits-sync.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-require_once ('vn/web/auth.php');
-require_once ('vn/hedera/init.php');
-
-use Vn\Web\Auth;
-
-// Update the visit info using browscap
-
-Auth::getCredentials ();
-$conn = new mysqli
-(
-	 $conf['db']['host']
-	,Auth::getUser ()
-	,Auth::getPassword ()
-	,$conf['db']['schema']
-);
-
-if ($conn->connect_error)
-	exit ($conn->connect_error);
-
-$result = $conn->query ("SELECT id, agent FROM visit_agent "
-	."WHERE version = '0.0' OR platform = 'unknown' OR cookies IS NULL ORDER BY id DESC");
-
-$stmt = $conn->prepare (
-	'UPDATE visit_agent SET platform = ?, browser = ?, version = ?, javascript = ?, cookies = ? WHERE id = ?');
-
-if ($result && $stmt)
-{
-	set_time_limit (0);
-
-	$stmt->bind_param('sssiii'
-		,$platform
-		,$browser
-		,$version
-		,$javascript
-		,$cookies
-		,$id
-	);
-
-	while ($row = $result->fetch_assoc ())
-	{
-		echo sprintf ("Processing row: %d\n", $row['id']);
-
-		$info = get_browser ($row['agent']);
-		$platform   = $info->platform;
-		$browser    = $info->browser;
-		$version    = $info->version;
-		$javascript = $info->javascript;
-		$cookies    = $info->cookies;
-		$id         = $row['id'];
-		$stmt->execute ();
-	}
-}
-
-if ($stmt)
-	$stmt->close ();
-if ($result)
-	$result->free ();
-	
-if ($conn->errno)
-	exit ($conn->error);
-
-$conn->close ();
-
-?>