diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 4905808802..6e998ca881 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -1,17 +1,18 @@
 <div class="controls separated">
-  <?php if (! $this->compact): ?>
+<?php if (! $this->compact): ?>
     <?= $this->tabs ?>
-  <?php endif ?>
+<?php endif ?>
     <?= $this->render('partials/service/object-header.phtml') ?>
-    <h1><?= $this->translate("Service detail information") ?></h1>
+    <h1><?= $this->translate('Service detail information') ?></h1>
 </div>
+
 <div class="content" data-base-target="_next">
     <?= $this->render('show/components/output.phtml') ?>
     <?= $this->render('show/components/grapher.phtml') ?>
 
+    <h2><?= $this->translate('Problem handling') ?></h2>
     <table class="name-value-table">
-        <tbody>
-        <tr><td colspan="2"><h2><?= $this->translate('Problem handling') ?></h2></td></tr>
+    <tbody>
         <?= $this->render('show/components/acknowledgement.phtml') ?>
         <?= $this->render('show/components/comments.phtml') ?>
         <?= $this->render('show/components/downtime.phtml') ?>
@@ -20,16 +21,35 @@
         <?= $this->render('show/components/flapping.phtml') ?>
         <?= $this->render('show/components/servicegroups.phtml') ?>
         <?= $this->render('show/components/perfdata.phtml') ?>
-        <tr><td colspan="2"><h2><?= $this->translate('Notifications') ?></h2></td></tr>
+    </tbody>
+    </table>
+
+    <h2><?= $this->translate('Notifications') ?></h2>
+    <table class="name-value-table">
+    <tbody>
         <?= $this->render('show/components/notifications.phtml') ?>
         <?= $this->render('show/components/contacts.phtml') ?>
-        <tr><td colspan="2"><h2><?= $this->translate('Check execution') ?></h2></td></tr>
+    </tbody>
+    </table>
+
+    <h2><?= $this->translate('Check execution') ?></h2>
+    <table class="name-value-table">
+    <tbody>
         <?= $this->render('show/components/command.phtml') ?>
         <?= $this->render('show/components/checksource.phtml') ?>
         <?= $this->render('show/components/checkstatistics.phtml') ?>
         <?= $this->render('show/components/checktimeperiod.phtml') ?>
+    </tbody>
+    </table>
+
+    <?php if (! empty($object->customvars)): ?>
+    <h2><?= $this->translate('Custom Variables') ?></h2>
+    <table class="name-value-table">
+    <tbody>
         <?= $this->render('show/components/customvars.phtml') ?>
-        <?= $this->render('show/components/flags.phtml') ?>
-        </tbody>
+    </tbody>
     </table>
+    <?php endif ?>
+
+    <?= $this->render('show/components/flags.phtml') ?>
 </div>