diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 283afc5565..70a111f59c 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -70,10 +70,6 @@ $values[SECONDS_5MINUTES] = human_time_description_raw(SECONDS_5MINUTES);
 $values[SECONDS_10MINUTES] = human_time_description_raw(SECONDS_10MINUTES);
 $values[SECONDS_30MINUTES] = human_time_description_raw(SECONDS_30MINUTES);
 
-$table_behaviour->data[$row][0] = __('Default interval for refresh on Visual Console').ui_print_help_tip(__('This interval will affect to Visual Console pages'), true);
-$table_behaviour->data[$row][1] = html_print_select($values, 'vc_refr', $config['vc_refr'], '', 'N/A', 0, true, false, false);
-$row++;
-
 $table_behaviour->data[$row][0] = __('Paginated module view');
 $table_behaviour->data[$row][1] = html_print_checkbox_switch(
     'paginate_module',
@@ -908,6 +904,24 @@ $row++;
     $table_vc->size[0] = '50%';
     $table_vc->data = [];
 
+    // Remove when the new view reaches rock solid stability.
+    $table_vc->data[$row][0] = __('Legacy Visual Console View');
+    $table_vc->data[$row][0] .= ui_print_help_tip(
+        __('To use the old view when using the Visual Console visor'),
+        true
+    );
+    $table_vc->data[$row][1] = html_print_checkbox_switch(
+        'legacy_vc',
+        1,
+        (bool) $config['legacy_vc'],
+        true
+    );
+    $row++;
+
+    $table_vc->data[$row][0] = __('Default interval for refresh on Visual Console').ui_print_help_tip(__('This interval will affect to Visual Console pages'), true);
+    $table_vc->data[$row][1] = html_print_select($values, 'vc_refr', (int) $config['vc_refr'], '', 'N/A', 0, true, false, false);
+    $row++;
+
     $vc_favourite_view_array[0] = __('Classic view');
     $vc_favourite_view_array[1] = __('View of favorites');
     $table_vc->data[$row][0] = __('Type of view of visual consoles').ui_print_help_tip(__('Allows you to directly display the list of favorite visual consoles'), true);
@@ -918,12 +932,8 @@ $row++;
     $table_vc->data[$row][1] = "<input type ='number' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>";
     $row++;
 
-    if (empty($config['vc_line_thickness'])) {
-        $config['vc_line_thickness'] = 2;
-    }
-
     $table_vc->data[$row][0] = __('Default line thickness for the Visual Console').ui_print_help_tip(__('This interval will affect to the lines between elements on the Visual Console'), true);
-    $table_vc->data[$row][1] = html_print_input_text('vc_line_thickness', $config['vc_line_thickness'], '', 5, 5, true);
+    $table_vc->data[$row][1] = html_print_input_text('vc_line_thickness', (int) $config['vc_line_thickness'], '', 5, 5, true);
 
 
     echo '<fieldset>';
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 7b3c4b632b..0200331e5b 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -980,7 +980,11 @@ function config_update_config()
                         $error_update[] = __('Custom support url');
                     }
 
-                    if (!config_update_value('vc_refr', get_parameter('vc_refr'))) {
+                    if (!config_update_value('legacy_vc', (int) get_parameter('legacy_vc'))) {
+                        $error_update[] = __('Use the legacy Visual Console');
+                    }
+
+                    if (!config_update_value('vc_refr', (int) get_parameter('vc_refr'))) {
                         $error_update[] = __('Default interval for refresh on Visual Console');
                     }
 
@@ -2415,10 +2419,18 @@ function config_process_config()
         config_update_value('dbtype', 'mysql');
     }
 
+    if (!isset($config['legacy_vc'])) {
+        config_update_value('legacy_vc', 0);
+    }
+
     if (!isset($config['vc_refr'])) {
         config_update_value('vc_refr', 300);
     }
 
+    if (!isset($config['vc_line_thickness'])) {
+        config_update_value('vc_line_thickness', 2);
+    }
+
     if (!isset($config['agent_size_text_small'])) {
         config_update_value('agent_size_text_small', 18);
     }
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Container.php b/pandora_console/include/rest-api/models/VisualConsole/Container.php
index 29b6809153..18a81b32fb 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Container.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Container.php
@@ -78,15 +78,16 @@ final class Container extends Model
     protected function decode(array $data): array
     {
         return [
-            'id'              => (int) $data['id'],
-            'name'            => $data['name'],
-            'groupId'         => $this->extractGroupId($data),
-            'backgroundImage' => $this->extractBackgroundImage($data),
-            'backgroundColor' => $this->extractBackgroundColor($data),
-            'isFavorite'      => $this->extractFavorite($data),
-            'width'           => (int) $data['width'],
-            'height'          => (int) $data['height'],
-            'backgroundURL'   => $this->extractBackgroundUrl($data),
+            'id'                => (int) $data['id'],
+            'name'              => $data['name'],
+            'groupId'           => $this->extractGroupId($data),
+            'backgroundImage'   => $this->extractBackgroundImage($data),
+            'backgroundColor'   => $this->extractBackgroundColor($data),
+            'isFavorite'        => $this->extractFavorite($data),
+            'width'             => (int) $data['width'],
+            'height'            => (int) $data['height'],
+            'backgroundURL'     => $this->extractBackgroundUrl($data),
+            'relationLineWidth' => (int) $data['relationLineWidth'],
         ];
     }
 
@@ -216,6 +217,8 @@ final class Container extends Model
         // Clean HTML entities.
         $row = \io_safe_output($row);
 
+        $row['relationLineWidth'] = (int) $config['vc_line_thickness'];
+
         $backgroundUrl = static::extractBackgroundUrl($row);
         $backgroundImage = static::extractBackgroundImage($row);
 
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
new file mode 100644
index 0000000000..bc5b3d2a20
--- /dev/null
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -0,0 +1,259 @@
+<?php
+
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 20012 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation for version 2.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// Don't start a session before this import.
+// The session is configured and started inside the config process.
+require_once '../../include/config.php';
+
+// Set root on homedir, as defined in setup
+chdir($config['homedir']);
+
+ob_start();
+// Enterprise support
+if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+    include_once ENTERPRISE_DIR.'/load_enterprise.php';
+}
+
+if (file_exists(ENTERPRISE_DIR.'/include/functions_login.php')) {
+    include_once ENTERPRISE_DIR.'/include/functions_login.php';
+}
+
+echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
+echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n";
+echo '<head>';
+
+global $vc_public_view;
+$vc_public_view = true;
+// This starts the page head. In the call back function,
+// things from $page['head'] array will be processed into the head
+ob_start('ui_process_page_head');
+// Enterprise main
+enterprise_include('index.php');
+
+require_once 'include/functions_visual_map.php';
+
+$hash = get_parameter('hash');
+$id_layout = (int) get_parameter('id_layout');
+$graph_javascript = (bool) get_parameter('graph_javascript');
+$config['id_user'] = get_parameter('id_user');
+
+$myhash = md5($config['dbpass'].$id_layout.$config['id_user']);
+
+// Check input hash
+if ($myhash != $hash) {
+    exit;
+}
+
+$refr = (int) get_parameter('refr', 0);
+$layout = db_get_row('tlayout', 'id', $id_layout);
+
+if (! $layout) {
+    db_pandora_audit('ACL Violation', 'Trying to access visual console without id layout');
+    include $config['homedir'].'/general/noaccess.php';
+    exit;
+}
+
+if (!isset($config['pure'])) {
+    $config['pure'] = 0;
+}
+
+// ~ $xhr = (bool) get_parameter('xhr');
+if ($layout) {
+    $id_group = $layout['id_group'];
+    $layout_name = $layout['name'];
+    $background = $layout['background'];
+    $bwidth = $layout['width'];
+    $bheight = $layout['height'];
+    // ~ $width = (int) get_parameter('width');
+    // ~ if ($width <= 0) $width = null;
+    // ~ $height = (int) get_parameter('height');
+    // ~ if ($height <= 0) $height = null;
+    // ~ ob_start();
+    // ~ // Render map
+    visual_map_print_visual_map(
+        $id_layout,
+        true,
+        true,
+        $width,
+        $height,
+        '../../',
+        true,
+        true,
+        true
+    );
+    // ~ return;
+} else {
+    echo '<div id="vc-container"></div>';
+}
+
+// Floating menu - Start
+echo '<div id="vc-controls" style="z-index:300;">';
+
+echo '<div id="menu_tab">';
+echo '<ul class="mn">';
+
+// QR code
+echo '<li class="nomn">';
+echo '<a href="javascript: show_dialog_qrcode();">';
+echo '<img class="vc-qr" src="../../images/qrcode_icon_2.jpg"/>';
+echo '</a>';
+echo '</li>';
+
+// Countdown
+echo '<li class="nomn">';
+echo '<div class="vc-refr">';
+echo '<div class="vc-countdown"></div>';
+echo '<div id="vc-refr-form">';
+echo __('Refresh').':';
+echo html_print_select(get_refresh_time_array(), 'refr', $refr, '', '', 0, true, false, false);
+echo '</div>';
+echo '</div>';
+echo '</li>';
+
+// Console name
+echo '<li class="nomn">';
+echo '<div class="vc-title">'.$layout_name.'</div>';
+echo '</li>';
+
+echo '</ul>';
+echo '</div>';
+
+echo '</div>';
+// Floating menu - End
+// QR code dialog
+echo '<div style="display: none;" id="qrcode_container" title="'.__('QR code of the page').'">';
+echo '<div id="qrcode_container_image"></div>';
+echo '</div>';
+
+ui_require_jquery_file('countdown');
+ui_require_javascript_file('wz_jsgraphics');
+ui_require_javascript_file('pandora_visual_console');
+$ignored_params['refr'] = '';
+?>
+
+<script language="javascript" type="text/javascript">
+    $(document).ready(function () {
+        var refr = <?php echo (int) $refr; ?>;
+        var href = "<?php echo ui_get_url_refresh($ignored_params); ?>";
+        
+        var startCountDown = function (duration, cb) {
+            $('div.vc-countdown').countdown('destroy');
+            if (!duration) return;
+            var t = new Date();
+            t.setTime(t.getTime() + duration * 1000);
+            $('div.vc-countdown').countdown({
+                until: t,
+                format: 'MS',
+                layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
+                alwaysExpire: true,
+                onExpiry: function () {
+                    $('div.vc-countdown').countdown('destroy');
+                    //~ cb();
+                    url = js_html_entity_decode( href ) + duration;
+                    $(document).attr ("location", url);
+                }
+            });
+        }
+        startCountDown(refr, false);
+        // Auto hide controls
+        var controls = document.getElementById('vc-controls');
+        autoHideElement(controls, 1000);
+        
+        $('select#refr').change(function (event) {
+            refr = Number.parseInt(event.target.value, 10);
+            startCountDown(refr, false);
+        });
+        
+        
+        $('body').css('background-color','<?php echo $layout['background_color']; ?>');
+        $('body').css('margin','0');
+        $('body').css('height','100%');
+        $('body').css('overflow','hidden');
+        $(".module_graph .menu_graph").css('display','none');
+        
+        $(".parent_graph").each(function(){
+            
+        if($(this).css('background-color') != 'rgb(255, 255, 255)'){
+                $(this).css('color', '#999');                
+                }
+        });            
+
+        $(".overlay").removeClass("overlay").addClass("overlaydisabled");
+        
+        // Start the map fetch
+        //~ fetchMap();
+    });
+    
+    $(window).on('load', function () {
+        $('.item:not(.icon) img:not(.b64img)').each( function() {
+            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
+                if(    $(this).parent()[0].tagName == 'DIV'){
+                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+                }
+                else if (    $(this).parent()[0].tagName == 'A') {
+                    $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+                }
+                $(this).css('margin-left','');
+            }
+            else {
+                if(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2 < 0){
+                    $(this).css('margin-left','');
+                    $(this).css('margin-top','');
+                } else {
+                    if(    $(this).parent()[0].tagName == 'DIV'){
+                        $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                    }
+                    else if (    $(this).parent()[0].tagName == 'A') {
+                        $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                    }
+                    $(this).css('margin-top','');
+                }
+            }
+        });
+        
+        $('.item > div').each( function() {
+            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
+                if($(this).attr('id').indexOf('clock') || $(this).attr('id').indexOf('overlay')){
+                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+                }
+                else{
+                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px');
+                }
+                $(this).css('margin-left','');
+            }
+            else {
+                $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                $(this).css('margin-top','');
+            }
+        });
+        
+        $('.item > a > div').each( function() {
+            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
+                $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2-5)+'px');
+                $(this).css('margin-left','');
+            }
+            else {
+                $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                $(this).css('margin-top','');
+            }
+        });
+        
+        $(".graph:not([class~='noresizevc'])").each(function(){
+            height = parseInt($(this).css("height")) - 30;
+            $(this).css('height', height);
+        });
+        
+        // Start the map fetch
+        //~ fetchMap();
+    });
+</script>
diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php
new file mode 100644
index 0000000000..4799932e2c
--- /dev/null
+++ b/pandora_console/operation/visual_console/legacy_view.php
@@ -0,0 +1,380 @@
+<?php
+
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation for version 2.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+global $config;
+
+// Login check
+require_once $config['homedir'].'/include/functions_visual_map.php';
+
+check_login();
+
+if (!defined('METACONSOLE')) {
+    $id_layout = (int) get_parameter('id');
+} else {
+    $id_layout = (int) get_parameter('id_visualmap');
+}
+
+if ($id_layout) {
+    $default_action = 'edit';
+} else {
+    $default_action = 'new';
+}
+
+if (!defined('METACONSOLE')) {
+    $action = get_parameterBetweenListValues(
+        'action',
+        [
+            'new',
+            'save',
+            'edit',
+            'update',
+            'delete',
+        ],
+        $default_action
+    );
+} else {
+    $action = get_parameterBetweenListValues(
+        'action2',
+        [
+            'new',
+            'save',
+            'edit',
+            'update',
+            'delete',
+        ],
+        $default_action
+    );
+}
+
+$refr = (int) get_parameter('refr', $config['vc_refr']);
+$graph_javascript = (bool) get_parameter('graph_javascript', true);
+$vc_refr = false;
+
+if (isset($config['vc_refr']) and $config['vc_refr'] != 0) {
+    $view_refresh = $config['vc_refr'];
+} else {
+    $view_refresh = '300';
+}
+
+// Get input parameter for layout id
+if (! $id_layout) {
+    db_pandora_audit(
+        'ACL Violation',
+        'Trying to access visual console without id layout'
+    );
+    include 'general/noaccess.php';
+    exit;
+}
+
+$layout = db_get_row('tlayout', 'id', $id_layout);
+
+if (! $layout) {
+    db_pandora_audit(
+        'ACL Violation',
+        'Trying to access visual console without id layout'
+    );
+    include 'general/noaccess.php';
+    exit;
+}
+
+$id_group = $layout['id_group'];
+$layout_name = $layout['name'];
+$background = $layout['background'];
+$bwidth = $layout['width'];
+$bheight = $layout['height'];
+
+$pure_url = '&pure='.$config['pure'];
+
+// ACL
+$vconsole_read = check_acl($config['id_user'], $id_group, 'VR');
+$vconsole_write = check_acl($config['id_user'], $id_group, 'VW');
+$vconsole_manage = check_acl($config['id_user'], $id_group, 'VM');
+
+if (! $vconsole_read && !$vconsole_write && !$vconsole_manage) {
+    db_pandora_audit(
+        'ACL Violation',
+        'Trying to access visual console without group access'
+    );
+    include 'general/noaccess.php';
+    exit;
+}
+
+// Render map
+$options = [];
+
+$options['consoles_list']['text'] = '<a href="index.php?sec=network&sec2=godmode/reporting/map_builder&refr='.$refr.'">'.html_print_image(
+    'images/visual_console.png',
+    true,
+    ['title' => __('Visual consoles list')]
+).'</a>';
+
+if ($vconsole_write || $vconsole_manage) {
+    $url_base = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&action=';
+
+    $hash = md5($config['dbpass'].$id_layout.$config['id_user']);
+
+    $options['public_link']['text'] = '<a href="'.ui_get_full_url(
+        'operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config['id_user']
+    ).'" target="_blank">'.html_print_image(
+        'images/camera_mc.png',
+        true,
+        ['title' => __('Show link to public Visual Console')]
+    ).'</a>';
+    $options['public_link']['active'] = false;
+
+    $options['data']['text'] = '<a href="'.$url_base.$action.'&tab=data&id_visual_console='.$id_layout.'">'.html_print_image(
+        'images/op_reporting.png',
+        true,
+        ['title' => __('Main data')]
+    ).'</a>';
+    $options['list_elements']['text'] = '<a href="'.$url_base.$action.'&tab=list_elements&id_visual_console='.$id_layout.'">'.html_print_image(
+        'images/list.png',
+        true,
+        ['title' => __('List elements')]
+    ).'</a>';
+
+    if (enterprise_installed()) {
+        $options['wizard_services']['text'] = '<a href="'.$url_base.$action.'&tab=wizard_services&id_visual_console='.$id_layout.'">'.html_print_image(
+            'images/wand_services.png',
+            true,
+            ['title' => __('Services wizard')]
+        ).'</a>';
+    }
+
+    $options['wizard']['text'] = '<a href="'.$url_base.$action.'&tab=wizard&id_visual_console='.$id_layout.'">'.html_print_image(
+        'images/wand.png',
+        true,
+        ['title' => __('Wizard')]
+    ).'</a>';
+    $options['editor']['text'] = '<a href="'.$url_base.$action.'&tab=editor&id_visual_console='.$id_layout.'">'.html_print_image(
+        'images/builder.png',
+        true,
+        ['title' => __('Builder')]
+    ).'</a>';
+}
+
+$options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$view_refresh.'">'.html_print_image('images/operation.png', true, ['title' => __('View')]).'</a>';
+$options['view']['active'] = true;
+
+if (!is_metaconsole()) {
+    if (!$config['pure']) {
+        $options['pure']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'&pure=1">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).'</a>';
+        ui_print_page_header($layout_name, 'images/visual_console.png', false, '', false, $options);
+    }
+
+    // Set the hidden value for the javascript
+    html_print_input_hidden('metaconsole', 0);
+} else {
+    // Set the hidden value for the javascript
+    html_print_input_hidden('metaconsole', 1);
+}
+
+if ($config['pure']) {
+    // Container of the visual map (ajax loaded)
+    echo '<div id="vc-container">'.visual_map_print_visual_map(
+        $id_layout,
+        true,
+        true,
+        null,
+        null,
+        '',
+        false,
+        true
+    ).'</div>';
+
+    // Floating menu - Start
+    echo '<div id="vc-controls" style="z-index: 999">';
+
+    echo '<div id="menu_tab">';
+    echo '<ul class="mn">';
+
+    // Quit fullscreen
+    echo '<li class="nomn">';
+    echo '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'">';
+    echo html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode')]);
+    echo '</a>';
+    echo '</li>';
+
+    // Countdown
+    echo '<li class="nomn">';
+    echo '<div class="vc-refr">';
+    echo '<div class="vc-countdown"></div>';
+    echo '<div id="vc-refr-form">';
+    echo __('Refresh').':';
+    echo html_print_select(get_refresh_time_array(), 'refr', $refr, '', '', 0, true, false, false);
+    echo '</div>';
+    echo '</div>';
+    echo '</li>';
+
+    // Console name
+    echo '<li class="nomn">';
+    echo '<div class="vc-title">'.$layout_name.'</div>';
+    echo '</li>';
+
+    echo '</ul>';
+    echo '</div>';
+
+    echo '</div>';
+    // Floating menu - End
+    ui_require_jquery_file('countdown');
+
+    ?>
+    <style type="text/css">
+        /* Avoid the main_pure container 1000px height */
+        body.pure {
+            min-height: 100px;
+            margin: 0px;
+            overflow: hidden;
+            height: 100%;
+            <?php
+            echo 'background-color: '.$layout['background_color'].';';
+            ?>
+        }
+        div#main_pure {
+            height: 100%;
+            margin: 0px;
+            <?php
+            echo 'background-color: '.$layout['background_color'].';';
+            ?>
+        }
+    </style>
+    <?php
+} else {
+    visual_map_print_visual_map($id_layout, true, true, null, null, '', false, true, true);
+}
+
+ui_require_javascript_file('wz_jsgraphics');
+ui_require_javascript_file('pandora_visual_console');
+$ignored_params['refr'] = '';
+?>
+
+<script language="javascript" type="text/javascript">
+    $(document).ready (function () {
+        var refr = <?php echo (int) $refr; ?>;
+        var pure = <?php echo (int) $config['pure']; ?>;
+        var href = "<?php echo ui_get_url_refresh($ignored_params); ?>";
+        if (pure) {
+            var startCountDown = function (duration, cb) {
+                $('div.vc-countdown').countdown('destroy');
+                if (!duration) return;
+                var t = new Date();
+                t.setTime(t.getTime() + duration * 1000);
+                $('div.vc-countdown').countdown({
+                    until: t,
+                    format: 'MS',
+                    layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
+                    alwaysExpire: true,
+                    onExpiry: function () {
+                        $('div.vc-countdown').countdown('destroy');
+                        //cb();
+                        url = js_html_entity_decode( href ) + duration;
+                        $(document).attr ("location", url);
+                        /*$.post(window.location.href.replace("refr=300","refr="+new_count), function(respuestaSolicitud){
+                            $('#background_<?php echo $id_layout; ?>').html(respuestaSolicitud);
+                        });
+                        */
+                        $("#main_pure").css('background-color','<?php echo $layout['background_color']; ?>');
+                        
+                        }
+                });
+            }
+            
+            startCountDown(refr, false);
+            
+            var controls = document.getElementById('vc-controls');
+            autoHideElement(controls, 1000);
+            
+            $('select#refr').change(function (event) {
+                refr = Number.parseInt(event.target.value, 10);
+                new_count = event.target.value;
+                startCountDown(refr, false);
+            });
+        }
+        else {
+            $('#refr').change(function () {
+                $('#hidden-vc_refr').val($('#refr option:selected').val());
+            });
+        }
+        
+        $(".module_graph .menu_graph").css('display','none');
+        
+        $(".parent_graph").each( function() {
+            if ($(this).css('background-color') != 'rgb(255, 255, 255)')
+                $(this).css('color', '#999');
+        });
+        
+        $(".overlay").removeClass("overlay").addClass("overlaydisabled");
+    
+    });
+    
+    $(window).on('load', function () {
+        $('.item:not(.icon) img:not(.b64img)').each( function() {
+            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
+                if(    $(this).parent()[0].tagName == 'DIV'){
+                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+                }
+                else if (    $(this).parent()[0].tagName == 'A') {
+                    $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+                }
+                $(this).css('margin-left','');
+            }
+            else {
+                if(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2 < 0){
+                    $(this).css('margin-left','');
+                    $(this).css('margin-top','');
+                } else {
+                    if(    $(this).parent()[0].tagName == 'DIV'){
+                        $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                    }
+                    else if (    $(this).parent()[0].tagName == 'A') {
+                        $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                    }
+                    $(this).css('margin-top','');
+                }
+            }
+        });
+        
+        $('.item > div').each( function() {
+            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
+                if($(this).attr('id').indexOf('clock') || $(this).attr('id').indexOf('overlay')){
+                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
+                }
+                else{
+                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px');
+                }
+                $(this).css('margin-left','');
+            }
+            else {
+                $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                $(this).css('margin-top','');
+            }
+        });
+        
+        $('.item > a > div').each( function() {
+            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
+                $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2-5)+'px');
+                $(this).css('margin-left','');
+            }
+            else {
+                $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
+                $(this).css('margin-top','');
+            }
+        });
+        
+        $(".graph:not([class~='noresizevc'])").each(function(){
+            height = parseInt($(this).css("height")) - 30;
+            $(this).css('height', height);
+        });
+        
+    });
+</script>
\ No newline at end of file
diff --git a/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php
index 6411fcd9df..8a6ff462fc 100755
--- a/pandora_console/operation/visual_console/public_console.php
+++ b/pandora_console/operation/visual_console/public_console.php
@@ -15,251 +15,9 @@
 // The session is configured and started inside the config process.
 require_once '../../include/config.php';
 
-$legacy = (bool) get_parameter('legacy', false);
+$legacy = (bool) get_parameter('legacy', $config['legacy_vc']);
 if ($legacy === false) {
     include_once $config['homedir'].'/operation/visual_console/public_view.php';
-    return;
-}
-
-// Set root on homedir, as defined in setup
-chdir($config['homedir']);
-
-ob_start();
-// Enterprise support
-if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
-    include_once ENTERPRISE_DIR.'/load_enterprise.php';
-}
-
-if (file_exists(ENTERPRISE_DIR.'/include/functions_login.php')) {
-    include_once ENTERPRISE_DIR.'/include/functions_login.php';
-}
-
-echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
-echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n";
-echo '<head>';
-
-global $vc_public_view;
-$vc_public_view = true;
-// This starts the page head. In the call back function,
-// things from $page['head'] array will be processed into the head
-ob_start('ui_process_page_head');
-// Enterprise main
-enterprise_include('index.php');
-
-require_once 'include/functions_visual_map.php';
-
-$hash = get_parameter('hash');
-$id_layout = (int) get_parameter('id_layout');
-$graph_javascript = (bool) get_parameter('graph_javascript');
-$config['id_user'] = get_parameter('id_user');
-
-$myhash = md5($config['dbpass'].$id_layout.$config['id_user']);
-
-// Check input hash
-if ($myhash != $hash) {
-    exit;
-}
-
-$refr = (int) get_parameter('refr', 0);
-$layout = db_get_row('tlayout', 'id', $id_layout);
-
-if (! $layout) {
-    db_pandora_audit('ACL Violation', 'Trying to access visual console without id layout');
-    include $config['homedir'].'/general/noaccess.php';
-    exit;
-}
-
-if (!isset($config['pure'])) {
-    $config['pure'] = 0;
-}
-
-// ~ $xhr = (bool) get_parameter('xhr');
-if ($layout) {
-    $id_group = $layout['id_group'];
-    $layout_name = $layout['name'];
-    $background = $layout['background'];
-    $bwidth = $layout['width'];
-    $bheight = $layout['height'];
-    // ~ $width = (int) get_parameter('width');
-    // ~ if ($width <= 0) $width = null;
-    // ~ $height = (int) get_parameter('height');
-    // ~ if ($height <= 0) $height = null;
-    // ~ ob_start();
-    // ~ // Render map
-    visual_map_print_visual_map(
-        $id_layout,
-        true,
-        true,
-        $width,
-        $height,
-        '../../',
-        true,
-        true,
-        true
-    );
-    // ~ return;
 } else {
-    echo '<div id="vc-container"></div>';
+    include_once $config['homedir'].'/operation/visual_console/legacy_public_view.php';
 }
-
-// Floating menu - Start
-echo '<div id="vc-controls" style="z-index:300;">';
-
-echo '<div id="menu_tab">';
-echo '<ul class="mn">';
-
-// QR code
-echo '<li class="nomn">';
-echo '<a href="javascript: show_dialog_qrcode();">';
-echo '<img class="vc-qr" src="../../images/qrcode_icon_2.jpg"/>';
-echo '</a>';
-echo '</li>';
-
-// Countdown
-echo '<li class="nomn">';
-echo '<div class="vc-refr">';
-echo '<div class="vc-countdown"></div>';
-echo '<div id="vc-refr-form">';
-echo __('Refresh').':';
-echo html_print_select(get_refresh_time_array(), 'refr', $refr, '', '', 0, true, false, false);
-echo '</div>';
-echo '</div>';
-echo '</li>';
-
-// Console name
-echo '<li class="nomn">';
-echo '<div class="vc-title">'.$layout_name.'</div>';
-echo '</li>';
-
-echo '</ul>';
-echo '</div>';
-
-echo '</div>';
-// Floating menu - End
-// QR code dialog
-echo '<div style="display: none;" id="qrcode_container" title="'.__('QR code of the page').'">';
-echo '<div id="qrcode_container_image"></div>';
-echo '</div>';
-
-ui_require_jquery_file('countdown');
-ui_require_javascript_file('wz_jsgraphics');
-ui_require_javascript_file('pandora_visual_console');
-$ignored_params['refr'] = '';
-?>
-
-<script language="javascript" type="text/javascript">
-    $(document).ready(function () {
-        var refr = <?php echo (int) $refr; ?>;
-        var href = "<?php echo ui_get_url_refresh($ignored_params); ?>";
-        
-        var startCountDown = function (duration, cb) {
-            $('div.vc-countdown').countdown('destroy');
-            if (!duration) return;
-            var t = new Date();
-            t.setTime(t.getTime() + duration * 1000);
-            $('div.vc-countdown').countdown({
-                until: t,
-                format: 'MS',
-                layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
-                alwaysExpire: true,
-                onExpiry: function () {
-                    $('div.vc-countdown').countdown('destroy');
-                    //~ cb();
-                    url = js_html_entity_decode( href ) + duration;
-                    $(document).attr ("location", url);
-                }
-            });
-        }
-        startCountDown(refr, false);
-        // Auto hide controls
-        var controls = document.getElementById('vc-controls');
-        autoHideElement(controls, 1000);
-        
-        $('select#refr').change(function (event) {
-            refr = Number.parseInt(event.target.value, 10);
-            startCountDown(refr, false);
-        });
-        
-        
-        $('body').css('background-color','<?php echo $layout['background_color']; ?>');
-        $('body').css('margin','0');
-        $('body').css('height','100%');
-        $('body').css('overflow','hidden');
-        $(".module_graph .menu_graph").css('display','none');
-        
-        $(".parent_graph").each(function(){
-            
-        if($(this).css('background-color') != 'rgb(255, 255, 255)'){
-                $(this).css('color', '#999');                
-                }
-        });            
-
-        $(".overlay").removeClass("overlay").addClass("overlaydisabled");
-        
-        // Start the map fetch
-        //~ fetchMap();
-    });
-    
-    $(window).on('load', function () {
-        $('.item:not(.icon) img:not(.b64img)').each( function() {
-            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-                if(    $(this).parent()[0].tagName == 'DIV'){
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-                }
-                else if (    $(this).parent()[0].tagName == 'A') {
-                    $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-                }
-                $(this).css('margin-left','');
-            }
-            else {
-                if(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2 < 0){
-                    $(this).css('margin-left','');
-                    $(this).css('margin-top','');
-                } else {
-                    if(    $(this).parent()[0].tagName == 'DIV'){
-                        $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                    }
-                    else if (    $(this).parent()[0].tagName == 'A') {
-                        $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                    }
-                    $(this).css('margin-top','');
-                }
-            }
-        });
-        
-        $('.item > div').each( function() {
-            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-                if($(this).attr('id').indexOf('clock') || $(this).attr('id').indexOf('overlay')){
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-                }
-                else{
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px');
-                }
-                $(this).css('margin-left','');
-            }
-            else {
-                $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                $(this).css('margin-top','');
-            }
-        });
-        
-        $('.item > a > div').each( function() {
-            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-                $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2-5)+'px');
-                $(this).css('margin-left','');
-            }
-            else {
-                $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                $(this).css('margin-top','');
-            }
-        });
-        
-        $(".graph:not([class~='noresizevc'])").each(function(){
-            height = parseInt($(this).css("height")) - 30;
-            $(this).css('height', height);
-        });
-        
-        // Start the map fetch
-        //~ fetchMap();
-    });
-</script>
diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index dc51cbaac1..00cdc2d113 100755
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -13,374 +13,9 @@
 // GNU General Public License for more details.
 global $config;
 
-$legacy = (bool) get_parameter('legacy');
+$legacy = (bool) get_parameter('legacy', $config['legacy_vc']);
 if ($legacy === false) {
     include_once $config['homedir'].'/operation/visual_console/view.php';
-    return;
-}
-
-// Login check
-require_once $config['homedir'].'/include/functions_visual_map.php';
-
-check_login();
-
-if (!defined('METACONSOLE')) {
-    $id_layout = (int) get_parameter('id');
 } else {
-    $id_layout = (int) get_parameter('id_visualmap');
+    include_once $config['homedir'].'/operation/visual_console/legacy_view.php';
 }
-
-if ($id_layout) {
-    $default_action = 'edit';
-} else {
-    $default_action = 'new';
-}
-
-if (!defined('METACONSOLE')) {
-    $action = get_parameterBetweenListValues(
-        'action',
-        [
-            'new',
-            'save',
-            'edit',
-            'update',
-            'delete',
-        ],
-        $default_action
-    );
-} else {
-    $action = get_parameterBetweenListValues(
-        'action2',
-        [
-            'new',
-            'save',
-            'edit',
-            'update',
-            'delete',
-        ],
-        $default_action
-    );
-}
-
-$refr = (int) get_parameter('refr', $config['vc_refr']);
-$graph_javascript = (bool) get_parameter('graph_javascript', true);
-$vc_refr = false;
-
-if (isset($config['vc_refr']) and $config['vc_refr'] != 0) {
-    $view_refresh = $config['vc_refr'];
-} else {
-    $view_refresh = '300';
-}
-
-// Get input parameter for layout id
-if (! $id_layout) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access visual console without id layout'
-    );
-    include 'general/noaccess.php';
-    exit;
-}
-
-$layout = db_get_row('tlayout', 'id', $id_layout);
-
-if (! $layout) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access visual console without id layout'
-    );
-    include 'general/noaccess.php';
-    exit;
-}
-
-$id_group = $layout['id_group'];
-$layout_name = $layout['name'];
-$background = $layout['background'];
-$bwidth = $layout['width'];
-$bheight = $layout['height'];
-
-$pure_url = '&pure='.$config['pure'];
-
-// ACL
-$vconsole_read = check_acl($config['id_user'], $id_group, 'VR');
-$vconsole_write = check_acl($config['id_user'], $id_group, 'VW');
-$vconsole_manage = check_acl($config['id_user'], $id_group, 'VM');
-
-if (! $vconsole_read && !$vconsole_write && !$vconsole_manage) {
-    db_pandora_audit(
-        'ACL Violation',
-        'Trying to access visual console without group access'
-    );
-    include 'general/noaccess.php';
-    exit;
-}
-
-// Render map
-$options = [];
-
-$options['consoles_list']['text'] = '<a href="index.php?sec=network&sec2=godmode/reporting/map_builder&refr='.$refr.'">'.html_print_image(
-    'images/visual_console.png',
-    true,
-    ['title' => __('Visual consoles list')]
-).'</a>';
-
-if ($vconsole_write || $vconsole_manage) {
-    $url_base = 'index.php?sec=network&sec2=godmode/reporting/visual_console_builder&action=';
-
-    $hash = md5($config['dbpass'].$id_layout.$config['id_user']);
-
-    $options['public_link']['text'] = '<a href="'.ui_get_full_url(
-        'operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config['id_user']
-    ).'" target="_blank">'.html_print_image(
-        'images/camera_mc.png',
-        true,
-        ['title' => __('Show link to public Visual Console')]
-    ).'</a>';
-    $options['public_link']['active'] = false;
-
-    $options['data']['text'] = '<a href="'.$url_base.$action.'&tab=data&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/op_reporting.png',
-        true,
-        ['title' => __('Main data')]
-    ).'</a>';
-    $options['list_elements']['text'] = '<a href="'.$url_base.$action.'&tab=list_elements&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/list.png',
-        true,
-        ['title' => __('List elements')]
-    ).'</a>';
-
-    if (enterprise_installed()) {
-        $options['wizard_services']['text'] = '<a href="'.$url_base.$action.'&tab=wizard_services&id_visual_console='.$id_layout.'">'.html_print_image(
-            'images/wand_services.png',
-            true,
-            ['title' => __('Services wizard')]
-        ).'</a>';
-    }
-
-    $options['wizard']['text'] = '<a href="'.$url_base.$action.'&tab=wizard&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/wand.png',
-        true,
-        ['title' => __('Wizard')]
-    ).'</a>';
-    $options['editor']['text'] = '<a href="'.$url_base.$action.'&tab=editor&id_visual_console='.$id_layout.'">'.html_print_image(
-        'images/builder.png',
-        true,
-        ['title' => __('Builder')]
-    ).'</a>';
-}
-
-$options['view']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$view_refresh.'">'.html_print_image('images/operation.png', true, ['title' => __('View')]).'</a>';
-$options['view']['active'] = true;
-
-if (!is_metaconsole()) {
-    if (!$config['pure']) {
-        $options['pure']['text'] = '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'&pure=1">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).'</a>';
-        ui_print_page_header($layout_name, 'images/visual_console.png', false, '', false, $options);
-    }
-
-    // Set the hidden value for the javascript
-    html_print_input_hidden('metaconsole', 0);
-} else {
-    // Set the hidden value for the javascript
-    html_print_input_hidden('metaconsole', 1);
-}
-
-if ($config['pure']) {
-    // Container of the visual map (ajax loaded)
-    echo '<div id="vc-container">'.visual_map_print_visual_map(
-        $id_layout,
-        true,
-        true,
-        null,
-        null,
-        '',
-        false,
-        true
-    ).'</div>';
-
-    // Floating menu - Start
-    echo '<div id="vc-controls" style="z-index: 999">';
-
-    echo '<div id="menu_tab">';
-    echo '<ul class="mn">';
-
-    // Quit fullscreen
-    echo '<li class="nomn">';
-    echo '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'">';
-    echo html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode')]);
-    echo '</a>';
-    echo '</li>';
-
-    // Countdown
-    echo '<li class="nomn">';
-    echo '<div class="vc-refr">';
-    echo '<div class="vc-countdown"></div>';
-    echo '<div id="vc-refr-form">';
-    echo __('Refresh').':';
-    echo html_print_select(get_refresh_time_array(), 'refr', $refr, '', '', 0, true, false, false);
-    echo '</div>';
-    echo '</div>';
-    echo '</li>';
-
-    // Console name
-    echo '<li class="nomn">';
-    echo '<div class="vc-title">'.$layout_name.'</div>';
-    echo '</li>';
-
-    echo '</ul>';
-    echo '</div>';
-
-    echo '</div>';
-    // Floating menu - End
-    ui_require_jquery_file('countdown');
-
-    ?>
-    <style type="text/css">
-        /* Avoid the main_pure container 1000px height */
-        body.pure {
-            min-height: 100px;
-            margin: 0px;
-            overflow: hidden;
-            height: 100%;
-            <?php
-            echo 'background-color: '.$layout['background_color'].';';
-            ?>
-        }
-        div#main_pure {
-            height: 100%;
-            margin: 0px;
-            <?php
-            echo 'background-color: '.$layout['background_color'].';';
-            ?>
-        }
-    </style>
-    <?php
-} else {
-    visual_map_print_visual_map($id_layout, true, true, null, null, '', false, true, true);
-}
-
-ui_require_javascript_file('wz_jsgraphics');
-ui_require_javascript_file('pandora_visual_console');
-$ignored_params['refr'] = '';
-?>
-
-<script language="javascript" type="text/javascript">
-    $(document).ready (function () {
-        var refr = <?php echo (int) $refr; ?>;
-        var pure = <?php echo (int) $config['pure']; ?>;
-        var href = "<?php echo ui_get_url_refresh($ignored_params); ?>";
-        if (pure) {
-            var startCountDown = function (duration, cb) {
-                $('div.vc-countdown').countdown('destroy');
-                if (!duration) return;
-                var t = new Date();
-                t.setTime(t.getTime() + duration * 1000);
-                $('div.vc-countdown').countdown({
-                    until: t,
-                    format: 'MS',
-                    layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
-                    alwaysExpire: true,
-                    onExpiry: function () {
-                        $('div.vc-countdown').countdown('destroy');
-                        //cb();
-                        url = js_html_entity_decode( href ) + duration;
-                        $(document).attr ("location", url);
-                        /*$.post(window.location.href.replace("refr=300","refr="+new_count), function(respuestaSolicitud){
-                            $('#background_<?php echo $id_layout; ?>').html(respuestaSolicitud);
-                        });
-                        */
-                        $("#main_pure").css('background-color','<?php echo $layout['background_color']; ?>');
-                        
-                        }
-                });
-            }
-            
-            startCountDown(refr, false);
-            
-            var controls = document.getElementById('vc-controls');
-            autoHideElement(controls, 1000);
-            
-            $('select#refr').change(function (event) {
-                refr = Number.parseInt(event.target.value, 10);
-                new_count = event.target.value;
-                startCountDown(refr, false);
-            });
-        }
-        else {
-            $('#refr').change(function () {
-                $('#hidden-vc_refr').val($('#refr option:selected').val());
-            });
-        }
-        
-        $(".module_graph .menu_graph").css('display','none');
-        
-        $(".parent_graph").each( function() {
-            if ($(this).css('background-color') != 'rgb(255, 255, 255)')
-                $(this).css('color', '#999');
-        });
-        
-        $(".overlay").removeClass("overlay").addClass("overlaydisabled");
-    
-    });
-    
-    $(window).on('load', function () {
-        $('.item:not(.icon) img:not(.b64img)').each( function() {
-            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-                if(    $(this).parent()[0].tagName == 'DIV'){
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-                }
-                else if (    $(this).parent()[0].tagName == 'A') {
-                    $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-                }
-                $(this).css('margin-left','');
-            }
-            else {
-                if(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2 < 0){
-                    $(this).css('margin-left','');
-                    $(this).css('margin-top','');
-                } else {
-                    if(    $(this).parent()[0].tagName == 'DIV'){
-                        $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                    }
-                    else if (    $(this).parent()[0].tagName == 'A') {
-                        $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                    }
-                    $(this).css('margin-top','');
-                }
-            }
-        });
-        
-        $('.item > div').each( function() {
-            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-                if($(this).attr('id').indexOf('clock') || $(this).attr('id').indexOf('overlay')){
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
-                }
-                else{
-                    $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px');
-                }
-                $(this).css('margin-left','');
-            }
-            else {
-                $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                $(this).css('margin-top','');
-            }
-        });
-        
-        $('.item > a > div').each( function() {
-            if ($(this).css('float')=='left' || $(this).css('float')=='right') {
-                $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2-5)+'px');
-                $(this).css('margin-left','');
-            }
-            else {
-                $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
-                $(this).css('margin-top','');
-            }
-        });
-        
-        $(".graph:not([class~='noresizevc'])").each(function(){
-            height = parseInt($(this).css("height")) - 30;
-            $(this).css('height', height);
-        });
-        
-    });
-</script>
\ No newline at end of file
diff --git a/visual_console_client/src/VisualConsole.ts b/visual_console_client/src/VisualConsole.ts
index a780d01cb9..a79f779058 100644
--- a/visual_console_client/src/VisualConsole.ts
+++ b/visual_console_client/src/VisualConsole.ts
@@ -133,6 +133,7 @@ export interface VisualConsoleProps extends Size {
   backgroundURL: string | null; // URL?
   backgroundColor: string | null;
   isFavorite: boolean;
+  relationLineWidth: number;
 }
 
 /**
@@ -154,7 +155,8 @@ export function visualConsolePropsDecoder(
     groupId,
     backgroundURL,
     backgroundColor,
-    isFavorite
+    isFavorite,
+    relationLineWidth
   } = data;
 
   if (id == null || isNaN(parseInt(id))) {
@@ -174,6 +176,7 @@ export function visualConsolePropsDecoder(
     backgroundURL: notEmptyStringOr(backgroundURL, null),
     backgroundColor: notEmptyStringOr(backgroundColor, null),
     isFavorite: parseBoolean(isFavorite),
+    relationLineWidth: parseIntOr(relationLineWidth, 0),
     ...sizePropsDecoder(data)
   };
 }
@@ -520,7 +523,8 @@ export default class VisualConsole {
         endX,
         endY,
         width: 0,
-        height: 0
+        height: 0,
+        lineWidth: this.props.relationLineWidth
       })
     );
     // Save a reference to the line item.
diff --git a/visual_console_client/src/items/Line.ts b/visual_console_client/src/items/Line.ts
index 2a1ee2b646..efae84ffd0 100644
--- a/visual_console_client/src/items/Line.ts
+++ b/visual_console_client/src/items/Line.ts
@@ -26,6 +26,8 @@ interface LineProps extends ItemProps {
  * is missing from the raw object or have an invalid type.
  */
 export function linePropsDecoder(data: UnknownObject): LineProps | never {
+  const lineWidth = parseIntOr(data.lineWidth, 0);
+
   return {
     ...itemBasePropsDecoder({ ...data, width: 1, height: 1 }), // Object spread. It will merge the properties of the two objects.
     type: ItemType.LINE_ITEM,
@@ -47,8 +49,8 @@ export function linePropsDecoder(data: UnknownObject): LineProps | never {
       x: parseIntOr(data.endX, 0),
       y: parseIntOr(data.endY, 0)
     },
-    lineWidth: parseIntOr(data.borderWidth, 1),
-    color: notEmptyStringOr(data.borderColor, null)
+    lineWidth: lineWidth > 0 ? lineWidth : 1,
+    color: notEmptyStringOr(data.borderColor || data.color, null)
   };
 }