diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 07dcb7f0f1..18e2199f6c 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-17  Raúl Mateos <raulofpandora@gmail.com>
+
+	* extensions/agents_modules.php, extensions/module_groups.php: Use
+	"status" instead "state". Change the order of colours, to maintain
+	coherence with other pages. Few cosmetic and gramatical changes.
+
 2010-08-17  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/agentes/massive_operations.php: Fixed the default tab 
diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 4a5390694d..d50c3b3ff9 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -111,7 +111,7 @@ function mainAgentsModules() {
 	
 	echo '<table cellpadding="1" cellspacing="4" cellspacing="0" border="0" style="background-color: #EEE;">';
 
-	echo "<th width='140px'>".__("Agents")." \\ ".__("Modules")."</th>";	
+	echo "<th width='140px' style='background-color: #799E48;'>".__("Agents")." / ".__("Modules")."</th>";	
 
 	if($hor_offset > 0) {
 		$new_hor_offset = $hor_offset-$block;
@@ -227,23 +227,23 @@ function mainAgentsModules() {
 		"<ul style='float: left;'>" .
 		'<li style="clear: both;">
 			<div style="float: left; background: #ffa300; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Orange cell when the module have fired alerts.") .
+			__("Orange cell when the module has fired alerts") .
 		'</li>' .
 		'<li style="clear: both;">
 			<div style="float: left; background: #cc0000; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Red cell when the module have critical state.") .
+			__("Red cell when the module has a critical status") .
 		'</li>' .
 		'<li style="clear: both;">
 			<div style="float: left; background: #fce94f; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Yellow cell when the module have warning state.") .
-		'</li>' .
-		'<li style="clear: both;">
-			<div style="float: left; background: #babdb6; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Grey cell when the module have unknown state.") .
+			__("Yellow cell when the module has a warning status") .
 		'</li>' .
 		'<li style="clear: both;">
 			<div style="float: left; background: #8ae234; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Green cell when the module have normal state.") .
+			__("Green cell when the module has a normal status") .
+		'</li>' .
+		'<li style="clear: both;">
+			<div style="float: left; background: #babdb6; height: 14px; width: 26px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
+			__("Grey cell when the module has an unknown status") .
 		'</li>' .
 		"</ul>" .
 	"</p>";
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 4e7518529a..6bb4576637 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -135,19 +135,19 @@ function mainModuleGroups() {
 		"<ul style='float: left;'>" .
 		'<li style="clear: both;">
 			<div style="float: left; background: #cc0000; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Red cell when the module group and agent have at least one module in critical state and the others in any state.") .
+			__("Red cell when the module group and agent have at least one module in critical status and the others in any status") .
 		'</li>' .
 		'<li style="clear: both;">
 			<div style="float: left; background: #fce94f; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Yellow cell when the module group and agent have at least one in warning state and the others in grey or green state.") .
-		'</li>' .
-		'<li style="clear: both;">
-			<div style="float: left; background: #babdb6; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Grey cell when the module group and agent have at least one in unknown state and the others in green state.") .
+			__("Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status") .
 		'</li>' .
 		'<li style="clear: both;">
 			<div style="float: left; background: #8ae234; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
-			__("Green cell when the module group and agent have all modules in OK state.") .
+			__("Green cell when the module group and agent have all modules in OK status") .
+		'</li>' .
+		'<li style="clear: both;">
+			<div style="float: left; background: #babdb6; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;">&nbsp;</div>' .
+			__("Grey cell when the module group and agent have at least one in unknown status and the others in green status") .
 		'</li>' .
 		"</ul>" .
 	"</p>";