diff --git a/api/L10n.scripts.js.php b/api/L10n.scripts.js.php
new file mode 100755
index 0000000..7db730c
--- /dev/null
+++ b/api/L10n.scripts.js.php
@@ -0,0 +1,36 @@
+<?php
+# Italian petrol pumps comparator - Project born (and winner) at hackaton Facile.it 2015
+# Copyright (C) 2015 Valerio Bozzolan, Marcelino Franchini, Fabio Mottan, Alexander Bustamente, Cesare de Cal, Edoardo de Cal
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require '../load.php';
+
+header('Content-Type: application/javascript');
+
+?>
+/* Localized using GNU Gettext. Help translate using Poedit: <?php echo URL ?>/l10n/ */
+var L10N = {
+	errorSent: "<?php _esc_attr( _("La tua segnalazione è preziosa. Per ora però sara ignorata <_<") ) ?>",
+	addedToFavorites: "<?php _esc_attr( _("Aggiunta ai preferiti... Se funzionassero <_<") ) ?>",
+	noLocation: "<?php _esc_attr( _("Posizione non disponibile.") ) ?>",
+	pleaseZoomIn: "<?php _esc_attr( _("Trova la tua zona, zomma!") ) ?>",
+	errorTooStations: "<?php _esc_attr( _("Vedo molte stazioni. Fai zoom per scoprirle") ) ?>",
+	noStations: "<?php _esc_attr( _("Nessuna pompa di benzina in questa zona") ) ?>",
+	tooStations: "<?php _esc_attr( _("Fai zoom! Qui ci sono {n} stazioni") ) ?>",
+	litersEuros: "<?php _esc_attr( _("Litri ogni {euro} € per {station}") ) ?>",
+	actionFavorites: "<?php _esc_attr( _("Preferiti") ) ?>",
+	actionError: "<?php _esc_attr( _("Segnala errore") ) ?>",
+	noAddressFound: "<?php _esc_attr( _("Nessun indirizzo trovato. Riprova con parole più semplici.") ) ?>"
+};
diff --git a/index.php b/index.php
index 6585f23..7610e9d 100755
--- a/index.php
+++ b/index.php
@@ -1,103 +1,89 @@
 <?php
 # Italian petrol pumps comparator - Project born (and winner) at hackaton Facile.it 2015
 # Copyright (C) 2015 Valerio Bozzolan, Marcelino Franchini, Fabio Mottan, Alexander Bustamente, Cesare de Cal, Edoardo de Cal
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /*
  * The map
  */
 
 require 'load.php';
 
 enqueue_css('leaflet');
 enqueue_css('my-fuel-map');
 
 foreach($JQUERY_UI_PARTS as $part) {
 	enqueue_js("jquery.ui.$part");
 }
 
 enqueue_js('leaflet');
 enqueue_js('leaflet.bouncemarker');
+
+enqueue_js('my-fuel-map.l10n');
 enqueue_js('my-fuel-map');
 
 get_header('map');
 
 $last_price_rfc3339 = last_price_date(DateTime::RFC3339);
 $last_price_text    = last_price_date();
 ?>
 <div id="overworld">
 	<div class="card-panel">
 		<h1 class="hide-on-small-only"><?php echo HTML::a(URL, SITE_NAME, SITE_DESCRIPTION, 'orange-text') ?></h1>
 		<h5 class="hide-on-med-and-up"><?php echo HTML::a(URL, SITE_NAME, SITE_DESCRIPTION, 'orange-text') ?></h5>
 		<noscript>
 			<p><?php _e("È necessario abilitare JavaScript. Tranquillo, viene utilizzato escusivamente software libero.") ?></p>
 		</noscript>
 		<p><?php printf(
 			_("Confronta velocemente i prezzi fra %s stazioni di rifornimento."),
 			HTML::tag(
 				'b',
 				query_value(
 					"SELECT COUNT(*) as count FROM {$T('station')}",
 					'count'
 				),
 				HTML::property('class', 'station-counter')
 			)
 		) ?></p>
 		<p class="last-update"><?php printf(
 			_("Ultimo aggiornamento: %s."),
 			"<time datetime=\"$last_price_rfc3339\">$last_price_text</time>"
 		) ?></p>
 		<div class="divider"></div>
 		<div class="section">
 			<a class="btn blue waves-effect waves-white" href="<?php echo URL ?>/about.php" title="<?php _esc_attr( _("Maggiori informazioni") ) ?>"><?php echo _("Maggiori info") . mdi_icon('info', 'right') ?></a>
 			<button class="btn orange close-overworld waves-effect waves-white"><?php echo _("Socchiudi scheda") . mdi_icon('close', 'right') ?></button>
 		</div>
 		<div class="divider"></div>
 		<form action="#" method="get">
 			<div class="input-field">
 				<i class="material-icons prefix">navigation</i>
 				<input type="text" name="search_address" placeholder="<?php _esc_attr( _("Cerca un indirizzo") ) ?>" />
 			</div>
 		</form>
 	</div>
 </div>
 <div id="overworld-buttons">
 	<a class="btn-floating btn-large waves-effect waves-light orange"><i class="material-icons">navigation</i></a>
 </div>
 <div id="map"></div>
 <div id="modal-search-addr-results" class="modal">
 	<div class="modal-content container">
 		<h4><?php _e("Risultati ricerca") ?></h4>
 		<ol></ol>
 	</div>
 </div>
-<script>
-// Localized using GNU Gettext. Help translate using Poedit: <?php echo URL ?>/l10n/
-var L10N = {
-	errorSent: "<?php _esc_attr( _("La tua segnalazione è preziosa. Per ora però sara ignorata <_<") ) ?>",
-	addedToFavorites: "<?php _esc_attr( _("Aggiunta ai preferiti... Se funzionassero <_<") ) ?>",
-	noLocation: "<?php _esc_attr( _("Posizione non disponibile.") ) ?>",
-	pleaseZoomIn: "<?php _esc_attr( _("Trova la tua zona, zomma!") ) ?>",
-	errorTooStations: "<?php _esc_attr( _("Vedo molte stazioni. Fai zoom per scoprirle") ) ?>",
-	noStations: "<?php _esc_attr( _("Nessuna pompa di benzina in questa zona") ) ?>",
-	tooStations: "<?php _esc_attr( _("Fai zoom! Qui ci sono {n} stazioni") ) ?>",
-	litersEuros: "<?php _esc_attr( _("Litri ogni {euro} € per {station}") ) ?>",
-	actionFavorites: "<?php _esc_attr( _("Preferiti") ) ?>",
-	actionError: "<?php _esc_attr( _("Segnala errore") ) ?>",
-	noAddressFound: "<?php _esc_attr( _("Nessun indirizzo trovato. Riprova con parole più semplici.") ) ?>"
-};
-</script>
 <?php
 get_footer();
diff --git a/load-post.php b/load-post.php
index 200223e..9bd119a 100755
--- a/load-post.php
+++ b/load-post.php
@@ -1,124 +1,129 @@
 <?php
 # Italian petrol pumps comparator - Project born (and winner) at hackaton Facile.it 2015
 # Copyright (C) 2015 Valerio Bozzolan, Marcelino Franchini, Fabio Mottan, Alexander Bustamente, Cesare de Cal, Edoardo de Cal
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Customizing Boz PHP - Another PHP framework
 expect('menu');
 
 define('INCLUDES', 'includes');
 define('IMAGES', 'images');
 define('MATERIALIZE', INCLUDES . _ . 'materialize');
 define('LEAFLET', INCLUDES . _ . 'leaflet');
 
 $JQUERY_UI_PARTS = [
 	'core',
 	'widget',
 	'mouse',
 	'position',
 	'autocomplete',
 	'button',
 	'dialog',
 	'effect',
 	'effect-drop'
 ];
 
 // Load functions
 require ABSPATH . _ . INCLUDES . '/functions.php';
 require ABSPATH . _ . INCLUDES . '/classes.php';
 require ABSPATH . _ . INCLUDES . '/header.php';
 require ABSPATH . _ . INCLUDES . '/footer.php';
 
 // Choose language
 switch( $lang = @$_GET['l'] ) {
 	case 'en_US':
 	case 'it_IT':
 		gettext_rocks($lang);
 		break;
 	default:
 		// Choose from browser settings
 		switch( substr(@$_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) ) {
 			case 'it':
 				gettext_rocks('it_IT');
 				break;
 			case 'en':
 				gettext_rocks('en_US');
 				break;
 			default:
 				gettext_rocks('en_US');
 		}
 }
 
 define('SITE_NAME', _("Compara carburanti") );
 define('SITE_DESCRIPTION', _("Confronta i prezzi dei carburanti") );
 
 // libjs-jquery
 register_js(
 	'jquery',
 	ROOT . '/javascript/jquery/jquery.min.js'
 );
 
 // libjs-jquery-ui
 foreach($JQUERY_UI_PARTS as $part) {
 	register_js(
 		"jquery.ui.$part",
 		ROOT . "/javascript/jquery-ui/ui/jquery.ui.$part.min.js"
 	);
 }
 
 register_js(
 	'materialize',
 	ROOT . _ . MATERIALIZE . '/js/materialize.min.js'
 );
 
 register_js(
 	'leaflet',
 	ROOT . _ . LEAFLET . '/leaflet.js'
 );
 
 register_js(
 	'leaflet.bouncemarker',
 	ROOT . _ . INCLUDES . '/leaflet.bouncemarker/bouncemarker.js'
 );
 
+register_js(
+	'my-fuel-map.l10n',
+	ROOT . '/api/L10n.scripts.js.php'
+);
+
 register_js(
 	'my-fuel-map',
 	ROOT . _ . INCLUDES . '/scripts.js'
 );
 
 register_css(
 	'materialize',
 	ROOT . _ . MATERIALIZE . '/css/materialize.min.css'
 );
 
 register_css(
 	'leaflet',
 	ROOT . _ . LEAFLET . '/leaflet.css'
 );
 
 register_css(
 	'my-fuel-map',
 	ROOT . _ . INCLUDES . '/style.css'
 );
 
 register_css(
 	'materialize.icons',
 	ROOT . _ . INCLUDES . '/googlefonts/material-icons.css'
 );
 
 add_menu_entries([
 	new MenuEntry('map',   URL,                _("Mappa carburanti") ),
 	new MenuEntry('about', URL . '/about.php', _("Informazioni sulla piattaforma") )
 ]);