diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a4553de206..9ec0fe362f 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-30  Raul Mateos  <raulofpandora@gmail.com>
+
+	* extensions/update_manager/main.php: Change Pandora FMS text to 3.0
+
+	* extensions/update_manager/settings.php, godmode/alerts/extensions.php,
+	godmode/alerts/alert_list.php, godmode/servers/plugin.php,
+	godmode/db/db_sanity.php, godmode/snmp_console/snmp_alert.php,
+	godmode/setup/*.php: Unify titles improving integrity of appearance.
+
 2009-08-29  Raul Mateos  <raulofpandora@gmail.com>
 
 	* include/config_process.php: Update build after last changes
diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php
index 2bd0504454..53e3c05949 100644
--- a/pandora_console/extensions/update_manager/main.php
+++ b/pandora_console/extensions/update_manager/main.php
@@ -28,9 +28,9 @@ if ($settings->customer_key == FREE_USER) {
 	echo '<div class="notify" style="width: 80%; text-align:left;" >';
 	echo '<img src="images/information.png" /> ';
 	/* Translators: Do not translade Update Manager, it's the name of the program */
-	echo __('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS 2.0. It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.');
+	echo __('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS 3.0. It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.');
 	echo '<p />';
-	echo __('Update Manager is one of the most advanced features of Pandora FMS 2.0 Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.');
+	echo __('Update Manager is one of the most advanced features of Pandora FMS 3.0 Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.');
 	echo '<p />';
 	echo __('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, just delete extension or remove remote server address from Update Manager plugin setup.');
 	echo '</div>';
diff --git a/pandora_console/extensions/update_manager/settings.php b/pandora_console/extensions/update_manager/settings.php
index 64f84ed166..60d7ab42ae 100644
--- a/pandora_console/extensions/update_manager/settings.php
+++ b/pandora_console/extensions/update_manager/settings.php
@@ -36,7 +36,7 @@ if ($update_settings) {
 
 $settings = um_db_load_settings ();
 
-echo '<h3>'.__('Settings').'</h3>';
+echo '<h2>'.__('Update manager')." &raquo; ". __('Settings').'</h2>';
 echo '<form method="post">';
 
 $table->width = '95%';
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index 211f7528e7..98a14fef0f 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -187,7 +187,7 @@ if ($id_agente) {
 	echo '<h2>'.__('Agent configuration').' &raquo; '.__('Alerts').'</h2>';
 	$agents = array ($id_agente => get_agent_name ($id_agente));
 } else {
-	echo '<h2>'.__('Alerts').'</h2>';
+	echo '<h2>'.__('Alerts').' &raquo; '.__('Manage alerts').'</h2>';;
 	$groups = get_user_groups ();
 	$agents = get_group_agents (array_keys ($groups), false, "none");
 }
diff --git a/pandora_console/godmode/db/db_sanity.php b/pandora_console/godmode/db/db_sanity.php
index 3609326d5f..8a0c5b2f2a 100644
--- a/pandora_console/godmode/db/db_sanity.php
+++ b/pandora_console/godmode/db/db_sanity.php
@@ -25,7 +25,8 @@ if (! give_acl ($config["id_user"], 0, "DM")) {
 	return;
 }
 
-echo "<h2>".__('Database sanity tool')."</h2>";
+echo '<h2>'.__('Database maintenance').' &raquo; ';
+echo __('Database sanity tool')."</h2>";
 
 $sanity = get_parameter ("sanity", 0);
 
diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php
index 91a14a89b9..2081a51685 100644
--- a/pandora_console/godmode/extensions.php
+++ b/pandora_console/godmode/extensions.php
@@ -28,7 +28,7 @@ if (sizeof ($config['extensions']) == 0) {
 	return;
 }
 
-echo '<h2>'.__('Defined extensions').'</h2>';
+echo '<h2>'.__('Extensions').' &raquo; '.__('Defined extensions').'</h2>';
 $table->width = '95%';
 $table->head = array ();
 $table->head[0] = __('Name');
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index fd1dcf4680..33a9a7e004 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -132,9 +132,9 @@ if (($create != "") OR ($view != "")){
 	
 	echo "<h2>";
 	if ($create != "")
-		echo __('Plugin creation');
+		echo __('Pandora servers')." &raquo; ". __('Plugin creation');
 	else {
-		echo __('Plugin update');
+		echo __('Pandora servers')." &raquo; ". __('Plugin update');
 		$plugin_id = get_parameter ("view","");
 	}
 	print_help_icon("plugin_definition");
@@ -200,7 +200,9 @@ if (($create != "") OR ($view != "")){
 }
 
 else {
-	echo "<h2>". __('Plugins registered in Pandora FMS')."</h2>";
+	echo "<h2>";
+ 	echo __('Pandora servers')." &raquo; ".__('Plugins registered in Pandora FMS');
+	echo "</h2>";
 	// If not edition or insert, then list available plugins
 	$sql1='SELECT * FROM tplugin ORDER BY name';
 	$result=mysql_query($sql1);
diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php
index d6151acd96..77c4d55132 100644
--- a/pandora_console/godmode/setup/file_manager.php
+++ b/pandora_console/godmode/setup/file_manager.php
@@ -61,7 +61,7 @@ if ($delete_file) {
 	}
 }
 
-echo "<h1>".__('File manager')."</h1>";
+echo "<h2>".__('Pandora Setup')." &raquo; ".__('File manager')."</h2>";
 
 $directory = (string) get_parameter ('directory', "/");
 
@@ -122,7 +122,7 @@ echo '<form method="post" action="index.php?sec=gsetup&amp;sec2=godmode/setup/fi
 print_table ($table);
 echo '</form>';
 
-echo '<h2>'.__('Index of %s', $directory).'</h2>';
+echo '<h3>'.__('Index of %s', $directory).'</h3>';
 
 // List files
 if (! is_dir ($real_directory)) {
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 0987514696..2decfd1634 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -48,7 +48,7 @@ enterprise_include ('godmode/setup/setup.php');
  to add it there.
 */
 
-echo "<h2>".__('Setup')." &raquo; ";
+echo "<h2>".__('Pandora Setup')." &raquo; ";
 echo __('General configuration')."</h2>";
 
 $table->width = '90%';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 8ae69df653..2e12da3a17 100644
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -38,7 +38,7 @@ enterprise_include ('godmode/setup/setup_visuals.php');
 
 require_once ('include/functions_themes.php');
 
-echo "<h2>".__('Setup')." &raquo; ";
+echo "<h2>".__('Pandora Setup')." &raquo; ";
 echo __('Visual configuration')."</h2>";
 
 $table->width = '90%';