diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 79619ac9a5..49e280cc71 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2011-09-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/help/en/help_network_map_enterprise.php
+	include/help/es/help_network_map_enterprise.php: Added new help files.
+	
+	* extensions/insert_data.php
+	extensions/extension_uploader.php
+	godmode/reporting/reporting_builder.item_editor.php: Added contextual 
+	helps.
+
 2011-09-19  Junichi Satoh  <junichi@rworks.jp>
 
 	* include/help/ja/help_gis_tab.php,
diff --git a/pandora_console/extensions/extension_uploader.php b/pandora_console/extensions/extension_uploader.php
index ed0aa49ecf..ac07cce366 100644
--- a/pandora_console/extensions/extension_uploader.php
+++ b/pandora_console/extensions/extension_uploader.php
@@ -52,7 +52,7 @@ function extension_uploader_extensions() {
 
 	$table = null;
 	
-	$table->width = '50%';
+	$table->width = '98%';
 	$table->data = array();
 	$table->data[0][0] = __('Upload extension');
 	$table->data[0][1] = html_print_input_file('extension', true) .
diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index 43c25ebba2..d90861a9eb 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -119,7 +119,7 @@ function mainInsertData() {
 	$src_code = html_print_image('images/lightning.png', true, false, true);
 	$table->data[0][1] = html_print_input_text_extended ('id_agent', $id_agent, 'text_id_agent', '', 30, 100, false, '',
 		array('style' => 'background: url(' . $src_code . ') no-repeat right;'), true)
-		. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
+		. ui_print_help_tip(__('Type at least two characters to search'), true);
 	$table->data[1][0] = __('Module');
 	$modules = array ();
 	if ($id_agent)
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 04060a97f1..5360d1fe75 100644
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -374,7 +374,7 @@ html_print_input_hidden('id_item', $idItem);
 				html_print_input_hidden('id_agent', $idAgent) .
 					html_print_input_text_extended ('agent', agents_get_name ($idAgent), 'text-agent', '', 30, 100, false, '',
 						array('style' => 'background: url(images/lightning.png) no-repeat right;'))
-						. '<a href="#" class="tip">&nbsp;<span>' . __("Type at least two characters to search") . '</span></a>';
+						. ui_print_help_tip(__("Type at least two characters to search"), false);
 					html_print_input_hidden ('server_name', $server_name);
 				?>
 			</td>
@@ -439,7 +439,7 @@ html_print_input_hidden('id_item', $idItem);
 				 ?></td>
 		</tr>
 		<tr id="row_header" style="" class="datos">
-			<td style="vertical-align: top;"><?php echo __('Serialized header') . '<a href="#" class="tip">&nbsp;<span>' . __("The separator character is | .") . '</span></a>';?></td>
+			<td style="vertical-align: top;"><?php echo __('Serialized header') . ui_print_help_tip(__("The separator character is |"), true);?></td>
 			<td style=""><?php html_print_input_text('header', $header, '', 40, 90); ?></td>
 		</tr>
 		<tr id="row_custom" style="" class="datos">
@@ -455,11 +455,11 @@ html_print_input_hidden('id_item', $idItem);
 			<td style=""><?php html_print_input_text('url', $url, '', 40, 90); ?></td>
 		</tr>
 		<tr id="row_field_separator" style="" class="datos">
-			<td style="vertical-align: top;"><?php echo __('Field separator'); ?></td>
+			<td style="vertical-align: top;"><?php echo __('Field separator') . ui_print_help_tip(__("Separator for different fields in the serialized text chain"), true); ?></td>
 			<td style=""><?php html_print_input_text('field', $field, '', 2, 4); ?></td>
 		</tr>
 		<tr id="row_line_separator" style="" class="datos">
-			<td style="vertical-align: top;"><?php echo __('Line separator'); ?></td>
+			<td style="vertical-align: top;"><?php echo __('Line separator') . ui_print_help_tip(__("Separator in different lines (composed by fields) of the serialized text chain"), true); ?></td>
 			<td style=""><?php html_print_input_text('line', $line, '', 2, 4); ?></td>
 		</tr>
 		<tr id="row_group_by_agent" style="" class="datos">
diff --git a/pandora_console/include/help/en/help_network_map_enterprise.php b/pandora_console/include/help/en/help_network_map_enterprise.php
new file mode 100644
index 0000000000..b5033a28f1
--- /dev/null
+++ b/pandora_console/include/help/en/help_network_map_enterprise.php
@@ -0,0 +1,23 @@
+<?php
+/*
+* @package Include/en
+*/
+?>
+
+<h1>Networkmap console</h1>
+
+<p>With Pandora FMS Enterprise we have the possibility of create editable network maps that are more interactive comparing with the Open version that is currently on the &#34;See agents&#34; submenu.</p>
+
+<p>On the contrary to the Open version, the Networkmap Enterprise provide us with more features, such as:</p>
+
+<ul>
+<li>Networkmaps much bigger, of more than 1000 agents to monitor.</li>
+<li>Monitoring in teal time of all the network topology of their systems.</li>
+<li>Different views of its network topology, defined in a manual way or generated automatically with agent groups.</li>
+<li>To link differebt views of its topology through fictitious points.</li>
+<li>To manipulate the topology represented in the view:</li>
+<li>Adding new nodes, one by one of in a massive way.</li>
+<li> Editing the nodes features.</li>
+</ul>
+
+
diff --git a/pandora_console/include/help/es/help_network_map_enterprise.php b/pandora_console/include/help/es/help_network_map_enterprise.php
new file mode 100644
index 0000000000..b220b59d2b
--- /dev/null
+++ b/pandora_console/include/help/es/help_network_map_enterprise.php
@@ -0,0 +1,22 @@
+<?php
+/*
+* @package Include/es
+*/
+?>
+
+<h1>Networkmap console</h1>
+
+<p>Con la version Enterprise puede crear mapas de red editables de una manera mas interactiva comparado con la version Open que esta actualmente en la subseccion &#34;Ver agentes&#34;.</p>
+
+<p>En contraste con la version Open, el mapa de red proprociona mas funcionalidades como:</p>
+
+<ul>
+<li>Mapa de red mas grande, con mas de 1000 agentes para monitorizar.</li>
+<li>Monitorizar en tiempo real toda la topologia de la red con sus sistemas.</li>
+<li>Diferentes vistas de la topologia de red, definidas de una forma manual o generadas automaticamente con grupos de agentes.</li>
+<li>Enlazar diferentes vistas mediante el uso de puntos ficticios.</li>
+<li>Manipular la topologia representada en cada una de las vistas.</li>
+<li>A&ntilde;adir nuevos nodos, uno por uno o de forma masiva.</li>
+<li>Editando las caracteristicas de los nodos.</li>
+</ul>
+