diff --git a/pandora_console/include/javascript/general_tactical_view.js b/pandora_console/include/javascript/general_tactical_view.js
index ee9aae65f2..c3d48b133b 100644
--- a/pandora_console/include/javascript/general_tactical_view.js
+++ b/pandora_console/include/javascript/general_tactical_view.js
@@ -51,6 +51,22 @@ $(document).ready(function() {
       $("#events-status-pending-validate").html(data);
     }
   });
+
+  $.ajax({
+    url: "ajax.php",
+    data: {
+      page: "include/ajax/general_tactical_view.ajax",
+      method: "getStatusHeatMap",
+      class: "Groups",
+      width: $("#heatmap-group").width() - 50,
+      height:
+        $("#heatmap-group").height() < 280 ? 280 : $("#heatmap-group").height()
+    },
+    type: "POST",
+    success: function(data) {
+      $("#heatmap-group").html(data);
+    }
+  });
 });
 
 function autoRefresh(interval, id, method, php_class) {
diff --git a/pandora_console/include/lib/TacticalView/elements/Groups.php b/pandora_console/include/lib/TacticalView/elements/Groups.php
index ee7ccf0ab6..234574511b 100644
--- a/pandora_console/include/lib/TacticalView/elements/Groups.php
+++ b/pandora_console/include/lib/TacticalView/elements/Groups.php
@@ -45,6 +45,7 @@ class Groups extends Element
         parent::__construct();
         include_once $config['homedir'].'/include/functions_users.php';
         include_once 'include/functions_groupview.php';
+        $this->ajaxMethods = ['getStatusHeatMap'];
         ui_require_css_file('heatmap');
         $this->title = __('Groups');
         $this->total = $this->calculateTotalGroups();
@@ -71,12 +72,12 @@ class Groups extends Element
     public function getStatusHeatMap():string
     {
         global $config;
+        $width = get_parameter('width', 350);
+        $height = get_parameter('height', 275);
 
         // ACL Check.
         $agent_a = check_acl($config['id_user'], 0, 'AR');
         $agent_w = check_acl($config['id_user'], 0, 'AW');
-        $width = 350;
-        $height = 275;
 
         $groups_list = groupview_get_groups_list(
             $config['id_user'],
diff --git a/pandora_console/include/styles/general_tactical_view.css b/pandora_console/include/styles/general_tactical_view.css
index b1b81e3c68..ff76053f69 100644
--- a/pandora_console/include/styles/general_tactical_view.css
+++ b/pandora_console/include/styles/general_tactical_view.css
@@ -20,6 +20,7 @@
 .row {
   display: flex;
   width: 100%;
+  align-items: stretch;
 }
 .col-12 {
   width: 100%;
@@ -55,7 +56,7 @@
   background-color: white;
   border: 1px solid #e5e9ed;
   border-radius: 10px;
-  margin: 5px;
+  height: 100%;
   max-width: 100%;
 }
 .br-l {
@@ -192,10 +193,6 @@ a.pandora_pagination:first-child {
   color: #8a96a6;
 }
 
-#Alerts {
-  padding-bottom: 20px;
-}
-
 .mini-criticity {
   width: 6px !important;
   min-width: auto !important;
@@ -245,12 +242,17 @@ table.dataTable thead th {
     width: 21%;
   }
   .col-4 {
-    width: 30%;
+    width: 33%;
   }
   .row {
     flex-wrap: wrap;
   }
-
+  .col-7 {
+    width: 56%;
+  }
+  .col-5 {
+    width: 41%;
+  }
   .flex-nowrap {
     flex-wrap: nowrap !important;
   }
diff --git a/pandora_console/views/tacticalView/view.php b/pandora_console/views/tacticalView/view.php
index 09e293bddb..8a59dd206c 100644
--- a/pandora_console/views/tacticalView/view.php
+++ b/pandora_console/views/tacticalView/view.php
@@ -5,7 +5,7 @@
 
 <div class="row">
     <div class="col-xl-6">
-        <div id="general-overview">
+        <div id="general-overview" class="pdd_5px">
             <div class="container">
                 <div class="title">
                     <?php echo $Overview->title; ?>
@@ -23,14 +23,14 @@
                                     </div>
                                 </div>
                                 <?php if ($Overview->wuxIsEnabled() === true) : ?>
-                                <div class="col-6 br-l">
-                                    <div class="padding10">
-                                        <span class="subtitle">
-                                            <?php echo __('Wux server status'); ?>
-                                        </span>
-                                        <?php echo $Overview->getWuxServerStatus(); ?>
+                                    <div class="col-6 br-l">
+                                        <div class="padding10">
+                                            <span class="subtitle">
+                                                <?php echo __('Wux server status'); ?>
+                                            </span>
+                                            <?php echo $Overview->getWuxServerStatus(); ?>
+                                        </div>
                                     </div>
-                                </div>
                                 <?php endif; ?>
                             </div>
                             <div class="br-t">
@@ -53,7 +53,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-7">
+            <div class="col-7 pdd_5px">
                 <div class="container">
                     <div class="title">
                         <?php echo $MonitoringElements->title; ?>
@@ -91,7 +91,7 @@
                 </div>
 
             </div>
-            <div class="col-5">
+            <div class="col-5 pdd_5px">
                 <div class="container" id="database">
                     <div class="title">
                         <?php echo $Database->title; ?>
@@ -144,7 +144,7 @@
         </div>
     </div>
     <div class="col-xl-6">
-        <div class="container">
+        <div class="container mrgn_5px">
             <div class="title">
                 <?php echo $NewsBoard->title; ?>
             </div>
@@ -152,7 +152,7 @@
         </div>
         <div class="row">
             <?php if ($Groups->total < 200) : ?>
-                <div class="<?php echo (($SnmpTraps->isEnabled() === true && $LogStorage->isEnabled() === true)) ? 'col-6' : 'col-12'; ?>">
+                <div class="<?php echo (($SnmpTraps->isEnabled() === true && $LogStorage->isEnabled() === true)) ? 'col-6 pdd_5px' : 'col-12 pdd_5px'; ?>">
                     <div class="container">
                         <div class="title br-b">
                             <?php echo $Groups->title; ?>
@@ -160,79 +160,81 @@
                         <div class="subtitle link padding10 padding2">
                             <?php echo __('Status'); ?> <a href=""><?php echo __('Info'); ?></a>
                         </div>
-                        <?php echo $Groups->getStatusHeatMap(); ?>
+                        <div id="heatmap-group">
+                            <?php echo $Groups->loading(); ?>
+                        </div>
                     </div>
                 </div>
             <?php endif; ?>
             <?php if ($LogStorage->isEnabled() === true && $SnmpTraps->isEnabled() === true) : ?>
-            <div class="col-6">
-                <?php if ($LogStorage->isEnabled() === true) : ?>
-                <div class="container" id="logStorage">
-                    <div class="title br-b">
-                        <?php echo $LogStorage->title; ?>
-                    </div>
-                    <div class="row">
-                        <div class="col-6 br-r br-b">
-                            <div class="subtitle">
-                                <?php echo __('Log storage status'); ?>
+                <div class="col-6">
+                    <?php if ($LogStorage->isEnabled() === true) : ?>
+                        <div class="container mrgn_5px" id="logStorage">
+                            <div class="title br-b">
+                                <?php echo $LogStorage->title; ?>
                             </div>
-                            <?php echo $LogStorage->getStatus(); ?>
-                        </div>
-                        <div class="col-6 br-b">
-                            <div class="subtitle">
-                                <?php echo __('Total sources'); ?>
+                            <div class="row">
+                                <div class="col-6 br-r br-b">
+                                    <div class="subtitle">
+                                        <?php echo __('Log storage status'); ?>
+                                    </div>
+                                    <?php echo $LogStorage->getStatus(); ?>
+                                </div>
+                                <div class="col-6 br-b">
+                                    <div class="subtitle">
+                                        <?php echo __('Total sources'); ?>
+                                    </div>
+                                    <?php echo $LogStorage->getTotalSources(); ?>
+                                </div>
                             </div>
-                            <?php echo $LogStorage->getTotalSources(); ?>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-6 br-r">
-                            <div class="subtitle">
-                                <?php echo __('Stored data'); ?>
+                            <div class="row">
+                                <div class="col-6 br-r">
+                                    <div class="subtitle">
+                                        <?php echo __('Stored data'); ?>
+                                    </div>
+                                    <?php echo $LogStorage->getStoredData(); ?>
+                                    <span class="indicative-text"><?php echo __('Lines'); ?></span>
+                                </div>
+                                <div class="col-6">
+                                    <div class="subtitle">
+                                        <?php echo __('Age of stored data'); ?>
+                                    </div>
+                                    <?php echo $LogStorage->getAgeOfStoredData(); ?>
+                                    <span class="indicative-text"><?php echo __('Days'); ?></span>
+                                </div>
                             </div>
-                            <?php echo $LogStorage->getStoredData(); ?>
-                            <span class="indicative-text"><?php echo __('Lines'); ?></span>
                         </div>
-                        <div class="col-6">
-                            <div class="subtitle">
-                                <?php echo __('Age of stored data'); ?>
+                    <?php endif; ?>
+                    <?php if ($SnmpTraps->isEnabled() === true) : ?>
+                        <div class="container mrgn_5px" id="SNMPTraps">
+                            <div class="title br-b">
+                                <?php echo $SnmpTraps->title; ?>
+                            </div>
+                            <div class="row">
+                                <div class="col-6 br-r">
+                                    <div class="subtitle">
+                                        <?php echo __('Trap queues'); ?>
+                                    </div>
+                                    <?php echo $SnmpTraps->getQueues(); ?>
+                                </div>
+                                <div class="col-6">
+                                    <div class="subtitle">
+                                        <?php echo __('Total sources'); ?>
+                                    </div>
+                                    <?php echo $SnmpTraps->getTotalSources(); ?>
+                                </div>
                             </div>
-                            <?php echo $LogStorage->getAgeOfStoredData(); ?>
-                            <span class="indicative-text"><?php echo __('Days'); ?></span>
                         </div>
-                    </div>
+                    <?php endif; ?>
                 </div>
-                <?php endif; ?>
-                <?php if ($SnmpTraps->isEnabled() === true) : ?>
-                <div class="container" id="SNMPTraps">
-                    <div class="title br-b">
-                        <?php echo $SnmpTraps->title; ?>
-                    </div>
-                    <div class="row">
-                        <div class="col-6 br-r">
-                            <div class="subtitle">
-                                <?php echo __('Trap queues'); ?>
-                            </div>
-                            <?php echo $SnmpTraps->getQueues(); ?>
-                        </div>
-                        <div class="col-6">
-                            <div class="subtitle">
-                                <?php echo __('Total sources'); ?>
-                            </div>
-                            <?php echo $SnmpTraps->getTotalSources(); ?>
-                        </div>
-                    </div>
-                </div>
-                <?php endif; ?>
-            </div>
             <?php endif; ?>
         </div>
     </div>
 </div>
 
 <div class="row">
-    <div class="col-md-3">
-       <div class="container" id="Alerts">
+    <div class="col-md-3 pdd_5px">
+        <div class="container" id="Alerts">
             <div class="title br-b">
                 <?php echo $Alerts->title; ?>
             </div>
@@ -250,13 +252,15 @@
                     <?php echo $Alerts->getActiveCorrelation(); ?>
                 </div>
             </div>
-            <div class="subtitle link padding10 padding2 br-t">
-                <b><?php echo __('Logged in users (24 hrs)'); ?></b> <a href=""><?php echo __('More details'); ?></a>
+            <div id="list-users">
+                <div class="subtitle link padding10 padding2 br-t">
+                    <b><?php echo __('Logged in users (24 hrs)'); ?></b> <a href=""><?php echo __('More details'); ?></a>
+                </div>
+                <?php echo $Alerts->getDataTableUsers(); ?>
             </div>
-            <?php echo $Alerts->getDataTableUsers(); ?>
-       </div>
+        </div>
     </div>
-    <div class="col-md-9">
+    <div class="col-md-9 pdd_5px">
         <div class="container overflow_hidden" id="Events">
             <div class="title br-b">
                 <?php echo $Events->title; ?>
@@ -301,7 +305,7 @@
 </div>
 
 <div class="row">
-    <div class="col-xl-6">
+    <div class="col-xl-6 pdd_5px">
         <div class="container" id="Agents">
             <div class="title br-b">
                 <?php echo $Agents->title; ?>
@@ -341,7 +345,7 @@
         </div>
     </div>
     <div class="col-xl-6">
-        <div class="container" id="Agents">
+        <div class="container mrgn_5px" id="Agents">
             <div class="title br-b">
                 <?php echo $Configurations->title; ?>
             </div>
@@ -371,7 +375,7 @@
                 </div>
             </div>
         </div>
-        <div class="container">
+        <div class="container mrgn_5px">
             <div class="title br-b">
                 <?php echo $ScheduledDowntime->title; ?>
             </div>