diff --git a/modules/monitoring/application/views/scripts/show/host.phtml b/modules/monitoring/application/views/scripts/show/host.phtml
index beb3c6524..447f8ccf6 100644
--- a/modules/monitoring/application/views/scripts/show/host.phtml
+++ b/modules/monitoring/application/views/scripts/show/host.phtml
@@ -2,13 +2,22 @@
 <?= $this->render('show/components/header.phtml') ?>
 </div>
 <div class="content">
-<?= $this->render('show/components/status.phtml'); ?>
-<?= $this->render('show/components/comments.phtml'); ?>
-<?= $this->render('show/components/downtime.phtml'); ?>
-<?= $this->render('show/components/properties.phtml'); ?>
-<?= $this->render('show/components/flags.phtml'); ?>
-<?= $this->render('show/components/customvars.phtml'); ?>
-<?= $this->render('show/components/hostgroups.phtml'); ?>
-<?= $this->render('show/components/contacts.phtml'); ?>
+<?= $this->render('show/components/output.phtml') ?>
+<?= $this->render('show/components/status.phtml') ?>
+
+
+<?= $this->render('show/components/downtime.phtml') ?>
+
+<table class="avp">
+<?= $this->render('show/components/comments.phtml') ?>
+<?= $this->render('show/components/flapping.phtml') ?>
+<?= $this->render('show/components/perfdata.phtml') ?>
 <?= $this->render('show/components/command.phtml') ?>
+<?= $this->render('show/components/hostgroups.phtml') ?>
+<?= $this->render('show/components/contacts.phtml') ?>
+<?= $this->render('show/components/checkstatistics.phtml') ?>
+<?= $this->render('show/components/customvars.phtml') ?>
+</table>
+<?= $this->render('show/components/properties.phtml') ?>
+<?= $this->render('show/components/flags.phtml') ?>
 </div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml
index 1682dbd85..141bee5bc 100644
--- a/modules/monitoring/application/views/scripts/show/service.phtml
+++ b/modules/monitoring/application/views/scripts/show/service.phtml
@@ -3,12 +3,20 @@
 </div>
 <div class="content" data-base-target="col1">
 <?= $this->render('show/components/status.phtml'); ?>
-<?= $this->render('show/components/comments.phtml'); ?>
-<?= $this->render('show/components/downtime.phtml'); ?>
-<?= $this->render('show/components/properties.phtml'); ?>
-<?= $this->render('show/components/flags.phtml'); ?>
-<?= $this->render('show/components/customvars.phtml'); ?>
-<?= $this->render('show/components/servicegroups.phtml'); ?>
-<?= $this->render('show/components/contacts.phtml'); ?>
+<?= $this->render('show/components/output.phtml') ?>
+
+<?= $this->render('show/components/downtime.phtml') ?>
+
+
+<table class="avp">
+<?= $this->render('show/components/comments.phtml') ?>
+<?= $this->render('show/components/flapping.phtml') ?>
+<?= $this->render('show/components/perfdata.phtml') ?>
 <?= $this->render('show/components/command.phtml') ?>
+<?= $this->render('show/components/servicegroups.phtml') ?>
+<?= $this->render('show/components/contacts.phtml') ?>
+<?= $this->render('show/components/customvars.phtml') ?>
+<?= $this->render('show/components/checkstatistics.phtml') ?>
+<?= $this->render('show/components/flags.phtml') ?>
+</table>
 </div>
\ No newline at end of file