diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index cf7c2ede9..adcb9e9d3 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -1,19 +1,49 @@
 <div>
-    Comments
-    <?php if (!empty($object->comments)): ?>
-    <blockquote>
-        <?php foreach ($object->comments as $comment): ?>
-            <p>
-                <?= sprintf(
-                    '[%s] %s (%s): %s',
-                    $this->escape($comment->comment_author),
-                    $this->format()->timeSince($comment->comment_timestamp),
-                    $comment->comment_type,
-                    $comment->comment_data
-                ); ?>
-                <a href="#" class="button">{{REMOVE_ICON}}</a>
-            </p>
-        <?php endforeach; ?>
-    </blockquote>
-    <?php endif; ?>
+  <div class="panel-heading">
+    <div class="panel-hostname">
+        Comments
+        <?php
+            $data = array(
+                'host' => $object->host_name
+            );
+            if ($object->service_description) {
+                $data['service'] = $object->service_description;
+            }
+            $addCommentHref = $this->href(
+                'monitoring/command/addComment',
+                $data
+            );
+            $sendNotificationHref = $this->href(
+                'monitoring/command/sendCustomNotification',
+                $data
+            );
+        ?>
+        <div class="pull-right">
+        <a href="<?= $addCommentHref; ?>" class="btn-common btn-small button">
+            <i class="icinga-icon-comment"></i>
+        </a>
+        <a href="<?= $sendNotificationHref; ?>" class="btn-common btn-small button">
+            <i class="icinga-icon-notification"></i>
+        </a>
+        </div>
+    </div>
+  </div>
+  <hr class="separator" />
+  <div class="panel-body">
+      <table class="table table-condensed table-detail">
+          <tbody>
+            <?php foreach ($object->comments as $comment): ?>
+                <tr>
+                    <td>
+                        <?= $this->escape($comment->comment_author); ?>, <?= $comment->comment_type; ?>
+                        (<?= $this->format()->timeSince($comment->comment_timestamp); ?>)
+                        <div class="small-row">
+                            <?= $this->escape($comment->comment_data); ?>
+                        </div>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+          </tbody>
+      </table>
+  </div>
 </div>
diff --git a/modules/monitoring/application/views/scripts/show/components/status.phtml b/modules/monitoring/application/views/scripts/show/components/status.phtml
index e26f0bc0c..bf282d762 100644
--- a/modules/monitoring/application/views/scripts/show/components/status.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/status.phtml
@@ -4,8 +4,10 @@
 
     if ($type === 'host') {
         $objectStateName = strtolower($this->util()->getHostStateName($this->object->host_state));
+        $objectState = (int) $object->host_state;
     } else {
         $objectStateName = strtolower($this->util()->getServiceStateName($this->object->service_state));
+        $objectState = (int) $object->service_state;
     }
 ?>
 <div>
@@ -71,7 +73,12 @@
             <p><?= $this->pluginOutput($object->output); ?></p>
 
             <form>
-                <button type="submit" class="button btn-cta btn-wide">Recheck</button>
+
+                <?php if ($objectState > 0): ?>
+                    <button type="submit" class="button btn-cta btn-half-left">Acknowledge</button>
+                <?php endif; ?>
+
+                <button type="submit" class="button btn-cta <?= ($objectState > 0) ? 'btn-half-right' : 'btn-wide'; ?>">Recheck</button>
             </form>
         </div>
 
@@ -88,6 +95,17 @@
             <?php endif; ?>
         </div>
 
+        <?php if ($object->is_flapping): ?>
+        <div class="panel-row">
+            <div class="panel-label">
+                Flapping
+            </div>
+            <div class="panel-content">
+                <?= sprintf('%.2f', $object->percent_state_change) ?>% state change
+            </div>
+        </div>
+        <?php endif; ?>
+
         <div class="panel-row">
             <div class="panel-label">
                 Last Check
@@ -112,5 +130,44 @@
                 </form>
             </div>
         </div>
+
+        <?php if ($objectState > 0): ?>
+        <?php
+            if ($object->service_description) {
+                $notificationsHref = $this->href(
+                    'monitoring/list/notifications',
+                    array(
+                        'host'      => $object->host_name,
+                        'service'   => $object->service_description
+                    )
+                    );
+            } else {
+                $notificationsHref = $this->href(
+                    'monitoring/list/notifications',
+                    array(
+                        'host'      => $object->host_name
+                    )
+                );
+            }
+        ?>
+        <div class="panel-row">
+            <div class="panel-label">
+                Last Notification
+            </div>
+            <div class="panel-content">
+                <a href="<?= $notificationsHref ?>">
+                    <?php if ($object->last_notification === '0000-00-00 00:00:00'): ?>
+                        N/A
+                    <?php else: ?>
+                        <?= $object->last_notification ?>
+                        <?php if ($object->current_notification_number > 0): ?>
+                            <br />
+                            <?= $object->current_notification_number ?> notifications sent during current problem state
+                        <?php endif ;?>
+                    <?php endif; ?>
+                </a>
+            </div>
+        </div>
+        <?php endif; ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/show/service.phtml b/modules/monitoring/application/views/scripts/show/service.phtml
index 4fab84322..e3b322b08 100644
--- a/modules/monitoring/application/views/scripts/show/service.phtml
+++ b/modules/monitoring/application/views/scripts/show/service.phtml
@@ -1,11 +1,9 @@
 <?= $this->tabs->render($this); ?>
 <?= $this->render('show/components/status.phtml'); ?>
-<?= $this->render('show/components/command.phtml') ?>
-<?= $this->render('show/components/downtime.phtml'); ?>
 <?= $this->render('show/components/comments.phtml'); ?>
-<?= $this->render('show/components/properties.phtml'); ?>
+<?= $this->render('show/components/downtime.phtml'); ?>
 <?= $this->render('show/components/flags.phtml'); ?>
 <?= $this->render('show/components/customvars.phtml'); ?>
 <?= $this->render('show/components/servicegroups.phtml'); ?>
 <?= $this->render('show/components/contacts.phtml'); ?>
-<?= $this->render('show/components/eventHistory.phtml'); ?>
+<?= $this->render('show/components/command.phtml') ?>
diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
index 33b1df745..1a2b69ca5 100644
--- a/modules/monitoring/library/Monitoring/Object/Host.php
+++ b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -44,14 +44,16 @@ class Host extends AbstractObject
             'in_downtime' => 'host_in_downtime',
             'host_acknowledged',
             'host_last_state_change',
-            'last_check'    => 'host_last_check',
-            'next_check'    => 'host_next_check',
-            'check_execution_time'    => 'host_check_execution_time',
-            'check_latency' => 'host_check_latency',
-            'output'        => 'host_output',
-            'long_output'   => 'host_long_output',
-            'check_command' => 'host_check_command',
-            'perfdata'      => 'host_perfdata',
+            'last_state_change'         => 'host_last_state_change',
+            'last_notification'         => 'host_last_notification',
+            'last_check'                => 'host_last_check',
+            'next_check'                => 'host_next_check',
+            'check_execution_time'      => 'host_check_execution_time',
+            'check_latency'             => 'host_check_latency',
+            'output'                    => 'host_output',
+            'long_output'               => 'host_long_output',
+            'check_command'             => 'host_check_command',
+            'perfdata'                  => 'host_perfdata',
             'host_icon_image',
             'passive_checks_enabled'    => 'host_passive_checks_enabled',
             'obsessing'                 => 'host_obsessing',
@@ -67,7 +69,8 @@ class Host extends AbstractObject
             'is_flapping' => 'host_is_flapping',
             'last_comment'              => 'host_last_comment',
             'action_url'                => 'host_action_url',
-            'notes_url'                 => 'host_notes_url'
+            'notes_url'                 => 'host_notes_url',
+            'percent_state_change'      => 'host_percent_state_change'
         ))->where('host_name', $this->name1)->fetchRow();
     }
 }