From ff3b7001c34d34833a183a4fa9fef16bc97e0cf0 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Sat, 4 Mar 2023 13:22:52 +0100
Subject: [PATCH] fixed styles

---
 .../godmode/reporting/map_builder.php         |   2 +-
 .../reporting/visual_console_builder.data.php |  15 +-
 .../visual_console_builder.elements.php       |  56 +-
 .../reporting/visual_console_builder.php      |  67 +--
 .../visual_console_builder.wizard.php         | 523 +++++++++---------
 .../reporting/visual_console_favorite.php     |   2 +-
 pandora_console/godmode/setup/license.php     |   2 +-
 .../include/ajax/alert_list.ajax.php          |   1 -
 .../include/functions_visual_map.php          |  12 +-
 pandora_console/include/javascript/pandora.js |   3 +-
 .../lib/Dashboard/Widgets/maps_status.php     |   2 +-
 .../rest-api/models/VisualConsole/Item.php    |  10 +-
 pandora_console/include/styles/alert.css      |  13 +
 pandora_console/include/styles/dashboards.css |  22 -
 pandora_console/include/styles/pandora.css    |  10 +-
 .../include/styles/visual_maps.css            |   3 +-
 .../include/visual-console-client/vc.main.css |   4 +-
 .../operation/visual_console/legacy_view.php  |   8 +-
 .../operation/visual_console/view.php         |  71 ++-
 19 files changed, 411 insertions(+), 415 deletions(-)

diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index b096226db4..898c3becda 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -513,7 +513,7 @@ if (!$maps && is_metaconsole() === false) {
         if (is_metaconsole() === false) {
             $data[0] = '<a href="index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;id='.$map['id'].'&amp;refr='.$refr.'">'.$map['name'].'</a>';
         } else {
-            $data[0] = '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$map['id'].'&amp;refr='.$refr.'">'.$map['name'].'</a>';
+            $data[0] = '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id='.$map['id'].'&amp;refr='.$refr.'">'.$map['name'].'</a>';
         }
 
         $data[1] = ui_print_group_icon($map['id_group'], true);
diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php
index ec0d805066..a27eb6ff67 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.data.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.data.php
@@ -82,7 +82,7 @@ switch ($action) {
             echo "<form id='back' method='post' action='index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab=".$activeTab.'&id_visual_console='.$idVisualConsole."' enctype='multipart/form-data'>";
             html_print_input_hidden('action', 'update');
         } else {
-            echo "<form id='back' action='index.php?sec=screen&sec2=screens/screens&tab=".$activeTab.'&id_visual_console='.$idVisualConsole.'&id_visualmap='.$idVisualConsole."&action=visualmap' method='post' enctype='multipart/form-data'>";
+            echo "<form id='back' action='index.php?sec=screen&sec2=screens/screens&tab=".$activeTab.'&id_visual_console='.$idVisualConsole.'&id='.$idVisualConsole."&action=visualmap' method='post' enctype='multipart/form-data'>";
             html_print_input_hidden('action2', 'update');
         }
     break;
@@ -136,14 +136,8 @@ echo $formHidden;
 
 $table = new stdClass();
 $table->width = '100%';
-if (is_metaconsole() === true) {
-    $table->class = 'databox data';
-    $table->head[0] = __('Create visual console');
-    $table->head_colspan[0] = 5;
-    $table->headstyle[0] = 'text-align: center';
-    $table->align[0] = 'left';
-    $table->align[1] = 'left';
-}
+
+
 
 $table->class = 'databox filter-table-adv';
 $table->size = [];
@@ -152,6 +146,9 @@ $table->size[1] = '50%';
 
 $table->data = [];
 
+$table->colspan[-1][0] = 2;
+$table->data[-1][0] = '<div class="section_table_title">'.__('Create visual console').'</div>';
+
 $table->data[0][] = html_print_label_input_block(
     __('Name'),
     html_print_input_text(
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index 5cc9d93bd0..1fba8bcc9a 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -113,7 +113,7 @@ foreach ($all_images as $image_file) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'databox filter-table-adv';
 
 $table->head = [];
 $table->head['icon'] = '';
@@ -783,23 +783,47 @@ foreach ($layoutDatas as $layoutData) {
 $pure = get_parameter('pure', 0);
 
 if (is_metaconsole() === false) {
-    echo '<form class="vc_elem_form" method="post" action="index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab='.$activeTab.'&id_visual_console='.$visualConsole['id'].'">';
+    echo '<form id="vc_elem_form" method="post" action="index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab='.$activeTab.'&id_visual_console='.$visualConsole['id'].'">';
     html_print_input_hidden('action', 'update');
 } else {
-    echo "<form class='vc_elem_form' method='post' action='index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure=0&tab=list_elements&id_visual_console=".$idVisualConsole."'>";
+    echo "<form id='vc_elem_form' method='post' action='index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure=0&tab=list_elements&id_visual_console=".$idVisualConsole."'>";
     html_print_input_hidden('action2', 'update');
 }
 
 html_print_table($table);
 
+// Form for multiple delete.
+if (is_metaconsole() === false) {
+    $url_multiple_delete = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab='.$activeTab.'&id_visual_console='.$visualConsole['id'];
+} else {
+    $url_multiple_delete = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&tab='.$activeTab.'&id_visual_console='.$visualConsole['id'];
+}
+
+echo '</form>';
+
 $buttons = html_print_submit_button(
     __('Update'),
     'go',
     false,
-    [ 'icon' => 'next' ],
+    [
+        'icon' => 'next',
+        'form' => 'vc_elem_form',
+    ],
     true
 );
 
+$buttons .= "<form id='form_multiple_delete' method='post' action=".$url_multiple_delete.'>';
+
+if (is_metaconsole() === false) {
+    $buttons .= html_print_input_hidden('action', 'multiple_delete', true);
+} else {
+    $buttons .= html_print_input_hidden('action2', 'multiple_delete', true);
+}
+
+$buttons .= html_print_input_hidden('id_visual_console', $visualConsole['id'], true);
+$buttons .= html_print_input_hidden('id_item_json', '', true);
+
+
 $buttons .= html_print_button(
     __('Delete'),
     'delete',
@@ -812,32 +836,12 @@ $buttons .= html_print_button(
     true
 );
 
+$buttons .= '</form>';
+
 html_print_action_buttons(
     $buttons
 );
 
-echo '</form>';
-
-// Form for multiple delete.
-if (is_metaconsole() === false) {
-    $url_multiple_delete = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab='.$activeTab.'&id_visual_console='.$visualConsole['id'];
-} else {
-    $url_multiple_delete = 'index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure=0&tab=list_elements&id_visual_console='.$idVisualConsole;
-}
-
-
-echo "<form id='form_multiple_delete' method='post' action=".$url_multiple_delete.'>';
-
-if (is_metaconsole() === false) {
-    html_print_input_hidden('action', 'multiple_delete');
-} else {
-    html_print_input_hidden('action2', 'multiple_delete');
-}
-
-html_print_input_hidden('id_visual_console', $visualConsole['id']);
-html_print_input_hidden('id_item_json', '');
-echo '</form>';
-
 
 // Trick for it have a traduct text for javascript.
 echo '<span id="ip_text" class="invisible">'.__('IP').'</span>';
diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php
index 8d4b84f735..ca1e0386bf 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.php
@@ -60,7 +60,7 @@ set_unless_defined($idVisualConsole, 0);
 // Set default.
 $idVisualConsole = get_parameter('id_visual_console', $idVisualConsole);
 if (empty($idVisualConsole) === true) {
-    $idVisualConsole = get_parameter('id_visualmap', 0);
+    $idVisualConsole = get_parameter('id', 0);
 }
 
 if (!defined('METACONSOLE')) {
@@ -81,7 +81,6 @@ $action = get_parameterBetweenListValues(
     ],
     'new'
 );
-
 $activeTab = get_parameterBetweenListValues(
     'tab',
     [
@@ -94,20 +93,17 @@ $activeTab = get_parameterBetweenListValues(
     'data'
 );
 
-// Visual console creation tab and actions
+
+// Visual console creation tab and actions.
 if (empty($idVisualConsole)) {
     $visualConsole = null;
 
-    // General ACL
-    // $vconsole_read = check_acl ($config['id_user'], 0, "VR");
+    // General ACL.
     $vconsole_write = check_acl($config['id_user'], 0, 'VW');
     $vconsole_manage = check_acl($config['id_user'], 0, 'VM');
-}
-// The visual console exists
-else if ($activeTab != 'data' || ($activeTab == 'data' && $action != 'new')) {
-    // Load the visual console data
+} else {
+    // Load the visual console data.
     $visualConsole = db_get_row_filter('tlayout', ['id' => $idVisualConsole]);
-
     // The visual console should exist.
     if (empty($visualConsole)) {
         db_pandora_audit(
@@ -118,20 +114,12 @@ else if ($activeTab != 'data' || ($activeTab == 'data' && $action != 'new')) {
         return;
     }
 
-    // The default group id is 0
+    // The default group id is 0.
     set_unless_defined($visualConsole['id_group'], 0);
 
-    // ACL for the existing visual console
-    // $vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
+    // ACL for the existing visual console.
     $vconsole_write = check_acl_restricted_all($config['id_user'], $visualConsole['id_group'], 'VW');
     $vconsole_manage = check_acl_restricted_all($config['id_user'], $visualConsole['id_group'], 'VM');
-} else {
-    db_pandora_audit(
-        AUDIT_LOG_ACL_VIOLATION,
-        'Trying to access report builder'
-    );
-    include 'general/noaccess.php';
-    return;
 }
 
 // This section is only to manage the visual console
@@ -803,7 +791,7 @@ if (!defined('METACONSOLE')) {
     $url_view = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$idVisualConsole.'&refr='.$view_refresh;
 } else {
     $url_base = 'index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&action2=';
-    $url_view = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$idVisualConsole.'&refr='.$view_refresh;
+    $url_view = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id='.$idVisualConsole.'&refr='.$view_refresh;
 }
 
 // Hash for auto-auth in public link.
@@ -863,27 +851,24 @@ $buttons[$activeTab]['active'] = true;
 
 $tab_builder = ($activeTab === 'editor') ? 'visual_console_editor_editor_tab' : '';
 
-if (is_metaconsole() === false) {
-    // Header.
-    ui_print_standard_header(
-        $visualConsoleName,
-        'images/visual_console.png',
-        false,
-        $tab_builder,
-        false,
-        $buttons,
+ui_print_standard_header(
+    $visualConsoleName,
+    'images/visual_console.png',
+    false,
+    $tab_builder,
+    false,
+    $buttons,
+    [
         [
-            [
-                'link'  => '',
-                'label' => __('Topology maps'),
-            ],
-            [
-                'link'  => '',
-                'label' => __('Visual console'),
-            ],
-        ]
-    );
-}
+            'link'  => '',
+            'label' => __('Topology maps'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Visual console'),
+        ],
+    ]
+);
 
 if ($statusProcessInDB !== null) {
     echo $statusProcessInDB['message'];
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index d624ba248b..351ba6de3d 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -48,9 +48,7 @@ $strict_user = db_get_value(
     $config['id_user']
 );
 
-// ACL for the existing visual console
-// if (!isset($vconsole_read))
-// $vconsole_read = check_acl ($config['id_user'], $visualConsole['id_group'], "VR");
+// ACL for the existing visual console.
 if (!isset($vconsole_write)) {
     $vconsole_write = check_acl(
         $config['id_user'],
@@ -82,36 +80,18 @@ require_once $config['homedir'].'/include/functions_agents.php';
 $table = new stdClass();
 $table->id = 'wizard_table';
 $table->head = [];
+$table->width = '100%';
+$table->class = 'databox filter-table-adv';
 if (is_metaconsole() === false) {
     $metaconsole_hack = '';
-    $table->width = '100%';
-    $table->class = 'databox filters';
 } else {
     $metaconsole_hack = '../../';
-    $table->width = '100%';
-    $table->class = 'databox filters';
-    $table->styleTable = ' margin-top:0px';
     include_once $config['homedir'].'/enterprise/meta/include/functions_html_meta.php';
 }
 
-$table->style = [];
-
-$table->style[0] = 'font-weight: bold; ';
-
-$table->style[2] = 'font-weight: bold; ';
-
 $table->size = [];
-$table->size[0] = '15%';
-$table->size[1] = '15%';
-$table->size[2] = '15%';
-$table->size[3] = '15%';
-
-
-$table->align = [];
-$table->align[0] = 'left';
-$table->align[1] = 'left';
-$table->align[2] = 'left';
-$table->align[3] = 'left';
+$table->size[0] = '50%';
+$table->size[1] = '50%';
 
 $table->data = [];
 
@@ -146,55 +126,60 @@ $type_list = [
     SIMPLE_VALUE   => __('Simple value'),
 ];
 
-
 $table->rowstyle['all_0'] = 'display: none;';
-$table->data['all_0'][0] = __('Type');
-$table->colspan['all_0'][1] = '3';
-$table->data['all_0'][1] = html_print_select(
-    $type_list,
-    'type',
-    '',
-    'hidden_rows()',
-    '',
-    '',
-    true,
-    false,
-    false
+$table->data['all_0'][0] = html_print_label_input_block(
+    __('Type'),
+    html_print_select(
+        $type_list,
+        'type',
+        '',
+        'hidden_rows()',
+        '',
+        '',
+        true,
+        false,
+        false
+    )
 );
 
 
 $table->rowstyle['staticgraph'] = 'display: none;';
-$table->data['staticgraph'][0] = __('Image');
-$table->colspan['staticgraph'][1] = '3';
-$table->data['staticgraph'][1] = html_print_select(
-    $images_list,
-    'image',
-    '',
-    '',
-    '',
-    '',
-    true
+$table->data['staticgraph'][0] = html_print_label_input_block(
+    __('Image'),
+    html_print_select(
+        $images_list,
+        'image',
+        '',
+        '',
+        '',
+        '',
+        true
+    )
 );
 
-
 $table->rowstyle['all_1'] = 'display: none;';
-$table->data['all_1'][0] = __('Range between elements (px)');
-$table->colspan['all_1'][1] = '3';
-$table->data['all_1'][1] = html_print_input_text(
-    'range',
-    50,
-    '',
-    5,
-    5,
-    true
+$table->data['all_1'][0] = html_print_label_input_block(
+    __('Range between elements (px)'),
+    html_print_input_text(
+        'range',
+        50,
+        '',
+        5,
+        5,
+        true
+    )
 );
 
+$input_size = __('Width').': ';
+$input_size .= html_print_input_text('width', 0, '', 5, 5, true);
+$input_size .= __('Height').': ';
+$input_size .= html_print_input_text('height', 0, '', 5, 5, true);
 
 $table->rowstyle['staticgraph_modulegraph'] = 'display: none;';
-$table->data['staticgraph_modulegraph'][0] = __('Size (px)');
-$table->colspan['staticgraph_modulegraph'][1] = '3';
-$table->data['staticgraph_modulegraph'][1] = __('Width').': '.html_print_input_text('width', 0, '', 5, 5, true);
-$table->data['staticgraph_modulegraph'][1] .= '&nbsp;&nbsp;&nbsp;'.__('Height').': '.html_print_input_text('height', 0, '', 5, 5, true);
+$table->data['staticgraph_modulegraph'][0] = html_print_label_input_block(
+    __('Size (px)'),
+    '<div>'.$input_size.'</div>'
+);
 
 $fontf = [
     'Roboto'       => 'Roboto',
@@ -227,78 +212,81 @@ $fonts = [
     '196pt' => '196pt',
 ];
 
+
 $table->rowstyle['all_9'] = 'display: none;';
-$table->data['all_9'][0] = __('Font');
-$table->colspan['all_9'][1] = '3';
-$table->data['all_9'][1] = html_print_select(
-    $fontf,
-    'fontf',
-    $fontf['Roboto'],
-    '',
-    '',
-    '',
-    true
+$table->data['all_9'][0] = html_print_label_input_block(
+    __('Font'),
+    html_print_select(
+        $fontf,
+        'fontf',
+        $fontf['Roboto'],
+        '',
+        '',
+        '',
+        true
+    )
 );
 
-$table->rowstyle['all_10'] = 'display: none;';
-$table->data['all_10'][0] = __('Font size');
-$table->colspan['all_10'][1] = '3';
-$table->data['all_10'][1] = html_print_select(
-    $fonts,
-    'fonts',
-    $fonts['12pt'],
-    '',
-    '',
-    '',
-    true
+$table->rowstyle['all_9'] = 'display: none;';
+$table->data['all_9'][1] = html_print_label_input_block(
+    __('Font size'),
+    html_print_select(
+        $fonts,
+        'fonts',
+        $fonts['12pt'],
+        '',
+        '',
+        '',
+        true
+    )
 );
 
-
 $table->rowstyle['modulegraph_simplevalue'] = 'display: none;';
-$table->data['modulegraph_simplevalue'][0] = __('Period');
-$table->colspan['modulegraph_simplevalue'][1] = '3';
-$table->data['modulegraph_simplevalue'][1] = html_print_extended_select_for_time(
-    'period',
-    '',
-    '',
-    '',
-    '',
-    false,
-    true
+$table->data['modulegraph_simplevalue'][0] = html_print_label_input_block(
+    __('Period'),
+    html_print_extended_select_for_time(
+        'period',
+        '',
+        '',
+        '',
+        '',
+        false,
+        true
+    )
 );
 
-
 $table->rowstyle['simplevalue'] = 'display: none;';
-$table->data['simplevalue'][0] = __('Process');
-$table->data['simplevalue'][1] = html_print_select(
-    [
-        PROCESS_VALUE_MIN => __('Min value'),
-        PROCESS_VALUE_MAX => __('Max value'),
-        PROCESS_VALUE_AVG => __('Avg value'),
-    ],
-    'process_value',
-    PROCESS_VALUE_AVG,
-    '',
-    __('None'),
-    PROCESS_VALUE_NONE,
-    true
+$table->data['simplevalue'][0] = html_print_label_input_block(
+    __('Process'),
+    html_print_select(
+        [
+            PROCESS_VALUE_MIN => __('Min value'),
+            PROCESS_VALUE_MAX => __('Max value'),
+            PROCESS_VALUE_AVG => __('Avg value'),
+        ],
+        'process_value',
+        PROCESS_VALUE_AVG,
+        '',
+        __('None'),
+        PROCESS_VALUE_NONE,
+        true
+    )
 );
 
-
 $table->rowstyle['percentileitem_1'] = 'display: none;';
-$table->data['percentileitem_1'][0] = __('Width (px)');
-$table->data['percentileitem_1'][1] = html_print_input_text('percentileitem_width', 0, '', 5, 5, true);
-
+$table->data['percentileitem_1'][0] = html_print_label_input_block(
+    __('Width (px)'),
+    html_print_input_text('percentileitem_width', 0, '', 5, 5, true)
+);
 
 $table->rowstyle['percentileitem_2'] = 'display: none;';
-$table->data['percentileitem_2'][0] = __('Max value');
-$table->data['percentileitem_2'][1] = html_print_input_text('max_value', 0, '', 5, 5, true);
+$table->data['percentileitem_2'][0] = html_print_label_input_block(
+    __('Max value'),
+    html_print_input_text('max_value', 0, '', 5, 5, true)
+);
 
-
-$table->rowstyle['percentileitem_3'] = 'display: none;';
-$table->data['percentileitem_3'][0] = __('Type');
-$table->colspan['percentileitem_3'][1] = '3';
-$table->data['percentileitem_3'][1] = __('Percentile').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended(
+$input_percentile = '<div class="inline-radio-button">'.__('Percentile');
+$input_percentile .= html_print_radio_button_extended(
     'type_percentile',
     'percentile',
     '',
@@ -307,8 +295,10 @@ $table->data['percentileitem_3'][1] = __('Percentile').'&nbsp;&nbsp;&nbsp;'.html
     '',
     '',
     true
-).'&nbsp;&nbsp;';
-$table->data['percentileitem_3'][1] .= __('Bubble').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended(
+);
+
+$input_percentile .= __('Bubble');
+$input_percentile .= html_print_radio_button_extended(
     'type_percentile',
     'bubble',
     '',
@@ -317,12 +307,17 @@ $table->data['percentileitem_3'][1] .= __('Bubble').'&nbsp;&nbsp;&nbsp;'.html_pr
     '',
     '',
     true
-).'&nbsp;&nbsp;';
+);
+$input_percentile .= '</div>';
 
-$table->rowstyle['percentileitem_4'] = 'display: none;';
-$table->data['percentileitem_4'][0] = __('Value to show');
-$table->colspan['percentileitem_4'][1] = '3';
-$table->data['percentileitem_4'][1] = __('Percent').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended(
+$table->rowstyle['percentileitem_3'] = 'display: none;';
+$table->data['percentileitem_3'][0] = html_print_label_input_block(
+    __('Type'),
+    $input_percentile
+);
+
+$input_value_to_show = '<div class="inline-radio-button">'.__('Percent');
+$input_value_to_show .= html_print_radio_button_extended(
     'value_show',
     'percent',
     '',
@@ -331,8 +326,9 @@ $table->data['percentileitem_4'][1] = __('Percent').'&nbsp;&nbsp;&nbsp;'.html_pr
     '',
     '',
     true
-).'&nbsp;&nbsp;';
-$table->data['percentileitem_4'][1] .= __('Value').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended(
+);
+$input_value_to_show .= __('Value');
+$input_value_to_show .= html_print_radio_button_extended(
     'value_show',
     'value',
     '',
@@ -341,59 +337,50 @@ $table->data['percentileitem_4'][1] .= __('Value').'&nbsp;&nbsp;&nbsp;'.html_pri
     '',
     '',
     true
-).'&nbsp;&nbsp;';
+);
+$input_value_to_show .= '</div>';
 
+$table->rowstyle['percentileitem_4'] = 'display: none;';
+$table->data['percentileitem_4'][0] = html_print_label_input_block(
+    __('Value to show'),
+    $input_value_to_show
+);
 
-if (is_metaconsole()) {
+if (is_metaconsole() === true) {
+    $sql = 'SELECT id, server_name FROM tmetaconsole_setup';
     $table->rowstyle['all_2'] = 'display: none;';
-    $table->data['all_2'][0] = __('Servers');
-    if ($strict_user) {
-        $table->data['all_2'][1] = html_print_select(
-            '',
+    $table->data['all_2'][0] = html_print_label_input_block(
+        __('Servers'),
+        html_print_select_from_sql(
+            $sql,
             'servers',
             '',
             'metaconsole_init();',
             __('All'),
             '0',
             true
-        );
-    } else {
-            $sql = 'SELECT id, server_name
-        FROM tmetaconsole_setup';
-    }
-
-    $table->data['all_2'][1] = html_print_select_from_sql(
-        $sql,
-        'servers',
-        '',
-        'metaconsole_init();',
-        __('All'),
-        '0',
-        true
+        )
     );
 }
 
-
 $table->rowstyle['all_3'] = 'display: none;';
-$table->data['all_3'][0] = __('Groups');
-$table->colspan['all_3'][1] = '3';
-$table->data['all_3'][1] = '<div class="w250px">'.html_print_select_groups(
-    $config['id_user'],
-    'AR',
-    true,
-    'groups',
-    '',
-    '',
-    '',
-    0,
-    true
-).'</div>';
+$table->data['all_3'][0] = html_print_label_input_block(
+    __('Groups'),
+    html_print_select_groups(
+        $config['id_user'],
+        'AR',
+        true,
+        'groups',
+        '',
+        '',
+        '',
+        0,
+        true
+    )
+);
 
-
-$table->rowstyle['all_one_item_per_agent'] = 'display: none';
-$table->data['all_one_item_per_agent'][0] = __('One item per agent');
-$table->colspan['all_one_item_per_agent'][1] = '3';
-$table->data['all_one_item_per_agent'][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended(
+$input_one_item_per_agent = '<div class="inline-radio-button">'.__('Yes');
+$input_one_item_per_agent .= html_print_radio_button_extended(
     'item_per_agent',
     1,
     '',
@@ -403,7 +390,8 @@ $table->data['all_one_item_per_agent'][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_
     '',
     true
 ).'&nbsp;&nbsp;';
-$table->data['all_one_item_per_agent'][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended(
+$input_one_item_per_agent .= __('No');
+$input_one_item_per_agent .= html_print_radio_button_extended(
     'item_per_agent',
     0,
     '',
@@ -413,15 +401,18 @@ $table->data['all_one_item_per_agent'][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_
     '',
     true
 );
-$table->data['all_one_item_per_agent'][1] .= html_print_input_hidden(
+$input_one_item_per_agent .= html_print_input_hidden(
     'item_per_agent_test',
     0,
     true
 );
+$input_one_item_per_agent .= '</div>';
 
-
-$table->rowstyle['all_4'] = 'display: none;';
-$table->data['all_4'][0] = __('Agents').ui_print_help_tip(__('If you select several agents, only the common modules will be displayed'), true);
+$table->rowstyle['all_one_item_per_agent'] = 'display: none';
+$table->data['all_one_item_per_agent'][0] = html_print_label_input_block(
+    __('One item per agent'),
+    $input_one_item_per_agent
+);
 
 $agents_list = [];
 if (is_metaconsole() === false) {
@@ -434,106 +425,142 @@ if (is_metaconsole() === false) {
     );
 }
 
-
-$table->data['all_4'][1] = html_print_select(
-    $agents_list,
-    'id_agents[]',
-    0,
-    false,
-    '',
-    '',
-    true,
-    true
-);
-$table->data['all_4'][2] = ' <span class="align-top">'.__('Modules').'</span>';
-$table->data['all_4'][3] = html_print_select(
-    [],
-    'module[]',
-    0,
-    false,
-    __('None'),
-    -1,
-    true,
-    true
+$table->rowstyle['all_4'] = 'display: none;';
+$table->data['all_4'][0] = html_print_label_input_block(
+    __('Agents').ui_print_help_tip(
+        __('If you select several agents, only the common modules will be displayed'),
+        true
+    ),
+    html_print_select(
+        $agents_list,
+        'id_agents[]',
+        0,
+        false,
+        '',
+        '',
+        true,
+        true
+    )
 );
 
+$table->data['all_4'][1] = html_print_label_input_block(
+    __('Modules'),
+    html_print_select(
+        [],
+        'module[]',
+        0,
+        false,
+        __('None'),
+        -1,
+        true,
+        true
+    )
+);
 
-$table->rowstyle['all_6'] = 'display: none;';
-$table->data['all_6'][0] = __('Label');
 $label_type = [
     'agent_module' => __('Agent - Module'),
     'module'       => __('Module'),
     'agent'        => __('Agent'),
     'none'         => __('None'),
 ];
-$table->colspan['all_6'][1] = '3';
-$table->data['all_6'][1] = html_print_select(
-    $label_type,
-    'label_type',
-    'agent_module',
+
+$table->rowstyle['all_6'] = 'display: none;';
+$table->data['all_6'][0] = html_print_label_input_block(
+    __('Label'),
+    html_print_select(
+        $label_type,
+        'label_type',
+        'agent_module',
+        '',
+        '',
+        '',
+        true
+    )
+);
+
+$input_enable_link = '<div class="inline-radio-button">'.__('Yes');
+$input_enable_link .= html_print_radio_button_extended(
+    'enable_link',
+    1,
     '',
+    1,
+    false,
     '',
     '',
     true
 );
+$input_enable_link .= __('No');
+$input_enable_link .= html_print_radio_button_extended(
+    'enable_link',
+    0,
+    '',
+    1,
+    false,
+    '',
+    '',
+    true
+);
+$input_enable_link .= '</div>';
 
-
-$table->data['all_7'][0] = __('Enable link agent');
-$table->colspan['all_7'][1] = '3';
-$table->data['all_7'][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended('enable_link', 1, '', 1, false, '', '', true).'&nbsp;&nbsp;';
-$table->data['all_7'][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button_extended('enable_link', 0, '', 1, false, '', '', true);
-
+$table->data['all_6'][1] = html_print_label_input_block(
+    __('Enable link agent'),
+    $input_enable_link
+);
 
 $parents = visual_map_get_items_parents($visualConsole['id']);
 if (empty($parents) === true) {
     $parents = [];
 }
 
-$table->data['all_8'][0] = __('Set Parent');
-$table->data['all_8'][1] = html_print_select(
-    [
-        VISUAL_MAP_WIZARD_PARENTS_ITEM_MAP            => __('Item created in the visualmap'),
-        VISUAL_MAP_WIZARD_PARENTS_AGENT_RELANTIONSHIP => __('Use the agents relationship (from selected agents)'),
-    ],
-    'kind_relationship',
-    0,
-    '',
-    __('None'),
-    VISUAL_MAP_WIZARD_PARENTS_NONE,
-    true
+$table->data['all_8'][0] = html_print_label_input_block(
+    __('Set Parent'),
+    html_print_select(
+        [
+            VISUAL_MAP_WIZARD_PARENTS_ITEM_MAP            => __('Item created in the visualmap'),
+            VISUAL_MAP_WIZARD_PARENTS_AGENT_RELANTIONSHIP => __('Use the agents relationship (from selected agents)'),
+        ],
+        'kind_relationship',
+        0,
+        '',
+        __('None'),
+        VISUAL_MAP_WIZARD_PARENTS_NONE,
+        true,
+        false,
+        true,
+        '',
+        false,
+        'max-width:50%;'
+    )
 );
-$table->data['all_8'][2] = '<span id="parent_column_2_item_in_visual_map">'.__('Item in the map').'</span><span id="parent_column_2_relationship">'.ui_print_help_tip(
-    __('The parenting relationships in %s will be drawn on the map.', get_product_name()),
-    true
-).'</span>';
-$table->data['all_8'][3] = '<span id="parent_column_3_item_in_visual_map">'.html_print_select(
-    $parents,
-    'item_in_the_map',
-    0,
-    '',
-    __('None'),
-    0,
-    true
-).'</span>';
-
 
+$table->data['all_8'][1] = html_print_label_input_block(
+    '<span id="parent_column_2_item_in_visual_map">'.__('Item in the map').'</span><span id="parent_column_2_relationship">'.ui_print_help_tip(
+        __('The parenting relationships in %s will be drawn on the map.', get_product_name()),
+        true
+    ).'</span>',
+    '<span id="parent_column_3_item_in_visual_map">'.html_print_select(
+        $parents,
+        'item_in_the_map',
+        0,
+        '',
+        __('None'),
+        0,
+        true
+    ).'</span>'
+);
 
 if (is_metaconsole() === true) {
     $pure = get_parameter('pure', 0);
 
-    echo '<form method="post"
+    echo '<form method="post" class="max_floating_element_size"
 		action="index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&tab=wizard&id_visual_console='.$visualConsole['id'].'"
 		onsubmit="if (! confirm(\''.__('Are you sure to add many elements\nin visual map?').'\')) return false; else return check_fields();">';
 } else {
-    echo '<form method="post"
+    echo '<form method="post" class="max_floating_element_size" 
 		action="index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab='.$activeTab.'&id_visual_console='.$visualConsole['id'].'"
 		onsubmit="if (! confirm(\''.__('Are you sure to add many elements\nin visual map?').'\')) return false; else return check_fields();">';
 }
 
-if (is_metaconsole() === true) {
-    echo "<div class='title_tactical mrgn_top_15px'>".__('Wizard').'</div>';
-}
-
 html_print_table($table);
 
 if (is_metaconsole() === true) {
@@ -543,17 +570,15 @@ if (is_metaconsole() === true) {
 }
 
 html_print_input_hidden('id_visual_console', $visualConsole['id']);
-html_print_div(
-    [
-        'class'   => 'action-buttons',
-        'content' => html_print_submit_button(
-            __('Add'),
-            'go',
-            false,
-            [ 'icon' => 'wand' ],
-            true
-        ),
-    ]
+html_print_action_buttons(
+    html_print_submit_button(
+        __('Add'),
+        'go',
+        false,
+        [ 'icon' => 'wand' ],
+        true
+    ),
+    []
 );
 
 echo '</form>';
diff --git a/pandora_console/godmode/reporting/visual_console_favorite.php b/pandora_console/godmode/reporting/visual_console_favorite.php
index 4f12802a90..1724a241a9 100644
--- a/pandora_console/godmode/reporting/visual_console_favorite.php
+++ b/pandora_console/godmode/reporting/visual_console_favorite.php
@@ -242,7 +242,7 @@ if ($favorite_array == false) {
     echo "<ul class='container'>";
     foreach ($favorite_array as $favorite_k => $favourite_v) {
         if (is_metaconsole() === true) {
-            $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$favourite_v['id'];
+            $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id='.$favourite_v['id'];
         } else {
             $url = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$favourite_v['id'];
         }
diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index 7378a0b0f2..68ffdb6853 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -150,7 +150,7 @@ $table->size[1] = '50%';
 $table->data = [];
 $table->colspan = [];
 
-$table->colspan[0][0] = 2;
+$table->colspan[-1][0] = 2;
 $table->data[-1][0] = '<div class="section_table_title">'.__('Licence').'</div>';
 
 $table->colspan[0][0] = 2;
diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php
index 46792c7822..7d9e372d7e 100644
--- a/pandora_console/include/ajax/alert_list.ajax.php
+++ b/pandora_console/include/ajax/alert_list.ajax.php
@@ -639,7 +639,6 @@ if ($alert_validate === true) {
 }
 
 if ($get_agent_alerts_datatable === true) {
-    hd('holaaaaaaaaaaaaaa', true);
     // Datatables offset, limit and order.
     $filter_alert = get_parameter('filter', []);
     unset($filter_alert[0]);
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index b6e3932293..80267a18e9 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -478,7 +478,7 @@ function visual_map_print_item(
                     if (!is_metaconsole()) {
                         $url = $config['homeurl'].'index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;pure='.$config['pure'].'&amp;id='.$layoutData['id_layout_linked'];
                     } else {
-                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
+                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id='.$layoutData['id_layout_linked'].'&refr=0';
                     }
                 } else {
                     if ($layoutData['id_agente_modulo'] != 0) {
@@ -565,7 +565,7 @@ function visual_map_print_item(
 
                 if ($is_a_link_to_other_visualconsole) {
                     if (is_metaconsole() === true) {
-                        $url = $config['homeurl'].'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$layoutData['id_layout_linked'].'&refr=300';
+                        $url = $config['homeurl'].'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id='.$layoutData['id_layout_linked'].'&refr=300';
                     } else {
                         $url = $config['homeurl'].'index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;pure='.$config['pure'].'&amp;id='.$layoutData['id_layout_linked'];
                     }
@@ -593,7 +593,7 @@ function visual_map_print_item(
                         $url = 'index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;pure='.$config['pure'].'&amp;id='.$layoutData['id_layout_linked'];
                     } else {
                         $pure = get_parameter('pure', 0);
-                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
+                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id='.$layoutData['id_layout_linked'].'&refr=0';
                     }
                 } else if (preg_match('/<a.*href=["\'](.*)["\']>/', $layoutData['label'], $matches)) {
                     // Link to an URL
@@ -641,7 +641,7 @@ function visual_map_print_item(
                         $url = 'index.php?sec=network&amp;sec2=operation/visual_console/render_view&amp;pure='.$config['pure'].'&amp;id='.$layoutData['id_layout_linked'];
                     } else {
                         $pure = get_parameter('pure', 0);
-                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
+                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id='.$layoutData['id_layout_linked'].'&refr=0';
                     }
                 } else if ($layoutData['id_agente_modulo'] != 0) {
                         // Link to an module
@@ -724,7 +724,7 @@ function visual_map_print_item(
                         $url = 'index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config['pure'].'&amp;id='.$layoutData['id_layout_linked'];
                     } else {
                         $pure = get_parameter('pure', 0);
-                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
+                        $url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id='.$layoutData['id_layout_linked'].'&refr=0';
                     }
                 }
             break;
@@ -780,7 +780,7 @@ function visual_map_print_item(
                         $url = $config['homeurl'].'/index.php?sec=reporting&amp;sec2=operation/visual_console/render_view&amp;pure='.$config['pure'].'&amp;id='.$layoutData['id_layout_linked'];
                     } else {
                         $pure = get_parameter('pure', 0);
-                        $url = $config['homeurl'].'/index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
+                        $url = $config['homeurl'].'/index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id='.$layoutData['id_layout_linked'].'&refr=0';
                     }
                 }
             break;
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 968d0b006b..30da9745eb 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -247,7 +247,8 @@ function agent_changed_by_multiple_agents(event, id_agent, selected) {
       id_server: id_server,
       status_module: module_status,
       id_group: id_group,
-      pendingdelete: event.target.dataset.pendingdelete // Get pendingdelete attribute from target
+      pendingdelete:
+        event.target != undefined ? event.target.dataset.pendingdelete : 0 // Get pendingdelete attribute from target
     },
     function(data) {
       $("#module").empty();
diff --git a/pandora_console/include/lib/Dashboard/Widgets/maps_status.php b/pandora_console/include/lib/Dashboard/Widgets/maps_status.php
index 9f603adfb7..d608b72047 100755
--- a/pandora_console/include/lib/Dashboard/Widgets/maps_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/maps_status.php
@@ -336,7 +336,7 @@ class MapsStatusWidget extends Widget
                 $url = $config['homeurl'];
                 if (\is_metaconsole() === true) {
                     $url .= sprintf(
-                        'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&refr=%s&id_visualmap=%s',
+                        'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&refr=%s&id=%s',
                         $config['vc_refr'],
                         $id_layout
                     );
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php
index b1e4307d8a..67cf9d30c0 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@@ -1147,11 +1147,11 @@ class Item extends CachedModel
 
                 return $baseUrl.'?'.http_build_query(
                     [
-                        'sec'          => 'screen',
-                        'sec2'         => 'screens/screens',
-                        'action'       => 'visualmap',
-                        'id_visualmap' => $vcId,
-                        'pure'         => (int) (isset($config['pure']) === true) ? $config['pure'] : 0,
+                        'sec'    => 'screen',
+                        'sec2'   => 'screens/screens',
+                        'action' => 'visualmap',
+                        'id'     => $vcId,
+                        'pure'   => (int) (isset($config['pure']) === true) ? $config['pure'] : 0,
                     ]
                 );
             } else if (empty($linkedLayoutNodeId) === true
diff --git a/pandora_console/include/styles/alert.css b/pandora_console/include/styles/alert.css
index 74820af632..24915928ab 100644
--- a/pandora_console/include/styles/alert.css
+++ b/pandora_console/include/styles/alert.css
@@ -43,6 +43,19 @@ li#li-time-from-to > label:not(:first-child) {
   margin-right: 15px;
 }
 
+div.rule-builder-actions {
+  width: 100%;
+  z-index: 0;
+}
+div.rule-builder-actions ul {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
+  align-items: center;
+  align-content: center;
+}
+
 #rule-builder .rule-builder-actions li label {
   width: 0;
 }
diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index ca497902c1..ec43f4befc 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -501,28 +501,6 @@ div#main_pure {
   align-items: center;
 }
 
-#form-config-widget .info_box,
-.content-widget .info_box {
-  border-radius: 5px;
-  width: 100%;
-}
-
-#form-config-widget .info_box {
-  margin: 0 auto;
-}
-#form-config-widget .info_box tbody tr td,
-.content-widget .info_box tbody tr td {
-  padding: 10px;
-}
-#form-config-widget .info_box tbody tr td.icon,
-.content-widget .info_box tbody tr td.icon {
-  padding-right: 10px !important;
-}
-
-#form-config-widget .info_box tbody tr td {
-  font-size: 8pt;
-}
-
 .content-widget .databox.filters > tbody > tr > td {
   padding-right: 30px;
 }
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 2695f6adc2..65e793c71d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1766,7 +1766,7 @@ div.title_line {
 #menu_tab_frame_view,
 #menu_tab_frame_view_bc {
   position: sticky;
-  top: 59px;
+  top: 61px;
   z-index: 1;
   display: flex;
   align-items: flex-end;
@@ -1775,7 +1775,7 @@ div.title_line {
   width: -webkit-fill-available;
   width: -moz-available;
   padding-right: 0px;
-  height: 53px;
+  height: 50px;
   box-sizing: border-box;
   background-color: #fff;
   margin: -25px -25px 25px -25px;
@@ -2772,7 +2772,8 @@ td.cellBig {
 .info_box_container.info_box_information {
   width: -webkit-fill-available;
   width: -moz-available;
-  position: relative;
+  position: inherit;
+  display: flex;
   top: 0 !important;
   right: 0;
   margin: 0 10px;
@@ -10097,7 +10098,6 @@ button.submitButton {
   border-radius: 8px;
   padding: 0 10px;
   cursor: pointer;
-  z-index: 100;
 }
 
 button.buttonButton.mini,
@@ -11015,7 +11015,7 @@ pre.external_tools_output {
 
 .fixed_filter_bar {
   position: sticky;
-  top: 114px;
+  top: 111px;
   border: 1px solid #e5e9ed;
   background-color: #fff;
   z-index: 1;
diff --git a/pandora_console/include/styles/visual_maps.css b/pandora_console/include/styles/visual_maps.css
index bba9f1343d..8a0af9160b 100644
--- a/pandora_console/include/styles/visual_maps.css
+++ b/pandora_console/include/styles/visual_maps.css
@@ -77,8 +77,7 @@ div#vc-controls img.vc-qr {
   flex: 1;
   display: flex;
   justify-content: space-between;
-  margin: 1em 0;
-  padding-left: 12px;
+  padding: 10px 20px;
 }
 
 .visual-console-edit-controls > span {
diff --git a/pandora_console/include/visual-console-client/vc.main.css b/pandora_console/include/visual-console-client/vc.main.css
index b5ff96df95..d09216b63d 100644
--- a/pandora_console/include/visual-console-client/vc.main.css
+++ b/pandora_console/include/visual-console-client/vc.main.css
@@ -5,6 +5,7 @@
   background-size: 100% 100%;
   background-position: center;
   margin-top: 5px;
+  z-index: 0;
 }
 
 .is-maintenance {
@@ -857,5 +858,4 @@ div.module-graph .gauge_d3_class {
   animation: rotate-second 60s infinite linear;
 }
 
-
-/*# sourceMappingURL=vc.main.css.map*/
\ No newline at end of file
+/*# sourceMappingURL=vc.main.css.map*/
diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php
index a0e4ac2493..c7831cc2a5 100644
--- a/pandora_console/operation/visual_console/legacy_view.php
+++ b/pandora_console/operation/visual_console/legacy_view.php
@@ -21,11 +21,7 @@ ui_require_css_file('visual_maps');
 
 check_login();
 
-if (!defined('METACONSOLE')) {
-    $id_layout = (int) get_parameter('id');
-} else {
-    $id_layout = (int) get_parameter('id_visualmap');
-}
+$id_layout = (int) get_parameter('id');
 
 if ($id_layout) {
     $default_action = 'edit';
@@ -247,7 +243,7 @@ if ($config['pure']) {
     if (!is_metaconsole()) {
         echo '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'">';
     } else {
-        echo '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$id_layout.'&refr='.$refr.'">';
+        echo '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id='.$id_layout.'&refr='.$refr.'">';
     }
 
     echo html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode'), 'class' => 'invert_filter']);
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index 0b55078d81..0c295c9914 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -73,7 +73,7 @@ ui_require_css_file('visual_maps');
 ui_require_css_file('register');
 
 // Query parameters.
-$visualConsoleId = (int) get_parameter(!is_metaconsole() ? 'id' : 'id_visualmap');
+$visualConsoleId = (int) get_parameter('id');
 // To hide the menus.
 $pure = (bool) get_parameter('pure', $config['pure']);
 // Refresh interval in seconds.
@@ -81,7 +81,6 @@ $refr = (int) get_parameter('refr', $config['vc_refr']);
 
 $width = (int) get_parameter('width', 0);
 $height = (int) get_parameter('height', 0);
-
 // Load Visual Console.
 use Models\VisualConsole\Container as VisualConsole;
 $visualConsole = null;
@@ -207,37 +206,6 @@ $options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual
 $options['view']['active'] = true;
 
 if (is_metaconsole() === false) {
-    if (!$config['pure']) {
-        $options['pure']['text'] = '<a id ="full_screen" href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&pure=1&refr='.$refr.'">'.html_print_image(
-            'images/fullscreen@svg.svg',
-            true,
-            [
-                'title' => __('Full screen mode'),
-                'class' => 'main_menu_icon invert_filter',
-            ]
-        ).'</a>';
-
-        // Header.
-        ui_print_standard_header(
-            $visualConsoleName,
-            'images/visual_console.png',
-            false,
-            'visual_console_view',
-            false,
-            $options,
-            [
-                [
-                    'link'  => '',
-                    'label' => __('Topology maps'),
-                ],
-                [
-                    'link'  => '',
-                    'label' => __('Visual console'),
-                ],
-            ]
-        );
-    }
-
     // Set the hidden value for the javascript.
     html_print_input_hidden('metaconsole', 0);
 } else {
@@ -245,6 +213,37 @@ if (is_metaconsole() === false) {
     html_print_input_hidden('metaconsole', 1);
 }
 
+if (!$config['pure']) {
+    $options['pure']['text'] = '<a id ="full_screen" href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&pure=1&refr='.$refr.'">'.html_print_image(
+        'images/fullscreen@svg.svg',
+        true,
+        [
+            'title' => __('Full screen mode'),
+            'class' => 'main_menu_icon invert_filter',
+        ]
+    ).'</a>';
+
+    // Header.
+    ui_print_standard_header(
+        $visualConsoleName,
+        'images/visual_console.png',
+        false,
+        'visual_console_view',
+        false,
+        $options,
+        [
+            [
+                'link'  => '',
+                'label' => __('Topology maps'),
+            ],
+            [
+                'link'  => '',
+                'label' => __('Visual console'),
+            ],
+        ]
+    );
+}
+
 $edit_capable = (bool) (
     check_acl($config['id_user'], 0, 'VM')
     || check_acl($config['id_user'], 0, 'VW')
@@ -252,7 +251,7 @@ $edit_capable = (bool) (
 
 if ($pure === false) {
     if ($edit_capable === true) {
-        echo '<div id ="edit-vc">';
+        echo '<div id ="edit-vc" class="fixed_filter_bar">';
         echo '<div id ="edit-controls" class="visual-console-edit-controls" style="visibility:hidden">';
         echo '<div class="toolbox-buttons">';
         $class_camera = 'camera_min link-create-item';
@@ -403,7 +402,7 @@ if ($pure === false) {
         echo '</div>';
 
         if ($aclWrite === true || $aclManage === true) {
-            echo '<div class="flex-row" style="width:220px;">';
+            echo '<div class="flex-row" style="width:220px;padding:10px 30px;">';
             if (is_metaconsole() === false) {
                 echo '<div id="force_check_control" class="flex-colum-center">';
                 echo html_print_label(__('Force'), 'force-mode', true);
@@ -476,7 +475,7 @@ if ($pure === true) {
     // Quit fullscreen.
     echo '<li class="nomn">';
     if (is_metaconsole() === true) {
-        $urlNoFull = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$visualConsoleId.'&refr='.$refr;
+        $urlNoFull = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id='.$visualConsoleId.'&refr='.$refr;
     } else {
         $urlNoFull = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&refr='.$refr;
     }