diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 94cbc63a1d..9d69e1148e 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -614,6 +614,7 @@ if ($agents !== false) {
                         $url.'&op=update&id='.$cluster->id()
                     );
                     echo '<a href="'.$url.'">'.__('Edit').'</a>';
+                    echo ' | ';
                 }
             } else {
                 echo '<a href="index.php?sec=gagente&
diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php
index b8be4f128f..b983bd6f63 100644
--- a/pandora_console/godmode/alerts/alert_list.php
+++ b/pandora_console/godmode/alerts/alert_list.php
@@ -230,16 +230,6 @@ if ($delete_alert) {
         '',
         true
     );
-
-    $id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
-
-    if ($id_cluster) {
-        if ($id_cluster[0]['cluster_type'] == 'AA') {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_delete_alert='.$result);
-        } else {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_delete_alert='.$result);
-        }
-    }
 }
 
 if ($add_action) {
@@ -328,16 +318,6 @@ if ($delete_action) {
         '',
         true
     );
-
-    $id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
-
-    if ($id_cluster) {
-        if ($id_cluster[0]['cluster_type'] == 'AA') {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_delete_action='.$result);
-        } else {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_delete_action='.$result);
-        }
-    }
 }
 
 if ($enable_alert) {
@@ -359,16 +339,6 @@ if ($enable_alert) {
         '',
         true
     );
-
-    $id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
-
-    if ($id_cluster) {
-        if ($id_cluster[0]['cluster_type'] == 'AA') {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_enable_alert='.$result);
-        } else {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_enable_alert='.$result);
-        }
-    }
 }
 
 if ($disable_alert) {
@@ -390,16 +360,6 @@ if ($disable_alert) {
         '',
         true
     );
-
-    $id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
-
-    if ($id_cluster) {
-        if ($id_cluster[0]['cluster_type'] == 'AA') {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_disable_alert='.$result);
-        } else {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_disable_alert='.$result);
-        }
-    }
 }
 
 if ($standbyon_alert) {
@@ -421,16 +381,6 @@ if ($standbyon_alert) {
         '',
         true
     );
-
-    $id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
-
-    if ($id_cluster) {
-        if ($id_cluster[0]['cluster_type'] == 'AA') {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_standbyon='.$result);
-        } else {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_standbyon='.$result);
-        }
-    }
 }
 
 if ($standbyoff_alert) {
@@ -452,16 +402,6 @@ if ($standbyoff_alert) {
         '',
         true
     );
-
-    $id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
-
-    if ($id_cluster) {
-        if ($id_cluster[0]['cluster_type'] == 'AA') {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_standbyoff='.$result);
-        } else {
-            header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_standbyoff='.$result);
-        }
-    }
 }
 
 if ($id_agente) {
diff --git a/pandora_console/include/class/HTML.class.php b/pandora_console/include/class/HTML.class.php
index b2f664c1dd..002c91f181 100644
--- a/pandora_console/include/class/HTML.class.php
+++ b/pandora_console/include/class/HTML.class.php
@@ -759,7 +759,12 @@ class HTML
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form id="'.$form['id'].'" class="discovery '.$form['class'].'" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '';
+        if (empty($data['pre-content']) === false) {
+            $output_head .= $data['pre-content'];
+        }
+
+        $output_head .= '<form id="'.$form['id'].'" class="discovery '.$form['class'].'" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {