diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php
index fcc9957bdb..4b6c333468 100755
--- a/pandora_console/godmode/massive/massive_add_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_action_alerts.php
@@ -270,7 +270,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json);
 
 echo "<input type='hidden' id='hidden-agents_with_templates' value='$agents_with_templates_json'>";
 
-attachActionButton('add', 'create', $table->width);
+attachActionButton('add', 'create', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php
index 92027c3529..8fbb307e97 100755
--- a/pandora_console/godmode/massive/massive_add_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_alerts.php
@@ -293,7 +293,7 @@ $table->data[2][3] = '';
 echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=add_alerts">';
 html_print_table($table);
 
-attachActionButton('add', 'add', $table->width);
+attachActionButton('add', 'add', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_add_profiles.php b/pandora_console/godmode/massive/massive_add_profiles.php
index 9e84c44b71..38657bdf1c 100644
--- a/pandora_console/godmode/massive/massive_add_profiles.php
+++ b/pandora_console/godmode/massive/massive_add_profiles.php
@@ -295,7 +295,7 @@ array_push($table->data, $data);
 
 html_print_table($table);
 
-attachActionButton('create_profiles', 'update', $table->width);
+attachActionButton('create_profiles', 'update', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php
index 4bccfa6007..c3a65ad624 100755
--- a/pandora_console/godmode/massive/massive_copy_modules.php
+++ b/pandora_console/godmode/massive/massive_copy_modules.php
@@ -310,7 +310,7 @@ echo '<legend><span>'.__('To agent(s)').'</span></legend>';
 html_print_table($table);
 echo '</fieldset>';
 
-attachActionButton('do_operation', 'copy', $table->width);
+attachActionButton('do_operation', 'copy', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_action_alerts.php b/pandora_console/godmode/massive/massive_delete_action_alerts.php
index c19823fc57..1df2809c75 100644
--- a/pandora_console/godmode/massive/massive_delete_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_action_alerts.php
@@ -298,7 +298,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json);
 
 echo "<input type='hidden' id='hidden-agents_with_templates' value='".$agents_with_templates_json."'>";
 
-attachActionButton('delete', 'delete', $table->width);
+attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_agents.php b/pandora_console/godmode/massive/massive_delete_agents.php
index bb0dd1799d..f5b194f3cc 100755
--- a/pandora_console/godmode/massive/massive_delete_agents.php
+++ b/pandora_console/godmode/massive/massive_delete_agents.php
@@ -188,7 +188,7 @@ $params = [
 echo get_table_inputs_masive_agents($params);
 
 if (is_metaconsole() === true || is_management_allowed() === true) {
-    attachActionButton('delete', 'delete', '100%');
+    attachActionButton('delete', 'delete', '100%', false, $SelectAction);
 }
 
 echo '</form>';
diff --git a/pandora_console/godmode/massive/massive_delete_alerts.php b/pandora_console/godmode/massive/massive_delete_alerts.php
index 7e899e7f9f..1c4117828e 100755
--- a/pandora_console/godmode/massive/massive_delete_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_alerts.php
@@ -358,7 +358,7 @@ $table->data[2][3] = html_print_select([], 'module[]', '', false, '', '', true,
 echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_alerts" >';
 html_print_table($table);
 
-attachActionButton('delete', 'delete', $table->width);
+attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php
index f54a127b19..cb885e7ec2 100755
--- a/pandora_console/godmode/massive/massive_delete_modules.php
+++ b/pandora_console/godmode/massive/massive_delete_modules.php
@@ -583,7 +583,7 @@ $table->data['form_agents_3'][3] = html_print_select(
 echo '<form method="post" id="form_modules" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_modules" >';
 html_print_table($table);
 
-attachActionButton('delete', 'delete', $table->width);
+attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_delete_profiles.php b/pandora_console/godmode/massive/massive_delete_profiles.php
index 7c45b2a285..46824e90ba 100644
--- a/pandora_console/godmode/massive/massive_delete_profiles.php
+++ b/pandora_console/godmode/massive/massive_delete_profiles.php
@@ -246,7 +246,7 @@ array_push($table->data, $data);
 
 html_print_table($table);
 
-attachActionButton('delete_profiles', 'delete', $table->width);
+attachActionButton('delete_profiles', 'delete', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index b5da8ca9ae..a6bb7a9322 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -1257,7 +1257,7 @@ echo '<h3 class="error invisible" id="message"> </h3>';
 
 html_print_input_hidden('id_agente', $id_agente);
 
-attachActionButton('update_agents', 'update', $table->width);
+attachActionButton('update_agents', 'update', $table->width, false, $SelectAction);
 
 // Shown and hide div.
 echo '</div></form>';
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index a03e278957..2aa4fe00e0 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -1265,7 +1265,7 @@ $table->data['edit1'][1] = '<table width="100%">';
             echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_modules" id="form_edit">';
             html_print_table($table);
 
-            attachActionButton('update', 'update', $table->width);
+            attachActionButton('update', 'update', $table->width, false, $SelectAction);
 
             echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_edit_plugins.php b/pandora_console/godmode/massive/massive_edit_plugins.php
index 2e91eafaf8..192c893f00 100644
--- a/pandora_console/godmode/massive/massive_edit_plugins.php
+++ b/pandora_console/godmode/massive/massive_edit_plugins.php
@@ -391,7 +391,7 @@ echo '<form method="POST" id="form-massive_plugin_edition"
 
 html_print_table($table);
 
-attachActionButton('update', 'update', $table->width);
+attachActionButton('update', 'update', $table->width, false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_edit_users.php b/pandora_console/godmode/massive/massive_edit_users.php
index ddbd45c440..928b761694 100644
--- a/pandora_console/godmode/massive/massive_edit_users.php
+++ b/pandora_console/godmode/massive/massive_edit_users.php
@@ -556,7 +556,7 @@ echo sprintf(
 );
 echo '</div>';
 
-attachActionButton('edit_users', 'update', '100%');
+attachActionButton('edit_users', 'update', '100%', false, $SelectAction);
 
 echo '</form>';
 
diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index 864382bd78..fb2331a5dd 100755
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -443,29 +443,26 @@ if (is_management_allowed() === false) {
     );
 }
 
-echo '<br />';
-echo '<form method="post" id="form_options" action="'.$url.'">';
-echo '<table border="0"><tr><td>';
-echo __('Action');
-echo '</td><td>';
-html_print_select(
+$tip = '';
+if ($option === 'edit_agents' || $option === 'edit_modules') {
+    $tip = ui_print_help_tip(__('The blank fields will not be updated'), true);
+}
+
+$SelectAction = '<form method="post" id="form_options" action="'.$url.'">';
+$SelectAction .= '<span class="mrgn_lft_10px mrgn_right_10px">'._('Action').'</span>';
+$SelectAction .= html_print_select(
     $options,
     'option',
     $option,
     'this.form.submit()',
     '',
     0,
-    false,
+    true,
     false,
     false
-);
-if ($option === 'edit_agents' || $option === 'edit_modules') {
-    ui_print_help_tip(__('The blank fields will not be updated'));
-}
+).$tip;
 
-echo '</td></tr></table>';
-echo '</form>';
-echo '<br />';
+$SelectAction .= '</form>';
 
 switch ($option) {
     case 'delete_alerts':
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index 486ec90265..26d5c16f68 100644
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -50,13 +50,23 @@ echo '<form action="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2" method="
 switch ($action) {
     case 'create_connection_map':
         // Header.
-        ui_print_page_header(
+        ui_print_standard_header(
             __('Create new map connection'),
             '',
             false,
             'map_connection_tab',
             true,
-            $buttons
+            $buttons,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Setup'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Setup').' - '.__('Gis'),
+                ],
+            ]
         );
 
         $mapConnection_name = '';
@@ -77,13 +87,23 @@ switch ($action) {
 
     case 'edit_connection_map':
         // Header.
-        ui_print_page_header(
+        ui_print_standard_header(
             __('Edit map connection'),
             '',
             false,
             'map_connection_tab',
             true,
-            $buttons
+            $buttons,
+            [
+                [
+                    'link'  => '',
+                    'label' => __('Setup'),
+                ],
+                [
+                    'link'  => '',
+                    'label' => __('Setup').' - '.__('Gis'),
+                ],
+            ]
         );
 
         $idConnectionMap = get_parameter('id_connection_map');
diff --git a/pandora_console/include/functions_massive_operations.php b/pandora_console/include/functions_massive_operations.php
index c08f439fc5..890940b8dd 100644
--- a/pandora_console/include/functions_massive_operations.php
+++ b/pandora_console/include/functions_massive_operations.php
@@ -43,7 +43,8 @@ function attachActionButton(
     string $action,
     string $buttonAction,
     string $tableWidth,
-    bool $return=false
+    bool $return=false,
+    string $SelectAction=''
 ) {
     switch ($buttonAction) {
         case 'add':
@@ -88,7 +89,7 @@ function attachActionButton(
             ['icon' => $class],
             true
         ),
-        [],
+        ['right_content' => $SelectAction],
         $return
     );
 }
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index e425f2363a..f4d542a358 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -75,6 +75,10 @@ function menu_print_menu(&$menu)
         } else {
             $sec2 = 'operation/gis_maps/gis_map';
         }
+    } else if ($sec2 === 'enterprise/godmode/servers/manage_export_form') {
+        $sec2 = 'enterprise/godmode/servers/manage_export';
+    } else if ($sec2 === 'godmode/setup/gis_step_2') {
+        $sec2 = 'godmode/setup/setup&section=gis';
     } else if ($sec2 === 'operation/gis_maps/render_view') {
         $map_id = (int) get_parameter('map_id');
         if (empty($map_id) === false) {