diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 21361c340..ec46b8172 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -73,9 +73,9 @@ class Monitoring_ListController extends Controller
             $stateColumn = 'host_hard_state';
             $stateChangeColumn = 'host_last_hard_state_change';
         } else {
-            $stateType = 'soft';
             $stateColumn = 'host_state';
             $stateChangeColumn = 'host_last_state_change';
+            $stateType = 'soft';
         }
 
         $this->addTitleTab('hosts');
@@ -148,7 +148,7 @@ class Monitoring_ListController extends Controller
             }
         }
         $this->setAutorefreshInterval(10);
-
+        
         $columns = array_merge(array(
             'host_name',
             'host_state',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 98661f4e6..b29a5ab15 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -10,8 +10,9 @@
 if (count($groupData) === 0) {
     echo t('No contacts matching the filter');
 }
+?>
 
-foreach ($groupData as $groupName => $groupInfo): ?>
+<?php foreach ($groupData as $groupName => $groupInfo): ?>
         <div class="box contactgroup">
             <h2><?= $groupInfo['alias']; ?></h2>
 <?php if ($groupInfo['alias'] !== $groupName): ?>
@@ -30,8 +31,8 @@ foreach ($groupData as $groupName => $groupInfo): ?>
                     <p>
 <?php if ($c->contact_email): ?>
                         <?= $c->contact_email; ?>
-<?php endif;
-if ($c->contact_pager): ?>
+<?php endif ?>
+<?php if ($c->contact_pager): ?>
                         <br />
                         <?= $c->contact_pager; ?>
 <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 642fd7b57..fff475cc4 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -10,7 +10,7 @@ $contactHelper = $this->getHelper('ContactFlags');
     <?= $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
-<div data-base-target="_next" class="content contacts">
+<div class="content contacts">
     <?php
     if (count($contacts) === 0) {
         echo t('No contacts matching the filter');
@@ -20,17 +20,14 @@ $contactHelper = $this->getHelper('ContactFlags');
         <div style="background-color: lightgray; padding: 0.5em; border-radius: 0.5em; overflow: hidden; margin: 0.125em; float: left;">
             <img src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>"
                  style="width: 60px; border: 4px solid white; border-radius: 8px; margin-right: 8px; float: left;" />
-            <a href="<?= $this->href(
-                'monitoring/show/contact',
-                array('contact' => $contact->contact_name)
-            ) ?>"><strong><?= $contact->contact_name ?></strong></a> (<?= $contact->contact_alias ?>)
+            <strong><?= $contact->contact_name ?></strong> (<?= $contact->contact_alias ?>)
             <?php
             foreach (array(
-                'eMail: <a href="mailto:%1$s">%1$s</a>' => $contact->contact_email,
-                'Pager: %s'                             => $contact->contact_pager,
-                'Service notification period: %s'       => $contact->contact_notify_service_timeperiod,
-                'Host notification period: %s'          => $contact->contact_notify_host_timeperiod
-            ) as $format => $value):
+                $contact->contact_email => 'eMail: <a href="mailto:%1$s">%1$s</a>',
+                $contact->contact_pager => 'Pager: %s',
+                $contact->contact_notify_service_timeperiod => 'Service notification period: %s',
+                $contact->contact_notify_host_timeperiod => 'Host notification period: %s'
+            ) as $value => $format):
                 if ($value): ?>
                     <br />
                     <?php
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 995a66001..6a6e7a3f6 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -4,9 +4,9 @@ $helper = $this->getHelper('CommandForm');
 <div class="controls">
 <?= $this->tabs ?>
 <div style="margin: 1em">
-<?= $this->sortControl->render($this); ?>
+<?=  $this->sortControl->render($this); ?>
 </div>
-<?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
+<?=  $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
 <div class="content downtimes">
@@ -16,7 +16,8 @@ $helper = $this->getHelper('CommandForm');
 if (count($downtimes) === 0) {
     echo t('No downtimes matching the filter');
 }
-foreach ($this->downtimes as $downtime): ?>
+?>
+<?php foreach ($this->downtimes as $downtime): ?>
 <tr>
   <td>
     <?= $this->dateFormat()->formatDateTime($downtime->start); ?> -