From e42393821fa14175832164bcbc0df3b1ecc2c1ad Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Sun, 27 May 2007 02:55:55 +0000
Subject: [PATCH] 2007-05-26  Raul Mateos  <raulofpandora@gmail.com> 
 Massive Update 	* include/styles/pandora.css: Cleaned and updated some
 styles. 	* index.php: Updated, now the page is allways at the center. 
 * general/login*.php: Updated login/logoff pages with new sytles 	and
 clean code. 	* images/setup.png: New file (changed from setup.gif). 	*
 include/languages/*.php: Deleted old text about database and 	updated some
 strings.* help/en/chapter3.php, help/es/chapter3.php: Changed 	image
 setup.gif 	to the new setup.png file. 	* operation/*.php: Massive
 close HTML tags and changed all h3 to h2 	for new console headings. 
 * godmode/*.php	* include/styles/pandora.css 	* godmode/*.php:
 Changed name for directories and files: New ones are 	alerts, profiles,
 groups and users, and now the files are named in 	english. All features
 seem to be OK. 	* godmode/menu.php: Updated to include new names and
 some highlighting.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@471 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  96 +++++++++-----
 pandora_console/general/error_install.php     |   3 +-
 pandora_console/general/login_page.php        |  28 ++---
 pandora_console/general/logoff.php            |  14 +--
 pandora_console/general/logon_failed.php      |  30 ++---
 pandora_console/godmode/admin_access_logs.php |  23 ++--
 .../godmode/agentes/agent_manager.php         |   8 +-
 .../godmode/agentes/configurar_agente.php     |   2 +-
 .../godmode/agentes/manage_config.php         |   4 +-
 .../configure_alert.php}                      |   7 +-
 .../modify_alert.php}                         |  10 +-
 pandora_console/godmode/db/db_audit.php       |   4 +-
 pandora_console/godmode/db/db_event.php       |   6 +-
 pandora_console/godmode/db/db_info.php        |   6 +-
 pandora_console/godmode/db/db_info_data.php   |  10 +-
 pandora_console/godmode/db/db_main.php        |   4 +-
 pandora_console/godmode/db/db_purge.php       |   6 +-
 pandora_console/godmode/db/db_refine.php      |   4 +-
 .../configure_group.php}                      |  26 ++--
 .../group_list.php}                           |  19 ++-
 pandora_console/godmode/menu.php              |  51 ++------
 .../godmode/modules/manage_nc_groups.php      |   4 +-
 .../modules/manage_network_components.php     |   4 +-
 .../modules/manage_network_templates.php      |   4 +-
 .../godmode/modules/module_list.php           |   4 +-
 .../profile_list.php}                         |  19 +--
 .../godmode/servers/manage_recontask.php      |   3 +-
 .../godmode/servers/manage_recontask_form.php |   4 +-
 .../godmode/servers/modificar_server.php      |   8 +-
 pandora_console/godmode/setup/links.php       |   8 +-
 pandora_console/godmode/setup/setup.php       |  41 +++---
 .../configure_user.php}                       |  12 +-
 .../user_list.php}                            |  10 +-
 pandora_console/help/en/chap3.php             |   2 +-
 pandora_console/help/es/chap3.php             |   2 +-
 pandora_console/images/setup.gif              | Bin 561 -> 0 bytes
 pandora_console/images/setup.png              | Bin 0 -> 509 bytes
 pandora_console/include/config.inc.php        |   4 +-
 .../include/languages/language_ast_es.php     |   5 -
 .../include/languages/language_ca.php         |   9 +-
 .../include/languages/language_de.php         |  12 +-
 .../include/languages/language_en.php         |  15 +--
 .../include/languages/language_es_es.php      |   5 -
 .../include/languages/language_es_la.php      |   5 -
 .../include/languages/language_fr.php         |   5 -
 .../include/languages/language_gl.php         |   5 -
 .../include/languages/language_it.php         |   5 -
 .../include/languages/language_pt_br.php      |   5 -
 pandora_console/include/styles/calendar.css   |  19 ---
 pandora_console/include/styles/op.css         |   1 -
 pandora_console/include/styles/pandora.css    | 118 +++++++++---------
 pandora_console/include/styles/tip.css        |   1 +
 pandora_console/index.php                     |  52 ++++----
 pandora_console/install.php                   |  10 +-
 .../operation/agentes/estadisticas.php        |   4 +-
 .../operation/agentes/estado_agente.php       |   2 +-
 .../operation/agentes/estado_alertas.php      |  13 +-
 .../operation/agentes/exportdata.php          |  19 +--
 .../operation/agentes/status_monitor.php      |   6 +-
 .../operation/agentes/ver_agente.php          |   9 +-
 .../operation/events/event_statistics.php     |   4 +-
 .../operation/incidents/incident.php          |   6 +-
 .../operation/incidents/incident_detail.php   |  10 +-
 .../operation/incidents/incident_search.php   |   4 +-
 .../incidents/incident_statistics.php         |   4 +-
 .../operation/messages/message.php            |  41 +++---
 .../operation/reporting/graph_builder.php     |  10 +-
 .../operation/reporting/graph_viewer.php      |   8 +-
 .../operation/servers/view_server.php         |   2 +-
 .../operation/snmpconsole/snmp_alert.php      |   6 +-
 .../operation/snmpconsole/snmp_view.php       |   4 +-
 pandora_console/operation/users/user_edit.php |   4 +-
 .../operation/users/user_statistics.php       |   4 +-
 .../operation/visual_console/index.php        |   2 +-
 74 files changed, 433 insertions(+), 491 deletions(-)
 rename pandora_console/godmode/{alertas/configurar_alerta.php => alerts/configure_alert.php} (96%)
 rename pandora_console/godmode/{alertas/modificar_alerta.php => alerts/modify_alert.php} (84%)
 rename pandora_console/godmode/{grupos/configurar_grupo.php => groups/configure_group.php} (84%)
 rename pandora_console/godmode/{grupos/lista_grupos.php => groups/group_list.php} (88%)
 rename pandora_console/godmode/{perfiles/lista_perfiles.php => profiles/profile_list.php} (92%)
 rename pandora_console/godmode/{usuarios/configurar_usuarios.php => users/configure_user.php} (92%)
 rename pandora_console/godmode/{usuarios/lista_usuarios.php => users/user_list.php} (83%)
 delete mode 100644 pandora_console/images/setup.gif
 create mode 100644 pandora_console/images/setup.png
 delete mode 100644 pandora_console/include/styles/calendar.css

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 1b3e084ac5..55baeea9d8 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,51 +1,79 @@
-2007-05-24  Sancho Lerena  <slerena@artica.es>
+2007-05-26  Raul Mateos  <raulofpandora@gmail.com>
 
-        * include/styles/pandora_red.css: Added alternate sample style.
-
-        * include/styles/pandora.css: Some problems with fonts fixed (I
-        hope!)
-
-        * include/config.inc.php: Modified code to support custom Style in
-        DB config. By default uses "pandora".
-
-        * include/languages/language_en.php: new string to render style
-        setup.
-
-        * images/header_red.jpg: New image for red style.
-
-        * godmode/grupos/configurar_grupo.php: Updated styles.
-
-        * godmode/setup/setup.php: Added support for style selector.
+	* include/styles/pandora.css: Cleaned and updated some styles.
+	
+	* index.php: Updated, now the page is allways at the center.
+	
+	* general/login*.php: Updated login/logoff pages with new sytles
+	and clean code.
+	
+	* images/setup.png: New file (changed from setup.gif).
+	
+	* include/languages/*.php: Deleted old text about database and
+	updated some strings.
+	
+	* help/en/chapter3.php, help/es/chapter3.php: Changed image setup.gif
+	to the new setup.png file.
+	
+	* operation/*.php: Massive close HTML tags and changed all h3 to h2
+	for new console headings.
+	
+	* godmode/*.php	* include/styles/pandora.css
+	
+	* godmode/*.php: Changed name for directories and files: New ones are
+	alerts, profiles, groups and users, and now the files are named in
+	english. All features seem to be OK.
+	
+	* godmode/menu.php: Updated to include new names and some highlighting.
 
 2007-05-24  Sancho Lerena  <slerena@artica.es>
 
-        * include/styles/pandora.css: Some margin adjustements for databox
-        classes and H1-3.
+	* include/styles/pandora_red.css: Added alternate sample style.
 
-        * include/config.inc.php: Added support to detect empty
-        configuration tokens in DB and abort.
+	* include/styles/pandora.css: Some problems with fonts fixed (I
+	hope!)
 
-        * include/languages/language_en.php: More strings.
+	* include/config.inc.php: Modified code to support custom Style in
+	DB config. By default uses "pandora".
 
-        * operation/visual_console/render_view.php: Fixed static links to
-        images.
+	* include/languages/language_en.php: new string to render style
+	setup.
 
-        * operation/agentes/estado_alertas.php: Databox style fixed.
+	* images/header_red.jpg: New image for red style.
 
-        * operation/agentes/estado_monitores.php: Added image instead
-        label.
+	* godmode/grupos/configurar_grupo.php: Updated styles.
 
-        * operation/servers/view_server.php: Fixed divbyzero notice.
+	* godmode/setup/setup.php: Added support for style selector.
 
-        * operation/servers/view_server_detail.php: Fixed static image URL.
+2007-05-24  Sancho Lerena  <slerena@artica.es>
 
-        * reporting/fgraph.php: Fixed distribution of X axis ticks.
+	* include/styles/pandora.css: Some margin adjustements for databox
+	classes and H1-3.
 
-        * general/login_page.php: Added "demo" user by default.
+	* include/config.inc.php: Added support to detect empty
+	configuration tokens in DB and abort.
 
-        * godmode/agentes/alert_manager.php,
-        godmode/alertas/modificar_alerta.php
-        godmode/alertas/configurar_alerta.php: Style 'databox' update.
+	* include/languages/language_en.php: More strings.
+
+	* operation/visual_console/render_view.php: Fixed static links to
+	images.
+
+	* operation/agentes/estado_alertas.php: Databox style fixed.
+
+	* operation/agentes/estado_monitores.php: Added image instead
+	label.
+
+	* operation/servers/view_server.php: Fixed divbyzero notice.
+
+	* operation/servers/view_server_detail.php: Fixed static image URL.
+
+	* reporting/fgraph.php: Fixed distribution of X axis ticks.
+
+	* general/login_page.php: Added "demo" user by default.
+
+	* godmode/agentes/alert_manager.php,
+	godmode/alertas/modificar_alerta.php
+	godmode/alertas/configurar_alerta.php: Style 'databox' update.
 
 2007-05-22  Sancho Lerena  <slerena@artica.es>
 
diff --git a/pandora_console/general/error_install.php b/pandora_console/general/error_install.php
index 52688bba98..04bd18c908 100644
--- a/pandora_console/general/error_install.php
+++ b/pandora_console/general/error_install.php
@@ -17,6 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 include "include/config.php";
 if (file_exists("include/languages/language_".$language_code.".php")) {
 	 include "include/languages/language_".$language_code.".php";
@@ -48,7 +49,7 @@ if (file_exists("include/languages/language_".$language_code.".php")) {
 		<?php echo $pandora_version; ?>
 		</font>
 	</div>
-	<div class="msg"><br><br>For security reasons, normal operation is not possible until you delete installer file. Please delete <b>./install.php</b> file before running Pandora FMS Console.</div>
+	<div class="msg"><br><br>For security reasons, normal operation is not possible until you delete installer file. Please delete the <b>./install.php</b> file before running Pandora FMS Console.</div>
 </div>
 </div>
 </body>
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 6dc71f4f73..a1cb0c1ae1 100644
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -18,29 +18,29 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ?>
-<center>
-<div align='center' class='databox' style='margin-top:200px; width: 460px; border-left: solid 1px #000;border-top: solid 1px #000; border-bottom: solid 2px #000; border-right: solid 2px #000;'>
-	<h1 style='font-size: 18px; color: #000; margin-bottom: 0px;'><?php echo $lang_label['welcome_title']; ?></h1>
-	<div  class='databox' style='width: 400px;'>
+<div class='databox' id='login'>
+	<h1 id='log'><?php echo $lang_label['welcome_title']; ?></h1>
+	<div class='databox' id='login_in'>
 		<form method="post" action="index.php?login=1">
-		<table cellpadding=4 cellspacing=1 width=400>
-		<tr><td rowspan=5 align='left'>
+		<table cellpadding='4' cellspacing='1' width='400'>
+		<tr><td rowspan='3' align='left' style="border-right: solid 1px #678;">
 			<a href="index.php">
 			<img src="images/pandora_logo.png" border="0" alt="logo"></a><br>
 			<?php echo $pandora_version; ?>
 		<td class='f9b'>
-				Login <br>
-		
-				<input class="login" type="text" name="nick" value="demo">
+			Login <br>
+			<input class="login" type="text" name="nick" value="demo">
+		</td></tr>
 		<tr><td class='f9b'>
-				Password <br>
-				<input class="login" type="password" name="pass" value="demo">
+			Password <br>
+			<input class="login" type="password" name="pass" value="demo">
+		</td></tr>
 		<tr><td align='center'>
-				<input type="submit" class="sub next" value="Login">	
+			<input type="submit" class="sub next" value="Login">
+		</td></tr>
 		</table>
 		</form>
 	</div>
 	<div id="ip"><?php echo 'IP: <b class="f10">'.$REMOTE_ADDR.'</b>'; ?></div>
 
-</div>
-</center>
+</div>
\ No newline at end of file
diff --git a/pandora_console/general/logoff.php b/pandora_console/general/logoff.php
index 5de4ba27f9..00024cbd71 100644
--- a/pandora_console/general/logoff.php
+++ b/pandora_console/general/logoff.php
@@ -19,18 +19,18 @@
 ?>
 
 <center>
-<div align='center' class='databox' style='margin-top:200px; width: 460px; border-left: solid 1px #000;border-top: solid 1px #000; border-bottom: solid 2px #000; border-right: solid 2px #000;'>
-	<h1 style='font-size: 18px; color: #000; margin-bottom: 0px;'>
-	<?php echo $lang_label["logged_out"]; ?></h1>
-	<div  class='databox' style='width: 400px;'>
+<div class='databox' id='login'>
+	<h1 id='log'><?php echo $lang_label["logged_out"]; ?></h1>
+	<div class='databox' style='width: 400px;'>
 		<form method="post" action="index.php?login=1">
-		<table cellpadding=4 cellspacing=1 width=400>
+		<table cellpadding='4' cellspacing='1' width='400'>
 		<tr><td align='left'>
 			<a href="index.php">
 			<img src="images/pandora_logo.png" border="0" alt="logo"></a><br>
 			<?php echo $pandora_version; ?>
-		<td valign='bottom'>
-			<?PHP echo $lang_label["logout_msg"]; ?>
+		</td><td valign='bottom'>
+			<?php echo $lang_label["logout_msg"]; ?>
+		</td></tr>
 		</table>
 		</form>
 	</div>
diff --git a/pandora_console/general/logon_failed.php b/pandora_console/general/logon_failed.php
index 02c0ec62c0..1dff1de5ac 100644
--- a/pandora_console/general/logon_failed.php
+++ b/pandora_console/general/logon_failed.php
@@ -18,22 +18,18 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ?>
 
-<center>
-<div align='center' class='databox' style='margin-top:200px; width: 460px; border-left: solid 1px #000;border-top: solid 1px #000; border-bottom: solid 2px #000; border-right: solid 2px #000;'>
-<div id='login_f' class='databox' style='width:400px; margin-top: 10px;'>
-	<h1 id="log_f" style='margin-top: 0px;' class="error"><?php echo $lang_label['err_auth']; ?></h1>
-	<div id='noa' style='width:50px' >
-		<img src='images/noaccess.gif'>
+<div class='databox' id='login'>
+	<div id='login_f' class='databox'>
+		<h1 id="log_f" style='margin-top: 0px;' class="error"><?php echo $lang_label['err_auth']; ?></h1>
+		<div id='noa' style='width:50px' >
+			<img src='images/noaccess.gif'>
+		</div>
+
+		<div style='width: 350px'>
+			<a href="index.php"><img src="images/pandora_logo.png" border="0"></a><br>
+			<?php echo $pandora_version; ?>
+		</div>
+
+		<div class="msg"><?php echo $lang_label["err_auth_msg"]; ?></div>
 	</div>
-
-	<div style='width: 350px'>
-		<a href="index.php"><img src="images/pandora_logo.png" border="0"></a><br>
-		<?php echo $pandora_version; ?>
-	</div>
-
-	<div class="msg"><?php echo $lang_label["err_auth_msg"]; ?></div>
 </div>
-<br>
-</div>
-</center>
-
diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index 44d93c2d29..7f0085d5e0 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -33,7 +33,7 @@
 		exit;
 	}
 
-	echo "<h2>".$lang_label["audit_title"]."</h2>";
+	echo "<h2>".$lang_label["audit_title"]." &gt; ";
 	if (isset($_GET["offset"]))
 		$offset=$_GET["offset"];
 	else
@@ -56,24 +56,27 @@
 
 	// generate select 
 
-	echo "<h3>".$lang_label["filter"];
+	echo $lang_label["filter"];
 	echo "<a href='help/".$help_code."/chap6.php#6' target='_help' class='help'>
-	&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	echo "<form name='query_sel' method='post' action='index.php?sec=godmode&sec2=godmode/admin_access_logs'>";
 	echo "<table border='0'><tr><td valign='middle'>";
 	echo "<select name='tipo_log' onChange='javascript:this.form.submit();'>";
-	if (isset($tipo_log))
-		echo "<option>".$tipo_log;
-	echo "<option value='-1'>".$lang_label["all"];
+	if (isset($tipo_log)) {
+		echo "<option>".$tipo_log. "</option>";
+	}
+	echo "<option value='-1'>".$lang_label["all"]."</option>";
 	$sql3="SELECT DISTINCT (accion) FROM `tsesion`"; 
 	// Prepare index for pagination
 	$result3=mysql_query($sql3);
 	while ($row3=mysql_fetch_array($result3)){
 		if (isset($tipo_log)) {
-			if ($tipo_log != $row3[0])
-				echo "<option value='".$row3[0]."'>".$row3[0];
-		} else
-		echo "<option value='".$row3[0]."'>".$row3[0];
+			if ($tipo_log != $row3[0]) {
+				echo "<option value='".$row3[0]."'>".$row3[0]."</option>";
+			}
+		} else {
+			echo "<option value='".$row3[0]."'>".$row3[0]."</option>";
+		}
 	}
 	echo "</select>";
 	echo "<td valign='middle'><noscript><input name='uptbutton' type='submit' class='sub' value='".$lang_label["show"]."'></noscript>";
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 51817444d7..b65358c098 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -147,12 +147,12 @@ while ($row=mysql_fetch_array($result)){
 <td class="datos2">
 	<?php if ($modo == "1"){
 		echo $lang_label["learning_mode"].'
-		<input type="radio" class="chk" name="modo" value="1" class="mr40" checked>';
+		<input type="radio" class="chk" name="modo" value="1" style="margin-right: 40px;" checked>';
 		echo $lang_label["normal_mode"].' 
 		<input type="radio" class="chk" name="modo" value="0">';
 	} else {
 		echo $lang_label["learning_mode"].'
-		<input type="radio" class="chk" name="modo" value="1" class="mr40">';
+		<input type="radio" class="chk" name="modo" value="1" style="margin-right: 40px;">';
 		echo $lang_label["normal_mode"].'
 		<input type="radio" name="modo" class="chk" value="0" checked>';
 	}
@@ -161,12 +161,12 @@ while ($row=mysql_fetch_array($result)){
 <td class="datos">
 <?php if ($disabled == "1"){
 		echo $lang_label["disabled"].'
-		<input type="radio" class="chk" name="disabled" value="1" class="mr40" checked>';
+		<input type="radio" class="chk" name="disabled" value="1" style="margin-right: 40px;" checked>';
 		echo $lang_label["active"].' 
 		<input class="chk" type="radio" name="disabled" value="0">';
 	} else {
 		echo $lang_label["disabled"].'
-		<input type="radio" class="chk" name="disabled" value="1" class="mr40">';
+		<input type="radio" class="chk" name="disabled" value="1" style="margin-right: 40px;">';
 		echo $lang_label["active"].'
 		<input type="radio" name="disabled" class="chk" value="0" checked>';
 	}
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 289b716552..d6d56be52a 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -129,7 +129,7 @@ echo "<div id='menu_tab_left'>
 <ul class='mn'>	
 <li class='nomn'>";
 echo "<li class='nomn'>";
-echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente'><img src='images/bricks.png' class='top' border=0>&nbsp; ".dame_nombre_agente($id_agente)." - ".$lang_label["setup_mode"]."</A>";
+echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente'><img src='images/setup.png' class='top' border=0>&nbsp; ".dame_nombre_agente($id_agente)." - ".$lang_label["setup_mode"]."</a>";
 echo "</li>";
 echo "</ul></div>";
 
diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php
index 5884c502c3..faef0ac27f 100644
--- a/pandora_console/godmode/agentes/manage_config.php
+++ b/pandora_console/godmode/agentes/manage_config.php
@@ -249,8 +249,8 @@ if (comprueba_login() == 0)
 		} else { // Form view
 			?>
 							
-			<h2><?php echo $lang_label["agent_conf"] ?></h2>
-			<h3><?php echo $lang_label["config_manage"]; ?><a href="help/<?php echo $help_code;?>/chap3.php#323" target="_help" class="help">&nbsp;<span><?php echo $lang_label["help"]; ?></span></a></h3>
+			<h2><?php echo $lang_label["agent_conf"] ?> &gt; 
+			<?php echo $lang_label["config_manage"]; ?><a href="help/<?php echo $help_code;?>/chap3.php#323" target="_help" class="help">&nbsp;<span><?php echo $lang_label["help"]; ?></span></a></h2>
 			<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/manage_config&operacion=1">
 			<table width=450 border=0 cellspacing=3 cellpadding=5>
 			<tr>
diff --git a/pandora_console/godmode/alertas/configurar_alerta.php b/pandora_console/godmode/alerts/configure_alert.php
similarity index 96%
rename from pandora_console/godmode/alertas/configurar_alerta.php
rename to pandora_console/godmode/alerts/configure_alert.php
index 1c1c37fc9d..72733643f9 100644
--- a/pandora_console/godmode/alertas/configurar_alerta.php
+++ b/pandora_console/godmode/alerts/configure_alert.php
@@ -52,8 +52,7 @@ if ( (give_acl($id_user, 0, "LM")==1)){
 		$creacion_alerta = 1;
 	}
 	
-echo "<h2>".$lang_label["alert_config"]."</h2>";
-echo "<h3>";
+echo "<h2>".$lang_label["alert_config"]." &gt; ";
 	if (isset($_GET["creacion"])){
 		echo $lang_label["create_alert"];
 	}
@@ -62,11 +61,11 @@ echo "<h3>";
 	}
 	echo '<a href="help/'.$help_code.'/chap3.php#3221" target="_help" class="help">
 	<span>'.$lang_label["help"].'</span></a>';
-echo "</h3>";
+echo "</h2>";
  ?>
 <table width="500" cellspacing="4" cellpadding="4" class="databox_color">
 
-<form name="alerta" method="post" action="index.php?sec=galertas&sec2=godmode/alertas/modificar_alerta&id_alerta=<?php echo $id_alerta ?>">
+<form name="alerta" method="post" action="index.php?sec=galertas&sec2=godmode/alerts/modify_alert&id_alerta=<?php echo $id_alerta ?>">
 
 <?php
 	if ($creacion_alerta == 1)
diff --git a/pandora_console/godmode/alertas/modificar_alerta.php b/pandora_console/godmode/alerts/modify_alert.php
similarity index 84%
rename from pandora_console/godmode/alertas/modificar_alerta.php
rename to pandora_console/godmode/alerts/modify_alert.php
index 2b9e45b343..bf15782649 100644
--- a/pandora_console/godmode/alertas/modificar_alerta.php
+++ b/pandora_console/godmode/alerts/modify_alert.php
@@ -48,8 +48,8 @@ if ( (give_acl($id_user, 0, "LM")==1)){
 		$result=mysql_query($sql_delete2);
 	}
 
-    echo "<h2>".$lang_label["alert_config"]."</h2>";
-	echo "<h3>".$lang_label["alert_defined2"]."<a href='help/".$help_code."/chap3.php#3221' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+    echo "<h2>".$lang_label["alert_config"]." &gt; ";
+	echo $lang_label["alert_defined2"]."<a href='help/".$help_code."/chap3.php#3221' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	echo "<table width='500' cellpadding='4' cellspacing='4' class='databox'>";
 	echo "<th width='100px'>".$lang_label["alertname"]."</th>";
 	echo "<th>".$lang_label["description"]."</th>";
@@ -66,16 +66,16 @@ if ( (give_acl($id_user, 0, "LM")==1)){
 			$tdcolor = "datos2";
 			$color = 1;
 		}
-		echo "<tr><td class='$tdcolor'><b><a href='index.php?sec=galertas&sec2=godmode/alertas/configurar_alerta&id_alerta=".$row["id_alerta"]."'>".$row["nombre"]."</a></b></td>";
+		echo "<tr><td class='$tdcolor'><b><a href='index.php?sec=galertas&sec2=godmode/alerts/configure_alert&id_alerta=".$row["id_alerta"]."'>".$row["nombre"]."</a></b></td>";
 		echo "<td class='$tdcolor'>".$row["descripcion"]."</td>";
-		echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/alertas/modificar_alerta&borrar_alerta=".$row["id_alerta"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a></td></tr>";
+		echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/alerts/modify_alert&borrar_alerta=".$row["id_alerta"]."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a></td></tr>";
 	}
 
 	echo "</table>";
 	echo "<br>";
 	echo "<table width=500>";
 	echo "<tr><td align='right'>";
-	echo "<form method=post action='index.php?sec=galertas&sec2=godmode/alertas/configurar_alerta&creacion=1'>";
+	echo "<form method=post action='index.php?sec=galertas&sec2=godmode/alerts/configure_alert&creacion=1'>";
 	echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_alert"]."'>";
 	echo "</form>";
 	echo "</td></tr></table>";
diff --git a/pandora_console/godmode/db/db_audit.php b/pandora_console/godmode/db/db_audit.php
index 6f6fdbace6..0a3a0e0916 100644
--- a/pandora_console/godmode/db/db_audit.php
+++ b/pandora_console/godmode/db/db_audit.php
@@ -94,8 +94,8 @@ if (comprueba_login() == 0)
 	}
 	# End of get parameters block
 	
-	echo "<h2>".$lang_label["dbmain_title"]."</h2>";
-	echo "<h3>".$lang_label["db_purge_audit"]."<a href='help/".$help_code."/chap8.php#841' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["dbmain_title"]." &gt; ";
+	echo  $lang_label["db_purge_audit"]."<a href='help/".$help_code."/chap8.php#841' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	echo "<table cellpadding='4' cellspacing='4' border='0'>";
 	echo "<tr><td class='datos'>";
diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php
index aeed283b90..b30d6f7137 100644
--- a/pandora_console/godmode/db/db_event.php
+++ b/pandora_console/godmode/db/db_event.php
@@ -8,8 +8,6 @@
 
 // Load global vars
 require("include/config.php");
-//require("include/functions.php");
-//require("include/functions_db.php");
 if (comprueba_login() == 0) 
 	
 	if ((give_acl($id_user, 0, "DM")==1) or (dame_admin($id_user)==1)) {	
@@ -75,8 +73,8 @@ if (comprueba_login() == 0)
 	}
 	# End of get parameters block
 	
-	echo "<h2>".$lang_label["dbmain_title"]."</h2>";
-	echo "<h3>".$lang_label["db_purge_event"]."<a href='help/".$help_code."/chap8.php#842' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["dbmain_title"]." &gt; ";
+	echo  $lang_label["db_purge_event"]."<a href='help/".$help_code."/chap8.php#842' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	echo "<table cellpadding='4' cellspacing='4' border='0'>";
 	echo "<tr><td class='datos'>";	
diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php
index b1566ce873..1777040171 100644
--- a/pandora_console/godmode/db/db_info.php
+++ b/pandora_console/godmode/db/db_info.php
@@ -8,8 +8,6 @@
 
 // Load global vars
 require("include/config.php");
-//require("include/functions.php");
-//require("include/functions_db.php");
 if (comprueba_login() == 0) 
 	if ((give_acl($id_user, 0, "DM")==1) or (dame_admin($id_user)==1)) {
  	// Todo for a good DB maintenance 
@@ -22,8 +20,8 @@ if (comprueba_login() == 0)
  		- A more powerful selection (by Agent, by Module, etc).
  	*/
 		
-	echo "<h2>".$lang_label["dbmain_title"]."</h2>";
-	echo "<h3>".$lang_label["db_info2"]."<a href='help/".$help_code."/chap8.php#81' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["dbmain_title"]." &gt; ";
+	echo $lang_label["db_info2"]."<a href='help/".$help_code."/chap8.php#81' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	echo "<table border=0>";
 	echo "<tr><td><img src='reporting/fgraph.php?tipo=db_agente_modulo'><br>";
 	echo "<tr><td><br>";
diff --git a/pandora_console/godmode/db/db_info_data.php b/pandora_console/godmode/db/db_info_data.php
index 8090a78249..7daf1ccad0 100644
--- a/pandora_console/godmode/db/db_info_data.php
+++ b/pandora_console/godmode/db/db_info_data.php
@@ -32,12 +32,12 @@ if (comprueba_login() == 0)
  		- A more powerful selection (by Agent, by Module, etc).
  	*/
 		
-	echo "<h2>".$lang_label["dbmain_title"]."</h2>";
-	echo "<h3>".$lang_label["db_stat_agent"]."</h3>";
+	echo "<h2>".$lang_label["dbmain_title"]." &gt; ";
+	echo  $lang_label["db_stat_agent"]."</h2>";
 	echo "<table cellspacing='3' cellpadding='3'>";
-	echo "<tr><th>".$lang_label["agent_name"];
-	echo "<th>".$lang_label["assigned_module"];
-	echo "<th>".$lang_label["total_data"];
+	echo "<tr><th>".$lang_label["agent_name"]."</th>";
+	echo "<th>".$lang_label["assigned_module"]."</th>";
+	echo "<th>".$lang_label["total_data"]."</th>";
 	$color=0;
 	
 	$result_2=mysql_query("SELECT id_agente FROM tagente");
diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php
index ecd18fc31e..2cec094c41 100644
--- a/pandora_console/godmode/db/db_main.php
+++ b/pandora_console/godmode/db/db_main.php
@@ -22,8 +22,8 @@ if (comprueba_login() == 0)
  		- A more powerful selection (by Agent, by Module, etc).
  	*/
 ?>
-	<h2><?php echo $lang_label["dbmain_title"] ?></h2>
-	<h3><?php echo $lang_label["current_dbsetup"] ?><a href="help/<?php echo $help_code ?>/chap8.php#8" target="_help" class="help">&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h3>
+	<h2><?php echo $lang_label["dbmain_title"] ?> &gt; 
+	<?php echo $lang_label["current_dbsetup"] ?><a href="help/<?php echo $help_code ?>/chap8.php#8" target="_help" class="help">&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h2>
 	<table width=550 cellspacing=3 cellpadding=3 border=0>
 	<tr><td>
 	<i><?php echo $lang_label["days_compact"]; ?>:</i>&nbsp;<b><?php echo $days_compact; ?></b><br><br>
diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php
index 8de95e5ddc..fa9fb7a301 100644
--- a/pandora_console/godmode/db/db_purge.php
+++ b/pandora_console/godmode/db/db_purge.php
@@ -8,8 +8,6 @@
 
 // Load global vars
 require("include/config.php");
-//require("include/functions.php");
-//require("include/functions_db.php");
 if (comprueba_login() == 0) 
    $id_usuario= $_SESSION["id_usuario"];
    if (give_acl($id_usuario, 0, "DM")==1){
@@ -22,8 +20,8 @@ if (comprueba_login() == 0)
  		- A more powerful selection (by Agent, by Module, etc).
  	*/
 	 ?>	
-	<h2><?php echo $lang_label["dbmain_title"] ?></h2>
-	<h3><?php echo $lang_label["db_purge"] ?><a href='help/<?php echo $help_code ?>/chap8.php#8' target='_help' class='help'>&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h3>
+	<h2><?php echo $lang_label["dbmain_title"] ?> &gt; 
+	<?php echo $lang_label["db_purge"] ?><a href='help/<?php echo $help_code ?>/chap8.php#8' target='_help' class='help'>&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h2>
 	<img src="reporting/fgraph.php?tipo=db_agente_purge&id=-1"><br><br>
 	<h3><?php echo $lang_label["get_data_agent"] ?></h3>
 	<?php
diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php
index 8c4f9637db..49e0f386ec 100644
--- a/pandora_console/godmode/db/db_refine.php
+++ b/pandora_console/godmode/db/db_refine.php
@@ -46,8 +46,8 @@ if (comprueba_login() == 0)
 			} //if copia modulos o alertas
 		} else { // Form view
 			?>
-			<h2><?php echo $lang_label["dbmain_title"]; ?></h2>
-			<h3><?php echo $lang_label["db_refine"]; ?><a href='help/<?php echo $help_code?>/chap8.php#831' target='_help' class='help'>&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h3> 
+			<h2><?php echo $lang_label["dbmain_title"]; ?> &gt; 
+			<?php echo $lang_label["db_refine"]; ?><a href='help/<?php echo $help_code?>/chap8.php#831' target='_help' class='help'>&nbsp;<span><?php echo $lang_label["help"] ?></span></a></h2> 
 			<form method="post" action="index.php?sec=gdbman&sec2=godmode/db/db_refine&operacion=1">
 			<table width='500' border='0' cellspacing='3' cellpadding='5'>
 			<tr>
diff --git a/pandora_console/godmode/grupos/configurar_grupo.php b/pandora_console/godmode/groups/configure_group.php
similarity index 84%
rename from pandora_console/godmode/grupos/configurar_grupo.php
rename to pandora_console/godmode/groups/configure_group.php
index f7212330c8..2353c2018b 100644
--- a/pandora_console/godmode/grupos/configurar_grupo.php
+++ b/pandora_console/godmode/groups/configure_group.php
@@ -33,10 +33,10 @@ if (comprueba_login() == 0)
 	$id_parent = "";	
  	$disabled = 0;
 	
-	if (isset($_GET["creacion_grupo"])){ //
-		$creacion_grupo = entrada_limpia($_GET["creacion_grupo"]);
+	if (isset($_GET["create_g"])){ //
+		$create_g = entrada_limpia($_GET["create_g"]);
 	} else
-		$creacion_grupo = 0;
+		$create_g = 0;
 		
 	if (isset($_GET["id_grupo"])){
 		// Conecto con la BBDD
@@ -57,21 +57,25 @@ if (comprueba_login() == 0)
 			}
 	}
 
-	echo "<h2>".$lang_label["group_management"]."</h2>";
-	if (isset($_GET["creacion_grupo"])) {echo "<h3>".$lang_label["create_group"]."<a href='help/".$help_code."/chap3.php#31' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";}
-	if (isset($_GET["id_grupo"])) {echo "<h3>".$lang_label["update_group"]."<a href='help/".$help_code."/chap3.php#31' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";}
+	echo "<h2>".$lang_label["group_management"]." &gt; ";
+	if (isset($_GET["create_g"])) {
+		echo $lang_label["create_group"]."<a href='help/".$help_code."/chap3.php#31' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
+	}
+	if (isset($_GET["id_grupo"])) {
+		echo $lang_label["update_group"]."<a href='help/".$help_code."/chap3.php#31' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
+	}
 	
 ?>
 <table width="450" cellpadding=4 cellspacing=4 class='databox_color'>
 
 <form name="grupo" method="post" action="index.php?sec=gagente&
-sec2=godmode/grupos/lista_grupos">
+sec2=godmode/groups/group_list">
 
 <?php
-	if ($creacion_grupo == 1)
-		echo "<input type='hidden' name='crear_grupo' value='1'>";
+	if ($create_g == 1)
+		echo "<input type='hidden' name='create_g' value='1'>";
 	else {
-		echo "<input type='hidden' name='update_grupo' value='1'>";
+		echo "<input type='hidden' name='update_g' value='1'>";
 		echo "<input type='hidden' name='id_grupo' value='".$id_grupo."'>";
 	}
 ?>
@@ -135,7 +139,7 @@ sec2=godmode/grupos/lista_grupos">
 	echo "</table>";
 	echo "<table width=450>";
 	echo '<tr><td align="right">';
-	if (isset($_GET["creacion_grupo"]))
+	if (isset($_GET["create_g"]))
 		echo "<input name='crtbutton' type='submit' class='sub wand' value='".$lang_label["create"]."'>";
 	else 
 		echo "<input name='uptbutton' type='submit' class='sub upd' value='".$lang_label["update"]."'>";
diff --git a/pandora_console/godmode/grupos/lista_grupos.php b/pandora_console/godmode/groups/group_list.php
similarity index 88%
rename from pandora_console/godmode/grupos/lista_grupos.php
rename to pandora_console/godmode/groups/group_list.php
index 5f6ae8df77..6135f7a74e 100644
--- a/pandora_console/godmode/grupos/lista_grupos.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -28,7 +28,7 @@ if (comprueba_login() == 0)
    $id_user = $_SESSION["id_usuario"];
    if (give_acl($id_user, 0, "PM")==1) {
    
-	if (isset($_POST["crear_grupo"])){ // Create group
+	if (isset($_POST["create_g"])){ // Create group
 		$nombre = entrada_limpia($_POST["nombre"]);
 		$icon = entrada_limpia($_POST["icon"]);
 		$parent = entrada_limpia($_POST["parent"]);
@@ -44,7 +44,7 @@ if (comprueba_login() == 0)
 		}
 	}
 
-	if (isset($_POST["update_grupo"])){ // if modified any parameter
+	if (isset($_POST["update_g"])){ // if modified any parameter
 		$nombre = entrada_limpia($_POST["nombre"]);
 		$id_grupo = entrada_limpia($_POST["id_grupo"]);
 		$icon = entrada_limpia($_POST["icon"]);
@@ -60,7 +60,7 @@ if (comprueba_login() == 0)
 			echo "<h3 class='suc'>".$lang_label["modify_group_ok"]."</h3>";
 	}
 	
-	if (isset($_GET["borrar_grupo"])){ // if delete
+	if (isset($_GET["delete_g"])){ // if delete
 		$id_borrar_modulo = entrada_limpia($_GET["id_grupo"]);
 		
 		// First delete from tagente_modulo
@@ -71,12 +71,11 @@ if (comprueba_login() == 0)
 		else
 			echo "<h3 class='suc'>".$lang_label["delete_group_ok"]."</h3>";
 	}
-	echo "<h2>".$lang_label["group_management"]."</h2>";	
-	echo "
-		<h3>".$lang_label["definedgroups"]."
+	echo "<h2>".$lang_label["group_management"]." &gt; ";	
+	echo $lang_label["definedgroups"]."
 		<a href='help/".$help_code."/chap3.php#31' target='_help' class='help'>
 		<span>".$lang_label["help"]."</span></a>
-		</h3>";
+		</h2>";
 
 	echo "<table cellpadding=3 cellspacing=3 width=400>";
 	echo "<th>".$lang_label["icon"]."</th>";
@@ -101,7 +100,7 @@ if (comprueba_login() == 0)
 			echo "<img src='images/groups_small/".$row["icon"].".png' border='0'>";
 			echo "</td>";
 			echo "<td class='$tdcolor'>";
-			echo "<b><a href='index.php?sec=gagente&sec2=godmode/grupos/configurar_grupo&id_grupo=".$row["id_grupo"]."'>".$row["nombre"]."</a>";
+			echo "<b><a href='index.php?sec=gagente&sec2=godmode/groups/configure_group&id_grupo=".$row["id_grupo"]."'>".$row["nombre"]."</a>";
 			echo "</b></td>";
 			echo "<td class='$tdcolor'>";
 			echo dame_nombre_grupo ($row["parent"]);
@@ -116,7 +115,7 @@ if (comprueba_login() == 0)
                         echo "</td>";
 
 			echo "<td class='$tdcolor' align='center'>";	
-			echo "<a href='index.php?sec=gagente&sec2=godmode/grupos/lista_grupos&id_grupo=".$row["id_grupo"]."&borrar_grupo=".$row["id_grupo"]."'";
+			echo "<a href='index.php?sec=gagente&sec2=godmode/groups/group_list&id_grupo=".$row["id_grupo"]."&delete_g=".$row["id_grupo"]."'";
 			echo ' onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;">';
 			echo "<img border='0' src='images/cross.png'></a></td></tr>";
 		}
@@ -124,7 +123,7 @@ if (comprueba_login() == 0)
 	echo "<tr><td colspan='5'><div class='raya'></div></td></tr>";
 	echo "<tr><td colspan='5' align='right'>";
 	echo "<form method=post action='index.php?sec=gagente&
-	sec2=godmode/grupos/configurar_grupo&creacion_grupo=1'>";
+	sec2=godmode/groups/configure_group&create_g=1'>";
 	echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_group"]."'>";
 	echo "</form></td></tr></table>";
 
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 91529d257c..7029abffcb 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -47,12 +47,12 @@ if (comprueba_login() == 0){
 			else echo "<div class='arrowg'>";
 			echo "<ul class='mn'><li><a href='index.php?sec=gagente&amp;sec2=godmode/agentes/manage_config' class='mn'>".$lang_label["manage_config"]."</a></li></ul></div>";
 			
-			if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/grupos/lista_grupos" || $_GET["sec2"] == "godmode/grupos/configurar_grupo")){
+			if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/groups/group_list" || $_GET["sec2"] == "godmode/groups/configure_group")){
 				echo "<div class='arrowgs'>";
 			}
 			else
 				echo "<div class='arrowg'>";
-			echo "<ul class='mn'><li><a href='index.php?sec=gagente&amp;sec2=godmode/grupos/lista_grupos' class='mn'>".$lang_label["manage_groups"]."</a></li></ul></div>";
+			echo "<ul class='mn'><li><a href='index.php?sec=gagente&amp;sec2=godmode/groups/group_list' class='mn'>".$lang_label["manage_groups"]."</a></li></ul></div>";
 		}
 	}
 
@@ -89,25 +89,25 @@ if (comprueba_login() == 0){
 	}
 	
 	if ((give_acl($id_user, 0, "LM")==1)){
-		if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/alertas/modificar_alerta" || $_GET["sec2"] == "godmode/alertas/configurar_alerta")){
+		if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/alerts/modify_alert" || $_GET["sec2"] == "godmode/alerts/configure_alert")){
 			echo '<div id="god2s">';
 		}
 		else echo '<div id="god2">';
-		echo '<ul class="mn"><li><a href="index.php?sec=galertas&amp;sec2=godmode/alertas/modificar_alerta" class="mn">'.$lang_label["manage_alerts"].'</a></li></ul></div>';
+		echo '<ul class="mn"><li><a href="index.php?sec=galertas&amp;sec2=godmode/alerts/modify_alert" class="mn">'.$lang_label["manage_alerts"].'</a></li></ul></div>';
 	}
 	if ((give_acl($id_user, 0, "UM")==1)){
-		if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/usuarios/lista_usuarios" || $_GET["sec2"] == "godmode/usuarios/configurar_usuarios")){
+		if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/users/user_list" || $_GET["sec2"] == "godmode/users/configure_user")){
 			echo '<div id="god3s">';
 		}
 		else echo '<div id="god3">';
-		echo '<ul class="mn"><li><a href="index.php?sec=gusuarios&amp;sec2=godmode/usuarios/lista_usuarios" class="mn">'.$lang_label["manage_users"].'</a></li></ul></div>';
+		echo '<ul class="mn"><li><a href="index.php?sec=gusuarios&amp;sec2=godmode/users/user_list" class="mn">'.$lang_label["manage_users"].'</a></li></ul></div>';
 	}
 	if ( (give_acl($id_user, 0, "PM")==1)){
-		if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/perfiles/lista_perfiles"){
+		if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/profiles/profile_list"){
 			echo '<div id="god4s">';
 		}
 		else echo '<div id="god4">';
-		echo '<ul class="mn"><li><a href="index.php?sec=gperfiles&amp;sec2=godmode/perfiles/lista_perfiles" class="mn">'.$lang_label["manage_profiles"].'</a></li></ul></div>';
+		echo '<ul class="mn"><li><a href="index.php?sec=gperfiles&amp;sec2=godmode/profiles/profile_list" class="mn">'.$lang_label["manage_profiles"].'</a></li></ul></div>';
 		
 		if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/servers/modificar_server"){
 			echo '<div id="god5s">';
@@ -117,44 +117,13 @@ if (comprueba_login() == 0){
 		echo '<ul class="mn"><li><a href="index.php?sec=gservers&amp;sec2=godmode/servers/modificar_server" class="mn">'.$lang_label["manage_servers"].'</a></li></ul></div>';
 
 		if (isset($_GET["sec"]) && $_GET["sec"] == "gservers"){
-			if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/servers/manage_recontask"){
+			if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/servers/manage_recontask"|| $_GET["sec2"] == "godmode/servers/manage_recontask_form"){
 				echo "<div class='arrowgs'>";
 			} else
 				echo "<div class='arrowg'>";
 			echo "<ul class='mn'><li><a href='index.php?sec=gservers&sec2=godmode/servers/manage_recontask' class='mn'>".$lang_label["manage_recontask"]."</a></li></ul></div>";
 		}
-/*
-		if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/agentes/modificar_agente" || $_GET["sec2"] == "godmode/agentes/configurar_agente")){
-			echo '<div id="god1s">';
-		}
-		else
-			echo '<div id="god1">';
-		echo '<ul class="mn"><li><a href="index.php?sec=gagente&amp;sec2=godmode/agentes/modificar_agente" class="mn">'.$lang_label["manage_agents"].'</a></li></ul></div>';
-		
-		if (isset($_GET["sec"]) && $_GET["sec"] == "gagente"){
-			if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/agentes/manage_config"){
-				echo "<div class='arrowgs'>";
-			}
-			else echo "<div class='arrowg'>";
-			echo "<ul class='mn'><li><a href='index.php?sec=gagente&amp;sec2=godmode/agentes/manage_config' class='mn'>".$lang_label["manage_config"]."</a></li></ul></div>";
-			
-			if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/grupos/lista_grupos" || $_GET["sec2"] == "godmode/grupos/configurar_grupo")){
-				echo "<div class='arrowgs'>";
-			}
-			else
-				echo "<div class='arrowg'>";
-			echo "<ul class='mn'><li><a href='index.php?sec=gagente&amp;sec2=godmode/grupos/lista_grupos' class='mn'>".$lang_label["manage_groups"]."</a></li></ul></div>";
-		}
-*/
-
-
-
-
-
-
-
-
-        
+       
 		if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/admin_access_logs"){
 			echo '<div id="god6s">';
 		}
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index 8ca06908f3..372d56da45 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -75,8 +75,8 @@ if (isset($_GET["delete"])){ // if delete
 	
 	$result=mysql_query($sql_delete);
 }
-
-echo "<h2>".$lang_label["network_component_group_management"]."</h2>";
+echo "<h2>".$lang_label["module_management"]." &gt; ";
+echo $lang_label["network_component_group_management"]."</h2>";
 
 echo "<table cellpadding=4 cellspacing=4 width=550>";
 echo "<th>".$lang_label["name"]."</th>";
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index a957883f10..6f3ab9b726 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -155,8 +155,8 @@ if (isset($_GET["delete"])){ // if delete
 // ------------------
 // SHOW MODULES
 // ------------------
-
-echo "<h2>".$lang_label["network_component_management"]."</h2>";
+echo "<h2>".$lang_label["module_management"]." &gt; ";
+echo $lang_label["network_component_management"]."</h2>";
 
 // Show group selector
 if (isset($_POST["ncgroup"]))
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index 64a694effa..4e50664079 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -41,8 +41,8 @@ if (isset($_GET["delete"])){ // if delete
 	
 	$result=mysql_query($sql_delete);
 }
-
-echo "<h2>".$lang_label["network_profile_management"]."</h2>";
+echo "<h2>".$lang_label["module_management"]." &gt; ";
+echo $lang_label["network_profile_management"]."</h2>";
 
 
 $sql1='SELECT * FROM tnetwork_profile ORDER BY name';
diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php
index f43a3f4ca1..1b4712ceee 100644
--- a/pandora_console/godmode/modules/module_list.php
+++ b/pandora_console/godmode/modules/module_list.php
@@ -56,8 +56,8 @@ if (give_acl($id_user, 0, "PM")==1) {
 		else
 			echo "<h3 class='suc'>".$lang_label["delete_group_ok"]."</h3>";
 	}*/
-	echo "<h2>".$lang_label["module_management"]."</h2>";
-	echo "<h3>".$lang_label["defined_modules"]."</h3>";
+	echo "<h2>".$lang_label["module_management"]." &gt; ";
+	echo $lang_label["defined_modules"]."</h2>";
 
 	echo "<table cellpadding=4 cellspacing=4 width=750>";
 	echo "<th>".$lang_label["icon"]."</th>";
diff --git a/pandora_console/godmode/perfiles/lista_perfiles.php b/pandora_console/godmode/profiles/profile_list.php
similarity index 92%
rename from pandora_console/godmode/perfiles/lista_perfiles.php
rename to pandora_console/godmode/profiles/profile_list.php
index 01e9754c2c..6e3a08b134 100644
--- a/pandora_console/godmode/perfiles/lista_perfiles.php
+++ b/pandora_console/godmode/profiles/profile_list.php
@@ -124,16 +124,19 @@ if (comprueba_login() == 0)
 			}
 		 	unset($id_perfil);
 		}
-		echo '<h2>'.$lang_label["profile_title"].'</h2>';     
+		echo '<h2>'.$lang_label["profile_title"].' &gt; ';     
 		echo (isset($_GET["new_profile"]))?
-		('<h3>'.$lang_label["create_profile"].'<a href="help/'.$help_code.'/chap2.php#21" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h3>'):
-		((isset($_GET["edit_profile"]))?('<h3>'.$lang_label["update_profile"].'<a href="help/'.$help_code.'/chap2.php#21" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h3>'):
-		('<h3>'.$lang_label["definedprofiles"].'<a href="help/'.$help_code.'/chap2.php#21" target="_help"  class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h3>'));
+		($lang_label["create_profile"].'<a href="help/'.$help_code.'/chap2.php#21" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h2>'):
+		(
+		(isset($_GET["edit_profile"]))?
+		($lang_label["update_profile"].'<a href="help/'.$help_code.'/chap2.php#21" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h2>'):
+		($lang_label["definedprofiles"].'<a href="help/'.$help_code.'/chap2.php#21" target="_help"  class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h2>')
+		);
 		// Form to manage date
 		if (isset ($id_perfil)){ // There are values defined, let's show form with data for INSERT or UPDATE
 			echo "<table width='400' cellpadding='3' cellspacing='3'>";
 			echo "<tr><td class='lb' rowspan='11' width='5'>";
-			echo "<form method='post' action='index.php?sec=gperfiles&sec2=godmode/perfiles/lista_perfiles&update_data'>";
+			echo "<form method='post' action='index.php?sec=gperfiles&sec2=godmode/profiles/profile_list&update_data'>";
 			echo "<input type=hidden name=id_perfil value='".$id_perfil."'>";
 			echo "<td class=datos>".$lang_label["profile_name"]."<td class=datos><input name='name' type=text size='27' value='".$name."'>";
 			
@@ -216,7 +219,7 @@ echo "<tr><td colspan='3' align='right'><input name='uptbutton' type='submit' cl
 			$tdcolor = "datos2";
 			$color = 1;
 		}
-		echo "<td class='$tdcolor'><a href='index.php?sec=gperfiles&amp;sec2=godmode/perfiles/lista_perfiles&amp;edit_profile=".$id_perfil."'><b>".$nombre."</b></a>";
+		echo "<td class='$tdcolor'><a href='index.php?sec=gperfiles&amp;sec2=godmode/profiles/profile_list&amp;edit_profile=".$id_perfil."'><b>".$nombre."</b></a>";
 		
 		echo "<td class='$tdcolor'>";
 		if ($incident_view == 1) echo "<img src='images/ok.png' border=0>";
@@ -247,13 +250,13 @@ echo "<tr><td colspan='3' align='right'><input name='uptbutton' type='submit' cl
 			
 		echo "<td class='$tdcolor'>";
 		if ($pandora_management == 1) echo "<img src='images/ok.png' border=0>";
-		echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/perfiles/lista_perfiles&delete_profile=".$id_perfil."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a></td></tr>";
+		echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/profiles/profile_list&delete_profile=".$id_perfil."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a></td></tr>";
 		
 	}
 			echo "</div></td></tr>";
 			echo "<tr><td colspan='12'><div class='raya'></div></td></tr>";
 			echo "<tr><td colspan='12' align='right'>";
-			echo "<form method=post action='index.php?sec=gperfiles&sec2=godmode/perfiles/lista_perfiles&new_profile=1'>";
+			echo "<form method=post action='index.php?sec=gperfiles&sec2=godmode/profiles/profile_list&new_profile=1'>";
 			echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_profile"]."'>";
 			echo "</form></table>";
 		}
diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php
index 6864672842..b85d408ff6 100644
--- a/pandora_console/godmode/servers/manage_recontask.php
+++ b/pandora_console/godmode/servers/manage_recontask.php
@@ -87,7 +87,8 @@ if (isset($_GET["create"])) {
 // --------------------------------
 // SHOW TABLE WITH ALL RECON TASKs
 // --------------------------------
-echo "<h2>".$lang_label["manage_recontask"]."</h2>";
+echo "<h2>".$lang_label["view_servers"]." &gt; ";
+echo $lang_label["manage_recontask"]."</h2>";
 $query="SELECT * FROM trecon_task";
 $result=mysql_query($query);
 $color=1;
diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php
index a96b57b4d2..5e512a11de 100644
--- a/pandora_console/godmode/servers/manage_recontask_form.php
+++ b/pandora_console/godmode/servers/manage_recontask_form.php
@@ -55,8 +55,8 @@ if (isset($_GET["update"])){ // Edit mode
 	$id_network_profile = 1;
 	$id_network_server_assigned = 0;
 }
-
-echo "<h2>".$lang_label["manage_recontask"]."</h2>";
+echo "<h2>".$lang_label["view_servers"]." &gt; ";
+echo $lang_label["manage_recontask"]."</h2>";
 echo '<table width="700" cellspacing="4" cellpadding="4">';
 
 // Different Form url if it's a create or if it's a update form
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index dec24348fc..1bd8e23a98 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -48,8 +48,8 @@ if (comprueba_login() == 0) {
 	}
 	if (isset($_GET["server"])) {
 		$id_server=entrada_limpia($_GET["server"]);
-		echo "<h2>".$lang_label["view_servers"]."</h2>";
-		echo "<h3>".$lang_label["update_server"]."<a href='help/".$help_code."/chap7.php#7' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["view_servers"]." &gt; ";
+		echo $lang_label["update_server"]."<a href='help/".$help_code."/chap7.php#7' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	$query="SELECT * FROM tserver WHERE id_server=".$id_server;
 	$result=mysql_query($query);
@@ -84,8 +84,8 @@ if (comprueba_login() == 0) {
 	{
 	$sql='SELECT * FROM tserver';
 	
-	echo "<h2>".$lang_label["view_servers"]."</h2>";
-	echo "<h3>".$lang_label["manage_servers"]."<a href='help/".$help_code."/chap7.php#7' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["view_servers"]." &gt; ";
+	echo $lang_label["manage_servers"]."<a href='help/".$help_code."/chap7.php#7' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	// Connect DataBase
 	$result=mysql_query($sql);
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index 912c61af74..bafdc4f1c6 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -65,8 +65,8 @@ if (comprueba_login() == 0)
 		}
 
 		// Create link
-        echo "<h2>".$lang_label["setup_screen"]."</h2>";
-		echo "<h3>".$lang_label["link_management"]."<a href='help/".$help_code."/chap9.php#91' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+        echo "<h2>".$lang_label["setup_screen"]." &gt; ";
+		echo $lang_label["link_management"]."<a href='help/".$help_code."/chap9.php#91' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 		echo '<table class="fon" cellpadding="3" cellspacing="3" width="500">';   
 		echo '<form name="ilink" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/links">';
         	if ($creation_mode == 1)
@@ -85,8 +85,8 @@ if (comprueba_login() == 0)
 	}
 
 	else {  // Main list view for Links editor
-		echo "<h2>".$lang_label["setup_screen"]."</h2>";
-		echo "<h3>".$lang_label["link_management"]."<a href='help/".$help_code."/chap9.php#9' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["setup_screen"]." &gt; ";
+		echo  $lang_label["link_management"]."<a href='help/".$help_code."/chap9.php#9' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 		echo "<table cellpadding=3 cellspacing=3>";
 		echo "<th width='180px'>".$lang_label["link_name"];
 		echo "<th width='80px'>".$lang_label["delete"];
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 70bfa620fa..414a2d45b8 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -51,11 +51,11 @@ if (comprueba_login() == 0)
 		$result2=mysql_query("UPDATE tconfig SET VALUE='".$config_show_lastalerts."' WHERE token='show_lastalerts'");
 		$result2=mysql_query("UPDATE tconfig SET VALUE='".$config_style."' WHERE token='style'");
 	}	
-	echo "<h2>".$lang_label["setup_screen"]."</h2>";
-	echo "<h3>".$lang_label["general_config"]."<a href='help/".$help_code."/chap9.php#9' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["setup_screen"]." &gt; ";
+	echo $lang_label["general_config"]."<a href='help/".$help_code."/chap9.php#9' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	echo "<form name='setup' method='POST' action='index.php?sec=gsetup&amp;sec2=godmode/setup/setup&update=1'>";
 	echo '<table width="500" cellpadding="4" cellspacing="4" class="databox_color">';
-	echo '<tr><td class="datos">'.$lang_label["language_code"];
+	echo '<tr><td class="datos">'.$lang_label["language_code"].'</td>';
 	echo '<td class="datos"><select name="language_code" onChange="javascript:this.form.submit();" width="180px">';
 	
 	$sql="SELECT * FROM tlanguage";
@@ -64,30 +64,30 @@ if (comprueba_login() == 0)
 	// This combo is dedicated to Raul... beautiful interface for dirty minds :-D
 	$result2=mysql_query("SELECT * FROM tlanguage WHERE id_language = '$language_code'");
 	if ($row2=mysql_fetch_array($result2)){
-		echo '<option value="'.$row2["id_language"].'">'.$row2["name"];
+		echo '<option value="'.$row2["id_language"].'">'.$row2["name"]."</option>";
 	}
 	while ($row=mysql_fetch_array($result)){
-		echo "<option value=".$row["id_language"].">".$row["name"];
+		echo "<option value=".$row["id_language"].">".$row["name"]."</option>";
 	}
-	echo '</select>';
+	echo '</select></td></tr>';
 			
 	echo '<tr><td class="datos2">'.$lang_label["block_size"];
-	echo '<td class="datos2"><input type="text" name="block_size" size=5 value="'.$block_size.'">';
+	echo '<td class="datos2"><input type="text" name="block_size" size=5 value="'.$block_size.'"></td></tr>';
 	
 	echo '<tr><td class="datos">'.$lang_label["days_compact"];
-	echo '<td class="datos"><input type="text" name="days_compact" size=5 value="'.$days_compact.'">';
+	echo '<td class="datos"><input type="text" name="days_compact" size=5 value="'.$days_compact.'"></td></tr>';
 	
 	echo '<tr><td class="datos2">'.$lang_label["days_purge"];
-	echo '<td class="datos2"><input type="text" name="days_purge" size=5 value="'.$days_purge.'">';
+	echo '<td class="datos2"><input type="text" name="days_purge" size=5 value="'.$days_purge.'"></td></tr>';
 	
 	echo '<tr><td class="datos">'.$lang_label["graph_res"];
-	echo '<td class="datos"><input type="text" name="graph_res" size=5 value="'.$config_graph_res.'">';
+	echo '<td class="datos"><input type="text" name="graph_res" size=5 value="'.$config_graph_res.'"></td></tr>';
 	
-	echo '<tr><td class="datos2">'.$lang_label["step_compact"];
-	echo '<td class="datos2"><input type="text" name="step_compact" size=5 value="'.$config_step_compact.'">';
+	echo '<tr><td class="datos2">'.$lang_label["step_compact"].'</td>';
+	echo '<td class="datos2"><input type="text" name="step_compact" size=5 value="'.$config_step_compact.'"></td></tr>';
 
 	
-	echo '<tr><td class="datos">'.$lang_label["show_unknown"];
+	echo '<tr><td class="datos">'.$lang_label["show_unknown"].'</td>';
 	echo '<td class="datos"><select name="show_unknown" class="w120">';
 	if ($config_show_unknown==1) {
 		echo '<option value="1">'.$lang_label["active"].'</option>';
@@ -109,33 +109,33 @@ if (comprueba_login() == 0)
 		echo '<option value="1">'.$lang_label["active"].'</option>';
 	}
 
-	echo '<tr><td class="datos">'.$lang_label["background_image"];
+	echo '<tr><td class="datos">'.$lang_label["background_image"].'</td>';
 	echo '<td class="datos">';
 	echo '<select name="bgimage" class="w155">';
 	if ($config_bgimage!=""){
-		echo '<option>'.$config_bgimage;
+		echo '<option>'.$config_bgimage."</option>";
 	}
 	
 	$ficheros = list_files('images/backgrounds/', "background",1, 0);
 	$a=0;
 	while (isset($ficheros[$a])){
-		echo "<option>".$ficheros[$a];
+		echo "<option>".$ficheros[$a]."</option>";
 		$a++;
 	}
 	echo '</select>';
 
-	echo '<tr><td class="datos">'.$lang_label["style_template"];
-	echo '<td class="datos">';
+	echo '<tr><td class="datos2">'.$lang_label["style_template"].'</td>';
+	echo '<td class="datos2">';
 	echo '<select name="style" class="w155">';
 	if ($config_bgimage!=""){
-		echo '<option>'.$config_style;
+		echo '<option>'.$config_style.'</option>';
       	}
 	$ficheros2 = list_files('include/styles/', "pandora",1, 0);
         $a=0;
         while (isset($ficheros2[$a])){
 		$fstyle = substr($ficheros2[$a],0,strlen($ficheros2[$a])-4);
 		if ($fstyle != $config_style)
-			echo "<option>".$fstyle;
+			echo "<option>".$fstyle."</option>";
         	$a++;
         }
         echo '</select>';
@@ -143,6 +143,7 @@ if (comprueba_login() == 0)
 	echo "<table width=500>";
 	echo "<tr><td align='right'>";
 	echo '<input type="submit" class="sub upd" value="'.$lang_label["update"].'">';
+	echo "</td></tr>";
 	echo "</table>";
 }
 else {
diff --git a/pandora_console/godmode/usuarios/configurar_usuarios.php b/pandora_console/godmode/users/configure_user.php
similarity index 92%
rename from pandora_console/godmode/usuarios/configurar_usuarios.php
rename to pandora_console/godmode/users/configure_user.php
index ac91310757..003c1287ae 100644
--- a/pandora_console/godmode/usuarios/configurar_usuarios.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -145,23 +145,23 @@ if (comprueba_login() == 0)
 		$id_usuario_mio = $nombre;
 		$modo ="edicion";
 	}
-		echo "<h2>".$lang_label["user_management"]."</h2>";
+		echo "<h2>".$lang_label["user_management"]." &gt; ";
 		if (isset($_GET["alta"])){
 				if ($_GET["alta"]==1){
-				echo '<h3>'.$lang_label["create_user"].'<a href="help/'.$help_code.'/chap2.php#22" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h3>';
+				echo $lang_label["create_user"].'<a href="help/'.$help_code.'/chap2.php#22" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h2>';
 				}
 		}
 		if (isset($_GET["id_usuario_mio"]) OR isset($_GET["nuevo_usuario"])){
-			echo '<h3>'.$lang_label["update_user"].'<a href="help/'.$help_code.'/chap2.php#22" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h3>';
+			echo $lang_label["update_user"].'<a href="help/'.$help_code.'/chap2.php#22" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h2>';
 		}
 
 ?> 
 	<table width='500' cellpadding='3' cellspacing='3'>
 	<?php 
 	if (isset($_GET["alta"]))
-		echo '<form name="new_user" method="post" action="index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&nuevo_usuario=1"><tr><td class="lb" rowspan="9" width="5">';
+		echo '<form name="new_user" method="post" action="index.php?sec=gusuarios&sec2=godmode/users/configure_user&nuevo_usuario=1"><tr><td class="lb" rowspan="9" width="5">';
 	else
-		echo '<form name="user_mod" method="post" action="index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&id_usuario_mio='.$id_usuario_mio.'"><tr><td class="lb" rowspan="11" width="5">';
+		echo '<form name="user_mod" method="post" action="index.php?sec=gusuarios&sec2=godmode/users/configure_user&id_usuario_mio='.$id_usuario_mio.'"><tr><td class="lb" rowspan="11" width="5">';
 	?>
 	<td class="datos"><?php echo $lang_label["id_user"] ?>
 	<td class="datos"><input type="text" name="nombre" value="<?php echo $id_usuario_mio ?>">
@@ -236,7 +236,7 @@ if (comprueba_login() == 0)
 				echo '<td class="'.$tdcolor.'">';
 				echo "<b style='margin-left:10px'>".dame_perfil($row["id_perfil"])."</b> / ";
 				echo "<b>".dame_grupo($row["id_grupo"])."</b>";
-				echo '<td class="'.$tdcolor.'t"><a href="index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&id_usuario_mio='.$id_usuario_mio.'&borrar_grupo='.$row["id_up"].' " onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;"><img border=0 src="images/cross.png"></a><tr>';
+				echo '<td class="'.$tdcolor.'t"><a href="index.php?sec=gusuarios&sec2=godmode/users/configure_user&id_usuario_mio='.$id_usuario_mio.'&borrar_grupo='.$row["id_up"].' " onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;"><img border=0 src="images/cross.png"></a><tr>';
 			}
 				echo "<tr><td colspan='3'><div class='raya'></div></td></tr>";
 		}
diff --git a/pandora_console/godmode/usuarios/lista_usuarios.php b/pandora_console/godmode/users/user_list.php
similarity index 83%
rename from pandora_console/godmode/usuarios/lista_usuarios.php
rename to pandora_console/godmode/users/user_list.php
index 6534470fa2..249c8a6372 100644
--- a/pandora_console/godmode/usuarios/lista_usuarios.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -26,8 +26,8 @@ if (comprueba_login() == 0)
 		}
 ?>
 
-<h2><?php echo $lang_label["user_management"] ?></h2>
-<h3><?php echo $lang_label["users"] ?><a href="help/<?php echo $help_code; ?>/chap2.php#22" target="_help" class="help">&nbsp;<span><?php echo $lang_label["help"]; ?></span></a></h3>
+<h2><?php echo $lang_label["user_management"] ?> &gt; 
+<?php echo $lang_label["users"] ?><a href="help/<?php echo $help_code; ?>/chap2.php#22" target="_help" class="help">&nbsp;<span><?php echo $lang_label["help"]; ?></span></a></h2>
  
 <table cellpadding="3" cellspacing="3" width="700">
 <th width="80px"><?php echo $lang_label["user_ID"]?>
@@ -62,7 +62,7 @@ while ($rowdup=mysql_fetch_array($resq1)){
 		$color = 1;
 	}
 	echo "<tr><td class='$tdcolor'>";
-	echo "<a href='index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&id_usuario_mio=".$name."'><b>".$name."</b></a>";
+	echo "<a href='index.php?sec=gusuarios&sec2=godmode/users/configure_user&id_usuario_mio=".$name."'><b>".$name."</b></a>";
 	echo "<td class='$tdcolor'>".$fecha_registro;
 	echo "<td class='$tdcolor'>";
 	if ($nivel == 1) 
@@ -84,11 +84,11 @@ while ($rowdup=mysql_fetch_array($resq1)){
 	
 	echo "<td class='$tdcolor' width='100'>".substr($real_name,0,16)."</td>";
 	echo "<td class='$tdcolor'>".$comments."</td>";
-	echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/usuarios/lista_usuarios&borrar_usuario=".$name."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a>";
+	echo "<td class='$tdcolor' align='center'><a href='index.php?sec=gagente&sec2=godmode/users/user_list&borrar_usuario=".$name."' onClick='if (!confirm(\' ".$lang_label["are_you_sure"]."\')) return false;'><img border='0' src='images/cross.png'></a>";
 }
 	echo "<tr><td colspan='6'><div class='raya'></div></td></tr>";
 	echo "<tr><td colspan='6' align='right'>";
-	echo "<form method=post action='index.php?sec=gusuarios&sec2=godmode/usuarios/configurar_usuarios&alta=1'>";
+	echo "<form method=post action='index.php?sec=gusuarios&sec2=godmode/users/configure_user&alta=1'>";
 	echo "<input type='submit' class='sub next' name='crt' value='".$lang_label["create_user"]."'>";
 	echo "</form></td></tr></table>";
 
diff --git a/pandora_console/help/en/chap3.php b/pandora_console/help/en/chap3.php
index 1113902f58..b2a0d91d7f 100644
--- a/pandora_console/help/en/chap3.php
+++ b/pandora_console/help/en/chap3.php
@@ -311,7 +311,7 @@ all in black save the last one.</p>
 	</div>
 <p><b>Last contact:</b> Shows the time and date of the last data package sent by the agent, using a progress bar, according to value of the interval. If you see the image <img src="../../images/outof.gif">, the agent has not send data during the interval. Passing the mouse over the image will show you the last contact in time and date format.</p>
 
-<p><b><u>Note:</u></b> The icon <img src="../../images/setup.gif" width="15"> is only visible if you're and administrator and it's a link to the "Manage Agents" &gt; "Update Agent" option in the Administration menu.</p>
+<p><b><u>Note:</u></b> The icon <img src="../../images/setup.png" width="15"> is only visible if you're and administrator and it's a link to the "Manage Agents" &gt; "Update Agent" option in the Administration menu.</p>
 
 <h3><a name="332">3.3.2. Accessing the data of an agent</a></h3>
 
diff --git a/pandora_console/help/es/chap3.php b/pandora_console/help/es/chap3.php
index 09f9f27f99..eb17c2efa5 100644
--- a/pandora_console/help/es/chap3.php
+++ b/pandora_console/help/es/chap3.php
@@ -338,7 +338,7 @@ problema de comunicaci&oacute;n o a un 
 		</div>
 <p><b>&Uacute;ltimo contacto</b>: Muestra la fecha y hora en que se recibieron los &uacute;ltimos datos del agente, utilizando una barra de progreso, de acuerdo con el valor del intervalo. Si se muestra la imagen <img src="../../images/outof.gif">, el agente no ha enviado datos al finalizar el intervalo. Si pasamos el rat&oacute;n encima de la imagen, se mostrar&aacute; el &uacute;ltimo contacto en formato de fecha y hora.</p>
 
-<p><b><u>Nota:</u></b> El icono <img src="../../images/setup.gif" width="15"> s&oacute;lo es visible si es usuario es administrador y es un enlace a la opci&oacute;n �Gestionar agentes� &gt; �Actualizar agente� del men&uacute; de administraci&oacute;n.</p>
+<p><b><u>Nota:</u></b> El icono <img src="../../images/setup.png" width="15"> s&oacute;lo es visible si es usuario es administrador y es un enlace a la opci&oacute;n �Gestionar agentes� &gt; �Actualizar agente� del men&uacute; de administraci&oacute;n.</p>
 
 <h3><a name="332">3.3.2. Acceso a los datos de un agente concreto</a></h3>
 
diff --git a/pandora_console/images/setup.gif b/pandora_console/images/setup.gif
deleted file mode 100644
index 72ac80e0bc8f32d51ec035d971f8c2c12da5e7d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmZ?wbhEHb6krfwIOflwo+4?OuVPlLVP2wXQL1HGrejsEYg?)BP-E=fY8TMy9N6s|
z((4i4?;SD0Cw59;+|;0iX(7oo!c%5OHa9n?&5CMiX=!b3&72$8-rk-wKe4m3v#YBs
ze_={bPfu@eZ{gy!zP`SqB^mww{Uu8?%a&zNnlx$h<jK{m3Z_k)R<pWj#*7(tYf5I$
zoH={;?56b<bLPxx-cZ@PvASb(eb?5;zU{3OcC=62)wyQPnyp*6?%cU^*REZA_Ut)u
z;J~3nhYlY;eB{WHqeqV(J9g~&@#7~>oH%pl%=z=@FI~EH<;s=o*RS8bd-u_!M^BzS
zdH($QyLa#Y4?dvylZBCsp`Jm90SG{G!oc3wP~X(tVxXtn(%G!%<EPoxspsu$r9PoW
z+s93<UQteFx~7+-vb=?-<aBip7aMCk2k}l(enw|kXD54Gu})zX1p#+UX-RRBP9Y_8
zGYKw+>4K+qv`hpzCI~8+>By=Y^Ragc$eL-%su=OIP2e@vkWzZZI-SepfFTdd^m<MK
WLwzxx2kIOL8=06m{&BJ}SOWm6ut9bJ

diff --git a/pandora_console/images/setup.png b/pandora_console/images/setup.png
new file mode 100644
index 0000000000000000000000000000000000000000..288ae384e2f05588c61b89e7cc9b5d0c55f9007e
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002+P)t-s0000n
zZzMKzC^vK|ICUyHb}Tw~Ej@WJKzuVxg+5S;Ls5%GRE<bik4spPOkI>wUX@Z{mQ-Vy
zS7e!4gM))+np%W}goTBLX`Nn&hlgyRVTp-}ii(PFp=6AVjE#+raieCAj*fDqXpfJN
zbfsx_rfZUtl9Q8@d#Z4jmX>_0a+sKyeyntvnVFlLn}V-+oSdA4uz7{Cdx*1tinW1`
zw}p_nhmpF8tgNiHwY9mqxw^W#yu7@?z`(-7!o$PE#KgqK#l^<P#>dCU$jHdd%*@Zv
z&(hM;)YR11*Vo<M-Qwcn<mBY%=jZP3?k8j!PxAa&00001bW%=J06^y0W&i*H0b)x>
zL;#2d9Y_EG00(qQO+^RS1sehY3HDF56951Jn@L1LRCwBBV1NSyJzWN5py%VKiNg2x
zwNghG(DrdtV^EZnfeUDQIV#IrcuK+r)ID5mtnD1cAv{rjMrT)NCwp5l2wzx5LBQQo
zT2fpD!WU99H<RG<hwBzpGS|^E5#WIH70h&GRgL-Bp?m>ZGc8#aBVIO`0$x)MDJ3Ib
zR=5dVCMpVsJS+$&a|#&hb2B4*f`grv35g2;+Tjq>edwJW00000NkvXXu0mjf?uy@q

literal 0
HcmV?d00001

diff --git a/pandora_console/include/config.inc.php b/pandora_console/include/config.inc.php
index a3492ad53b..b0997c24e8 100644
--- a/pandora_console/include/config.inc.php
+++ b/pandora_console/include/config.inc.php
@@ -61,7 +61,7 @@ if (! mysql_connect($dbhost,$dbuser,$dbpassword)){
 		<a href="index.php"><img src="images/pandora_logo.png" border="0"></a>
 		</div>
 	<div id="db_ftxt">
-		<h1 id="db_fh1" class="error">Pandora Console Error DB-001</h1>
+		<h1 id="log_f" class="error">Pandora Console Error DB-001</h1>
 		Cannot connect with Database, please check your database setup in the 
 		<b>./include/config.php</b> file and read documentation.<i><br><br>
 		Probably any of your user/database/hostname values are incorrect or 
@@ -106,7 +106,7 @@ if($result2=mysql_query("SELECT * FROM tconfig")){
                  <a href="index.php"><img src="images/pandora_logo.png" border="0"></a>
                  </div>
 	         <div id="db_ftxt">
-                 <h1 id="db_fh1" class="error">Pandora Console Error DB-002</h1>
+                 <h1 id="log_f" class="error">Pandora Console Error DB-002</h1>
                  Cannot load configuration variables. Please check your database setup in the
                  <b>./include/config.php</b> file and read documentation.<i><br><br>
                   Probably database schema is created but there are no data inside it or you have a problem with DB access credentials.
diff --git a/pandora_console/include/languages/language_ast_es.php b/pandora_console/include/languages/language_ast_es.php
index 3b512af40b..07705ed4b4 100644
--- a/pandora_console/include/languages/language_ast_es.php
+++ b/pandora_console/include/languages/language_ast_es.php
@@ -227,11 +227,6 @@ $lang_label["total"]="Total";
 $lang_label["checked_by"]="Valid&aacute;u per";
 $lang_label["disabled"]="deshabilit&aacute;u";
 $lang_label["active"]="Activu";
-$lang_label["db_description"]="La base datos ye el n&uacute;cleu de Pandora. Nesta base de datos resire tola informaci&oacute;n de la empresa, por exemplu, tolos datos recopilaos pelos axentes, tola informaci&oacute;n defin&iacute;a pol alministrador, tolos eventos, incidentes o informaci&oacute;n d'auditor&iacute;a.
-<br><br>
-El rendimientu y fiabilid&aacute; d'esti n&uacute;cleu ye vital pal funcionamientu correutu de Pandora. Ye necesariu mantener esta Base de Datos utilizando comandos est&aacute;ndar de MySQL.
-<br><br>
-El tama&ntilde;u de la Base de Datos aumentar&aacute; de manera llineal. Utilizamos un m&eacute;todu de compactaci&oacute;n pa reducir el n&uacute;mberu d'eventos almacen&aacute;os na base de datos ensin perder l'informaci&oacute;n necesaria. Esta compautaci&oacute;n produzse cada ciertu tiempu.";
 $lang_label["begin_date"]="Fecha comienzu (*)";
 $lang_label["end_date"]="Fecha fin (*)";
 $lang_label["resolution"]="Resoluci&oacute;n (%)";
diff --git a/pandora_console/include/languages/language_ca.php b/pandora_console/include/languages/language_ca.php
index 5c7d0345c7..487e9cb03f 100644
--- a/pandora_console/include/languages/language_ca.php
+++ b/pandora_console/include/languages/language_ca.php
@@ -145,7 +145,7 @@ $lang_label["normal_user"]="Usuari Estandard";
 $lang_label["has_connected"]="Est&aacute;s conectat com";
 $lang_label["logged_out"]="Sessi&oacute; finalitzada";
 $lang_label["logout_msg"]="La teva sessi&oacute; ha caducat. Si us plau tanca el teu navegador web per finalitzar la sessi&oacute; del Pandora.<br><br>";
-$lang_label["user_last_activity"]="Aquesta es la teva &uacute;ltima activitat amb el Pandora";
+$lang_label["user_last_activity"]="Aquesta es la teva &uacute;ltima activitat amb el Pandora FMS";
 $lang_label["err_auth"]="Error d'autenticaci&oacute;";
 $lang_label["err_auth_msg"]="Pot ser que el teu usuari o contrasenya no sigui correcte. Si us plau tingues en compte que les contrasenyes diferencien MAJUSCULES i minuscules. Comproba que no tinguis la tecla de bloqueig de majuscules (CAPS LOCK).<br><br>Totes les accions, inclosos els intents de login fallides son enregistrats pel sistema de logs del Pandora, i aquests poden ser revisats per cada usuari. Si us plau notifica al administrador qualsevol incident o funcionament incorrecte.";
 $lang_label["find_crit"]="Si us plau selecciona un creiteri de cerca";
@@ -225,17 +225,12 @@ $lang_label["total"]="Total";
 $lang_label["checked_by"]="Comprobat per";
 $lang_label["disabled"]="Desabilitat";
 $lang_label["active"]="Actiu";
-$lang_label["db_description"]="La base de dades es el nucli de Pandora. En aquesta base de dades es trova tota la informaci&oacute; de l'empresa, per exemple, totes les dades recolectades pels agents, tots els events, incidents, informaci&oacute; d'auditories...
-<br><br>
-El rendiment y la fiabilitat del nucli es vital per poder utilitzar correctament Pandora. Es necessari mantenir correctament aquesta base de dades utilitzant el comandaments estandar de MySQL.
-<br><br>
-El tamany de la base de dades augmentar&agrave; de manera lineal. Estem utilitzant un m&egrave;tode per reduir el nombre d'events emmagatzemats en la base de dades sense perdre informaci&oacute;, compactant les dades cada vegada que es configura el Pandora en 'Configuraci&oacute; del Pandora'";
 $lang_label["begin_date"]="Comen&ccedil;ar data (*)";
 $lang_label["end_date"]="Finalitzar data (*)";
 $lang_label["resolution"]="Resoluci&oacute; (%)";
 $lang_label["date_format"]="(*) Si us plaus introdueix la data amb el seguent format yyyy/mm/dd hh:mm:ss";
 $lang_label["please_wait"]="Si us plau, sigues pacient. Aquesta operaci&oacute; por trigar molt de temps (5-10 minuts)";
-$lang_label["welcome_title"]="Benvingut a la Consola Web del Pandora";
+$lang_label["welcome_title"]="Benvingut a la Consola Web del Pandora FMS";
 $lang_label["incident_view_filter"]="Veure incidents filtrats";
 $lang_label["there_are"]="Hi ha ";
 $lang_label["user_defined"]="usuaris definits en el Pandora";
diff --git a/pandora_console/include/languages/language_de.php b/pandora_console/include/languages/language_de.php
index cb9df89afd..dcec114fba 100644
--- a/pandora_console/include/languages/language_de.php
+++ b/pandora_console/include/languages/language_de.php
@@ -247,16 +247,6 @@ $lang_label["checked_by"]="&Uuml;berpr&uuml;ft durch";
 
 $lang_label["disabled"]="Inaktiv";
 $lang_label["active"]="Aktiv";
-$lang_label["db_description"]="Die Datenbasis ist das Kernelement von Pandora. In dieser Datenbasis sind all die Informationen des zu &uuml;berwachenden Systems gespeichert. Zu diesen Informationen geh&ouml;ren
-die Daten, die durch die Agenten gesammelt werden, die Konfigurationseinstellungen, die durch die Administratoren eingestellt wurden,
-alle Ereignisse, Vorf&auml;lle und &Uuml;berwachungsinformationen ... 
-<br><br>
-The performance and reliability of the core is vital for the correct use of Pandora. It's necessary to maintain correctly this Database using the MySQL standard commands.
-<br><br>
-Die Datenbasis vergr&ouml;sert sich linear. 
-Wir nutzen Methoden, um die Anzahl der Ereignisse, die in der Datenbasis gespeichert werden, zu minimieren,
-ohne ben&ouml;tigte Informationen zu verlieren. Die Daten werden zu Zeiten zusammengefasst, 
-die in der Konfiguration von Pandora definiert werden.";
 
 $lang_label["begin_date"]="Beginndatum (*)";
 $lang_label["end_date"]="Endedatum (*)";
@@ -264,7 +254,7 @@ $lang_label["resolution"]="Aufl&ouml;sung (%)";
 $lang_label["date_format"]="(*) Bitte geben Sie das Datum im folgenden Format ein: yyyy/mm/dd hh:mm:ss";
 $lang_label["please_wait"]="Bitte, haben Sie Geduld. Diese Operation kann sehr lange dauern (5-10 minutes)";
 
-$lang_label["welcome_title"]="Willkommen auf der Pandora Web Konsole";
+$lang_label["welcome_title"]="Willkommen auf der Pandora FMS Web Konsole";
 $lang_label["incident_view_filter"]="Sicht der Vorf&auml;lle";
 $lang_label["there_are"]="Es gibt ";
 $lang_label["user_defined"]="Nutzer, die in Pandora eingetragen sind";
diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php
index e84e61a5b5..9aba6c7939 100644
--- a/pandora_console/include/languages/language_en.php
+++ b/pandora_console/include/languages/language_en.php
@@ -64,7 +64,7 @@ $lang_label["in_openedby"]="Owner";
 $lang_label["in_openedwhen"]="Opened at";
 $lang_label["updated_at"]="Updated at";
 
-$lang_label["main_text"]="This is the Web Management System for Pandora. From here you can manage its agents, alerts and incidents. Session will be open while activity exists.";
+$lang_label["main_text"]="This is the Web Management System for Pandora FMS. From here you can manage its agents, alerts and incidents. Session is open while activity exists.";
 
 $lang_label["id_user"]="User ID";
 $lang_label["real_name"]="Real name";
@@ -164,7 +164,7 @@ $lang_label["logged_out"]="Logged Out";
 $lang_label["logout_msg"]="Your session is over. Please close your browser window to close session on Pandora.<br><br>";
 $lang_label["user_last_activity"]="This is your last activity in Pandora FMS console";
 $lang_label["err_auth"]="Authentication Error";
-$lang_label["err_auth_msg"]="Either, your password or your login are incorrect. Please check your CAPS LOCK key, username and password are case SeNSiTiVe.<br><br>All actions, included failed login attempts are logged in Pandora System logs, and these can be reviewed by each user, please report to admin any incident or malfunction.";
+$lang_label["err_auth_msg"]="Either, your password or your login are incorrect. Please check your CAPS LOCK key, username and password are case SeNSiTiVe.<br><br>All actions, included failed login attempts are logged in Pandora FMS System logs, and these can be reviewed by each user, please report to admin any incident or malfunction.";
 $lang_label["find_crit"]="Please select a search criterion";
 $lang_label["all"]="All";
 $lang_label["free_text_search"]="Free text for search (*)";
@@ -250,11 +250,6 @@ $lang_label["checked_by"]="Checked by";
 
 $lang_label["disabled"]="Disabled";
 $lang_label["active"]="Active";
-$lang_label["db_description"]="Database is the core of Pandora. In this database resides all the information of the enterprise, for example, all data gathered by agents, all configuration defined by administrator, all events, incidents, audit info... 
-<br><br>
-The performance and reliability of the core is vital for the correct use of Pandora. It's necessary to maintain correctly this Database using the MySQL standard commands.
-<br><br>
-The database size will increase in a linear way. We use a method to reduce the number of event stored in the database without losing the information we need, compacting data when every time configured in Pandora Setup.";
 
 $lang_label["begin_date"]="Begin date (*)";
 $lang_label["end_date"]="End date (*)";
@@ -262,7 +257,7 @@ $lang_label["resolution"]="Resolution (%)";
 $lang_label["date_format"]="(*) Please enter date with format yyyy/mm/dd hh:mm:ss";
 $lang_label["please_wait"]="Please be patient. This operation can be very long in time (5-10 minutes)";
 
-$lang_label["welcome_title"]="Welcome to Pandora Web Console";
+$lang_label["welcome_title"]="Welcome to Pandora FMS Web Console";
 $lang_label["incident_view_filter"]="Viewing incidents";
 $lang_label["there_are"]="There are ";
 $lang_label["user_defined"]="users defined in Pandora";
@@ -351,7 +346,7 @@ $lang_label["config_manage"]="Configuration Management";
 $lang_label["get_info"]="Get Info";
 
 $lang_label["are_you_sure"]="Are you sure?";
-$lang_label["users_msg"]="User profiles in Pandora define which users can access Pandora as well as what each user can do. Groups define elements in common among various users. Each user could be in one or more groups at any one time. Each group has user profiles which are defined and attached to it. A profile is a list of things a user can do, such as view incidents, manage database or other. A list of available profiles is defined below by the local Pandora administrators ";
+$lang_label["users_msg"]="User profiles in Pandora define which users can access Pandora as well as what each user can do. Groups define elements in common among various users. Each user could be in one or more groups at any one time. Each group has user profiles which are defined and attached to it. A profile is a list of things a user can do, such as view incidents, manage database or other. A list of available profiles is defined below by the local Pandora administrators";
 
 $help_label["users_msg1"]="This user has permissions to manage all. This is admin user and overwrites all permissions given in profiles/groups.";
 $help_label["users_msg2"]="This user has separated permissions to view data in his group agents, create incidents belong to his groups, add notes in another incidents, create personal assignments or reviews and other tasks, on different profiles";
@@ -360,7 +355,7 @@ $help_label["db_purge1"]="This button refresh info about database usage among ti
 $help_label["db_purge0"]="Use this combo to select agent for operation. You need to select an agent to purge data and to get info about database usage";
 
 $lang_label["profiles"] ="Profiles";
-$lang_label["current_dbsetup"]="This is your current database maintenance setup";
+$lang_label["current_dbsetup"]="Current database maintenance setup";
 $lang_label["dbsetup_info"]="Please check your Pandora Server setup and be sure that database maintenance daemon is running. It's very important to keep up-to-date database to get the best performance and results in Pandora";
 
 $lang_label["profile_title"]="Profile management";
diff --git a/pandora_console/include/languages/language_es_es.php b/pandora_console/include/languages/language_es_es.php
index f801472d6b..595a0d8695 100644
--- a/pandora_console/include/languages/language_es_es.php
+++ b/pandora_console/include/languages/language_es_es.php
@@ -257,11 +257,6 @@ $lang_label["checked_by"]="Validado por";
 
 $lang_label["disabled"]="Desactivado";
 $lang_label["active"]="Activo";
-$lang_label["db_description"]="La base de datos es el n&uacute;cleo de Pandora . En esta base de datos reside toda la informaci&oacute;n de la empresa, por ejemplo, todos los datos recopilados por los agentes, toda la informaci&oacute;n definida por el administrador, todos los eventos, incidentes o informaci&oacute;n de auditor&iacute;a.
-<br><br>
-El rendimiento y fiabilidad de este n&uacute;cleo es vital para el funcionamiento correcto de Pandora. Es necesario mantener esta Base de Datos utilizando los comandos est&aacute;ndar de MySQL.
-<br><br>
-El tama&ntilde;o de la Base de Datos aumentar&aacute; de manera lineal. Utilizamos un m&eacute;todo de compactaci&oacute;n para reducir el n&uacute;mero de eventos almacenados en la base de datos sin perder la informaci&oacute;n necesaria. Esta compactaci&oacute;n se produce cada cierto tiempo (configurable)."; 
 
 $lang_label["begin_date"]="Fecha comienzo (*)";
 $lang_label["end_date"]="Fecha fin (*)";
diff --git a/pandora_console/include/languages/language_es_la.php b/pandora_console/include/languages/language_es_la.php
index 3bd258ccd2..4ebfaceea6 100644
--- a/pandora_console/include/languages/language_es_la.php
+++ b/pandora_console/include/languages/language_es_la.php
@@ -254,11 +254,6 @@ $lang_label["checked_by"]="Validado por";
 
 $lang_label["disabled"]="Desactivado";
 $lang_label["active"]="Activo";
-$lang_label["db_description"]="La base de datos es el n&uacute;cleo de Pandora . En esta base de datos reside toda la informaci&oacute;n de la empresa, por ejemplo, todos los datos recopilados por los agentes, toda la informaci&oacute;n definida por el administrador, todos los eventos, incidentes o informaci&oacute;n de auditor&iacute;a.
-<br><br>
-El rendimiento y fiabilidad de este n&uacute;cleo es vital para el funcionamiento correcto de Pandora. Es necesario mantener esta Base de Datos utilizando los comandos est&aacute;ndar de MySQL.
-<br><br>
-El tama&ntilde;o de la Base de Datos aumentar&aacute; de manera lineal. Utilizamos un m&eacute;todo de compactaci&oacute;n para reducir el n&uacute;mero de eventos almacenados en la base de datos sin perder la informaci&oacute;n necesaria. Esta compactaci&oacute;n se produce cada cierto tiempo (configurable)."; 
 
 $lang_label["begin_date"]="Fecha comienzo (*)";
 $lang_label["end_date"]="Fecha fin (*)";
diff --git a/pandora_console/include/languages/language_fr.php b/pandora_console/include/languages/language_fr.php
index 419ebf3672..03f6670768 100644
--- a/pandora_console/include/languages/language_fr.php
+++ b/pandora_console/include/languages/language_fr.php
@@ -253,11 +253,6 @@ $lang_label["checked_by"]="Valid&eacute; par";
 
 $lang_label["disabled"]="Desactiv&eacute;";
 $lang_label["active"]="Activ&eacute;";
-$lang_label["db_description"]="La base de donn&eacute;es est le noyau de Pandora . C'est sur cette base de donn&eacute;es qu'est gard&eacute;e tout l'information concernant l'entreprise, par exemlpe, toutes les donn&eacute;es r&eacute;unies par les agents, toute l'information d&eacute;finie par l'administrateur, tous les &eacute;v&eacute;nements, les incidents ou l'information de l'audit.
-<br><br>
-Le rendement et la fiabilit&eacute; de ce noyau est d'une importance vitale pour que Pandora fonctionne correctement. Il est n&eacute;cessaire de entretenir cette Base de Donn&eacute;es en utilisant des commandes standard MySQL.
-<br><br>
-La taille de la Base de Donn&eacute;es augmentera de fa&ccedil;on lin&eacute;aire. Nous utilisons une m&eacute;thode de compression afin de r&eacute;duire le nombre d'&eacute;v&eacute;nements archiv&eacute;s dans la base de donn&eacute;es sans perdre l'information necessaire. Cette compression est lanc&eacute; p&eacute;riodiquement (configurable)."; 
 
 $lang_label["begin_date"]="Date d&eacute;but (*)";
 $lang_label["end_date"]="Date fin (*)";
diff --git a/pandora_console/include/languages/language_gl.php b/pandora_console/include/languages/language_gl.php
index 832d39532f..4c5f7f0fc3 100644
--- a/pandora_console/include/languages/language_gl.php
+++ b/pandora_console/include/languages/language_gl.php
@@ -253,11 +253,6 @@ $lang_label["checked_by"]="Validado por";
 
 $lang_label["disabled"]="Desactivado";
 $lang_label["active"]="Activo";
-$lang_label["db_description"]="A base de datos &eacute; o n&uacute;cleo de Pandora. Nesta base de datos reside toda a informaci&oacute;n da empresa, por exemplo, t&oacute;dolos datos recopilados polos axentes, toda a informaci&oacute;n definida polo administrador, t&oacute;dolos eventos, incidentes ou informaci&oacute;n de auditor&iacute;a.
-<br><br>
-O rendemento e fiabilidade deste n&uacute;cleo &eacute; vital para o funcionamento correcto de Pandora. &Eacute; preciso manter esta Base de Datos empregando os comandos est&aacute;ndar de MySQL.
-<br><br>
-O tama&ntilde;o da base de datos aumentar&aacute; de xeito lineal. Empregamos un m&eacute;todo de compactaci&oacute;n para reducir o n&uacute;mero dos eventos almaceados na base de datos sen perder a informaci&oacute;n necesaria. Esta compactaci&oacute;n producese cada certo tempo (configurable)."; 
 
 $lang_label["begin_date"]="Data comezo (*)";
 $lang_label["end_date"]="Data fin (*)";
diff --git a/pandora_console/include/languages/language_it.php b/pandora_console/include/languages/language_it.php
index ee42ec5f9d..fbb174eb7a 100644
--- a/pandora_console/include/languages/language_it.php
+++ b/pandora_console/include/languages/language_it.php
@@ -226,11 +226,6 @@ $lang_label["total"] = "Totale";
 $lang_label["checked_by"] = "Verificato da";
 $lang_label["disabled"] = "Disabilitato";
 $lang_label["active"] = "Attivo";
-$lang_label["db_description"] = "Il database &agrave; il nucleo di Pandora. In questo database risiedono tutte le informazioni dell'impresa, ad esempio, tutti i dati raccolti dagli agenti; tutte le configurazioni definite dall'amministratore, tutti gli eventi, avvenimenti, informazioni di verifica ...
-<br><br>
-Le prestazioni e l'affidabilit&agrave; del nucleo sono vitali per il corretto uso di Pandora. E' necessario gestire correttamente il Database usando i comandi standard di MySQL.
-<br><br>
-La dimensione del database aumenter&agrave; in modo lineare. Usiamo un metodo per ridurre il numero di eventi registrati nel database senza che vengano perse le informazioni necessarie, compattando i dati ogniqualvolta sia configurato nelle Impostazioni di Pandora";
 $lang_label["begin_date"] = "Data di inizio (*)";
 $lang_label["end_date"] = "Data di fine (*)";
 $lang_label["resolution"] = "Risoluzione (%)";
diff --git a/pandora_console/include/languages/language_pt_br.php b/pandora_console/include/languages/language_pt_br.php
index bbd73605f9..14a7ef6bd5 100644
--- a/pandora_console/include/languages/language_pt_br.php
+++ b/pandora_console/include/languages/language_pt_br.php
@@ -225,11 +225,6 @@ $lang_label["total"] = "Total";
 $lang_label["checked_by"] = "Checado por";
 $lang_label["disabled"] = "Desativado";
 $lang_label["active"] = "Ativo";
-$lang_label["db_description"] = "A base de dados &eacute; o n&uacute;cleo do Pandora. Nesta base de dados residem todas as informa&ccedil;&otilde;es da empresa, por exemplo, todos os dados recompilados pelos agentes, todas as informa&ccedil;&otilde;es definidas pelo administrador, todos os eventos, incidentes ou informa&ccedil;&otilde;es de auditoria.
-<br><br>
-O desempenho e confiabilidade deste n&uacute;cleo s&atilde;o vitais para o funcionamento correto do Pandora. &eacute; necess&aacute;rio manter esta base de dados utilizando os comandos dispon&iacute;veis como padr&atilde;o no MySQL.
-<br><br>
-O tamanho da Base de Dados aumentar&aacute; de maneira linear. Utilizamos um m&eacute;todo de compacta&ccedil;&atilde;o para reduzir o n&uacute;mero de eventos armazenados na base de dados sem perder as informa&ccedil;&otilde;es necess&aacute;rias. Esta compacta&ccedil;&atilde;o ocorre dentro de certos intervalos de tempo. (configur&aacute;vel).";
 $lang_label["begin_date"] = "Data de in&iacute;cio";
 $lang_label["end_date"] = "Data final";
 $lang_label["resolution"] = "Resolu&ccedil;&atilde;o (%)";
diff --git a/pandora_console/include/styles/calendar.css b/pandora_console/include/styles/calendar.css
deleted file mode 100644
index 46c51635bc..0000000000
--- a/pandora_console/include/styles/calendar.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.calendar-month
-{
-font-family: Verdana, sans-serif, Arial, Helvetica;
-color: #5a8629;
-font-weight: bold;
-margin-top: 2px;
-font-size: 12px;
-text-align: center;
-}
-table.calendar th td
-{
-text-align: center;
-}
-table.calendar th
-{
-background-color: #f5f5f5;
-height: 10px;
-color: #103a3a;
-}
\ No newline at end of file
diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css
index ec7ac2abd1..87fe1de103 100644
--- a/pandora_console/include/styles/op.css
+++ b/pandora_console/include/styles/op.css
@@ -12,7 +12,6 @@
 div.menuop {
 	background-color: #e6e9cd;
 	border: 1px solid #dadbdb;
-	/* border: 1px solid #4a6629; */
 	width: 155px;
 	margin-bottom: 5px;
 	}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index a33cc7886a..08cefc3fdf 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -32,7 +32,7 @@
 	font-size: 8pt;
 }
 body {
-	margin-top: 0;
+	text-align: center;
 }
 input, textarea {
 	border: 1px solid #ddd;
@@ -43,7 +43,7 @@ textarea {
 	padding: 5px;
 	height: 100px;
 	font-family: verdana, sans-serif;
-        font-size: 8pt;
+	font-size: 8pt;
 }
 input {
 	padding: 2px 3px 4px 3px;
@@ -60,7 +60,7 @@ select {
 	padding: 0px;
 	border:1px solid #ddd;
 	font-family: verdana, sans-serif;
-        font-size: 8pt;
+	font-size: 8pt;
 }
 checkbox {
 	padding: 4px;
@@ -69,19 +69,19 @@ checkbox {
 h1, h2, h3 {
 	font: bold 1em Arial, Sans-serif;
 	text-transform: uppercase;
-	color: #778855;
+	color: #786;
 	padding-bottom: 5px;
 	padding-top: 7px;
 }
-h3 {
-	font-size: 13px;
-}
 h1 {
 	font-size: 16px;
 }
 h2 {
 	font-size: 15px;
 }
+h3 {
+	font-size: 13px;
+}
 a {
 	color: #486787;
 	text-decoration: none;
@@ -91,54 +91,43 @@ a:hover {
 	text-decoration: underline;
 }
 a.white_bold {
-	color: #eeeeee;
+	color: #eee;
 	text-decoration: none;
 	font-weight: bold;
 }
 a.white {
-	color: #eeeeee;
+	color: #eee;
 	text-decoration: none;
 }
 p.center {
 	text-align: center;
 }
 h1#log {
-	border-bottom: 1px solid #778866;
-	padding-bottom: 3px;
-	margin-top: 5em;
-	width: 29em;
-	text-align: left;
+	font-size: 18px;
+	margin-bottom: 0px;
+	color: #000;	
 }
-h1#log_f, h1#db_fh1  {
-	color: #ff0000;
-	border-bottom: 1px solid #ff0000;
+h1#log_f {
+	color: #f00;
+	border-bottom: 1px solid #f00;
 	padding-bottom: 3px;
 }
 div#login {
-	text-align: left;
-	border: 1px solid #999999;
-	margin-top: 2em;
-	margin-bottom: -1em;
-	padding: 0.5em;
-	width: 40em;
-	background: url(../../images/backgrounds/background10.jpg);
+	margin: 0 auto;
+	margin-top: 200px;
+	width: 460px;
+	border-left: solid 1px #000;
+	border-top: solid 1px #000;
+	border-bottom: solid 2px #000;
+	border-right: solid 2px #000
+}
+div#login_in, #login_f {
+	margin: 0 auto;
+	width: 400px;
 }
 div#login_f {
-	text-align: left;
-	margin: auto;
-	padding: 0.5em;
-	width: 48em;
-	margin-top: 5em;
-}
-div#login_box {
-	float: right;
-	padding-right: 10px;
-	margin-top: 25px;
-	width: 140px;
-}
-div#logo_box {
-	margin-top: 25px;
-	padding-left: 5px;
+	margin-top: 10px;
+	margin-bottom: 25px;
 }
 div#noaccess {
 	width: 350px;
@@ -164,11 +153,21 @@ div#db_ftxt {
 	float: right;
 	padding-top: 10px;
 }
+div#container {
+	margin: 0 auto;
+	width: 960px;
+	text-align: left;
+	border-left: solid 2px #000;
+	border-right: solid 2px #000;
+	border-top: solid 2px #000;
+	margin-top: 5px;
+}
 div#page {
 	width: 960px;
 	background: #fff;
 	clear: both;
-	border-bottom: solid 5px #778855;
+	border-bottom: solid 5px #786;
+	border-top: solid 5px #786;
 }
 div#main {
 	width: 780px;
@@ -194,6 +193,7 @@ div#head {
 	width: 960px;
 	height: 60px;
 	background: url(../../images/header.jpg);
+	border-bottom: solid 2px #555;
 }
 div#foot {
 	font-size: 7pt;
@@ -210,7 +210,7 @@ div#foot {
 }
 #ip {
 	margin-top: 10px;
-	clear: both;
+	margin-bottom: 5px;
 }
 label {
 	display: block;
@@ -234,7 +234,7 @@ input.datos_readonly {
 	background-color: #050505;
 }
 input.login {
-	border-color: #778866;
+	border-color: #786;
 	background-color: #f5f5f5;
 	margin: 2px 0 8px;
 	width: 90px;
@@ -265,14 +265,9 @@ input.delete {
 table, img {
 	border: 0px;
 }
-th, td.lb {
+th, td.lb, td.lb_view {
 	color: #fff;
-	background-color: #778866;
-}
-td.lb_view {
-	color: #fff;
-	/*background-color: #7ba04a;*/
-	background-color: #778866;
+	background-color: #786;
 }
 td.lb, td.lb_view {
 	height: 16px;
@@ -286,7 +281,6 @@ td.datos2, td.datos2t, td.datos2b, td.datos2_id , td.datos2f9 {
 	background-color: #efefef; 
 }
 td.datos3 {
-	/*background-color: #a7b896;*/
 	background-color: #d4ddc6;
 }
 td.datos_id {
@@ -295,8 +289,8 @@ td.datos_id {
 td.datos_jus, td.datos2_jus {
 	text-align: justify;
 }
-.bg , .bgt { /* op menu */
-	background-color: #778855;
+.bg  { /* op menu */
+	background-color: #786;
 }
 .bg2 { /* main page */
 	background-color: #d84437;
@@ -365,7 +359,7 @@ td.datos_jus, td.datos2_jus {
 	font-weight: bold;
 }
 .raya {
-	border-top: 1px solid #778866;
+	border-top: 1px solid #786;
 	width: 100%;
 }
 .raya, .noraya {
@@ -404,12 +398,6 @@ td.datos_jus, td.datos2_jus {
 	margin-top: 15px;
 	text-align: justify;
 }
-.mr40 {
-	margin-right: 40px;
-}
-.mt35 {
-	margin-top: 35px;
-}
 ul.mn {
 	list-style: none;
 	padding: 0px 0px 0px 0px;
@@ -492,8 +480,7 @@ div.title_line {
 	float: left;
 	position: relative;
 }
-#menu_tab_left li a, #menu_tab_left li.nomn a {
-	background: #ac4444;
+#menu_tab_left li a {
 	background: #d84437;
 	padding: 2px 10px 2px 10px;
 	color: #fff;
@@ -504,6 +491,13 @@ div.title_line {
 	display: block;
 	text-decoration: none;
 }
+#menu_tab_left li.view a {
+	background: #6a4;
+	padding: 2px 10px 2px 10px;
+	color: #fff;
+	font-weight: bold;
+	line-height: 18px;
+}
 span.users {
 	background: url(../../images/group.png) no-repeat;
 }
@@ -552,7 +546,7 @@ span.master, span.snmp, span.binary, span.recon {
 	background-color: #fafafa;
 }
 .databox_color {
-	border-left: 4px solid #778855;
+	border-left: 4px solid #786;
 }
 #head_l {
 	float: left;
diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css
index 35e98ea426..90c57baa43 100644
--- a/pandora_console/include/styles/tip.css
+++ b/pandora_console/include/styles/tip.css
@@ -13,6 +13,7 @@ a.help {
 	background: url(../../images/help.gif) no-repeat;
 	padding: 2px 2px 2px 12px;
 	left: 5px;
+	text-transform: capitalize;
 }
 a.info {
 	padding: 25px 0px 0px 0px;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 51606c30ba..e170c94bbf 100644
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -96,7 +96,7 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){
 <meta name="keywords" content="pandora, monitoring, system, GPL, software">
 <meta name="robots" content="index, follow">
 <link rel="icon" href="images/pandora.ico" type="image/ico">
-<?PHP
+<?php
 // Pandora FMS 1.3 custom style selection
 	echo '<link rel="stylesheet" href="include/styles/'.$config_style.'.css" type="text/css">';
 ?>
@@ -106,7 +106,7 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){
 
 <?php
 	// Show custom background
-	echo '<body bgcolor=#555555>';
+	echo '<body bgcolor="#555555">';
 	$REMOTE_ADDR = getenv ("REMOTE_ADDR");
    	global $REMOTE_ADDR;
 
@@ -191,32 +191,32 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){
 	session_write_close(); 
 ?>
 
-<div style='border-left: solid 2px #000; width: 960px; border-right: solid 2px #000; border-top: solid 2px #000; margin-top: 5px;'>  
-<div id='head' style='border-bottom: solid 2px #555;'>
-	<?php require("general/header.php"); ?>
-</div>
-<div id="page" style='border-top: solid 5px #778855;'>
-	<div id="menu">
-		<?php require ("general/main_menu.php"); ?>
+<div id="container">  
+	<div id='head'>
+		<?php require("general/header.php"); ?>
 	</div>
-	<div id="main" style="background: url(images/backgrounds/<?php echo $config_bgimage; ?>)" >
-		<?php
-			// Page loader / selector
-			if ($pagina != ""){
-				if (file_exists ($pagina . ".php")) {
-					require ($pagina . ".php");
-				} else {
-					echo "<br><b class='error'>Sorry! I can't find the page!</b>";
-				}	
-			} else
-				require ("general/logon_ok.php");  //default
-		?>
+	<div id="page">
+		<div id="menu">
+			<?php require ("general/main_menu.php"); ?>
+		</div>
+		<div id="main" style="background: url(images/backgrounds/<?php echo $config_bgimage; ?>)" >
+			<?php
+				// Page loader / selector
+				if ($pagina != ""){
+					if (file_exists ($pagina . ".php")) {
+						require ($pagina . ".php");
+					} else {
+						echo "<br><b class='error'>Sorry! I can't find the page!</b>";
+					}	
+				} else
+					require ("general/logon_ok.php");  //default
+			?>
+		</div>
+		<div style="clear:both"></div>
+	</div>
+	<div id="foot">
+		<?php require("general/footer.php") ?>
 	</div>
-	<div style="clear:both"></div>
-</div>
-<div id="foot">
-	<?php require("general/footer.php") ?>
-</div>
 </div>
 
 </body>
diff --git a/pandora_console/install.php b/pandora_console/install.php
index ddf51e3eb9..6390866a81 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -146,7 +146,7 @@ function random_name ($size){
 
 function install_step1() {
 	echo "
-	<div align='center' class='mt35'>
+	<div align='center' style='margin-top: 35px;'>
 	<h1>Pandora FMS installation wizard. Step #1 of 4</h1>
 	<div id='wizard' style='height: 300px;'>
 		<div id='install_box'>
@@ -181,7 +181,7 @@ function install_step1() {
 
 function install_step2() {
 	echo "
-	<div align='center' class='mt35'>
+	<div align='center' style='margin-top: 35px'>
 	<h1>Pandora FMS console installation wizard. Step #2 of 4</h1>
 	<div id='wizard' style='height: 300px;'>
 		<div id='install_box'>";
@@ -225,7 +225,7 @@ function install_step2() {
 
 function install_step3() {
 	echo "
-	<div align='center' class='mt35'>
+	<div align='center' style='margin-top: 35px'>
 	<h1>Pandora FMS console installation wizard. Step #3 of 4 </h1>
 	<div id='wizard' style='height: 580px;'>
 		<div id='install_box'>
@@ -308,7 +308,7 @@ function install_step4() {
 	$step3=0;
 	$step4=0; $step5=0; $step6=0; $step7=0;
 	echo "
-	<div align='center' class='mt35'>
+	<div align='center' style='margin-top: 35px'>
 	<h1>Pandora FMS Console installation wizard. Step #4 of 4</h1>
 	<div id='wizard' style='height: 300px;'>
 		<div id='install_box'>
@@ -397,7 +397,7 @@ $BASE_URL="'.$url.'";			// Base URL
 
 function install_step5() {
 	echo "
-	<div align='center' class='mt35'>
+	<div align='center' style='margin-top: 35px'>
 	<h1>Pandora FMS console installation wizard. Finished</h1>
 	<div id='wizard' style='height: 300px;'>
 		<div id='install_box'>
diff --git a/pandora_console/operation/agentes/estadisticas.php b/pandora_console/operation/agentes/estadisticas.php
index 2b9072bbb6..7e59294604 100644
--- a/pandora_console/operation/agentes/estadisticas.php
+++ b/pandora_console/operation/agentes/estadisticas.php
@@ -11,8 +11,8 @@ require("include/config.php");
 if (comprueba_login() == 0){ 
 	$iduser_temp=$_SESSION['id_usuario'];
 	if (give_acl($iduser_temp, 0, "AR") == 1){
-		echo "<h2>".$lang_label["ag_title"]."</h2>";
-		echo "<h3>".$lang_label["db_stat_agent"]."<a href='help/".$help_code."/chap3.php#337' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["ag_title"]." &gt; ";
+		echo $lang_label["db_stat_agent"]."<a href='help/".$help_code."/chap3.php#337' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 		echo "<table border=0>";
 		echo "<tr><td><img src='reporting/fgraph.php?tipo=db_agente_modulo'><br>";
 		echo "<tr><td><br>";
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index dd2194dc03..d686379b1d 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -206,7 +206,7 @@ if (comprueba_login() == 0) {
 					echo "<a href='index.php?sec=gagente&amp;
 					sec2=godmode/agentes/configurar_agente&amp;
 					id_agente=".$id_agente."'>
-					<img src='images/setup.gif' border=0 width=16></a>";
+					<img src='images/setup.png' border=0 width=16></a>";
 				}
 				echo "&nbsp;<a href='index.php?sec=estado&amp;
 				sec2=operation/agentes/ver_agente&amp;id_agente=".$id_agente."'>
diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php
index 19ca67cc7a..50d2ccdb5e 100644
--- a/pandora_console/operation/agentes/estado_alertas.php
+++ b/pandora_console/operation/agentes/estado_alertas.php
@@ -46,7 +46,14 @@ if (isset($_GET["id_agente"])){
 	$query_gen='SELECT talerta_agente_modulo.alert_text, talerta_agente_modulo.id_alerta, talerta_agente_modulo.descripcion, talerta_agente_modulo.last_fired, talerta_agente_modulo.times_fired, tagente_modulo.nombre, talerta_agente_modulo.dis_max, talerta_agente_modulo.dis_min, talerta_agente_modulo.max_alerts, talerta_agente_modulo.time_threshold, talerta_agente_modulo.min_alerts, talerta_agente_modulo.id_agente_modulo, tagente_modulo.id_agente_modulo FROM tagente_modulo, talerta_agente_modulo WHERE tagente_modulo.id_agente = '.$id_agente.' AND tagente_modulo.id_agente_modulo = talerta_agente_modulo.id_agente_modulo ORDER BY tagente_modulo.nombre';
 	if ($result_gen=mysql_query($query_gen)){
 		echo "<table cellpadding='4' cellspacing='4' width=750 border=0 class='databox'>";
-		echo "<tr><th>".$lang_label["type"]."<th>".$lang_label["name"]."</th><th>".$lang_label["description"]."</th><th>".$lang_label["min_max"]."</th><th>".$lang_label["time_threshold"]."</th><th>".$lang_label["last_fired"]."</th><th>".$lang_label["times_fired"]."</th><th>".$lang_label["status"]."</th>";
+		echo "<tr>
+		<th>".$lang_label["type"]."<th>".$lang_label["name"]."</th>
+		<th>".$lang_label["description"]."</th>
+		<th>".$lang_label["min_max"]."</th>
+		<th>".$lang_label["time_threshold"]."</th>
+		<th>".$lang_label["last_fired"]."</th>
+		<th>".$lang_label["times_fired"]."</th>
+		<th>".$lang_label["status"]."</th>";
 		$color=1;
 		while ($data=mysql_fetch_array($result_gen)){
 			if ($color == 1){
@@ -102,8 +109,8 @@ if (isset($_GET["id_agente"])){
 	// SHOW ALL ALERTS (GENERAL PAGE)
 	// -------------------------------
 
-	echo "<h2>".$lang_label["ag_title"]."</h2>";
-	echo "<h3>".$lang_label["alert_listing"]."<a href='help/".$help_code."/chap3.php#335' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["ag_title"]." &gt; ";
+	echo $lang_label["alert_listing"]."<a href='help/".$help_code."/chap3.php#335' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	$iduser_temp=$_SESSION['id_usuario'];
 	if (isset($_POST["ag_group"]))
 		$ag_group = $_POST["ag_group"];
diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php
index 5c899e5c28..71ff77369c 100644
--- a/pandora_console/operation/agentes/exportdata.php
+++ b/pandora_console/operation/agentes/exportdata.php
@@ -53,9 +53,9 @@ function generate_average_table ($id_de_mi_agente, $id_agente_modulo, $fecha_ini
 	
 	// Table header
 	echo "<table border=0 cellpadding=4 cellspacing=4 width=600 class='databox'>";
-	echo "<tbody><TR><TH ROWSPAN=\"2\">".$lang_label["hour"]."</TH>";
-	echo "<TH COLSPAN=\"7\">".$lang_label["day"]."</TH></TR>";
-	echo "<TR>";
+	echo "<tbody><tr><th rowspan=\"2\">".$lang_label["hour"]."</th>";
+	echo "<th colspan=\"7\">".$lang_label["day"]."</Th></tr>";
+	echo "<tr>";
 	for ($dia=0;$dia<7;++$dia)
 		echo "<th>".$dias_de_la_semana[$dia]."</th>";
 	echo "</tr>";
@@ -106,7 +106,8 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){
 		$export_type = 3; // Standard table;
 
 	if ($export_type == 1) { // CSV
-		echo "<h3>".$lang_label["export_title"]."<a href='help/".$help_code."/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["ag_title"]." &gt; ";
+		echo $lang_label["export_title"]."<a href='help/".$help_code."/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 		if (isset ($_POST["origen_modulo"])){
 			$origen = $_POST["origen"];
@@ -145,7 +146,8 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){
 			$to_date = $end_date." ".$end_time;
 
 			// Header
-			echo "<h3>".$lang_label["export_title"]."<a href='help/".$help_code."/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+			echo "<h2>".$lang_label["ag_title"]." &gt; ";
+			echo $lang_label["export_title"]."<a href='help/".$help_code."/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 			echo $lang_label["db_agent_bra"]. "<b>" . dame_nombre_agente($origen). "-  $agentmodule_name</b>". $lang_label["from2"]. "<b>". $from_date. "</b>". $lang_label["to2"]. "<b>". $to_date. "</b><br>";
 			echo "<br>";
 
@@ -161,7 +163,8 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){
 	}
 	
 	if ($export_type == 3) { // Standard table
-		echo "<h3>".$lang_label["export_title"]."<a href='help/".$help_code."/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["ag_title"]." &gt; ";
+		echo $lang_label["export_title"]."<a href='help/".$help_code."/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 		if (isset ($_POST["origen_modulo"])){
 			$origen = $_POST["origen"];
 			if (give_acl($id_user,dame_id_grupo($origen),"AR")!=1) {
@@ -238,8 +241,8 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){
 			$date_to = $ahora;
 		
 
-	echo "<h2>".$lang_label["ag_title"]."</h2>";
-	echo "<h3>".$lang_label["export_data"]."<a href='help/$help_code/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["ag_title"]." &gt; ";
+	echo $lang_label["export_data"]."<a href='help/$help_code/chap3.php#336' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	echo '<form method="post" action="index.php?sec=estado&sec2=operation/agentes/exportdata" name="export_form">';
 	echo '<table width=550 border=0 cellspacing=3 cellpadding=5 class=databox>';
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 5b9da605ff..d7fb599d96 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -21,9 +21,9 @@ require("include/config.php");
 if (comprueba_login() == 0) {
  	if ((give_acl($id_user, 0, "AR")==1) or (give_acl($id_user,0,"AW")) or (dame_admin($id_user)==1)) {
 	
-	echo "<h2>".$lang_label["ag_title"]."</h2>";
-	echo "<h3>".$lang_label["monitor_listing"]."<a href='help/".$help_code."/chap3.php#334' target='_help' class='help'>
-	&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>".$lang_label["ag_title"]." &gt; ";
+	echo $lang_label["monitor_listing"]."<a href='help/".$help_code."/chap3.php#334' target='_help' class='help'>
+	&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	
 
 	if (isset($_POST["ag_group"]))
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 97e7212159..af7a904e30 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -48,10 +48,9 @@ if (comprueba_login() == 0) {
 			if (give_acl($id_usuario,$id_grupo, "AR") == 1){
 
 				echo "<div id='menu_tab_left'>
-				<ul class='mn'>	
-				<li class='nomn'>";
-				echo "<li class='nomn'>";
-				echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente'><img src='images/bricks.png' class='top' border=0>&nbsp; ".dame_nombre_agente($id_agente)." - ".$lang_label["view_mode"]."</a>";
+				<ul class='mn'>
+				<li class='view'>
+				<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente'><img src='images/bricks.png' class='top' border=0>&nbsp; ".dame_nombre_agente($id_agente)." - ".$lang_label["view_mode"]."</a>";
 				echo "</li>";
 				echo "</ul></div>";
 
@@ -63,7 +62,7 @@ if (comprueba_login() == 0) {
 				echo "<div id='menu_tab'><ul class='mn'>";
 				if (give_acl($id_usuario,$id_grupo, "AW") == 1){
 					// Manage agent
-					echo "<li class='nomn'><a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente'><img src='images/setup.gif' width='16' class='top' border=0> ".$lang_label["Manage"]." </a>";
+					echo "<li class='nomn'><a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente'><img src='images/setup.png' width='16' class='top' border=0> ".$lang_label["Manage"]." </a>";
 					echo "</li>";
 				}
 				// Main view
diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php
index 3ff80ce251..738fb8d91d 100644
--- a/pandora_console/operation/events/event_statistics.php
+++ b/pandora_console/operation/events/event_statistics.php
@@ -23,8 +23,8 @@ require("include/config.php");
 if (comprueba_login() == 0) {
 	$id_usuario =$_SESSION["id_usuario"];
         if (give_acl($id_usuario, 0, "AR")==1) {
-		echo "<h2>".$lang_label["events"]."</h2>";
-		echo "<h3>".$lang_label["event_statistics"]."<a href='help/".$help_code."/chap5.php#51' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["events"]." &gt; ";
+		echo $lang_label["event_statistics"]."<a href='help/".$help_code."/chap5.php#51' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 		echo '<img src="reporting/fgraph.php?tipo=total_events" border=0>';
 		echo "<br><br>";
 		echo '<img src="reporting/fgraph.php?tipo=user_events" border=0>';
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index a8dafd1650..d735dc5e9e 100644
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -186,10 +186,10 @@ $sql1_count="SELECT COUNT(id_incidencia) FROM tincidencia ".$sql1;
 $sql1=$sql0;
 $sql1=$sql1." LIMIT $offset, $block_size";
 
-echo "<h2>".$lang_label["incident_manag"]."</h2>";
-echo "<h3>".$lang_label["manage_incidents"]."<a href='help/".$help_code."/chap4.php#4' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+echo "<h2>".$lang_label["incident_manag"]." &gt; ";
+echo $lang_label["manage_incidents"]."<a href='help/".$help_code."/chap4.php#4' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 if (isset($_POST['operacion'])){
-	echo "<h3>".$lang_label["incident_view_filter"]." - ".$_POST['operacion']."</h3>";
+	echo $lang_label["incident_view_filter"]." - ".$_POST['operacion']."</h2>";
 }
 
 ?>
diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php
index 0de9df9d76..2fe294fc48 100644
--- a/pandora_console/operation/incidents/incident_detail.php
+++ b/pandora_console/operation/incidents/incident_detail.php
@@ -102,7 +102,9 @@ if (isset($_GET["id"])){
 			//echo "DEBUG: DELETING NOTE: ".$query."(----)".$query2;
 			mysql_query($query);
 			mysql_query($query2);
-			if (mysql_query($query)) echo "<h3 class='suc'>".$lang_label["del_note_ok"];
+			if (mysql_query($query)) {
+				echo "<h3 class='suc'>".$lang_label["del_note_ok"];
+			}
 		}
 	}
 
@@ -194,11 +196,11 @@ else
 if (isset($id_inc)) {
 	echo "<input type='hidden' name='id_inc' value='".$id_inc."'>";
 }
-echo "<h2>".$lang_label["incident_manag"]."</h2>";
+echo "<h2>".$lang_label["incident_manag"]." &gt; ";
 if (isset($id_inc)) {
-	echo "<h3>".$lang_label["rev_incident"]." # ".$id_inc." <a href='help/".$help_code."/chap4.php#42' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo $lang_label["rev_incident"]." # ".$id_inc." <a href='help/".$help_code."/chap4.php#42' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 } else {
-	echo "<h3>".$lang_label["create_incident"]."<a href='help/".$help_code."/chap4.php#41' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo $lang_label["create_incident"]."<a href='help/".$help_code."/chap4.php#41' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 }
 echo '<table cellpadding=3 cellspacing=3 border=0 width=600>';
 if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp))
diff --git a/pandora_console/operation/incidents/incident_search.php b/pandora_console/operation/incidents/incident_search.php
index 8ca8fe03fd..f406681f13 100644
--- a/pandora_console/operation/incidents/incident_search.php
+++ b/pandora_console/operation/incidents/incident_search.php
@@ -23,8 +23,8 @@ require("include/config.php");
 
 if (comprueba_login() == 0) {
 
-echo "<h2>".$lang_label["incident_manag"]."</h2>";
-echo "<h3>".$lang_label["find_crit"]." <a href='help/".$help_code."/chap4.php#43' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+echo "<h2>".$lang_label["incident_manag"]." &gt; ";
+echo $lang_label["find_crit"]." <a href='help/".$help_code."/chap4.php#43' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 echo "<div style='width:645'>";
 echo "<div style='float:right;'><img src='images/pulpo_lupa.gif' class='bot' align='left'></div>";	
 ?>
diff --git a/pandora_console/operation/incidents/incident_statistics.php b/pandora_console/operation/incidents/incident_statistics.php
index 90b1a4f904..01e29fcdb9 100644
--- a/pandora_console/operation/incidents/incident_statistics.php
+++ b/pandora_console/operation/incidents/incident_statistics.php
@@ -24,8 +24,8 @@ require("include/config.php");
 if (comprueba_login() == 0) {
 	$iduser=$_SESSION['id_usuario'];
 	if (give_acl($id_user, 0, "IR")==1) {	
-		echo "<h2>".$lang_label["incident_manag"]."</h2>";
-		echo "<h3>".$lang_label["statistics"]."<a href='help/".$help_code."/chap4.php#44' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["incident_manag"]." &gt; ";
+		echo $lang_label["statistics"]."<a href='help/".$help_code."/chap4.php#44' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 ?>
 <img src="reporting/fgraph.php?tipo=estado_incidente" border=0>
 <br><br>
diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php
index c4b4272507..2a487daff5 100644
--- a/pandora_console/operation/messages/message.php
+++ b/pandora_console/operation/messages/message.php
@@ -28,9 +28,12 @@ function create_message($usuario_origen, $usuario_destino, $subject, $mensaje){
 	INSERT INTO tmensajes (id_usuario_origen, id_usuario_destino, subject, mensaje, timestamp)
 	VALUES ("'.$usuario_origen.'", "'.$usuario_destino.'", "'.$subject.'", "'.$mensaje.'","'.$ahora.'")';
 	$result=mysql_query($sql);
-	if ($result) echo "<h3 class='suc'>".$lang_label["message_ok"]."</h3>";
-	else echo "<h3 class='error'>".$lang_label["message_no"]."</h3>";
+	if ($result) {
+		echo "<h3 class='suc'>".$lang_label["message_ok"]."</h3>";
+	} else {
+		echo "<h3 class='error'>".$lang_label["message_no"]."</h3>";
 	}
+}
 
 function create_message_g($usuario_origen, $usuario_destino, $subject, $mensaje){
 	$ahora=date("Y/m/d H:i:s");
@@ -38,10 +41,13 @@ function create_message_g($usuario_origen, $usuario_destino, $subject, $mensaje)
 	require ("include/languages/language_".$language_code.".php");
 	$sql='INSERT INTO tmensajes (id_usuario_origen, id_usuario_destino, subject, mensaje, timestamp) VALUES ("'.$usuario_origen.'", "'.$usuario_destino.'", "'.$subject.'", "'.$mensaje.'","'.$ahora.'")';
 	$result=mysql_query($sql);
-	if ($result) $error=0;
-	else $error=1;
-	return $error;
+	if ($result)  {
+		$error=0;
+	} else {
+		$error=1;
 	}
+	return $error;
+}
 
 //First Queries
 $iduser=$_SESSION['id_usuario'];
@@ -53,7 +59,7 @@ $row2=mysql_fetch_array($resultado2);
 $sql3='SELECT * FROM tgrupo';
 $resultado3=mysql_query($sql3);
 	
-echo '<h1>'.$lang_label["messages"].'</h1>';
+echo '<h2>'.$lang_label["messages"].' &gt; ';
 if (isset($_GET["nuevo_mensaje"])){
 	// Create message
 	$usuario_destino = entrada_limpia($_POST["u_destino"]);
@@ -74,15 +80,19 @@ if (isset($_GET["nuevo_mensaje_g"])){
 		while ($row=mysql_fetch_array($result)){
 			$error=create_message_g($iduser, $row["id_usuario"], $subject, $mensaje);
 		}
-		if ($error==0) echo "<h3 class='suc'>".$lang_label["message_ok"]."</h3>";
-		else echo "<h3 class='error'>".$lang_label["message_no"]."</h3>";
+		if ($error==0)  {
+			echo "<h3 class='suc'>".$lang_label["message_ok"]."</h3>";
+		} else {
+			echo "<h3 class='error'>".$lang_label["message_no"]."</h3>";
+		}
+	} else {
+		echo "<h3 class='error'>".$lang_label["message_no"]."</h3>";
 	}
-	else {echo "<h3 class='error'>".$lang_label["message_no"]."</h3>";}
 }
 if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 	if (isset($_GET["nuevo"])){ //create message
 	
-		echo '<h3>'.$lang_label["new_message"].'<a href="help/'.$help_code.'/chap2.php#25" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h3>';
+		echo  $lang_label["new_message"].'<a href="help/'.$help_code.'/chap2.php#25" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h2>';
 		echo '
 		<form name="new_mes" method="POST" action="index.php?sec=messages&sec2=operation/messages/message&nuevo_mensaje=1">
 		<table>
@@ -116,7 +126,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
 	}
 	
 	if (isset($_GET["nuevo_g"])){
-		echo '<h3>'.$lang_label["new_message_g"].'<a href="help/'.$help_code.'/chap2.php#251" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h3>';
+		echo $lang_label["new_message_g"].'<a href="help/'.$help_code.'/chap2.php#251" target="_help" class="help">&nbsp;<span>'.$lang_label["help"].'</span></a></h2>';
 		echo '
 		<form name="new_mes" method="post" action="index.php?sec=messages&sec2=operation/messages/message&nuevo_mensaje_g=1">
 		<table>
@@ -143,13 +153,16 @@ else {
 		$id_mensaje = $_GET["id_mensaje"];
 		$sql5='DELETE FROM tmensajes WHERE id_usuario_destino="'.$iduser.'" AND id_mensaje="'.$id_mensaje.'"';
 		$resultado5=mysql_query($sql5);
-		if ($resultado5) {echo "<h3 class='suc'>".$lang_label["del_message_ok"]."</h3>";}
-		else {echo "<h3 class='suc'>".$lang_label["del_message_no"]."</h3>";}
+		if ($resultado5) {
+			echo "<h3 class='suc'>".$lang_label["del_message_ok"]."</h3>";
+		} else {
+			echo "<h3 class='suc'>".$lang_label["del_message_no"]."</h3>";
+		}
 	}
 	
 	//List
 	
-	echo "<h3>".$lang_label["read_mes"]."<a href='help/".$help_code."/chap2.php#25' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo  $lang_label["read_mes"]."<a href='help/".$help_code."/chap2.php#25' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 	if ($row2["COUNT(*)"]!=0){
 		echo $lang_label["new_message_bra"]."<b> ".$row2["COUNT(*)"]."</b> <img src='images/mail.gif'>".$lang_label["new_message_ket"]."<br><br>";
 		}
diff --git a/pandora_console/operation/reporting/graph_builder.php b/pandora_console/operation/reporting/graph_builder.php
index ea04e24b3b..ae6243c284 100644
--- a/pandora_console/operation/reporting/graph_builder.php
+++ b/pandora_console/operation/reporting/graph_builder.php
@@ -187,9 +187,9 @@ if (! isset($_GET["delete_module"])){
 	}
 }
 
-
+	echo "<h2>".$lang_label["reporting"]." &gt; ";
 if (isset($chunk1)) {
-	echo "<h3>".$lang_label["graph_builder_modulelist"]."</h3>";
+	echo $lang_label["graph_builder_modulelist"]."</h2>";
 	echo "<form method='post' action='index.php?sec=reporting&sec2=operation/reporting/graph_builder&delete_module=1'>";
 	if (isset($chunkdata))
 		echo "<input type='hidden' name='chunk' value='$chunkdata'>";
@@ -228,10 +228,10 @@ if (isset($chunk1)) {
 // --------------------------------------
 if (($render == 1) && (isset($modules))) {
 	// parse chunk
-	echo "<h3>".$lang_label["combined_image"]."</h3>";
+	echo $lang_label["combined_image"]."</h2>";
 	echo "<table class='databox_frame'>";
 	echo "<tr><td>";
-	echo "<img  src='reporting/fgraph.php?tipo=combined&id=$modules&weight_l=$weights&label=Combined%20Sample%20Graph&height=$height&width=$width&period=$period' border=1 alt=''>";
+	echo "<img src='reporting/fgraph.php?tipo=combined&id=$modules&weight_l=$weights&label=Combined%20Sample%20Graph&height=$height&width=$width&period=$period' border=1 alt=''>";
 	echo "</td></tr></table>";
 
 }
@@ -239,7 +239,7 @@ if (($render == 1) && (isset($modules))) {
 // -----------------------
 // SOURCE AGENT TABLE/FORM
 // -----------------------
-echo "<h3>".$lang_label["graph_builder"]."</h3>";
+echo $lang_label["graph_builder"]."</h2>";
 echo "<table width='500' cellpadding=4 cellpadding=4 class='databox_frame'>";
 echo "<form method='post' action='index.php?sec=reporting&sec2=operation/reporting/graph_builder&get_agent=1'>";
 echo "<tr>";
diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php
index bb64c593d7..5833b4c88c 100644
--- a/pandora_console/operation/reporting/graph_viewer.php
+++ b/pandora_console/operation/reporting/graph_viewer.php
@@ -61,8 +61,8 @@ if (isset($_GET["view_graph"])){
 				$weights = $weights.",".$weight;
 			}
 		}
-
-		echo "<h3>".$lang_label["combined_image"]."</h3>";
+		echo "<h2>".$lang_label["reporting"]." &gt; ";
+		echo $lang_label["combined_image"]."</h2>";
 		echo "<table class='databox_frame'>";
 		echo "<tr><td>";
 		echo "<img  src='reporting/fgraph.php?tipo=combined&id=$modules&weight_l=$weights&label=$name&height=$height&width=$width&period=$period' border=1 alt=''>";
@@ -119,8 +119,8 @@ if (isset($_GET["view_graph"])){
 		echo "</form>";		
 	}
 }
-
-echo "<h3>".$lang_label["custom_graph_viewer"]."</h3>";
+echo "<h2>".$lang_label["reporting"]." &gt; ";
+echo  $lang_label["custom_graph_viewer"]."</h2>";
 echo "<table width='500' cellpadding=4 cellpadding=4 class='databox_frame'>";
 echo "<tr><th>".$lang_label["graph_name"]."<th>".$lang_label["description"]."<th>".$lang_label["view"];
 $color=1;
diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php
index e13115e24f..6a2eee67d4 100644
--- a/pandora_console/operation/servers/view_server.php
+++ b/pandora_console/operation/servers/view_server.php
@@ -29,7 +29,7 @@ if (comprueba_login() == 0) {
 
 	$sql='SELECT * FROM tserver';
 	
-	echo "<h2>".$lang_label["view_servers"]." -&gt; ";
+	echo "<h2>".$lang_label["view_servers"]." &gt; ";
 	echo $lang_label["server_detail"]." <a href='help/".$help_code."/chap7.php#7' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	// Get total modules defined (network)
diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/operation/snmpconsole/snmp_alert.php
index 78e838d70b..8e18f2191d 100644
--- a/pandora_console/operation/snmpconsole/snmp_alert.php
+++ b/pandora_console/operation/snmpconsole/snmp_alert.php
@@ -118,13 +118,13 @@ if (give_acl($id_user, 0, "LW")==1) {
 	if (isset($_POST["add_alert"])){
 		$alert_add = 1;
 	}
-	echo "<h2>Pandora SNMP</h2>";
+	echo "<h2>Pandora SNMP &gt; ";
 	// Add alert form
 	if (($alert_update != 0) || ($alert_add == 1)) {
 	
 		echo '<form name="agente" method="post" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_alert&submit=1">';
 		echo '<input type="hidden" name="id_as" value="'.$id_as.'">'; // if known, if add will be undetermined (0).
-		echo '<h3>'.$lang_label["create_alert"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo $lang_label["create_alert"]."<a href='help/".$help_code."/chap3.php#331' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 		echo '<table cellpadding="3" cellspacing="3" width="650" class="fon">';
 		echo '<tr><td class="lb" rowspan="13" width=5>';
 		// Alert
@@ -203,7 +203,7 @@ if (give_acl($id_user, 0, "LW")==1) {
 		$sql1='SELECT * FROM talert_snmp';
 		$result=mysql_query($sql1);
 		
-		echo '<h3>'.$lang_label["snmp_assigned_alerts"]."<a href='help/".$help_code."/chap4.php#341' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";		
+		echo $lang_label["snmp_assigned_alerts"]."<a href='help/".$help_code."/chap4.php#341' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";		
 		if (mysql_num_rows($result)){
 
 			echo '<table cellpadding="3" cellspacing="3" width="750">';
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index 32f5bd3718..5617d5623e 100644
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -119,8 +119,8 @@ if (comprueba_login() == 0) {
 			audit_db($id_usuario,$REMOTE_ADDR, "ACL Violation","Trying to mass-validate SNMP Trap ID");
 		}
 	}
-	echo "<h2>Pandora SNMP</h2>";
-	echo "<h3>".$lang_label["SNMP_console"]."<a href='help/".$help_code."/chap3.php#34' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+	echo "<h2>Pandora SNMP &gt; ";
+	echo $lang_label["SNMP_console"]."<a href='help/".$help_code."/chap3.php#34' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	if (isset($_GET["offset"]))
 		$offset=$_GET["offset"];
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 3b185fdfd8..6eafa1106d 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -81,8 +81,8 @@ if (comprueba_login() == 0) {
 			echo "<h3 class='error'>".$lang_label["pass_nomatch"]."</h3>";
 		}
 	} 
-		echo "<h2>".$lang_label["users_"]."</h2>";
-		echo "<h3>".$lang_label["user_edit_title"]."<a href='help/".$help_code."/chap2.php#22' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+		echo "<h2>".$lang_label["users_"]." &gt; ";
+		echo $lang_label["user_edit_title"]."<a href='help/".$help_code."/chap2.php#22' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 
 	// Si no se obtiene la variable "modificado" es que se esta visualizando la informacion y
 	// preparandola para su modificacion, no se almacenan los datos
diff --git a/pandora_console/operation/users/user_statistics.php b/pandora_console/operation/users/user_statistics.php
index f101e6277f..654079101f 100644
--- a/pandora_console/operation/users/user_statistics.php
+++ b/pandora_console/operation/users/user_statistics.php
@@ -21,8 +21,8 @@
 require("include/config.php");
 
 if (comprueba_login() == 0) {
-echo "<h2>".$lang_label["users"]."</h2>";
-echo "<h3>".$lang_label["users_statistics"]."<a href='help/".$help_code."/chap2.php#24' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h3>";
+echo "<h2>".$lang_label["users"]." &gt; ";
+echo $lang_label["users_statistics"]."<a href='help/".$help_code."/chap2.php#24' target='_help' class='help'>&nbsp;<span>".$lang_label["help"]."</span></a></h2>";
 echo '<img src="reporting/fgraph.php?tipo=user_activity" border=0>';
 }
 ?>
\ No newline at end of file
diff --git a/pandora_console/operation/visual_console/index.php b/pandora_console/operation/visual_console/index.php
index 6d9923bffb..6b95444c83 100644
--- a/pandora_console/operation/visual_console/index.php
+++ b/pandora_console/operation/visual_console/index.php
@@ -27,7 +27,7 @@ if (comprueba_login() != 0) {
 	exit;
 }
 
-echo "<h3>".$lang_label["visual_console"]."</h3>";
+echo "<h2>".$lang_label["visual_console"]."</h2>";
 echo "<table width='500' cellpadding=4 cellpadding=4 class='databox_frame'>";
 echo "<tr><th>".$lang_label["name"]."<th>".$lang_label["group"]."<th>".$lang_label["elements"]."<th>".$lang_label["view"];
 $color=1;