diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 059e76935..1ff78a568 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -61,7 +61,7 @@ class Monitoring_ShowController extends ActionController
         // TODO: Do not allow wildcards in names!
         if ($host !== null) {
             // TODO: $this->assertPermission('host/read', $host);
-            if ($this->action_name !== 'host' && $service !== null && $service !== '*') {
+            if ($this->getRequest()->getActionName() !== 'host' && $service !== null && $service !== '*') {
                 // TODO: $this->assertPermission('service/read', $service);
                 $object = Service::fetch($this->backend, $host, $service);
             } else {
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 83b0b5bcc..2bbb72135 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -12,7 +12,7 @@ $viewHelper = $this->getHelper('MonitoringState');
 
   <thead>
     <tr>
-      <th colspan="2">Status</th>
+      <th colspan="3">Status</th>
       <th>Host</th>
       <th>Output</th>
       <th></th>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 0590eb17c..b10316b0d 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -26,10 +26,17 @@ echo $this->paginationControl($notifications, null, null, array('preserve' => $t
   <?php foreach ($notifications as $notification): ?>
     <tr>
       <td>
-        <?= $notification->host_name ?>
+        <a href="<?= $this->href('monitoring/show/host', array('host' => $notification->host_name)); ?>">
+          <?= $notification->host_name ?>
+        </a>
       </td>
       <td>
-        <?= empty($notification->service_description) ? '' : $notification->service_description; ?>
+        <a href="<?= $this->href('monitoring/show/host', array(
+                          'host'    =>  $notification->host_name,
+                          'service' =>  $notification->service_description
+                          )
+                      ); ?>">
+          <?= empty($notification->service_description) ? '' : $notification->service_description; ?>
       </td>
       <td><?= $formatter->getNotificationType($notification); ?>
       </td>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index a8990c07a..a60b1800b 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -87,8 +87,15 @@ $trimArea = $this->getHelper('Trim');
           <i>{{COMMENT_ICON}}</i>
         </a>
         <?php endif; ?>
-
-        <b> <?= $service->service_display_name; ?></b>
+        <a href="<?= $this->href(
+                          'monitoring/show/service',
+                          array(
+                              'host' => $service->host_name,
+                              'service' => $service->service_description
+                          )
+                      ); ?>">
+          <b> <?= $service->service_display_name; ?></b>
+        </a>
         <br/>
 
         <?php if ($service->service_action_url != ""): ?>
@@ -102,7 +109,14 @@ $trimArea = $this->getHelper('Trim');
       </td>
 
       <td title="<?= $viewHelper->getStateTitle($service, 'host'); ?>">
-        <?= $service->host_name; ?>
+        <a href="<?= $this->href(
+                          'monitoring/show/host',
+                          array(
+                              'host' => $service->host_name,
+                          )
+                      ); ?>">
+          <?= $service->host_name; ?>
+        </a>
 
         <div>
           (<?= ucfirst($viewHelper->monitoringState($service, 'host')); ?>)