diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 4950b6166..ae83dced4 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,162 +1,137 @@
 <?php
-    $dateHelper = $this->getHelper('DateFormat');
+$dateHelper = $this->getHelper('DateFormat');
+$commandHelper = $this->getHelper('CommandForm');
+$viewHelper = $this->getHelper('MonitoringState');
 
-    /** @var Zend_View_Helper_CommandForm $commandHelper */
-    $commandHelper = $this->getHelper('CommandForm');
-    $viewHelper = $this->getHelper('MonitoringState');
 ?>
-
-<div class="row">
-  <div class="pull-left">
-    <h1>Comments</h1>
-  </div>
-  <div class="pull-right">
-    <?= $this->tabs->render($this); ?>
-  </div>
+<div class="controls">
+<?= $this->tabs ?>
+<?=  $this->sortControl->render($this); ?>
+<?=  $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
-<div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="single">
 
-  <div class="container pull-left">
+<div class="content">
+<table class="action">
+<tbody>
+<?php foreach ($comments as $comment): 
 
-    <div class="row">
-      <div class="col-md-12">
-        <?=  $this->sortControl->render($this); ?>
+    $objectType = ($comment->comment_objecttype_id === '1') ? 'host' : 'service';
+    $objectName = ($objectType === 'host') ? $comment->host_name : $comment->service_name;
+    $hrefParameters = array(
+      $objectType   => $objectName,
+      'comment_id'  => $comment->comment_id
+    );
+    if ($objectType === 'service') {
+      $hrefParameters['host'] = $comment->host_name;
+    }
+
+    $detailLink = $this->href(
+      'monitoring/show/' . $objectType,
+      $hrefParameters
+    );
+
+    $hostLink = $this->href(
+      'monitoring/show/host',
+      array(
+        'host' => $comment->host_name
+      )
+    );
+  ?>
+<tr>
+    <td>
+        <?= date('d.m. H:i', $comment->comment_timestamp); ?>
+    </td>
+
+    <td>
+        <?php if ($comment->comment_objecttype_id === '1'): ?>
+            <?= $this->img('img/icons/host.png', array('title' => 'Host comment')) ?>
+        <?php elseif ($comment->comment_objecttype_id === '2'): ?>
+            <?= $this->img('img/icons/service.png', array('title' => 'Service comment')) ?>
+        <?php endif; ?>
+        <small>
+            <?php
+            switch ($comment->comment_type) {
+                case 'flapping':
+                    $icon = 'flapping';
+                    $tooltip = 'Comment was caused by a flapping host or service.';
+                    break;
+                case 'comment':
+                    $icon = 'user';
+                    $tooltip = 'Comment was created by an user.';
+                    break;
+                case 'downtime':
+                    $icon = 'down';
+                    $tooltip = 'Comment was caused by a downtime.';
+                case 'ack':
+                    $icon = 'acknowledgement';
+                    $tooltip = 'Comment was caused by an acknowledgement.';
+            }
+            ?>
+            <?= $this->img('img/icons/' . $icon . '.png', array('title' => $tooltip)) ?>
+        </small>
+    </td>
+
+    <td>
+      <a class="hidden" href="<?= $detailLink; ?>"></a>
+
+        <div rel="tooltip" title="Comment #<?=$comment->comment_id ?>">
+        For
+        <?php if ($comment->service_name): ?>
+            <a href="<?= $detailLink ?>">
+                <?= $comment->service_name ?>
+                on
+                <?= $comment->host_name; ?>
+            </a>
+        <?php else: ?>
+            <a href="<?= $hostLink ?>">
+                <?= $comment->host_name; ?>
+            </a>
+        <?php endif; ?>
+        by
+        <?= $comment->comment_author; ?>
+      <div class="small-row">
+         <?= $comment->comment_data; ?>
       </div>
-    </div>
 
-    <div class="row">
-        <?=  $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
-    </div>
+      <small>
+        <span>
+           <b>Persists: </b><?= ($comment->comment_is_persistent === '1') ? 'Yes' : 'No'; ?>
+        </span>
+        <span>
+          <b>Expires: </b> <?=
+            ($comment->comment_expiration_timestamp) ?
+                'at ' . date('d.m H:i', $comment->comment_expiration_timestamp) :
+                'Never';
+            ?>
+        </span>
+      </small>
 
-    <div class="row">
-        <?= $this->selectionToolbar('single'); ?>
-    </div>
-  </div>
-
-  <table class="table table-condensed pull-left">
-    <tbody>
-    <?php foreach ($comments as $comment): ?>
+    </td>
+    <td>
       <?php
-        $objectType = ($comment->comment_objecttype_id === '1') ? 'host' : 'service';
-        $objectName = ($objectType === 'host') ? $comment->host_name : $comment->service_name;
-        $hrefParameters = array(
-          $objectType   => $objectName,
-          'comment_id'  => $comment->comment_id
+        $data = array(
+          'commentid' => $comment->comment_id,
+          'host'      => $comment->host_name
         );
+
         if ($objectType === 'service') {
-          $hrefParameters['host'] = $comment->host_name;
+          $data['service'] = $comment->service_name;
         }
 
-        $detailLink = $this->href(
-          'monitoring/show/' . $objectType,
-          $hrefParameters
-        );
-
-        $hostLink = $this->href(
-          'monitoring/show/host',
-          array(
-            'host' => $comment->host_name
-          )
+        echo $commandHelper->iconSubmitForm(
+            'img/icons/remove.png',
+            'Remove comment',
+            'btn-small',
+            'removecomment',
+            $data
         );
       ?>
-    <tr>
-        <td>
-            <?= date('d.m. H:i', $comment->comment_timestamp); ?>
-        </td>
+    </td>
+    </div>
+  </tr>
+<?php endforeach; ?>
+</tbody>
+</table>
 
-        <td>
-            <?php if ($comment->comment_objecttype_id === '1'): ?>
-                <?= $this->img('img/icons/host.png', array('title' => 'Host comment')) ?>
-            <?php elseif ($comment->comment_objecttype_id === '2'): ?>
-                <?= $this->img('img/icons/service.png', array('title' => 'Service comment')) ?>
-            <?php endif; ?>
-            <small>
-                <?php
-                switch ($comment->comment_type) {
-                    case 'flapping':
-                        $icon = 'flapping';
-                        $tooltip = 'Comment was caused by a flapping host or service.';
-                        break;
-                    case 'comment':
-                        $icon = 'user';
-                        $tooltip = 'Comment was created by an user.';
-                        break;
-                    case 'downtime':
-                        $icon = 'down';
-                        $tooltip = 'Comment was caused by a downtime.';
-                    case 'ack':
-                        $icon = 'acknowledgement';
-                        $tooltip = 'Comment was caused by an acknowledgement.';
-                }
-                ?>
-                <?= $this->img('img/icons/' . $icon . '.png', array('title' => $tooltip)) ?>
-            </small>
-        </td>
-
-        <td>
-          <a class="hidden" href="<?= $detailLink; ?>"></a>
-
-            <div rel="tooltip" title="Comment #<?=$comment->comment_id ?>">
-            For
-            <?php if ($comment->service_name): ?>
-                <a href="<?= $detailLink ?>">
-                    <?= $comment->service_name ?>
-                    on
-                    <?= $comment->host_name; ?>
-                </a>
-            <?php else: ?>
-                <a href="<?= $hostLink ?>">
-                    <?= $comment->host_name; ?>
-                </a>
-            <?php endif; ?>
-            by
-            <?= $comment->comment_author; ?>
-          <div class="small-row">
-             <?= $comment->comment_data; ?>
-          </div>
-
-          <small>
-            <span>
-               <b>Persists: </b><?= ($comment->comment_is_persistent === '1') ? 'Yes' : 'No'; ?>
-            </span>
-            <span>
-              <b>Expires: </b> <?=
-                ($comment->comment_expiration_timestamp) ?
-                    'at ' . date('d.m H:i', $comment->comment_expiration_timestamp) :
-                    'Never';
-                ?>
-            </span>
-          </small>
-
-        </td>
-        <td>
-          <?php
-            $data = array(
-              'commentid' => $comment->comment_id,
-              'host'      => $comment->host_name
-            );
-
-            if ($objectType === 'service') {
-              $data['service'] = $comment->service_name;
-            }
-
-            echo $commandHelper->iconSubmitForm(
-                'icinga-icon-remove',
-                'Remove comment',
-                'btn-small',
-                'removecomment',
-                $data
-            );
-          ?>
-        </td>
-        </div>
-      </tr>
-    <?php endforeach; ?>
-    </tbody>
-  </table>
-
-  <div class="container pull-left">
-    <?=  $this->paginationControl($comments, null, null, array('preserve' => $this->preserve)); ?>
-  </div>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 02e381b41..224cc50cc 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -1,87 +1,59 @@
 <?php
-$commandHelper = $this->getHelper('CommandForm');
+$helper = $this->getHelper('CommandForm');
 ?>
-<div class="row">
-  <div class="pull-left">
-    <h1>Downtimes</h1>
-  </div>
-  <div class="pull-right">
-    <?= $this->tabs->render($this); ?>
-  </div>
-</div>
-
-<div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="single">
-
-  <div class="container pull-left">
-    <div class="row">
-      <div class="col-md-12">
-      <?=  $this->sortControl->render($this); ?>
-      </div>
-    </div>
-
-    <div class="row">
-        <?=  $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
-    </div>
-
-    <div class="row">
-        <?= $this->selectionToolbar('single'); ?>
-    </div>
-  </div>
-
-  <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
-  <table class="table table-condensed">
-    <tbody>
-    <?php foreach ($downtimes as $downtime): ?>
-    <tr>
-      <td>
-        <?= $this->dateFormat()->formatDateTime((int) $downtime->downtime_start); ?> -
-        <?= $this->dateFormat()->formatDateTime((int) $downtime->downtime_end); ?>
-        <br />
-        <small>Duration: <?= $this->util()->showHourMin((int) $downtime->downtime_duration); ?></small>
-        <br />
-        <small>The <?php if($downtime->downtime_is_flexible): ?>flexible<?php else: ?>fixed<?php endif; ?> downtime is <?php if(!$downtime->downtime_is_in_effect): ?>not <?php endif; ?>in effect</small>
-      </td>
-      <td>
-        <?php if (isset($downtime->service)): ?>
-          <a href="<?= $this->href('monitoring/show/service', array(
-            'host'    => (string) $downtime->host,
-            'service' => (string) $downtime->service
-          )); ?>"><?= $downtime->service ?></a>
-          <small>on <?= $downtime->host ?></small>
-        <?php else: ?>
-          <a href="<?= $this->href('monitoring/show/host', array(
-            'host'    => (string) $downtime->host
-          )); ?>"><?= $downtime->host ?> </a>
-        <?php endif; ?>
-        <br />
-        <?= $downtime->downtime_author ?>: <?= $downtime->downtime_comment ?>
-        <br />
-        <small>Entry Time: <?= ($downtime->downtime_entry_time) ? $this->dateFormat()->formatDateTime((int) $downtime->downtime_entry_time) : ''; ?>
-        </small>
-      <td>
-          <?php
-            $data = array(
-              'downtimeid'    => $downtime->downtime_internal_downtime_id,
-              'host'          => $downtime->host
-            );
-            if (isset($downtime->service)) {
-              $data['service'] = $downtime->service;
-            }
-            echo $commandHelper->iconSubmitForm(
-              'icinga-icon-remove',
-              'Remove Downtime',
-              'btn-small',
-              'removedowntime',
-              $data
-            );
-          ?>
-      </td>
-    </tr>
-    <?php endforeach ?>
-    </tbody>
-  </table>
-
-  <div class="container pull-left">
-    <?= $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
-  </div>
+<div class="controls">
+<?= $this->tabs ?>
+<?=  $this->sortControl->render($this); ?>
+<?=  $this->paginationControl($downtimes, null, null, array('preserve' => $this->preserve)); ?>
 </div>
+<table class="action">
+<tbody>
+<?php foreach ($downtimes as $downtime): ?>
+<tr>
+  <td>
+    <?= $this->dateFormat()->formatDateTime((int) $downtime->downtime_start); ?> -
+    <?= $this->dateFormat()->formatDateTime((int) $downtime->downtime_end); ?>
+    <br />
+    <small>Duration: <?= $this->util()->showHourMin((int) $downtime->downtime_duration); ?></small>
+    <br />
+    <small>The <?php if($downtime->downtime_is_flexible): ?>flexible<?php else: ?>fixed<?php endif; ?> downtime is <?php if(!$downtime->downtime_is_in_effect): ?>not <?php endif; ?>in effect</small>
+  </td>
+  <td>
+    <?php if (isset($downtime->service)): ?>
+      <a href="<?= $this->href('monitoring/show/service', array(
+        'host'    => (string) $downtime->host,
+        'service' => (string) $downtime->service
+      )); ?>"><?= $downtime->service ?></a>
+      <small>on <?= $downtime->host ?></small>
+    <?php else: ?>
+      <a href="<?= $this->href('monitoring/show/host', array(
+        'host'    => (string) $downtime->host
+      )); ?>"><?= $downtime->host ?> </a>
+    <?php endif; ?>
+    <br />
+    <?= $downtime->downtime_author ?>: <?= $downtime->downtime_comment ?>
+    <br />
+    <small>Entry Time: <?= ($downtime->downtime_entry_time) ? $this->dateFormat()->formatDateTime((int) $downtime->downtime_entry_time) : ''; ?>
+    </small>
+  <td>
+      <?php
+        $data = array(
+          'downtimeid'    => $downtime->downtime_internal_downtime_id,
+          'host'          => $downtime->host
+        );
+        if (isset($downtime->service)) {
+          $data['service'] = $downtime->service;
+        }
+        echo $helper->iconSubmitForm(
+          'img/icons/remove.png',
+          'Remove Downtime',
+          'btn-small',
+          'removedowntime',
+          $data
+        );
+      ?>
+  </td>
+</tr>
+<?php endforeach ?>
+</tbody>
+</table>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index 3c59b50db..efe2fd40a 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -1,29 +1,22 @@
 <div class="controls">
 <?= $this->tabs ?>
-<?=  $this->paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?>
-<table class="action wide">
-<thead>
-  <tr>
-    <th style="width: 40%; padding-left: 1em;">Hosts</th>
-    <th style="width: 60%; padding-left: 1em;">Services</th>
-  </tr>
-</thead>
-</table>
 </div>
-
-<table class="action wide">
-<tbody>
+<div class="content">
+<div class="summary" data-base-target="col2">
 <?php foreach($hostgroups as $h): ?>
-  <tr>
-    <td style="width: 40%" class="summary">
-      <a href="<?= $this->href(
+<span class="state">
+
+<table><tr><td>
+ <strong><a href="<?= $this->href(
       'monitoring/list/services',
       array('hostgroup' => $h->hostgroup))
-      ?>"><?= $h->hostgroup; ?></a>
+      ?>"><?= $h->hostgroup; ?></a></strong>
 
 <?php if ($h->hosts_up): ?>
       <!-- Hosts UP -->
       <span class="state up">
+
+
         <a href="<?= $this->href(
           'monitoring/list/hosts',
           array('host_state' => 0, 'hostgroup' => $h->hostgroup)
@@ -75,8 +68,9 @@
       </span>
       <!-- End of hosts PENDING -->
 <?php endif ?>
-    </td>
-    <td style="width: 60%" class="summary">
+
+</td><td>
+  Services
 <?php if ($h->services_ok): ?>
       <!-- Services OK -->
       <span class="state ok">
@@ -97,7 +91,8 @@
           'monitoring/list/services',
           array(
             'service_state' => 2,
-            'hostgroup' => $h->hostgroup
+            'hostgroup' => $h->hostgroup,
+            'sort' => 'service_severity'
         )) ?>" title="Services Critical"><?= $h->services_critical ?> CRITICAL: </a>
 
 <?php if ($h->services_critical_unhandled): ?>
@@ -106,7 +101,8 @@
           array(
             'service_state' => 2,
             'service_unhandled' => 1,
-            'hostgroup' => $h->hostgroup
+            'hostgroup' => $h->hostgroup,
+            'sort' => 'service_severity'
           )
         ) ?>" title="Services Critical Unhandled"><?= $h->services_critical_unhandled ?> Unhandled</a>
 <?php endif ?>
@@ -178,8 +174,8 @@
           ) ?>" title="Services Pending"><?= $h->services_pending ?></a>
       </span>
 <?php endif ?>
-    </td>
-</tr>
+</td></tr></table>
+</span><!-- end of services -->
 <?php endforeach; ?>
-  </tbody>
-</table>
+</div>
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index bb0e4f241..63c7ed254 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -1,16 +1,22 @@
 <?php
-
-$viewHelper = $this->getHelper('MonitoringState');
+$helper = $this->getHelper('MonitoringState');
 ?>
 <div class="controls">
 <?= $this->tabs ?>
+<div style="display: inline-block; margin: 1em; vertical-align: top;">
 <?= $this->filterBox->render($this); ?>
-<?= $this->sortControl->render($this); ?><br />
-<?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?>
+</div>
+<div style="display: inline-block; margin: 1em; vertical-align: top;">
+<?= $this->sortControl->render($this); ?>
+</div><br />
+<div style="display: inline-block; margin: 1em; vertical-align: top;">
 <?= $this->selectionToolbar('multi', $this->href('monitoring/multi/host',array( 'host' => '*' ))); ?>
 </div>
+<?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)); ?>
+</div>
 <div class="content">
 <?php
+
 if ($hosts->count() === 0) {
     echo '<p>No host found</p>';
     return;
@@ -18,107 +24,93 @@ if ($hosts->count() === 0) {
 ?>
 
 <table class="action multiselect">
-    <tbody>
-    <?php foreach($hosts as $host): ?>
-      <?php $hostStateName = strtolower($this->util()->getHostStateName($host->host_state)); ?>
-      <?php $hostLink = $this->href('monitoring/show/host', array('host' => $host->host_name)); ?>
-      <!--<tr> -->
-       <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
-        <!-- Color column -->
-<!--        <td class="tacheader-status-<?= $hostStateName; ?>">
-          <a style="visibility:hidden" href="<?= $hostLink; ?>"></a>
-        </td>
--->
-        <!-- Icons -->
-<!--        <td>
-          <?php if (!$host->host_handled && $host->host_state > 0): ?>
-          <a href="#" title="Unhandled">
-            <i class="icon-table icinga-icon-unhandled"></i>
-          </a>
-          <?php endif; ?>
+<tbody>
+<?php foreach($hosts as $host):
 
-          <?php if ($host->host_acknowledged && !$host->host_in_downtime): ?>
-          <a href="#" title="Acknowledged">
-            <i class="icon-table icinga-icon-acknowledgement"></i>
-          </a>
-          <?php endif; ?>
+    $hostStateName = strtolower($this->util()->getHostStateName($host->host_state));
+    $hostLink = $this->href('monitoring/show/host', array('host' => $host->host_name));
 
-          <?php if ($host->host_is_flapping): ?>
-          <a href="#" title="Flapping">
-              <i class="icon-table icinga-icon-flapping"></i>
-          </a>
-          <?php endif; ?>
+    $icons = array();
+    if (!$host->host_handled && $host->host_state > 0){
+        $icons[] = $this->img('img/icons/unhandled.png', array(
+            'title' => 'Unhandled'
+        ));
+    }
 
-          <?php if (!$host->host_notifications_enabled): ?>
-          <a href="#" title="Notifications Disabled">
-              <i class="icon-table icinga-icon-notification-disabled"></i>
-          </a>
-          <?php endif; ?>
+    if ($host->host_acknowledged && !$host->host_in_downtime) {
+        $icons[] = $this->img('img/icons/acknowledgement.png', array(
+            'title' => 'Acknowledged'
+        ));
+    }
 
-          <?php if ($host->host_in_downtime): ?>
-          <a href="#" title="In Downtime">
-              <i class="icon-table icinga-icon-in-downtime"></i>
-          </a>
-          <?php endif; ?>
+    if ($host->host_is_flapping) {
+        $icons[] = $this->img('img/icons/flapping.png', array(
+            'title' => 'Flapping'
+        ));
+    }
 
-          <?php if (!$host->host_active_checks_enabled): ?>
-            <?php if (!$host->host_passive_checks_enabled): ?>
-              <a href="#" title="Active And Passive Checks Disabled">
-               <i class="icinga-icon-active-passive-checks-disabled"></i>
-              </a>
-            <?php else: ?>
-              <a href="#" title="Active Checks Disabled">
-                  <i class="icon-table icinga-icon-active-checks-disabled"></i>
-              </a>
-            <?php endif; ?>
-          <?php endif; ?>
+    if (!$host->host_notifications_enabled) {
+        $icons[] = $this->img('img/icons/notification_disabled.png', array(
+            'title' => 'Notifications Disabled'
+        ));
+    }
 
-          <?php if (isset($host->host_last_comment) && $host->host_last_comment !== null): ?>
-          <a href="#" title="Comments">
-              <i class="icon-table icinga-icon-comment"></i>
-          </a>
-          <?php endif; ?>
-        </td>
--->
-        <!-- State -->
-        <td class="state" title="<?= $viewHelper->getStateTitle($host, 'host'); ?>">
-          <div>
-            <?php if (isset($host->host_unhandled_service_count) && $host->host_unhandled_service_count > 0): ?>
-              <span class="badge pull-right" title="<?= $host->host_unhandled_service_count; ?> Service Problems on Host">
-              <a data-icinga-target="detail" href="<?= $this->href('monitoring/list/services', array('host' => $host->host_name, 'service_problem' => 1)); ?>">
-                <?= $host->host_unhandled_service_count; ?>
-              </a>
-            </span>
-            <?php endif; ?>
+    if (!$host->host_in_downtime) {
+        $icons[] = $this->img('img/icons/in_downtime.png', array(
+            'title' => 'In Downtime'
+        ));
+    }
 
-            <strong><?= ucfirst($viewHelper->monitoringState($host, 'host')); ?></strong><br />
-            <div class="small-row">
-            Since <?= $this->timeSince($host->host_last_state_change); ?>
-            <?php if ($host->host_state > 0): ?>
-              <br />
-              <strong><?= ($host->host_state_type === '1') ? 'Hard' : 'Soft'; ?> </strong> <?= $host->host_current_check_attempt; ?>/<?= $host->host_max_check_attempts; ?>
-            <?php endif; ?>
-            </div>
-          </div>
-        </td>
+    if (!$host->host_active_checks_enabled) {
+        if (!$host->host_passive_checks_enabled) {
+            $icons[] = $this->img('img/icons/active_passive_checks_disabled.png', array(
+                'title' => 'Active And Passive Checks Disabled'
+            ));
+        } else {
+            $icons[] = $this->img('img/icons/active_checks_disabled.png', array(
+                'title' => 'Active Checks Disabled'
+            ));
+        }
+    }
 
-        <!-- Host / Status / Output -->
-        <td>
-          <?php if ($host->host_icon_image) : ?>
-            <div class="pull-left" style="margin-right: 2px;">
-              <i class="inline-image" style="background-image: url(<?= $this->escape($this->resolveMacros($host->host_icon_image, $host)); ?>);"></i>
-            </div>
-          <?php endif; ?>
-          <a href="<?= $this->href('monitoring/list/services', array('host' => $host->host_name)) ?>">
-            <strong><?= $host->host_name ?></strong>
-          </a>
+    // Not available right now:
+    if (isset($host->host_last_comment) && $host->host_last_comment !== null) {
+        $icons[] = $this->img('img/icons/comment.png', array(
+            'title' => 'Comments'
+        ));
+    }
+?>
+   <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
+    <!-- State -->
+    <td class="state" title="<?= $helper->getStateTitle($host, 'host'); ?>">
+      <div>
+        <?php if (isset($host->host_unhandled_service_count) && $host->host_unhandled_service_count > 0): ?>
+          <span class="badge pull-right" title="<?= $host->host_unhandled_service_count; ?> Service Problems on Host">
+            <a href="<?= $this->href('monitoring/list/services', array('host' => $host->host_name, 'service_problem' => 1)) ?>"><?= $host->host_unhandled_service_count; ?></a>
+          </span>
+        <?php endif; ?>
 
-          <div class="output-text">
-            <?= $this->escape(substr(strip_tags($host->host_output), 0, 10000)); ?>
-          </div>
-        </td>
-      </tr>
-    <?php endforeach; ?>
-    </tbody>
-  </table>
+        <strong><?= ucfirst($helper->monitoringState($host, 'host')); ?></strong><br />
+        <div class="small-row">
+        Since <?= $this->timeSince($host->host_last_state_change); ?>
+        <?php if ($host->host_state > 0): ?>
+          <br />
+          <strong><?= ($host->host_state_type === '1') ? 'Hard' : 'Soft'; ?> </strong> <?= $host->host_current_check_attempt; ?>/<?= $host->host_max_check_attempts; ?>
+        <?php endif ?>
+        </div>
+      </div>
+    </td>
+
+    <!-- Host / Status / Output -->
+    <td>
+      <?php if ($host->host_icon_image) : ?>
+      <?= $this->img($this->resolveMacros($host->host_icon_image, $host), array('align' => 'right')) ?>
+      <?php endif ?>
+      <a href="<?= $this->href('monitoring/list/services', array('host' => $host->host_name)) ?>"><?= $host->host_name ?></a><br />
+        <?= $this->escape(substr(strip_tags($host->host_output), 0, 10000)); ?>
+    </td>
+  </tr>
+<?php endforeach; ?>
+</tbody>
+</table>
 </div>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 7ba68827e..247c45021 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -9,7 +9,8 @@ $helper = $this->getHelper('MonitoringState');
 <div style="display: inline-block; margin: 1em; vertical-align: top;">
 <?= $this->sortControl->render($this); ?>
 </div><br />
-<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/service', array( 'service' => '*', 'host' => '*' ))); ?> <?=  $this->paginationControl($services, null, null, array('preserve' => $this->preserve)); ?>
+<div style="display: inline-block; margin: 1em; vertical-align: top;">
+<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/service', array( 'service' => '*', 'host' => '*' ))); ?></div> <?=  $this->paginationControl($services, null, null, array('preserve' => $this->preserve)); ?>
 </div>
 
 <div class="content">
@@ -92,7 +93,7 @@ foreach ($services as $service):
         </td>
 -->
         <td class="state" title="<?= $helper->getStateTitle($service, 'service'); ?>">
-            <strong><?= ucfirst($helper->monitoringState($service, 'service')); ?></strong><br />
+            <strong><?= strtoupper($helper->monitoringState($service, 'service')); ?></strong><br />
 
             <div class="small-row">
               Since <?= $this->timeSince($service->service_last_state_change); ?>
@@ -106,6 +107,7 @@ foreach ($services as $service):
         </td>
 
         <td title="<?= $helper->getStateTitle($service, 'host'); ?>">
+        <?= $this->perfdata($service->service_perfdata, true) ?>
 <!--          <?php if ($service->service_icon_image): ?>
             <div class="pull-left" style="margin-right: 2px;">
                 <i class="inline-image" style="background-image: url(<?= $this->escape($this->resolveMacros($service->service_icon_image, $service)); ?>);"></i>
@@ -116,7 +118,7 @@ foreach ($services as $service):
   (<?= ucfirst($helper->monitoringState($service, 'host')); ?>)
 <?php endif; ?>
 </a><br />
-          <?= $this->escape(substr(strip_tags($service->service_output), 0, 10000)); ?>
+          <p class="pluginoutput"><?= $this->escape(substr(strip_tags($service->service_output), 0, 10000)); ?></p>
         </td>
       </tr>
 <?php endforeach; ?>