diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index eec03f4566..8c696738f4 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -270,8 +270,6 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	$sub["godmode/admin_access_logs"]["id"] = 'System audit log';
 	$sub["godmode/setup/links"]["text"] = __('Links');
 	$sub["godmode/setup/links"]["id"] = 'Links';
-	$sub["godmode/update_manager/update_manager"]["text"] = __('Update manager');
-	$sub["godmode/update_manager/update_manager"]["id"] = 'Update manager';
 	
 	
 	$sub["godmode/extensions"]["sub2"] = $sub2;
@@ -404,13 +402,36 @@ foreach ($rows as $row) {
 
 $menu_godmode["links"]["sub"] = $sub;
 
-if (license_free() && check_acl ($config['id_user'], 0, "PM")) {
-	$menu_godmode["messages"]["text"] = __('Update manager');
-	$menu_godmode["messages"]["sec2"] = "";
-	$menu_godmode["messages"]["id"] = "god-um_messages";
-	$menu_godmode["messages"]["notification"] = 6;
+// Update Manager
+$menu_godmode["messages"]["text"] = __('Update manager');
+$menu_godmode["messages"]["sec2"] = "";
+$menu_godmode["messages"]["id"] = "god-um_messages";
+
+$sub = array ();
+$sub["godmode/update_manager/update_manager&tab=offline"]["text"] = __('Offline');
+$sub["godmode/update_manager/update_manager&tab=offline"]["id"] = 'Offline';
+$sub["godmode/update_manager/update_manager&tab=online"]["text"] = __('Online');
+$sub["godmode/update_manager/update_manager&tab=online"]["id"] = 'Online';
+$sub["godmode/update_manager/update_manager&tab=setup"]["text"] = __('Options');
+$sub["godmode/update_manager/update_manager&tab=setup"]["id"] = 'Options';
+	
+if (license_free() && is_user_admin ($config['id_user'])) {	
+			
+	include_once ("include/functions_update_manager.php");		
+	//If there are unread messages, display the notification icon
+	$number_total_messages;
+	$number_unread_messages = update_manager_get_unread_messages ();
+	if ($number_unread_messages > 0) {
+		$menu_godmode["messages"]["notification"] = $number_unread_messages;
+	}
+	
+	$sub["godmode/update_manager/update_manager&tab=messages"]["text"] = __('Messages');
+	$sub["godmode/update_manager/update_manager&tab=messages"]["id"] = 'Messages';
+		
 }
 
+$menu_godmode["messages"]["sub"] = $sub;
+
 if (!$config['pure']) {
 	menu_print_menu ($menu_godmode);
 }