diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index 07cb09d61..a612ae1af 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -18,8 +18,8 @@
         <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
-        <?= $this->render('show/components/perfdata.phtml') ?>
         <?= $this->render('show/components/hostgroups.phtml') ?>
+        <?= $this->render('show/components/perfdata.phtml') ?>
         <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
         <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 03c6b213d..1fac5752f 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -18,8 +18,8 @@
         <?= $this->render('show/components/notes.phtml') ?>
         <?= $this->render('show/components/actions.phtml') ?>
         <?= $this->render('show/components/flapping.phtml') ?>
-        <?= $this->render('show/components/perfdata.phtml') ?>
         <?= $this->render('show/components/servicegroups.phtml') ?>
+        <?= $this->render('show/components/perfdata.phtml') ?>
         <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
         <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 070f6c4ff..03a93ae38 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -158,8 +158,13 @@ table.avp {
     th {
         font-weight: normal;
         font-size: 0.875em;
-        padding-top: 0.2em;
-        padding-bottom: 0.3em;
+        padding-top: 0.25em;
+    }
+
+    h2 {
+        font-size: 0.875em;
+        line-height: 1.2em;
+        padding-bottom: 0.1em;
     }
 
     td {
@@ -168,6 +173,9 @@ table.avp {
         th, td {
             padding: 0;
         }
+        td {
+            line-height: 1.5em;
+        }
     }
 
     a, button.link-like {