diff --git a/api/bounds.php b/api/bounds.php
index ce05070..4f6e314 100755
--- a/api/bounds.php
+++ b/api/bounds.php
@@ -1,76 +1,78 @@
 <?php
 /*
  * Landscapefor-map - The "Landscapefor" map management system
  * Copyright (C) 2015 Valerio Bozzolan
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 require '../load.php';
 
-$results = array();
+expect('db');
+
+$results = [];
 
 if( isset( $_GET['lat_n'], $_GET['lat_s'], $_GET['lng_e'], $_GET['lng_w'] ) ) {
 
 	$lat_n = & $_GET['lat_n'];
 	$lat_s = & $_GET['lat_s'];
 	$lng_e = & $_GET['lng_e'];
 	$lng_w = & $_GET['lng_w'];
 
 	$results = $db->getResults(
 		sprintf(
 			"SELECT station.station_ID, station.station_lat, station.station_lon, " .
 			"stationowner.stationowner_uid, stationowner.stationowner_name " .
 			"FROM {$db->getTables('station', 'stationowner')} " .
 			"WHERE station.station_lat BETWEEN %f AND %f " .
 			"AND station.station_lon BETWEEN %f AND %f " .
 			"AND station.stationowner_ID = stationowner.stationowner_ID",
 			$lat_s,
 			$lat_n,
 			$lng_w,
 			$lng_e
 		),
 		'Station'
 	);
 	$n_results = count( $results );
 
 	$results->error = $n_results > 90;
 
 	if(! $results->error) {
 
 		// Get prices
 		for($i=0; $i<$n_results; $i++) {
 			$results[$i]->prices = $db->getResults(
 				sprintf(
 					"SELECT DISTINCT price.price_value, price.price_self, " .
 					"fuel.fuel_uid, fuel.fuel_name " .
 					"FROM {$db->getTables('price', 'fuel')} " .
 					"WHERE price.station_ID = %d " .
 					"AND price.fuel_ID = fuel.fuel_ID " .
 					"ORDER BY price.price_value",
 					$results[$i]->station_ID
 				),
 				'Price'
 			);
 		}
 	}
 
 }
 
 http_json_header();
 
 echo json_encode(
 	$results,
 	isset( $_GET['pretty'] ) ? JSON_PRETTY_PRINT : 0
 );
diff --git a/includes/footer.php b/includes/footer.php
index c0daf48..bed31da 100755
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,25 +1,27 @@
 <?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/>.
  */
 
 function get_footer($page = null, $args = null) {
-	load_module('theme-footer');
+	expect('menu');
+
+	load_module('footer');
 ?>
 </body>
 </html><?php
 }
diff --git a/includes/header.php b/includes/header.php
index ae3d9e7..0cf01cb 100755
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,68 +1,70 @@
 <?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/>.
  */
 
-function get_header($uid, $args = array()) {
+function get_header($uid, $args = []) {
+	expect('menu');
+
 	$args = merge_args_defaults($args, [
 		'theme' => 'default'
 	] );
 
 	switch($args['theme']) {
 		case 'default':
 			enqueue_css('materialize');
 			enqueue_css('materialize.icons');
 			enqueue_js('jquery');
 			enqueue_js('materialize');
 			break;
 	}
 
 	header("Content-Type: text/html; charset=utf-8");
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 	<title><?php echo SITE_NAME ?> - <?php echo get_menu_entry($uid)->name ?></title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-	<link rel="icon" type="image/jpeg" href="<?php echo URL . _ . IMAGES . '/fuel-64px.png' ?>" /><?php load_module('theme-header') ?>
+	<link rel="icon" type="image/jpeg" href="<?php echo URL . _ . IMAGES . '/fuel-64px.png' ?>" /><?php load_module('header') ?>
 
 </head>
 <!--
  This website is
   _____                                          _             _____                            _
  |  ___|  _ __    ___    ___      __ _   ___    (_)  _ __     |  ___|  _ __    ___    ___    __| |   ___    _ __ ___
  | |_    | '__|  / _ \  / _ \    / _` | / __|   | | | '_ \    | |_    | '__|  / _ \  / _ \  / _` |  / _ \  | '_ ` _ \
  |  _|   | |    |  __/ |  __/   | (_| | \__ \   | | | | | |   |  _|   | |    |  __/ |  __/ | (_| | | (_) | | | | | | |
  |_|     |_|     \___|  \___|    \__,_| |___/   |_| |_| |_|   |_|     |_|     \___|  \___|  \__,_|  \___/  |_| |_| |_|
 
  Learn more from:
 
  http://www.gnu.org
 
 -->
 <body>
 <?php
 }
 
 function print_title($uid) {
 	$menuEntry = get_menu_entry($uid);
 	echo "<h1>" . HTML::a(
 		$menuEntry->url,
 		$menuEntry->name,
 		$menuEntry->get('description')
 	) . "</h1>\n";
 }
diff --git a/index.php b/index.php
index 0591553..bbf4bd1 100755
--- a/index.php
+++ b/index.php
@@ -1,101 +1,103 @@
 <?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';
 
+expect('db');
+
 enqueue_css('leaflet');
 enqueue_css('my-fuel-map');
 enqueue_js('jquery.ui');
 enqueue_js('leaflet');
 enqueue_js('leaflet.bouncemarker');
 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>
 		<p><?php printf(
 			_("Confronta velocemente i prezzi fra %s stazioni di rifornimento."),
 			HTML::tag(
 				'b',
 				$db->getValue(
 					"SELECT COUNT(*) as count FROM {$db->getTable('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>
 		<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 type="text/javascript">
 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 57fa2a1..ddee858 100755
--- a/load-post.php
+++ b/load-post.php
@@ -1,118 +1,119 @@
 <?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('JQUERY', INCLUDES . _ . 'jquery');
 define('LEAFLET', INCLUDES . _ . 'leaflet');
 
 // 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") );
 
 register_js(
 	'jquery',
 	URL . _ . JQUERY . '/jquery-2.1.4.min.js'
 );
 
 register_js(
 	'jquery.ui',
 	URL . _ . INCLUDES . '/jquery-ui/jquery-ui.min.js'
 );
 
 register_js(
 	'materialize',
 	URL . _ . MATERIALIZE . '/js/materialize.min.js'
 );
 
 register_js(
 	'leaflet',
 	URL . _ . LEAFLET . '/leaflet.js'
 );
 
 register_js(
 	'leaflet.bouncemarker',
 	URL . _ . INCLUDES . '/leaflet.bouncemarker/bouncemarker.js'
 );
 
 register_js(
 	'my-fuel-map',
 	URL . _ . INCLUDES . '/scripts.js'
 );
 
 register_css(
 	'materialize',
 	URL . _ . MATERIALIZE . '/css/materialize.min.css'
 );
 
 register_css(
 	'leaflet',
 	URL . _ . LEAFLET . '/leaflet.css'
 );
 
 register_css(
 	'my-fuel-map',
 	URL . _ . INCLUDES . '/style.css'
 );
 
 register_css(
 	'materialize.icons',
 	'https://fonts.googleapis.com/icon?family=Material+Icons'
 );
 
 add_menu_entries([
 	new MenuEntry(
 			'map',
 			URL,
 			_("Mappa")
 	),
 	new MenuEntry(
 			'about',
 			URL . '/about.php',
 			_("Informazioni sulla piattaforma")
 	)
 ]);