diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 96a12c6eeb..4e7b09fcec 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,19 @@
+2007-06-17  Raul Mateos  <raulofpandora@gmail.com>
+	
+	* include/languages/language_en.php: Updated text.
+	
+	* include/styles/pandora.css: Removed lb style not uses. Added ok style.
+	
+	* operation/agentes/estado_grupo.php: Changed old td.lb style to th.
+	
+	* operation/agentes/status_full.php: Deleted old file.
+	
+	* operation/events/events.php: Use ok style. Closed table.
+	
+	* operation/agentes/estado_ultimopaquete.php,
+	godmode/agentes/configurar_agente.php, godmode/agentes/module_manager.php:
+	Closed html tags.
+
 2007-06-17 Sancho Lerena  <slerena@artica.es>
 
 	* reporting/fgraph.php: Fixed ODOmeter problem with neg. values
@@ -1107,11 +1123,8 @@
 
 2007-02-27  Sancho Lerena  <slerena@openideas.info>
 
-	* include/styles/god.css: Moved style block.
-	
-	* include/styles/link.css: Moved style block.
-	
-	* include/styles/op.css: Moved style block.
+	* include/styles/god.css, include/styles/link.css, include/styles/op.css:
+	Moved style block.
 	
 	* include/styles/pandora.css: Added some clases for new
 	appearance. Needs to be improved, not finished yet !.
@@ -1203,7 +1216,7 @@
 
 2007-02-20  Sancho Lerena  <slerena@artica.es>
 
-        * pandoradb.sql: Upgraded SQL. Improved lenght for some fields.
+	* pandoradb.sql: Upgraded SQL. Improved lenght for some fields.
 	
 	* index.php: Better permission checks
 	
@@ -1296,17 +1309,9 @@
 	syntax, and pagination works fine. Several issues fixed, and added
 	function to report incident from here.
 	
-	* images/ok.gif, cancel.gif: Changed icon.
-
-	* images/control_start_blue.png: Added.
-
-	* images/page_lightning.png: Added.
-	
-	* images/control_rewind_blue.png: Added.
-	
-	* images/control_end_blue.png: Added.
-	
-	* images/control_fastforward_blue.png: Added.
+	* images/ok.gif, cancel.gif, control_start_blue.png, page_lightning.png,
+	control_rewind_blue.png, control_end_blue.png, control_fastforward_blue.png:
+	Added.
 
 2007-02-02 Manuel Arostegui <marostegui@artica.es>
 
@@ -1661,11 +1666,10 @@
 
 2006-11-05 Sancho Lerena  <slerena@artica.es>
 
-        * images/outlimits.png: Static image for progress bar out of
-	limits.
+	* images/outlimits.png: Static image for progress bar out of limits.
 
-        * reporting/fgraph.php: Progress bar now show static image if there is
-          out of limits before calculating (faster).
+	* reporting/fgraph.php: Progress bar now show static image if there is
+	 out of limits before calculating (faster).
 
 2006-10-31 Raul Mateos  <raulofpandora@gmail.com>
 
@@ -1675,7 +1679,7 @@
 2006-10-21 Sancho Lerena <slerena@artica.es>
 
 	* include/functions.php: Change function no_permission () to show 
-	  noaccess.gif image correctly, due a path problem.
+	noaccess.gif image correctly, due a path problem.
 
 	* general/noaccess.php: Change code to show noaccess.gif correctly.
 
@@ -1687,18 +1691,14 @@
 	* operation/agentes/estado_alertas.php, estado_agente.php
 	, status_monitor.php: Changed select size.
 	
-	* operation/incidents/incident_search.php: Changed select size.
-	
-	* operation/messages/message.php: Changed select size.
-	
-	* godmode/usuarios/configurar_usuarios.php: Changed select size.
-	
-	* godmode/setup/setup.php: Changed select size.
+	* operation/incidents/incident_search.php, operation/messages/message.php, 
+	godmode/usuarios/configurar_usuarios.php, godmode/setup/setup.php:
+	Changed select size.
 
 2006-10-08 Sancho Lerena <slerena@artica.es>
 
 	* incident_detail.php: Fixed DOS newlines to UNIX newlines. Fixed
-	  help code. Fixed Background color for field "Source".
+	help code. Fixed Background color for field "Source".
  
 2006-10-04 Raul Mateos  <raulofpandora@gmail.com>
 
@@ -1711,17 +1711,17 @@
 2006-09-28  Sancho Lerena  <slerena@artica.es>
 
 	* languages/language_es_es.php: Fixed message "out of limits"
-          without tildes in spanish for jpgraph output.
+	without tildes in spanish for jpgraph output.
 
 	* pandoradb_1.1_to_1.2.sql: Fixed small issues: mod_data_inc was
-	  as mod_inc.gif in modify SQL sentence. Spanish language is
-	  _es_es not _es. Setup by default english language after
-	  migration. Added network agent as OS. Changed Build versions in
-	  DB Scheme and versions (1.1 in old one !!!).
+	as mod_inc.gif in modify SQL sentence. Spanish language is
+	_es_es not _es. Setup by default english language after
+	migration. Added network agent as OS. Changed Build versions in
+	DB Scheme and versions (1.1 in old one !!!).
 
 	* pandora_console/pandoradb_data.sql: Fixed version number and
-	  build.
-	  
+	build.
+
 2006-09-23 Raul Mateos  <raulofpandora@gmail.com>
 
 	* godmode/agentes/configurar_agente.php: Comment DEBUG code added
@@ -1746,7 +1746,7 @@
 2006-09-10 Raul Mateos  <raulofpandora@gmail.com>
 
 	* Massive upload several files, to reflect changes in help,
-		only text, no code changed
+	only text, no code changed
 	
 	* pandoradb.sql: change value of ultimo_contacto row in 
 	tagente table to 0000-00-00 00:00:00, to solve a small issue
@@ -1758,8 +1758,7 @@
 
 2006-09-04 Raul Mateos  <raulofpandora@gmail.com>
 
-	* help/es/image001.gif: Replaced old image
-	* help/en/image001.gif: Repladed old image
+	* help/es/image001.gif, help/en/image001.gif: Repladed old image
 
 2006-08-30 Sancho Lerena  <slerena@artica.es>
 
@@ -1771,24 +1770,18 @@
 	
 2006-07-20  Raul Mateos  <raulofpandora@gmail.com>
 
-	* language_fr.php. Update text.
-
-	* language_ca.php. Update text.
+	* language_fr.php, language_ca.php, language_pt_br.php, language_ast_es.php,
+	language_it.php: Update text.
 	
-	* language_pt_br.php. Update text.
-	
-	* language_ast_es.php. Update text.
-
-	* language_it.php. Update text.
-	
-	* snmp_alert.php. Add text when alert not created /updated / deleted. Add
+	* snmp_alert.php: Add text when alert not created /updated / deleted. Add
 	different colors between
 	rows (cosmetic changes).
 	
 
 2006-07-18  Raul Mateos  <raulofpandora@gmail.com>
 
-	* Some headers changed to show the "official" GPL Header info. No new features or solved bugs
+	* Some headers changed to show the "official" GPL Header info. 
+	No new features or solved bugs
 
 
 2006-07-17  Raul Mateos  <raulofpandora@gmail.com>
@@ -1799,7 +1792,8 @@
 
 	* Some headers changed to show the "official" GPL Header info
 	
-	* modificar_server.php. Add different colors between rows (cosmetic changes). Add line before the submit button. Add help.
+	* modificar_server.php. Add different colors between rows (cosmetic changes).
+	Add line before the submit button. Add help.
 
 	* configurar_agente.php. Solved small bug that only show the last alert when creating alert in an agent, but the alert was created into database.
 
@@ -1814,7 +1808,9 @@
 
 2006-07-12  Raul Mateos  <raulofpandora@gmail.com>
 
-	* datos_agente.php. Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes). Add Help.
+	* datos_agente.php. Add new text about authors.
+	Add a line between table and button. 
+	Add different colors between rows (cosmetic changes). Add Help.
 	
 	* user.php. Add new text about authors. Clean code.
 	
@@ -1822,7 +1818,8 @@
 
 	* pandora.css. Add new text about authors.
 	
-	* changed name from pandora_info_es.html to pandora_info_es_es.html and pandora_info_bb.html to pandora_info_ast_es.html
+	* changed name from pandora_info_es.html to pandora_info_es_es.html and 
+	pandora_info_bb.html to pandora_info_ast_es.html
 
 	* pandora_info_it.html. New file, GPL license in italian
 
@@ -1836,7 +1833,9 @@
 
 	* Moved FreeSans.ttf to the reporting directory
 	
-	* Modified config.php. Now only shows the font, $config_fontpath var is set without the path (it should look for the font in the reporting directory)
+	* Modified config.php. Now only shows the font, 
+	$config_fontpath var is set without the path 
+	(it should look for the font in the reporting directory)
 
 2006-07-11  Sancho Lerena  <slerena@gmail.com>
 
@@ -1854,19 +1853,13 @@
 
 	* user_edit.php: Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes).
 	
-	* menu.php: Add new text about authors. Add code to highlight "edit my user" when editing the user authenticated.
-
-	* index.php: Add new text about authors.
+	* menu.php: Add new text about authors. 
+	Add code to highlight "edit my user" when editing the user authenticated.
 	
 	* functions.php: Add new text about authors. Change PATH to noaccess.php file.
-	
-	* noaccess.php: Add new text about authors.
-	
-	* login_failed.php: Add new text about authors.
-	
-	* logoff.php: Add new text about authors.
-	
-	* config.php: Add new text about authors.
+
+	* index.php, noaccess.php, login_failed.php, logoff.php, config.php:
+	Add new text about authors.
 	
 	* configurar_usuarios.php: Add new text about authors. Clean code. Solve small bug that avoid creating a new user. Add a line between table and button. Add different colors between rows (cosmetic changes).
 	
@@ -1886,14 +1879,11 @@
 	
 	* setup.php: Add new text about authors and add a line between table and button (cosmetic change).
 	
-	* estado_grupo.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.
-	
-	* view_server.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.
+	* estado_grupo.php, view_server.php, snmp_view.php: Add new text about authors. 
+	Add new help icon.  At this moment help for this item isn't available.
 	
 	* snmp_alert.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. Cosmetic change, adding class 'suc' when creating alert is successful.
-	
-	* snmp_view.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available.
-	
+
 	* tip.css: Change class padding to not showing error in Firefox Javascript Console.
 	
 	* message.php: Add new text about authors. Add new help icon; At this moment help for this item isn't available. Add a line between table and button (cosmetic change).
@@ -1901,7 +1891,6 @@
 	* incident_detail.php: Add new text about authors. Add a line between table and button. Add different colors between rows. Change button position (cosmetic changes).
 	
 	* incident_note.php: Add new text about authors. Add a line between table and button. Add different colors between rows (cosmetic changes).
-	
 
 	
 2006-07-09  Sancho Lerena  <slerena@artica.es>
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 2ae5748958..f1620b932d 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -127,17 +127,16 @@ if (isset($_POST["create_agent"])) { // Create a new and shining agent
 // -----------------
 
 echo "<div id='menu_tab_left'>
-<ul class='mn'>	
-<li class='nomn'>";
+<ul class='mn'>";
 echo "<li class='nomn'>";
-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 "<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>";
 
 
 echo "<div id='menu_tab'>
-<ul class='mn'>	
-<li class='nomn'>";
+<ul class='mn'>";
 
 echo "<li class='nomn'>";
 echo "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$id_agente'><img src='images/zoom.png' width='16' class='top' border=0>&nbsp; View</a>";
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index e2f8c0b755..ddbb2a33a5 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -233,8 +233,8 @@ if ($row=mysql_num_rows($result)){
 		// Value arithmetical media fix
 		if (($id_tipo != 3) AND ($id_tipo != 10) AND ($id_tipo != 17)){
 			echo "&nbsp;";
-                        echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente&tab=module&fix_module=".$row["id_agente_modulo"]."'".' onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;">';
-                        echo "<img src='images/chart_curve.png' border=0></b></a>";
+			echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=$id_agente&tab=module&fix_module=".$row["id_agente_modulo"]."'".' onClick="if (!confirm(\' '.$lang_label["are_you_sure"].'\')) return false;">';
+			echo "<img src='images/chart_curve.png' border=0></b></a>";
 		}
 	}
 	echo "</table>";
@@ -250,9 +250,9 @@ echo "<h3>".$lang_label["module_asociation_form"]."<a href='help/".$help_code."/
 &nbsp;<span>".$lang_label["help"]."</span></a></h3>";
 
 if ($update_module == "1")
-	echo '<form name="modulo" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente.'#module_assignment">';
-else // equal than previous, but without #module_assigment
 	echo '<form name="modulo" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente.'">';
+else // equal than previous, but without #module_assigment
+	echo '<form name="modulo" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente.'#module_assignment">';
 
 if ($update_module == "1"){
 	echo '<input type="hidden" name="update_module" value=1>';
@@ -268,8 +268,8 @@ else { // Create
 			$module_interval = $intervalo;
 	}
 }
-
-echo '<a name="modules"> <!-- Dont Delete !! -->';
+// Dont Delete  this <a name>!!
+echo '<a name="modules"></a>';
 echo '<table width="700" cellpadding="4" cellspacing="4" class="databox_color">';
 
 echo '<tr><td class="datos3">';
@@ -281,30 +281,30 @@ if ($update_module != "1"){
 	$result=mysql_query($sql1);
 	echo "<option value=-1>---".$lang_label["manual_config"]."---</option>";
 	while ($row=mysql_fetch_array($result)){
-		echo "<option value='".$row["id_nc"]."'>".substr($row["name"],0,20)." / ".substr($row["description"],0,20);
+		echo "<option value='".$row["id_nc"]."'>".substr($row["name"],0,20)." / ".substr($row["description"],0,20)."</option>";
 	}
-	echo "</select>";
-	echo '<td class="datos3" <input align="right" name="updbutton" type="submit" class="sub" value="'.$lang_label["update"].'">';
+	echo "</select></td>";
+	echo '<td class="datos3"><input align="right" name="updbutton" type="submit" class="sub" value="'.$lang_label["update"].'">';
 } else {
 	echo "<td class='datos3' colspan=3 align='left'>";
 	echo "<span class='redi'>";
 	echo $lang_label["not_available_in_edit_mode"];
-	echo "</span>";
-	
+	echo "</span></td>";
 }
 
-echo '<tr>';
-echo '<td class="datos2">'.$lang_label["module_name"];
-echo '<td class="datos2"><input type="text" name="nombre" size="25" value="'.$modulo_nombre.'">';
-echo '<td class="datos2">'.$lang_label["ip_target"];
-echo '<td class="datos2"><input type="text" name="ip_target" size="25" value="'.$ip_target.'">';
+echo '</tr><tr>';
+echo '<td class="datos2">'.$lang_label["module_name"]."</td>";
+echo '<td class="datos2"><input type="text" name="nombre" size="25" value="'.$modulo_nombre.'"></td>';
+echo '<td class="datos2">'.$lang_label["ip_target"]."</td>";
+echo '<td class="datos2"><input type="text" name="ip_target" size="25" value="'.$ip_target.'"></td>';
+echo '</tr>';
 
 echo "<tr>";
 echo "<td colspan='4'>";
 
 //-- Module type combobox
 echo "<tr>";
-echo "<td class='datos'>".$lang_label["module_type"];
+echo "<td class='datos'>".$lang_label["module_type"]."</td>";
 echo "<td class='datos'>";
 if ($update_module == "1") {
 	echo "<input type='hidden' name='tipo' value='".$modulo_id_tipo_modulo."'>";
@@ -314,52 +314,56 @@ if ($update_module == "1") {
 	$sql1='SELECT id_tipo, nombre FROM ttipo_modulo ORDER BY nombre';
 	$result=mysql_query($sql1);
 	if (($update_module == "1") OR ($modulo_id_tipo_modulo != 0)) {
-		echo "<option value='".$modulo_id_tipo_modulo ."'>".dame_nombre_tipo_modulo ($modulo_id_tipo_modulo);
+		echo "<option value='".$modulo_id_tipo_modulo ."'>".dame_nombre_tipo_modulo ($modulo_id_tipo_modulo)."</option>";
 	}
 	echo "<option>--</option>";
 	while ($row=mysql_fetch_array($result)){
-		echo "<option value='".$row["id_tipo"]."'>".$row["nombre"];
+		echo "<option value='".$row["id_tipo"]."'>".$row["nombre"]."</option>";
 	}
 	echo "</select>";
 }
 ?>
-</select>
 
 <!-- Module group selection -->
-<td class="datos"><?php echo $lang_label["module_group"] ?>
+<td class="datos"><?php echo $lang_label["module_group"] ?></td>
 <td class="datos">
+<select name="id_module_group">
 <?php
-	echo '<select name="id_module_group">';
 	if (($id_module_group != 0) OR ($update_module == "1")){
-		echo "<option value='".$id_module_group."'>".dame_nombre_grupomodulo($id_module_group);
+		echo "<option value='".$id_module_group."'>".dame_nombre_grupomodulo($id_module_group)."</option>";
 	}
 	$sql1='SELECT * FROM tmodule_group';
 	$result=mysql_query($sql1);
 	while ($row=mysql_fetch_array($result)){
-		echo "<option value='".$row["id_mg"]."'>".$row["name"];
+		echo "<option value='".$row["id_mg"]."'>".$row["name"]."</option>";
 	}
-	echo "</select>";
 ?>
 </select>
+</td></tr>
 
 <tr>
-
-<td class="datos2"><?php echo $lang_label["module_interval"] ?><td class="datos2">
+<td class="datos2"><?php echo $lang_label["module_interval"] ?></td>
+<td class="datos2">
 <input type="text" name="module_interval" size="5" value="<?php echo $module_interval ?>"> 
-
-<td class="datos2"><?php echo $lang_label["tcp_port"] ?>
-<td class="datos2"><input type="text" name="tcp_port" size="5" value="<?php echo $tcp_port ?>"> 
-
-<tr><td class="datos"><?php echo $lang_label["snmp_oid"] ?>
-<td class="datos"><input type="text" name="snmp_oid" size="25" value="<?php echo $snmp_oid ?>">
-
-
-<td class="datos"><?php echo $lang_label["snmp_community"] ?>
-<td class="datos"><input type="text" name="snmp_community" size="25" value="<?php echo $snmp_community ?>">
-
-
-<tr><td class="datos2"><?php echo $lang_label["snmp_oid"] ?>
-<td colspan=2 class="datos2"><select name="combo_snmp_oid">
+</td>
+<td class="datos2"><?php echo $lang_label["tcp_port"] ?></td>
+<td class="datos2">
+<input type="text" name="tcp_port" size="5" value="<?php echo $tcp_port ?>"> 
+</td>
+</tr>
+<tr>
+<td class="datos"><?php echo $lang_label["snmp_oid"] ?></td>
+<td class="datos">
+<input type="text" name="snmp_oid" size="25" value="<?php echo $snmp_oid ?>">
+</td>
+<td class="datos"><?php echo $lang_label["snmp_community"] ?></td>
+<td class="datos">
+<input type="text" name="snmp_community" size="25" value="<?php echo $snmp_community ?>">
+</td>
+</tr>
+<tr><td class="datos2"><?php echo $lang_label["snmp_oid"] ?></td>
+<td colspan='2' class="datos2">
+<select name="combo_snmp_oid">
 <?php
 // FILL OID Combobox
 if (isset($_POST["oid"])){
@@ -372,36 +376,46 @@ if (isset($_POST["oid"])){
 	}
 }
 ?>
-</select>
-<td class="datos2"><input type="submit" class="sub next" name="oid" value="SNMP Walk">
+</select></td>
+<td class="datos2">
+<input type="submit" class="sub next" name="oid" value="SNMP Walk">
+</td>
+</tr>
 
-<tr><td class="datost"><?php echo $lang_label["tcp_send"] ?>
-<td class="datos"><textarea name="tcp_send" cols="22" rows="2"><?php echo $tcp_send ?></textarea>
-
-<td class="datost"><?php echo $lang_label["tcp_rcv"] ?>
-<td class="datos"><textarea name="tcp_rcv" cols="22" rows="2"><?php echo $tcp_rcv ?></textarea>
-
-<tr><td class="datos2"><?php echo $lang_label["mindata"] ?>
-<td class="datos2"><input type="text" name="modulo_min" size="5" value="<?php echo $modulo_min ?>"> 
-<td class="datos2"><?php echo $lang_label["maxdata"] ?>
-<td class="datos2"><input type="text" name="modulo_max" size="5" value="<?php echo $modulo_max ?>">
-
-<tr><td class="datost"><?php echo $lang_label["comments"] ?>
+<tr><td class="datost"><?php echo $lang_label["tcp_send"] ?></td>
+<td class="datos">
+<textarea name="tcp_send" cols="22" rows="2"><?php echo $tcp_send ?></textarea>
+</td>
+<td class="datost"><?php echo $lang_label["tcp_rcv"] ?></td>
+<td class="datos">
+<textarea name="tcp_rcv" cols="22" rows="2"><?php echo $tcp_rcv ?></textarea>
+</td>
+</tr>
+<tr>
+<td class="datos2"><?php echo $lang_label["mindata"] ?></td>
+<td class="datos2">
+<input type="text" name="modulo_min" size="5" value="<?php echo $modulo_min ?>">
+</td>
+<td class="datos2"><?php echo $lang_label["maxdata"] ?></td>
+<td class="datos2">
+<input type="text" name="modulo_max" size="5" value="<?php echo $modulo_max ?>">
+</td>
+</tr>
+<tr><td class="datost"><?php echo $lang_label["comments"] ?></td>
 <td class="datos" colspan=3>
 <textarea name="descripcion" cols=71 rows=2>
 <?php echo $modulo_descripcion ?>
-</textarea>
+</textarea></td>
+
+</tr></table>
+<table width='700'>
+<tr><td align='right'>
 <?php
-	echo "</table>";
-	echo "<table width=700>";
-	echo "<td align='right'>";
 	if ($update_module == "1"){
 		echo '<input name="updbutton" type="submit" class="sub next" value="'.$lang_label["update"].'">';
 	} else {
 		echo '<input name="crtbutton" type="submit" class="sub wand" value="'.$lang_label["add"].'">';
 	}
-	echo "</form>";
-	echo "</table>";
-
 ?>
-
+</form></td></tr>
+</table>
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 5295f6a39d..23a0ff83a9 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -47,9 +47,9 @@ if (isset($_GET["delete"])){
 	$id_content = $_GET["delete"];
 	$sql = "DELETE FROM tlayout_data WHERE id = $id_content";
 	if ($res=mysql_query($sql))
-		$result = "<h2 class=suc>".$lang_label["delete_ok"]."</h2>";
+		$result = "<h3 class=suc>".$lang_label["delete_ok"]."</h3>";
 	else
-		$result = "<h2 class=error>".$lang_label["delete_no"]."</h2>";
+		$result = "<h3 class=error>".$lang_label["delete_no"]."</h3>";
 	echo $result;
 }
 
@@ -61,14 +61,14 @@ if (isset($_GET["delete_report"])){
 	$res=mysql_query($sql);
 	$res2=mysql_query($sql2);
 	if ($res AND $res2)
-		$result = "<h2 class=suc>".$lang_label["delete_ok"]."</h2>";
+		$result = "<h3 class=suc>".$lang_label["delete_ok"]."</h3>";
 	else
-		$result = "<h2 class=error>".$lang_label["delete_no"]."</h2>";
+		$result = "<h3 class=error>".$lang_label["delete_no"]."</h3>";
 	echo $result;
 }
 
 // Create new report. First step
-if (isset($_GET["create_report"])){
+if (isset($_GET["create_graph"])){
 	$createmode = 2;
 }
 
@@ -92,9 +92,9 @@ if (isset($_GET["add_module"])){
 	
 	$sql = "INSERT INTO tlayout_data (id_layout, id_gs, id_agent_module, type, sla_max, sla_min, sla_limit, period) VALUES ('$id_report', '$my_cg', '$my_id_module', '$my_type', '$my_slamax', '$my_slamin', '$my_slalimit', '$my_period')";
 	if ($res=mysql_query($sql))
-		$result = "<h2 class=suc>".$lang_label["create_ok"]."</h2>";
+		$result = "<h3 class=suc>".$lang_label["create_ok"]."</h3>";
 	else
-		$result = "<h2 class=error>".$lang_label["create_no"]."</h2>";
+		$result = "<h3 class=error>".$lang_label["create_no"]."</h3>";
 	echo $result;
 }
 
@@ -112,18 +112,18 @@ if (isset($_POST["createmode"])){
 		$form_id_user = $id_user;
 		$sql = "INSERT INTO tlayout (name, background, width, height) VALUES ('$map_name', '$map_background', '$map_width', '$map_height')";
 		if ($res=mysql_query($sql))
-			$result = "<h1 class=suc>".$lang_label["create_ok"]."</h1>";
+			$result = "<h3 class=suc>".$lang_label["create_ok"]."</h3>";
 		else
-			$result = "<h1 class=error>".$lang_label["create_no"]."</h1>";
+			$result = "<h3 class=error>".$lang_label["create_no"]."</h3>";
 		$id_map = mysql_insert_id();
 	// UPDATE REPORT DATA
 	} else {
 		$id_map = entrada_limpia($_POST["id_map"]);
 		$sql = "UPDATE tlayout SET name = '$map_name', height= '$map_height', width = '$map_width', background = '$map_background' WHERE id = $id_map";
 		if ($res=mysql_query($sql))
-			$result = "<h2 class=suc>".$lang_label["modify_ok"]."</h2>";
+			$result = "<h3 class=suc>".$lang_label["modify_ok"]."</h3>";
 		else
-			$result = "<h2 class=error>".$lang_label["modify_no"]."</h2>";
+			$result = "<h3 class=error>".$lang_label["modify_no"]."</h3>";
 	}
 	echo $result;
 	if ($id_map != ""){
diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php
index 42408ec809..13a12ac08e 100644
--- a/pandora_console/include/languages/language_en.php
+++ b/pandora_console/include/languages/language_en.php
@@ -752,8 +752,8 @@ $lang_label["assign"]="Assign";
 $lang_label["graph_store"]="Custom graph store";
 $lang_label["private"]="Private";
 $lang_label["store"]="Store";
-$lang_label["store_graph_suc"]="Graph store successful";
-$lang_label["store_graph_error"]="Graph store error";
+$lang_label["store_graph_suc"]="Graph stored successfully";
+$lang_label["store_graph_error"]="There was a problem storing Graph";
 $lang_label["custom_graph_viewer"]="Custom graph viewer";
 $lang_label["graph_name"]="Graph name";
 $lang_label["custom_graphs"]="Custom graphs";
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 2bfb5fc2c9..bbeb5482b1 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -278,18 +278,17 @@ input.copy {
 	padding-right: 21px;
 	background: #e5e5e5 url(../../images/copy.png) no-repeat right 3px;
 }
+input.ok {
+	padding-right: 21px;
+	background: #e5e5e5 url(../../images/ok.png) no-repeat right 3px;
+}
 table, img {
 	border: 0px;
 }
-th, td.lb, td.lb_view {
+th {
 	color: #fff;
 	background-color: #786;
 }
-td.lb, td.lb_view {
-	height: 16px;
-	padding-left: 3px;
-	font-weight: bold;
-}
 td.datos, td.datost, td.datosb , td.datos_id, td.datosf9 {
 	background-color: #f9f9f9;
 }
@@ -361,7 +360,6 @@ td.datos_jus, td.datos2_jus {
 	border-bottom: 1px solid #708090;
 	width: 100%;
 }
-
 .green  {
 	color: #5a8629;
 }
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 74be829e0c..79f97e6785 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -318,12 +318,12 @@ if ($total_events > 0){
 		}
 		$offset_counter++;
 	}
-		
-	echo "<tr><td colspan='8' align='right'>";
+	echo "</table>";
+	echo "<table width='750'><tr><td align='right'>";
 	
-	echo "<input class='sub' type='submit' name='updatebt' value='".$lang_label["validate"]."'> ";
+	echo "<input class='sub ok' type='submit' name='updatebt' value='".$lang_label["validate"]."'> ";
 	if (give_acl($id_user, 0,"IM") ==1){
-		echo "<input class='sub' type='submit' name='deletebt' value='".$lang_label["delete"]."'>";
+		echo "<input class='sub delete' type='submit' name='deletebt' value='".$lang_label["delete"]."'>";
 	}
 	echo "</form></table>";
 } // no events to show