diff --git a/public/templates/agents/agents-audit.html b/public/templates/agents/agents-audit.html
index a5f5af5bc..99c636626 100644
--- a/public/templates/agents/agents-audit.html
+++ b/public/templates/agents/agents-audit.html
@@ -24,35 +24,35 @@
 
     <div layout="row" layout-align="center stretch" class="height-230">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Groups</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Groups</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Audit-Groups" vis-id="'Wazuh-App-Agents-Audit-Groups'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Directories</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Directories</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Audit-Directories" vis-id="'Wazuh-App-Agents-Audit-Directories'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Files</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Files</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Audit-Files" vis-id="'Wazuh-App-Agents-Audit-Files'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -60,13 +60,13 @@
 
     <div layout="row" layout-align="center stretch" class="height-230">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">Alerts over time</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">Alerts over time</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Audit-Alerts-over-time" vis-id="'Wazuh-App-Agents-Audit-Alerts-over-time'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -75,25 +75,25 @@
     <div class="height-448" layout="row" layout-align="center stretch">
         <div flex="20" layout="column" layout-align="center stretch">
             <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+                <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                    ng-dblclick="expand(4)">
+                    <span class="wz-headline-title">File read access</span>
+                    <span flex></span>
+                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+                </md-card-actions>
                 <md-card-content class="wazuh-column">
-                    <div layout="row" ng-dblclick="expand(4)">
-                        <span class="wz-headline-title">File read access</span>
-                        <span flex></span>
-                        <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                    </div>
-                    <md-divider class="wz-margin-top-10"></md-divider>
                     <kbn-vis id="Wazuh-App-Agents-Audit-File-read-access" vis-id="'Wazuh-App-Agents-Audit-File-read-access'"></kbn-vis>
                 </md-card-content>
             </md-card>
 
             <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[5]}">
+                <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                    ng-dblclick="expand(5)">
+                    <span class="wz-headline-title">File write access</span>
+                    <span flex></span>
+                    <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
+                </md-card-actions>
                 <md-card-content class="wazuh-column">
-                    <div layout="row" ng-dblclick="expand(5)">
-                        <span class="wz-headline-title">File write access</span>
-                        <span flex></span>
-                        <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
-                    </div>
-                    <md-divider class="wz-margin-top-10"></md-divider>
                     <kbn-vis id="Wazuh-App-Agents-Audit-File-write-access" vis-id="'Wazuh-App-Agents-Audit-File-write-access'"></kbn-vis>
                 </md-card-content>
             </md-card>
@@ -101,13 +101,13 @@
 
         <div flex="60" layout="column" layout-align="center stretch">
             <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[6]}">
+                <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                    ng-dblclick="expand(6)">
+                    <span class="wz-headline-title">Commands</span>
+                    <span flex></span>
+                    <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
+                </md-card-actions>
                 <md-card-content class="wazuh-column">
-                    <div layout="row" ng-dblclick="expand(6)">
-                        <span class="wz-headline-title">Commands</span>
-                        <span flex></span>
-                        <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
-                    </div>
-                    <md-divider class="wz-margin-top-10"></md-divider>
                     <kbn-vis id="Wazuh-App-Agents-Audit-Commands" vis-id="'Wazuh-App-Agents-Audit-Commands'"></kbn-vis>
                 </md-card-content>
             </md-card>
@@ -115,24 +115,24 @@
 
         <div flex="20" layout="column" layout-align="center stretch">
             <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[7]}">
+                <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                    ng-dblclick="expand(7)">
+                    <span class="wz-headline-title">Created files</span>
+                    <span flex></span>
+                    <span class="wz-text-link" ng-click="expand(7)"><i class="fa fa-fw fa-expand"></i></span>
+                </md-card-actions>
                 <md-card-content class="wazuh-column">
-                    <div layout="row" ng-dblclick="expand(7)">
-                        <span class="wz-headline-title">Created files</span>
-                        <span flex></span>
-                        <span class="wz-text-link" ng-click="expand(7)"><i class="fa fa-fw fa-expand"></i></span>
-                    </div>
-                    <md-divider class="wz-margin-top-10"></md-divider>
                     <kbn-vis id="Wazuh-App-Agents-Audit-Created-files" vis-id="'Wazuh-App-Agents-Audit-Created-files'"></kbn-vis>
                 </md-card-content>
             </md-card>
             <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[8]}">
+                <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                    ng-dblclick="expand(8)">
+                    <span class="wz-headline-title">Removed files</span>
+                    <span flex></span>
+                    <span class="wz-text-link" ng-click="expand(8)"><i class="fa fa-fw fa-expand"></i></span>
+                </md-card-actions>
                 <md-card-content class="wazuh-column">
-                    <div layout="row" ng-dblclick="expand(8)">
-                        <span class="wz-headline-title">Removed files</span>
-                        <span flex></span>
-                        <span class="wz-text-link" ng-click="expand(8)"><i class="fa fa-fw fa-expand"></i></span>
-                    </div>
-                    <md-divider class="wz-margin-top-10"></md-divider>
                     <kbn-vis id="Wazuh-App-Agents-Audit-Removed-files" vis-id="'Wazuh-App-Agents-Audit-Removed-files'"></kbn-vis>
                 </md-card-content>
             </md-card>
@@ -141,13 +141,13 @@
 
     <div layout="row" layout-align="center stretch" class="height-570">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[9]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(9)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(9)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(9)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(9)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-Audit-Last-alerts'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-ciscat.html b/public/templates/agents/agents-ciscat.html
index 1fea556ec..c852cc8fa 100644
--- a/public/templates/agents/agents-ciscat.html
+++ b/public/templates/agents/agents-ciscat.html
@@ -43,24 +43,24 @@
     <!-- Top groups and result evolution section -->
     <div layout="row" layout-align="start stretch" class="height-320">
         <md-card flex="60" class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Top 5 CIS-CAT groups</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Top 5 CIS-CAT groups</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-app-Agents-CISCAT-top-5-groups'" id="Wazuh-app-Agents-CISCAT-top-5-groups"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Scan result evolution</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Scan result evolution</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-app-Agents-CISCAT-scan-result-evolution'" id="Wazuh-app-Agents-CISCAT-scan-result-evolution"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -70,13 +70,13 @@
     <!-- Alerts summary table section -->
     <div layout="row" layout-align="start stretch" class="height-570">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-app-Agents-CISCAT-alerts-summary'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-fim.html b/public/templates/agents/agents-fim.html
index 481e3376c..a419db523 100644
--- a/public/templates/agents/agents-fim.html
+++ b/public/templates/agents/agents-fim.html
@@ -1,8 +1,9 @@
-<md-content flex layout="column" ng-if="tab === 'fim' && tabView === 'panels'" ng-show="!showSyscheckFiles"
-    ng-class="{'no-opacity': resultState !== 'ready' || !rendered}" layout-align="start">
+<md-content flex layout="column" ng-if="tab === 'fim' && tabView === 'panels'" ng-show="!showSyscheckFiles" ng-class="{'no-opacity': resultState !== 'ready' || !rendered}"
+    layout-align="start">
     <div layout="row">
         <span flex></span>
-        <md-button ng-click="launchSyscheckScan()" class="discoverSectionSwitchBtn pull-right"><i class="fa fa-fw fa-play"></i> Run
+        <md-button ng-click="launchSyscheckScan()" class="discoverSectionSwitchBtn pull-right"><i class="fa fa-fw fa-play"></i>
+            Run
             scan</md-button>
         <span></span>
         <md-button ng-click="switchSyscheckFiles()" class="discoverSectionSwitchBtn pull-right"><i class="fa fa-fw fa-database"></i>
@@ -12,36 +13,36 @@
     <div layout="row" class="height-300">
 
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Most active users</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Most active users</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-FIM-Users" vis-id="'Wazuh-App-Agents-FIM-Users'">
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Actions</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Actions</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-FIM-Actions" vis-id="'Wazuh-App-Agents-FIM-Actions'">
             </md-card-content>
         </md-card>
 
         <md-card flex="40" class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Events</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Events</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-FIM-Events" vis-id="'Wazuh-App-Agents-FIM-Events'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -50,36 +51,36 @@
 
     <div layout="row" class="height-230">
         <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">Files added</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">Files added</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-FIM-Files-added" vis-id="'Wazuh-App-Agents-FIM-Files-added'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(4)">
+                <span class="wz-headline-title">Files modified</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(4)">
-                    <span class="wz-headline-title">Files modified</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-FIM-Files-modified" vis-id="'Wazuh-App-Agents-FIM-Files-modified'">
                 </kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[5]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(5)">
+                <span class="wz-headline-title">Files deleted</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(5)">
-                    <span class="wz-headline-title">Files deleted</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-FIM-Files-deleted" vis-id="'Wazuh-App-Agents-FIM-Files-deleted'">
                 </kbn-vis>
             </md-card-content>
@@ -88,21 +89,20 @@
 
     <div layout="row" layout-align="space-between stretch" class="height-570">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[6]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(6)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(6)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-FIM-Alerts-summary'"></kbn-vis>
             </md-card-content>
         </md-card>
     </div>
 </md-content>
 
-<md-content flex layout="column" ng-if="tab === 'fim' && tabView === 'panels' && showSyscheckFiles"
-    layout-align="start">
+<md-content flex layout="column" ng-if="tab === 'fim' && tabView === 'panels' && showSyscheckFiles" layout-align="start">
     <div layout="row" class="wz-padding-bottom-14 wz-padding-top-14">
         <span flex></span>
         <md-button ng-click="launchSyscheckScan()" class="discoverSectionSwitchBtn pull-right"><i class="fa fa-fw fa-play"></i>
@@ -112,16 +112,13 @@
             Show alerts</md-button>
     </div>
 
-    <div layout="row" class="wz-margin-top-10 wz-margin-right-8 wz-margin-left-8"
-        ng-if="showSyscheckFiles && (!agent || !agent.os)">
+    <div layout="row" class="wz-margin-top-10 wz-margin-right-8 wz-margin-left-8" ng-if="showSyscheckFiles && (!agent || !agent.os)">
         <div flex class="euiCallOut euiCallOut--warning">
             <div class="euiCallOutHeader">
-                <svg class="euiIcon euiIcon--medium euiCallOutHeader__icon" aria-hidden="true"
-                    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"
-                    viewBox="0 0 16 16">
+                <svg class="euiIcon euiIcon--medium euiCallOutHeader__icon" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
+                    xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
                     <defs>
-                        <path id="help-a"
-                            d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 0 0-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 0 1 0 8.373zM8 15A6.956 6.956 0 0 1 3.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 0 0 2.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 0 1 8 15zm-5.601-2.813a6.963 6.963 0 0 1 0-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 0 0 3 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 1 1 8 4a4 4 0 0 1 0 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 0 0 8 3a4.979 4.979 0 0 0-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 0 1 8 1zm0-1a8.001 8.001 0 1 0 .003 16.002A8.001 8.001 0 0 0 8 0z">
+                        <path id="help-a" d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 0 0-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 0 1 0 8.373zM8 15A6.956 6.956 0 0 1 3.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 0 0 2.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 0 1 8 15zm-5.601-2.813a6.963 6.963 0 0 1 0-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 0 0 3 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 1 1 8 4a4 4 0 0 1 0 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 0 0 8 3a4.979 4.979 0 0 0-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 0 1 8 1zm0-1a8.001 8.001 0 1 0 .003 16.002A8.001 8.001 0 0 0 8 0z">
                         </path>
                     </defs>
                     <use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#help-a" fill-rule="evenodd"></use>
@@ -137,12 +134,9 @@
                 <span class="wz-headline-title"><i class="fa fa-fw fa-windows"></i> Windows registry</span>
                 <md-divider class="wz-margin-top-10"></md-divider>
                 <div layout="row" class="wz-margin-top-10">
-                    <input placeholder="Filter registry..." ng-model="registrySearch" type="text"
-                        class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid height-30"
-                        aria-invalid="false"
-                        wz-enter="searchSyscheckFile(registrySearch,{name:'type',value:'registry'})">
-                    <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-30"
-                        ng-click="searchSyscheckFile(registrySearch,{name:'type',value:'registry'})">
+                    <input placeholder="Filter registry..." ng-model="registrySearch" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid height-30"
+                        aria-invalid="false" wz-enter="searchSyscheckFile(registrySearch,{name:'type',value:'registry'})">
+                    <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-30" ng-click="searchSyscheckFile(registrySearch,{name:'type',value:'registry'})">
                         <span class="fa fa-search" aria-hidden="true"></span>
                     </button>
                 </div>
@@ -152,10 +146,8 @@
                     </wz-table>
                 </div>
             </md-card-content>
-            <md-card-actions layout="row" layout-align="end center"
-                class="wz-card-actions layout-align-end-center layout-row">
-                <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload"
-                    ng-click="downloadCsv('/syscheck/' + agent.id, 'fim-registry.csv', [{name:'type',value:'registry'}])">Formatted
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions layout-align-end-center layout-row">
+                <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload" ng-click="downloadCsv('/syscheck/' + agent.id, 'fim-registry.csv', [{name:'type',value:'registry'}])">Formatted
                     <i aria-hidden="true" class="fa fa-download"></i></a>
             </md-card-actions>
         </md-card>
@@ -167,25 +159,20 @@
                 <span class="wz-headline-title"><i class="fa fa-fw fa-file-o"></i> Files</span>
                 <md-divider class="wz-margin-top-10"></md-divider>
                 <div layout="row" class="wz-margin-top-10">
-                    <input placeholder="Filter files..." ng-model="filesSearch" type="text"
-                        class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid height-30"
+                    <input placeholder="Filter files..." ng-model="filesSearch" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid height-30"
                         aria-invalid="false" wz-enter="searchSyscheckFile(filesSearch,{name:'type',value:'file'})">
-                    <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-30"
-                        ng-click="searchSyscheckFile(filesSearch,{name:'type',value:'file'})">
+                    <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-30" ng-click="searchSyscheckFile(filesSearch,{name:'type',value:'file'})">
                         <span class="fa fa-search" aria-hidden="true"></span>
                     </button>
                 </div>
                 <div layout="row" ng-if="agent && !load" class="wz-margin-top-10 wz-margin-bottom-40-inv">
                     <wz-table flex path="'/syscheck/' + agent.id" implicit-filter="[{name:'type',value:'file'}]"
-                        row-sizes="[6,6,6]" extra-limit="100"
-                        keys="['file',{value: 'size', width: '100px'},'uname','perm','sha256',{value: 'uid', width: '100px'},'mtime']">
+                        row-sizes="[6,6,6]" extra-limit="100" keys="['file',{value: 'size', width: '100px'},'uname','perm','sha256',{value: 'uid', width: '100px'},'mtime']">
                     </wz-table>
                 </div>
             </md-card-content>
-            <md-card-actions layout="row" layout-align="end center"
-                class="wz-card-actions layout-align-end-center layout-row">
-                <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload"
-                    ng-click="downloadCsv('/syscheck/' + agent.id, 'fim-files.csv', [{name:'type',value:'file'}])">Formatted
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions layout-align-end-center layout-row">
+                <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload" ng-click="downloadCsv('/syscheck/' + agent.id, 'fim-files.csv', [{name:'type',value:'file'}])">Formatted
                     <i aria-hidden="true" class="fa fa-download"></i></a>
             </md-card-actions>
         </md-card>
@@ -197,25 +184,20 @@
                 <span class="wz-headline-title"><i class="fa fa-fw fa-file-o"></i> Files</span>
                 <md-divider class="wz-margin-top-10"></md-divider>
                 <div layout="row" class="wz-margin-top-10 wz-margin-bottom-25">
-                    <input placeholder="Filter files..." ng-model="filesSearch" type="text"
-                        class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid height-30"
+                    <input placeholder="Filter files..." ng-model="filesSearch" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid height-30"
                         aria-invalid="false" wz-enter="searchSyscheckFile(filesSearch)">
-                    <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-30"
-                        ng-click="searchSyscheckFile(filesSearch)">
+                    <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-30" ng-click="searchSyscheckFile(filesSearch)">
                         <span class="fa fa-search" aria-hidden="true"></span>
                     </button>
                 </div>
                 <div layout="row" ng-if="agent && !load" class="wz-margin-top-16 wz-margin-bottom-40-inv">
                     <wz-table custom-columns="true" flex path="'/syscheck/' + agent.id" row-sizes="[16,14,12]"
-                        extra-limit="100"
-                        keys="['file',{value: 'size', width: '100px'},{value: 'gname', width: '150px'},{value: 'uname', width: '150px'},{value: 'perm', width: '125px'},'sha256',{value: 'uid', width: '100px'},{value: 'gid', width: '100px'},{value: 'mtime', width: '150px'}]">
+                        extra-limit="100" keys="['file',{value: 'size', width: '100px'},{value: 'gname', width: '150px'},{value: 'uname', width: '150px'},{value: 'perm', width: '125px'},'sha256',{value: 'uid', width: '100px'},{value: 'gid', width: '100px'},{value: 'mtime', width: '150px'}]">
                     </wz-table>
                 </div>
             </md-card-content>
-            <md-card-actions layout="row" layout-align="end center"
-                class="wz-card-actions layout-align-end-center layout-row">
-                <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload"
-                    ng-click="downloadCsv('/syscheck/' + agent.id, 'fim-files.csv')">Formatted
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions layout-align-end-center layout-row">
+                <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload" ng-click="downloadCsv('/syscheck/' + agent.id, 'fim-files.csv')">Formatted
                     <i aria-hidden="true" class="fa fa-download"></i></a>
             </md-card-actions>
         </md-card>
diff --git a/public/templates/agents/agents-gdpr.html b/public/templates/agents/agents-gdpr.html
index 590933719..eaff6fcb9 100644
--- a/public/templates/agents/agents-gdpr.html
+++ b/public/templates/agents/agents-gdpr.html
@@ -21,35 +21,35 @@
 
     <div layout="row" layout-align="center stretch" class="height-300">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Top 5 rule groups</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Top 5 rule groups</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-GDPR-Groups" vis-id="'Wazuh-App-Agents-GDPR-Groups'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Top 5 rules</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Top 5 rules</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-GDPR-Rule" vis-id="'Wazuh-App-Agents-GDPR-Rule'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Top 5 GDPR requirements</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Top 5 GDPR requirements</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-GDPR-Requirement" vis-id="'Wazuh-App-Agents-GDPR-Requirement'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -57,24 +57,24 @@
 
     <div layout="row" layout-align="center stretch" class="height-300">
         <md-card flex="70" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">GDPR Requirements</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">GDPR Requirements</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-GDPR-Requirements" vis-id="'Wazuh-App-Agents-GDPR-Requirements'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(4)">
+                <span class="wz-headline-title">Rule level distribution</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(4)">
-                    <span class="wz-headline-title">Rule level distribution</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-GDPR-Rule-level-distribution" vis-id="'Wazuh-App-Agents-GDPR-Rule-level-distribution'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -82,13 +82,13 @@
 
     <div layout="row" layout-align="center stretch" class="height-570">
         <md-card class="wz-md-card" flex ng-class="{'fullscreen': expandArray[5]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(5)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(5)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-GDPR-Last-alerts'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-general.html b/public/templates/agents/agents-general.html
index cbcc402f1..71089fc7b 100644
--- a/public/templates/agents/agents-general.html
+++ b/public/templates/agents/agents-general.html
@@ -1,95 +1,25 @@
 <md-content flex layout="column" ng-if="tab === 'general' && tabView === 'panels'" ng-class="{'no-opacity': resultState !== 'ready' || !rendered}"
     layout-align="start">
-
-    <!-- Agent information section -->
-    <div layout="row" layout-align="start center">
-        <md-card flex class="wz-metric-color wz-md-card">
-            <md-card-content layout="row" class="wz-padding-metric">
-                <div class="wz-text-truncatable" flex>
-                    Name: <span class="wz-text-bold">{{ agent.name }}</span>
-                    <md-tooltip ng-if="agent.name.length > 25" md-direction="bottom" class="wz-tooltip">
-                        Full name: {{ agent.name }}
-                    </md-tooltip>
-                </div>
-                <div class="wz-text-truncatable" flex>
-                    IP: <span class="wz-text-bold">{{ agent.ip }}</span>
-                </div>
-                <div class="wz-text-truncatable" flex ng-if="agent.version">
-                    Version: <span class="wz-text-bold">{{ agent.version }}</span>
-                </div>
-                <div class="wz-text-truncatable" flex>
-                    OS: <span class="wz-text-bold">{{ agentOS }}</span>
-                    <md-tooltip ng-if="agentOS.length > 25" md-direction="bottom" class="wz-tooltip">
-                        Full OS name: {{ agentOS }}
-                    </md-tooltip>
-                </div>
-            </md-card-content>
-        </md-card>
-    </div>
-    <div layout="row" layout-align="start center">
-        <md-card flex class="wz-metric-color wz-md-card">
-            <md-card-content layout="row" class="wz-padding-metric">
-                <div class="wz-word-break" flex ng-if="agent.group">
-                    Groups: <span ng-repeat="group in agent.group" class="wz-text-bold wz-text-link" ng-click="goGroups(agent,$index)">{{
-                        group }}&nbsp;</span>
-                </div>
-            </md-card-content>
-        </md-card>
-    </div>
-    <div layout="row" layout-align="start center">
-        <md-card flex class="wz-metric-color wz-md-card">
-            <md-card-content layout="row" class="wz-padding-metric">
-                <div class="wz-text-truncatable" flex>Last keep alive:<span class="wz-text-bold"> {{agent.lastKeepAlive
-                        || 'Unknown' }}</span></div>
-                <div class="wz-text-truncatable" flex>Registration date:<span class="wz-text-bold">
-                        {{agent.dateAdd}}</span></div>
-                <div class="wz-text-truncatable" flex ng-if="agent.syscheck.inProgress">Last syscheck scan:<span class="wz-text-bold">
-                        Scan in progress</span></div>
-                <div class="wz-text-truncatable" flex ng-if="!agent.syscheck.inProgress">Last syscheck scan:<span class="wz-text-bold">
-                        {{agent.syscheck.end || 'Unknown'}}</span>
-                    <md-tooltip ng-if="!agent.syscheck.inProgress && agent.syscheck.start && agent.syscheck.end"
-                        md-direction="bottom" class="wz-tooltip">
-                        Start time: {{ agent.syscheck.start || 'Unknown'}} <br>
-                        End time: {{ agent.syscheck.end || 'Unknown'}} <br>
-                        Duration time: {{ agent.syscheck.duration +' minutes' || 'Unknown'}}
-                    </md-tooltip>
-                </div>
-                <div class="wz-text-truncatable" flex ng-if="agent.rootcheck.inProgress">Last rootcheck scan:<span
-                        class="wz-text-bold"> Scan in progress</span></div>
-                <div class="wz-text-truncatable" flex ng-if="!agent.rootcheck.inProgress">Last rootcheck scan:<span
-                        class="wz-text-bold"> {{agent.rootcheck.end || 'Unknown'}}</span>
-                    <md-tooltip ng-if="!agent.rootcheck.inProgress && agent.rootcheck.start && agent.rootcheck.end"
-                        md-direction="bottom" class="wz-tooltip">
-                        Start time: {{ agent.rootcheck.start || 'Unknown'}} <br>
-                        End time: {{ agent.rootcheck.end || 'Unknown'}} <br>
-                        Duration time: {{ agent.rootcheck.duration +' minutes' || 'Unknown'}}
-                    </md-tooltip>
-                </div>
-            </md-card-content>
-        </md-card>
-    </div>
-    <!-- End agent information section -->
-
     <div layout="row" layout-align="start stretch" class="height-400">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">Alert level evolution</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">Alert level evolution</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Overview-Alert-level-evolution" vis-id="'Wazuh-App-Agents-Overview-Alert-level-evolution'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(4)">
+                <span class="wz-headline-title">Alerts</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(4)">
-                    <span class="wz-headline-title">Alerts</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Overview-Alerts" vis-id="'Wazuh-App-Agents-Overview-Alerts'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -98,37 +28,37 @@
     <!-- View: Panels -->
     <div layout="row" class="height-300">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Top 5 alerts</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Top 5 alerts</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Overview-Top-5-alerts" vis-id="'Wazuh-App-Agents-Overview-Top-5-alerts'">
                 </kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Top 10 groups</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Top 10 groups</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Overview-Top-10-groups" vis-id="'Wazuh-App-Agents-Overview-Top-10-groups'">
                 </kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Top 5 PCI DSS Requirements</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Top 5 PCI DSS Requirements</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Overview-Top-5-PCI-DSS-Requirements" vis-id="'Wazuh-App-Agents-Overview-Top-5-PCI-DSS-Requirements'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -136,24 +66,24 @@
 
     <div layout="row" class="height-570">
         <md-card class="wz-md-card" ng-class="{'fullscreen': expandArray[5]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(5)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(5)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-Overview-Alerts-summary'" id="Wazuh-App-Agents-Overview-Alerts-summary"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[6]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(6)">
+                <span class="wz-headline-title">Groups summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(6)">
-                    <span class="wz-headline-title">Groups summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-Overview-Groups-summary'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-oscap.html b/public/templates/agents/agents-oscap.html
index 35e2e234b..961e97caa 100644
--- a/public/templates/agents/agents-oscap.html
+++ b/public/templates/agents/agents-oscap.html
@@ -21,46 +21,46 @@
 
     <div layout="row" layout-align="center stretch" class="height-230">
         <md-card flex="25" class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Top 5 Scans</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Top 5 Scans</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-OSCAP-Scans" vis-id="'Wazuh-App-Agents-OSCAP-Scans'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="25" class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Top 5 Profiles</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Top 5 Profiles</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-OSCAP-Profiles" vis-id="'Wazuh-App-Agents-OSCAP-Profiles'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="25" class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Top 5 Content</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Top 5 Content</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-OSCAP-Content" vis-id="'Wazuh-App-Agents-OSCAP-Content'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="25" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">Top 5 Severity</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">Top 5 Severity</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-OSCAP-Severity" vis-id="'Wazuh-App-Agents-OSCAP-Severity'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -68,13 +68,13 @@
 
     <div layout="row" layout-align="start stretch" class="height-230">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(4)">
+                <span class="wz-headline-title">Daily scans evolution</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(4)">
-                    <span class="wz-headline-title">Daily scans evolution</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-OSCAP-Daily-scans-evolution" vis-id="'Wazuh-App-Agents-OSCAP-Daily-scans-evolution'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -82,24 +82,24 @@
 
     <div layout="row" layout-align="center stretch" class="height-250">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[5]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(5)">
+                <span class="wz-headline-title">Top 5 - Alerts</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(5)">
-                    <span class="wz-headline-title">Top 5 - Alerts</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-OSCAP-Top-5-Alerts" vis-id="'Wazuh-App-Agents-OSCAP-Top-5-Alerts'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[6]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(6)">
+                <span class="wz-headline-title">Top 5 - High risk alerts</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(6)">
-                    <span class="wz-headline-title">Top 5 - High risk alerts</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(6)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-OSCAP-Top-5-High-risk-alerts" vis-id="'Wazuh-App-Agents-OSCAP-Top-5-High-risk-alerts'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -107,13 +107,13 @@
 
     <div layout="row" layout-align="center stretch" class="height-570">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[7]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(7)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(7)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(7)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(7)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-OSCAP-Last-alerts'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-osquery.html b/public/templates/agents/agents-osquery.html
index f8fb7886a..8baeedc26 100644
--- a/public/templates/agents/agents-osquery.html
+++ b/public/templates/agents/agents-osquery.html
@@ -2,24 +2,24 @@
     layout-align="start">
     <div layout="row" class="height-300">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Most common Osquery packs being used</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Most common Osquery packs being used</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Osquery-top-5-packs-being-used" vis-id="'Wazuh-App-Agents-Osquery-top-5-packs-being-used'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="70" class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Evolution of Osquery events per pack over time</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Evolution of Osquery events per pack over time</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Osquery-events-per-pack-over-time" vis-id="'Wazuh-App-Agents-Osquery-events-per-pack-over-time'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -27,25 +27,25 @@
 
     <div layout="row" class="height-300">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Most common Osquery actions</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Most common Osquery actions</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Osquery-most-common-osquery-actions" vis-id="'Wazuh-App-Agents-Osquery-most-common-osquery-actions'"></kbn-vis>
             </md-card-content>
         </md-card>
 
         <md-card flex="70" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">Most common rules</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">Most common rules</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Osquery-monst-common-rules-being-fired" vis-id="'Wazuh-App-Agents-Osquery-monst-common-rules-being-fired'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -53,13 +53,13 @@
 
     <div layout="row" class="height-300">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(4)">
+                <span class="wz-headline-title">Evolution of Osquery events over time</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(4)">
-                    <span class="wz-headline-title">Evolution of Osquery events over time</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Osquery-events-over-time" vis-id="'Wazuh-App-Agents-Osquery-events-over-time'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-pci.html b/public/templates/agents/agents-pci.html
index 67d1bd08b..08d84f3be 100644
--- a/public/templates/agents/agents-pci.html
+++ b/public/templates/agents/agents-pci.html
@@ -20,35 +20,35 @@
 
     <div layout="row" layout-align="center stretch" class="height-300">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Top 5 rule groups</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Top 5 rule groups</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-PCI-Groups" vis-id="'Wazuh-App-Agents-PCI-Groups'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Top 5 rules</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Top 5 rules</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-PCI-Rule" vis-id="'Wazuh-App-Agents-PCI-Rule'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Top 5 PCI DSS requirements</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Top 5 PCI DSS requirements</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-PCI-Requirement" vis-id="'Wazuh-App-Agents-PCI-Requirement'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -56,24 +56,24 @@
 
     <div layout="row" layout-align="center stretch" class="height-300">
         <md-card flex="70" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">PCI Requirements</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">PCI Requirements</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-PCI-Requirements" vis-id="'Wazuh-App-Agents-PCI-Requirements'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(4)">
+                <span class="wz-headline-title">Rule level distribution</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(4)">
-                    <span class="wz-headline-title">Rule level distribution</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-PCI-Rule-level-distribution" vis-id="'Wazuh-App-Agents-PCI-Rule-level-distribution'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -81,13 +81,13 @@
 
     <div layout="row" layout-align="center stretch" class="height-570">
         <md-card class="wz-md-card" flex ng-class="{'fullscreen': expandArray[5]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(5)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(5)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-PCI-Last-alerts'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-pm.html b/public/templates/agents/agents-pm.html
index 927b8f300..ae6556081 100644
--- a/public/templates/agents/agents-pm.html
+++ b/public/templates/agents/agents-pm.html
@@ -1,5 +1,5 @@
-<md-content flex layout="column" ng-if="tab === 'pm' && tabView === 'panels'"
-    ng-class="{'no-opacity': resultState !== 'ready' || !rendered}" layout-align="start">
+<md-content flex layout="column" ng-if="tab === 'pm' && tabView === 'panels'" ng-class="{'no-opacity': resultState !== 'ready' || !rendered}"
+    layout-align="start">
     <div layout="row" layout-padding class="wz-padding-top-0">
         <span flex></span>
         <md-button ng-click="launchRootcheckScan()" class="wz-button pull-right"><i class="fa fa-fw fa-play"></i> Run
@@ -7,52 +7,50 @@
     </div>
     <div layout="row" class="height-240">
         <md-card flex="50" class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Alerts over time</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Alerts over time</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-PM-Alerts-over-time" vis-id="'Wazuh-App-Agents-PM-Alerts-over-time'">
                 </kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="25" class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Top 5 CIS Requirements</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Top 5 CIS Requirements</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
-                <kbn-vis id="Wazuh-App-Agents-PM-Top-5-CIS-Requirements"
-                    vis-id="'Wazuh-App-Agents-PM-Top-5-CIS-Requirements'"></kbn-vis>
+                <kbn-vis id="Wazuh-App-Agents-PM-Top-5-CIS-Requirements" vis-id="'Wazuh-App-Agents-PM-Top-5-CIS-Requirements'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex="25" class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Top 5 PCI DSS Requirements</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Top 5 PCI DSS Requirements</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
-                <kbn-vis id="Wazuh-App-Agents-PM-Top-5-PCI-DSS-Requirements"
-                    vis-id="'Wazuh-App-Agents-PM-Top-5-PCI-DSS-Requirements'"></kbn-vis>
+                <kbn-vis id="Wazuh-App-Agents-PM-Top-5-PCI-DSS-Requirements" vis-id="'Wazuh-App-Agents-PM-Top-5-PCI-DSS-Requirements'"></kbn-vis>
             </md-card-content>
         </md-card>
     </div>
 
     <div layout="row" layout-align="space-between stretch" class="height-570">
         <md-card flex="100" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">Alerts summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">Alerts summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-PM-Alerts-summary'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-sca.html b/public/templates/agents/agents-sca.html
index fd254e717..f231ea295 100644
--- a/public/templates/agents/agents-sca.html
+++ b/public/templates/agents/agents-sca.html
@@ -220,30 +220,30 @@
                 </div>
             </div>
         </div>
-
-        <div layout="row" class="wz-padding-top-0" ng-if="agent && agent.os && lookingSca">
-            <md-card flex class="wz-md-card fullWidth">
-                <md-card-content class="wz-padding-bottom-30">
-                    <span class="wz-headline-title"><i class="fa fa-fw fa-arrow-left cursor-pointer" ng-click="closeScaChecks()"></i>
-                        {{lookingSca.name}} checks</span>
-                    <md-divider class="wz-margin-top-10"></md-divider>
-                    <div layout="row" class="wz-margin-top-16 wz-margin-bottom-25">
-                        <input placeholder="Filter checks..." ng-model="custom_search" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid"
-                            aria-invalid="false" wz-enter="search(custom_search)">
-                        <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-40" ng-click="search(custom_search)">
-                            <span class="fa fa-search" aria-hidden="true"></span>
-                        </button>
-                    </div>
-                    <div layout="row" class="wz-margin-top-16 wz-margin-bottom-40-inv">
-                        <wz-table custom-columns="true" flex path="'/sca/' + agent.id + '/checks/' + lookingSca.id"
-                            row-sizes="[13,11,9]" extra-limit="100" keys="['title', 'file', 'result']">
-                        </wz-table>
-                    </div>
-                </md-card-content>
-                <md-card-actions layout="row" layout-align="end center" class="wz-card-actions layout-align-end-center layout-row">
-                    <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload" ng-click="downloadCsv('/sca/' + agent.id + '/checks/' + lookingSca.id, lookingSca.id + '.csv')">Formatted
-                        <i aria-hidden="true" class="fa fa-download"></i></a>
-                </md-card-actions>
-            </md-card>
-        </div>
+    </div>
+    <div layout="row" class="wz-padding-top-0" ng-if="agent && agent.os && lookingSca">
+        <md-card flex class="wz-md-card fullWidth">
+            <md-card-content class="wz-padding-bottom-30">
+                <span class="wz-headline-title"><i class="fa fa-fw fa-arrow-left cursor-pointer" ng-click="closeScaChecks()"></i>
+                    {{lookingSca.name}} checks</span>
+                <md-divider class="wz-margin-top-10"></md-divider>
+                <div layout="row" class="wz-margin-top-16 wz-margin-bottom-25">
+                    <input placeholder="Filter checks..." ng-model="custom_search" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid"
+                        aria-invalid="false" wz-enter="search(custom_search)">
+                    <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-40" ng-click="search(custom_search)">
+                        <span class="fa fa-search" aria-hidden="true"></span>
+                    </button>
+                </div>
+                <div layout="row" class="wz-margin-top-16 wz-margin-bottom-40-inv">
+                    <wz-table custom-columns="true" flex path="'/sca/' + agent.id + '/checks/' + lookingSca.id"
+                        row-sizes="[13,11,9]" extra-limit="100" keys="['title', 'file', 'result']">
+                    </wz-table>
+                </div>
+            </md-card-content>
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions layout-align-end-center layout-row">
+                <a class="wz-text-link cursor-pointer small md-button md-ink-ripple" id="btnDownload" ng-click="downloadCsv('/sca/' + agent.id + '/checks/' + lookingSca.id, lookingSca.id + '.csv')">Formatted
+                    <i aria-hidden="true" class="fa fa-download"></i></a>
+            </md-card-actions>
+        </md-card>
+    </div>
 </md-content>
\ No newline at end of file
diff --git a/public/templates/agents/agents-virustotal.html b/public/templates/agents/agents-virustotal.html
index 79861773c..84a4721ca 100644
--- a/public/templates/agents/agents-virustotal.html
+++ b/public/templates/agents/agents-virustotal.html
@@ -22,37 +22,37 @@
 
     <div layout="row" class="height-250">
         <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Last scanned files</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Last scanned files</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Virustotal-Last-Files-Pie" vis-id="'Wazuh-App-Agents-Virustotal-Last-Files-Pie'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card">
             <md-card-content class="wazuh-column" ng-class="{'fullscreen': expandArray[1]}">
-                <div layout="row" ng-dblclick="expand(1)">
+                <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                    ng-dblclick="expand(1)">
                     <span class="wz-headline-title">Malicious files alerts Evolution</span>
                     <span flex></span>
                     <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
+                </md-card-actions>
                 <kbn-vis id="Wazuh-App-Agents-Virustotal-Malicious-Evolution" vis-id="'Wazuh-App-Agents-Virustotal-Malicious-Evolution'"></kbn-vis>
             </md-card-content>
         </md-card>
     </div>
     <div layout="row" class="height-570">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Last files</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Last files</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-Virustotal-Files-Table" vis-id="'Wazuh-App-Agents-Virustotal-Files-Table'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/agents/agents-vuls.html b/public/templates/agents/agents-vuls.html
index 30d06c8ef..bde58a110 100644
--- a/public/templates/agents/agents-vuls.html
+++ b/public/templates/agents/agents-vuls.html
@@ -24,59 +24,59 @@
 
     <div layout="row" layout-align="center stretch" class="height-300">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(0)">
+                <span class="wz-headline-title">Alerts severity over time</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(0)">
-                    <span class="wz-headline-title">Alerts severity over time</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-vulnerability-Alerts-severity-over-time" vis-id="'Wazuh-App-Agents-vulnerability-Alerts-severity-over-time'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(1)">
+                <span class="wz-headline-title">Most common rules</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(1)">
-                    <span class="wz-headline-title">Most common rules</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-vulnerability-Most-common-rules'"></kbn-vis>
             </md-card-content>
         </md-card>
     </div>
     <div layout="row" layout-align="center stretch" class="height-270">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(2)">
+                <span class="wz-headline-title">Most common CVEs</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(2)">
-                    <span class="wz-headline-title">Most common CVEs</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(2)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-vulnerability-Vulnerability-Most-common-CVEs" vis-id="'Wazuh-App-Agents-vulnerability-Vulnerability-Most-common-CVEs'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(3)">
+                <span class="wz-headline-title">Severity distribution</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(3)">
-                    <span class="wz-headline-title">Severity distribution</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(3)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-vulnerability-Vulnerability-severity-distribution" vis-id="'Wazuh-App-Agents-vulnerability-Vulnerability-severity-distribution'"></kbn-vis>
             </md-card-content>
         </md-card>
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(4)">
+                <span class="wz-headline-title">Commonly affected packages</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(4)">
-                    <span class="wz-headline-title">Commonly affected packages</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(4)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis id="Wazuh-App-Agents-vulnerability-Commonly-affected-packages" vis-id="'Wazuh-App-Agents-vulnerability-Commonly-affected-packages'"></kbn-vis>
             </md-card-content>
         </md-card>
@@ -84,13 +84,13 @@
 
     <div layout="row" class="height-570">
         <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[5]}">
+            <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top"
+                ng-dblclick="expand(5)">
+                <span class="wz-headline-title">Alert summary</span>
+                <span flex></span>
+                <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
+            </md-card-actions>
             <md-card-content class="wazuh-column">
-                <div layout="row" ng-dblclick="expand(5)">
-                    <span class="wz-headline-title">Alert summary</span>
-                    <span flex></span>
-                    <span class="wz-text-link" ng-click="expand(5)"><i class="fa fa-fw fa-expand"></i></span>
-                </div>
-                <md-divider class="wz-margin-top-10"></md-divider>
                 <kbn-vis vis-id="'Wazuh-App-Agents-vulnerability-Alert-summary'"></kbn-vis>
             </md-card-content>
         </md-card>
diff --git a/public/templates/management/monitoring/main-timelions.html b/public/templates/management/monitoring/main-timelions.html
index 577892e97..36b843f20 100644
--- a/public/templates/management/monitoring/main-timelions.html
+++ b/public/templates/management/monitoring/main-timelions.html
@@ -19,25 +19,22 @@
 <div layout="row" layout-align="start stretch" class="height-400" ng-class="{'no-opacity': resultState !== 'ready' || !rendered}"
     ng-show="!loading && !showConfig && !showNodes && rendered">
     <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+        <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top" ng-dblclick="expand(0)">
+            <span class="wz-headline-title">Cluster alerts summary</span>
+            <span flex></span>
+            <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
+        </md-card-actions>
         <md-card-content class="wazuh-column">
-            <div layout="row" ng-dblclick="expand(0)">
-                <span class="wz-headline-title">Cluster alerts summary</span>
-                <span flex></span>
-                <span class="wz-text-link" ng-click="expand(0)"><i class="fa fa-fw fa-expand"></i></span>
-            </div>
-            <md-divider class="wz-margin-top-10"></md-divider>
             <kbn-vis vis-id="'Wazuh-App-Cluster-Overview-Manager'" id="Wazuh-App-Cluster-Overview-Manager"></kbn-vis>
         </md-card-content>
     </md-card>
     <md-card flex class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
-        <md-card-content class="wazuh-column">
-            <div layout="row" ng-dblclick="expand(1)">
-                <span class="wz-headline-title">Alerts by node summary</span>
-                <span flex></span>
-                <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
-            </div>
-            <md-divider class="wz-margin-top-10"></md-divider>
-            <kbn-vis vis-id="'Wazuh-App-Cluster-Overview'" id="Wazuh-App-Cluster-Overview"></kbn-vis>
+        <md-card-actions layout="row" layout-align="end center" class="wz-card-actions wz-card-actions-top" ng-dblclick="expand(1)">
+            <span class="wz-headline-title">Alerts by node summary</span>
+            <span flex></span>
+            <span class="wz-text-link" ng-click="expand(1)"><i class="fa fa-fw fa-expand"></i></span>
+        </md-card-actions>
+        <kbn-vis vis-id="'Wazuh-App-Cluster-Overview'" id="Wazuh-App-Cluster-Overview"></kbn-vis>
         </md-card-content>
     </md-card>
 </div>