diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 508f6c2858..8426105f17 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -13529,7 +13529,7 @@ tr.shown td.details-control {
   -webkit-mask: url(../../images/minimizar.svg) no-repeat right / contain;
 }
 
-<<<<<<< head .table-info-light {
+.table-info-light {
   border-collapse: separate;
   border-spacing: 0;
   min-width: 350px;
diff --git a/pandora_console/views/tacticalView/view.php b/pandora_console/views/tacticalView/view.php
index 1534d334a2..ff877b0243 100644
--- a/pandora_console/views/tacticalView/view.php
+++ b/pandora_console/views/tacticalView/view.php
@@ -4,9 +4,9 @@
         <?php echo $welcome; ?>
         <span class="subtitle-welcome-message"><?php echo __('This is the latest data in your tactical view'); ?></span>
     </div>
-
-
-
+    <div class="row">
+        <div class="col-xl-6">
+            <div id="general-overview" class="pdd_5px">
                 <div class="container">
                     <div class="title">
                         <?php echo $Overview->title; ?>
@@ -14,23 +14,47 @@
                     <div class="content br-t">
                         <div class="row">
                             <div class="col-12">
-                                <div>
+                                <div class="row">
+                                    <div class="col-4">
                                         <div class="padding10">
+                                            <span class="subtitle">
+                                                <?php echo __('Pandora FMS log size'); ?>
+                                            </span>
                                             <?php echo $Overview->getLogSizeStatus(); ?>
                                         </div>
-                                </div>
-                                <div class="br-t">
-                                    <div class="padding10">
-                                        <?php echo $Overview->getLicenseUsageGraph(); ?>
+                                    </div>
+                                    <div class="col-4 br-l">
+                                        <div class="padding10">
+                                            <span class="subtitle">
+                                                <?php echo __('Server status'); ?>
+                                            </span>
+                                            <?php echo $Overview->getServerStatus(); ?>
+                                        </div>
+                                    </div>
+                                    <div class="col-4 br-l">
+                                        <div class="padding10">
+                                            <span class="subtitle">
+                                                <?php echo __('System CPU Load'); ?>
+                                            </span>
+                                            <?php echo $Overview->getCPULoadGraph(); ?>
+                                        </div>
                                     </div>
                                 </div>
+                                <?php if ($disableGeneralStatistics === false) : ?>
+                                    <div class="br-t">
+                                        <div class="padding10">
+                                            <span class="subtitle">
+                                                <?php echo __('License usage'); ?>
+                                            </span>
+                                            <?php echo $Overview->getLicenseUsageGraph(); ?>
+                                        </div>
+                                    </div>
+                                <?php endif; ?>
                             </div>
                         </div>
                     </div>
                 </div>
-
-
-                
+            </div>
             <div class="row flex-nowrap height_100p">
                 <div class="col-7 pdd_5px">
                     <div class="container">
@@ -120,7 +144,7 @@
                     </div>
                 </div>
             </div>
-
+        </div>
         <div class="col-xl-6">
             <div class="container mrgn_5px">
                 <div class="title">