diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 631e3a964c..b003aee82b 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-06  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_treeview.php: Fixed repeated messages on
+	treeview in metaconsole mode and fix some performance and
+	aesthetic issues
+
 2013-02-05 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* operation/agentes/estado_monitores.php,
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 8ad6316516..673af33a47 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -380,7 +380,9 @@ function treeview_printTree($type) {
 			if (metaconsole_connect($server) != NOERR) {
 				continue;
 			}
-			$server_list = treeview_getData ($type, $server);
+			
+			$server_list = treeview_getData ($type);
+			
 			foreach ($server_list as $server_item) {
 				if (! isset ($list[$server_item['_name_']])) {
 					$list[$server_item['_name_']] = $server_item;
@@ -393,7 +395,6 @@ function treeview_printTree($type) {
 					$list[$server_item['_name_']]['_num_unknown_'] += $server_item['_num_unknown_'];
 				}
 			}
-			echo "<br/>";
 		}
 		
 		metaconsole_restore_db();
@@ -405,7 +406,7 @@ function treeview_printTree($type) {
 		echo '</table>';
 	}
 	else {
-		echo "<ul style='margin: 0; margin-top: 20px; padding: 0;'>\n";
+		echo "<ul style='margin: 0; margin-top: 10px; padding: 0;'>\n";
 		
 		$first = true;
 		foreach ($list as $item) {
@@ -461,15 +462,9 @@ function treeview_printTree($type) {
 }
 
 // Get data for the tree view
-function treeview_getData ($type, $server=false) {
+function treeview_getData ($type) {
 	global $config;
 	
-	if ($server !== false) {
-		if (metaconsole_connect ($server) != NOERR) {
-			return array ();
-		}
-	}
-	
 	$search_free = get_parameter('search_free', '');
 	$select_status = get_parameter('status', -1);
 	
@@ -547,7 +542,6 @@ function treeview_getData ($type, $server=false) {
 		
 		// If there are not groups display error and return
 		if (empty($avariableGroups)) {
-			echo '<h3 class="error">'.__('There aren\'t agents in this agrupation').'</h3>';
 			return array ();
 		}
 	}