diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index e321c2c62e..7694cfca1c 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-01  Raúl Mateos <raulofpandora@gmail.com>
+
+	* godmode/alerts/alert_list.list.php,
+	godmode/agentes/configurar_agente.php,
+	godmode/agentes/module_manager.php,
+	godmode/agentes/module_manager_editor.php,
+	godmode/agentes/agent_template.php: Updated headers.
+
 2010-06-01  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/agentes/planned_downtime.php: Fixed the
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 2f9a17ebf2..4e6d606dbc 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -2,7 +2,7 @@
 
 // Pandora FMS - http://pandorafms.com
 // ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index d14f72d265..58cd7af2a0 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -2,7 +2,7 @@
 
 // Pandora FMS - http://pandorafms.com
 // ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
 // Please see http://pandorafms.org for full contribution list
 
 // This program is free software; you can redistribute it and/or
@@ -82,7 +82,7 @@ if (isset ($_POST["template_id"])) {
 
 // Main header
 
-echo "<h2>".__('Agent configuration')." &raquo; ".__('Module templates')."</h2>";
+echo "<h2>".__('Module templates')."</h2>";
 
 // ==========================
 // TEMPLATE ASSIGMENT FORM
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 913aa4faa7..0bf83b86d1 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -201,7 +201,7 @@ if ($id_agente) {
 	echo '<div id="menu_tab_frame"><div id="menu_tab_left"><ul class="mn">';
 	echo '<li class="nomn"><a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'">';
 	print_image ("images/setup.png", false, $img_style);
-	echo '&nbsp; '.mb_substr(get_agent_name ($id_agente), 0, 21) .'</a>';
+	echo '&nbsp;'.__("Agent configuration").' -&nbsp;'.mb_substr(get_agent_name ($id_agente), 0, 21) .'</a>';
 	//echo '&nbsp;'. print_help_icon ('agent_manager', true);
 	echo "</li></ul></div>";
 
@@ -480,7 +480,7 @@ if ($update_module || $create_module) {
 		$plugin_pass = (string) get_parameter ('snmp3_auth_pass');
 		$plugin_parameter = (string) get_parameter ('snmp3_auth_method');
 
-		$custom_string_1  = (string) get_parameter ('snmp3_privacy_method');
+		$custom_string_1 = (string) get_parameter ('snmp3_privacy_method');
 		$custom_string_2 = (string) get_parameter ('snmp3_privacy_pass');
 		$custom_string_3 = (string) get_parameter ('snmp3_security_level');
 	}
@@ -704,10 +704,10 @@ if ($updateGIS) {
 	if ($previusAgentGISData !== false) {
 		process_sql_insert('tgis_data_history', array(
 			"longitude" => $previusAgentGISData['stored_longitude'],
-			"latitude" => $previusAgentGISData['stored_latitude'],         
-			"altitude" => $previusAgentGISData['stored_altitude'],  
-			"start_timestamp" => $previusAgentGISData['start_timestamp'],  
-			"end_timestamp" =>  date( 'Y-m-d H:i:s'),
+			"latitude" => $previusAgentGISData['stored_latitude'],
+			"altitude" => $previusAgentGISData['stored_altitude'],
+			"start_timestamp" => $previusAgentGISData['start_timestamp'],
+			"end_timestamp" => date( 'Y-m-d H:i:s'),
 			"description" => "Save by Pandora Console",
 			"manual_placement" => $previusAgentGISData['manual_placement'],
 			"number_of_packages" => $previusAgentGISData['number_of_packages'],
@@ -721,7 +721,7 @@ if ($updateGIS) {
 			"stored_longitude" => $lastLongitude,
 			"stored_latitude" => $lastLatitude,
 			"stored_altitude" => $lastAltitude,
-			"start_timestamp" =>  date( 'Y-m-d H:i:s'),
+			"start_timestamp" => date( 'Y-m-d H:i:s'),
 			"manual_placement" => 1,
 			"description" => "Update by Pandora Console"),
 			array("tagente_id_agente" => $idAgente));
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 49bd810290..79dca89b23 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -2,7 +2,7 @@
 
 // Pandora FMS - http://pandorafms.com
 // ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
 // Please see http://pandorafms.org for full contribution list
 
 // This program is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
 /* You can redefine $url and unset $id_agente to reuse the form. Dirty (hope temporal) hack */
 if (isset ($id_agente)) {
 	$url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente;
-	echo "<h2>".__('Agent configuration')." &raquo; ".__('Modules')."</h2>";
+	echo "<h2>".__('Modules')."</h2>";
 }
 
 enterprise_include ('godmode/agentes/module_manager.php');
@@ -31,9 +31,9 @@ echo "<tr><td class='datos'>";
 // kind of modules. If not, do not show server type in combo
 
 $network_available = get_db_sql ("SELECT count(*) from tserver where server_type = 1");
-$wmi_available =  get_db_sql ("SELECT count(*) from tserver where server_type = 6");
-$plugin_available =  get_db_sql ("SELECT count(*) from tserver where server_type = 4");
-$prediction_available =  get_db_sql ("SELECT count(*) from tserver where server_type = 5");
+$wmi_available = get_db_sql ("SELECT count(*) from tserver where server_type = 6");
+$plugin_available = get_db_sql ("SELECT count(*) from tserver where server_type = 4");
+$prediction_available = get_db_sql ("SELECT count(*) from tserver where server_type = 5");
 
 // Development mode to use all servers
 if ($develop_bypass) {
@@ -174,7 +174,7 @@ foreach($tempRows as $row) {
 
 foreach ($modules as $module) {
 	$type = $module["id_tipo_modulo"];
-	$id_module  = $module["id_modulo"];
+	$id_module = $module["id_modulo"];
 	$nombre_modulo = $module["nombre"];
 	$descripcion = $module["descripcion"];
 	$module_max = $module["max"];
@@ -224,9 +224,9 @@ foreach ($modules as $module) {
 	}
 
 	// This module is initialized ? (has real data)
-        $module_init = get_db_value ('utimestamp', 'tagente_estado', 'id_agente_modulo', $module['id_agente_modulo']);
-        if ($module_init == 0)
-                $data[2] .= print_image ('images/error.png', true, array ('title' => __('Non initialized module')));
+	$module_init = get_db_value ('utimestamp', 'tagente_estado', 'id_agente_modulo', $module['id_agente_modulo']);
+	if ($module_init == 0)
+		$data[2] .= print_image ('images/error.png', true, array ('title' => __('Non initialized module')));
 	
 	// Module type (by data type)
 	$data[3] = '';
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index 18b3a063ac..75955c3c26 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -2,7 +2,7 @@
 
 // Pandora FMS - http://pandorafms.com
 // ==================================================
-// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
 // Please see http://pandorafms.org for full contribution list
 
 // This program is free software; you can redistribute it and/or
@@ -275,7 +275,7 @@ default:
 	}
 }
 
-echo "<h2>".__('Agent configuration')." &raquo; ".__('Modules')."</h2>";
+echo "<h2>".__('Modules')."</h2>";
 
 echo '<h3>'.__('Module assignment');
 if (isset ($extra_title))
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 4b5e0f3b6e..f8f3b6e3c4 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -34,6 +34,8 @@ if (! give_acl ($config['id_user'], 0, "LW")) {
 	exit;
 }
 
+echo "<h2>".__('Alerts')."</h2>";
+
 echo '<a href="#" id="tgl_alert_control"><b>'.__('Alert control filter').'</b>&nbsp;'.print_image ("images/down.png", true, array ("title" => __('Toggle filter(s)'))).'</a><br><br>';
 
 //INI DIV OF FORM FILTER