diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 6176feea8..3a1a5bae1 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -1,5 +1,4 @@
 <?php
-use Icinga\Module\Monitoring\Web\Widget\StateBadges;
 
 if (! $this->compact): ?>
 <div class="controls">
@@ -12,46 +11,44 @@ if (! $this->compact): ?>
 <?php endif ?>
 <div class="content">
 <?php
-
 if (count($groupData) === 0) {
     echo $this->translate('No contactgroups found matching the filter') . '</div>';
     return;
 }
 ?>
+    <table class="action action-table listing-table" data-base-target="_next">
+        <thead>
+        <tr>
+            <th></th>
+            <th><?= $this->translate('Hostgroup') ?></th>
+            <th><?= $this->translate('Alias') ?></th>
+        </tr>
+        </thead>
+        <tbody>
 
-<table class="action action-table listing-table" data-base-target="_next">
-    <thead>
-    <tr>
-        <th></th>
-        <th><?= $this->translate('Hostgroup') ?></th>
-        <th><?= $this->translate('Alias') ?></th>
-    </tr>
-    </thead>
-    <tbody>
-
-    <?php foreach ($groupData as $groupName => $groupInfo): ?>
-    <tr>
-        <td class="count-col">
-            <span class="badge"><?= count($groupInfo['contacts'])  ?></span>
-        </td>
-        <td>
-            <?= $this->qlink(
-                $groupName,
-                'monitoring/list/contacts',
-                array('contactgroup' => $groupName),
-                array('title' => sprintf(
-                    $this->translate('Show detailed information about %s'),
-                    $groupName
-                ))
-            ); ?>
-        </td>
-        <td>
-            <?php if ($groupInfo['alias'] !== $groupName): ?>
-                <?= $groupInfo['alias'] ?>
-            <?php endif ?>
-        </td>
-    </tr>
-    <?php endforeach ?>
-    </tbody>
-</table>
+        <?php foreach ($groupData as $groupName => $groupInfo): ?>
+        <tr>
+            <td class="count-col">
+                <span class="badge"><?= count($groupInfo['contacts'])  ?></span>
+            </td>
+            <td>
+                <?= $this->qlink(
+                    $groupName,
+                    'monitoring/list/contacts',
+                    array('contactgroup' => $groupName),
+                    array('title' => sprintf(
+                        $this->translate('Show detailed information about %s'),
+                        $groupName
+                    ))
+                ) ?>
+            </td>
+            <td>
+                <?php if ($groupInfo['alias'] !== $groupName): ?>
+                    <?= $groupInfo['alias'] ?>
+                <?php endif ?>
+            </td>
+        </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 851a53980..5a365ffa7 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -8,71 +8,71 @@
 </div>
 <?php endif ?>
 
-<table class="action action-table listing-table" data-base-target="_next">
-    <thead>
-    <tr>
-        <th><?= $this->translate('Name') ?></th>
-        <th><?= $this->translate('Email') ?></th>
-        <th><?= $this->translate('Pager') ?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach ($contacts->peekAhead($this->compact) as $contact): ?>
+<div class="content">
+<?php if ($contacts->hasResult()): ?>
+    <table class="action action-table listing-table" data-base-target="_next">
+        <thead>
         <tr>
-        <td>
-            <?= $this->qlink(
-                $contact->contact_name,
-                'monitoring/show/contact',
-                array('contact_name' => $contact->contact_name),
-                array('title' => sprintf(
-                    $this->translate('Show detailed information about %s'),
-                    $contact->contact_alias
-                ), 'class' => 'rowaction')
-            ); ?>
-        </td>
-        <td>
-            <?= $this->translate('Email'); ?>:
-            <a href="mailto:<?= $contact->contact_email; ?>"
-               title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>"
-               aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
-                <?= $this->escape($contact->contact_email); ?>
-            </a>
-        </td>
-            <td>
-            <?php if ($contact->contact_pager): ?>
-                <div>
-                    <?= $this->escape($contact->contact_pager) ?>
-                </div>
-            <?php endif; ?>
-            </td>
-
-            <?php if ($contact->contact_notify_service_timeperiod): ?>
-            <td>
-                <?= $this->escape($contact->contact_notify_service_timeperiod) ?>
-            </td>
-            <?php endif; ?>
-
-            <?php if ($contact->contact_notify_host_timeperiod): ?>
-            <td>
-                <?= $this->escape($contact->contact_notify_host_timeperiod) ?>
-            </td>
-            <?php endif; ?>
+            <th><?= $this->translate('Name') ?></th>
+            <th><?= $this->translate('Email') ?></th>
+            <th><?= $this->translate('Pager') ?></th>
         </tr>
-    <?php endforeach ?>
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+        <?php foreach ($contacts->peekAhead($this->compact) as $contact): ?>
+            <tr>
+            <td>
+                <?= $this->qlink(
+                    $contact->contact_name,
+                    'monitoring/show/contact',
+                    array('contact_name' => $contact->contact_name),
+                    array('title' => sprintf(
+                        $this->translate('Show detailed information about %s'),
+                        $contact->contact_alias
+                    ), 'class' => 'rowaction')
+                ); ?>
+            </td>
+            <td>
+                <?= $this->translate('Email') ?>:
+                <a href="mailto:<?= $contact->contact_email; ?>"
+                   title="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>"
+                   aria-label="<?= sprintf($this->translate('Send a mail to %s'), $contact->contact_alias); ?>">
+                    <?= $this->escape($contact->contact_email); ?>
+                </a>
+            </td>
+                <td>
+                <?php if ($contact->contact_pager): ?>
+                    <?= $this->escape($contact->contact_pager) ?>
+                <?php endif; ?>
+                </td>
 
-<?php if (! $contacts->hasResult()): ?>
+                <?php if ($contact->contact_notify_service_timeperiod): ?>
+                <td>
+                    <?= $this->escape($contact->contact_notify_service_timeperiod) ?>
+                </td>
+                <?php endif; ?>
+
+                <?php if ($contact->contact_notify_host_timeperiod): ?>
+                <td>
+                    <?= $this->escape($contact->contact_notify_host_timeperiod) ?>
+                </td>
+                <?php endif; ?>
+            </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
+    <?php if ($contacts->hasMore()): ?>
+        <?= $this->qlink(
+            $this->translate('Show More'),
+            $this->url()->without(array('view', 'limit')),
+            null,
+            array(
+                'data-base-target'  => '_next',
+                'class'             => 'pull-right show-more'
+            )
+        ); ?>
+    <?php endif ?>
+<?php else: ?>
     <?= $this->translate('No contacts found matching the filter'); ?>
-<?php elseif ($contacts->hasMore()): ?>
-    <?= $this->qlink(
-        $this->translate('Show More'),
-        $this->url()->without(array('view', 'limit')),
-        null,
-        array(
-            'data-base-target'  => '_next',
-            'class'             => 'pull-right show-more'
-        )
-    ); ?>
 <?php endif ?>
-
+</div>
\ No newline at end of file