diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index ffba365b1..20338b08e 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -18,7 +18,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
 
 </div>
 
-<div class="content">
+<div class="content no-padding-top">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
index 6c910d46a..39445e277 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -18,8 +18,8 @@ $hiddenRich = array();
         <tr>
             <th></th>
             <th></th>
-            <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-            <th class="collapse"><?= $this->translate('Output'); ?></th>
+            <th class="oneline"><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+            <th class="oneline"><?= $this->icon('paste'); ?> <?= $this->translate('Plugin Output'); ?></th>
         </tr>
         </thead>
 
@@ -64,8 +64,8 @@ $hiddenRich = array();
                         <?= $this->icon('comment', $this->translate('Last Comment: ') . $host->host_last_comment) ?>
                     <?php endif ?>
                 </td>
-                <td><?= $this->escape($host->getName()); ?></td>
-                <td><p class="pluginoutput"><?= $this->escape($host->host_output) ?></p></td>
+                <td class="name oneline"><?= $this->escape($host->getName()); ?></td>
+                <td><?= $this->escape($host->host_output) ?></td>
             </tr>
         <?php endforeach ?>
 
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 11127ddf3..fe23cde2c 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -15,12 +15,11 @@ use Icinga\Web\Url;
     <tr>
         <th></th>
         <th></th>
-        <th><?= $this->icon('service'); ?> <?= $this->translate('Service'); ?></th>
-        <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
-        <th class="collapse"><?= $this->translate('Output'); ?></th>
+        <th class="oneline"><?= $this->icon('service'); ?> <?= $this->translate('Service'); ?></th>
+        <th class="oneline"><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+        <th class="oneline"><?= $this->icon('paste'); ?> <?= $this->translate('Plugin Output'); ?></th>
     </tr>
     </thead>
-
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php
@@ -62,16 +61,16 @@ use Icinga\Web\Url;
                     <?= $this->icon('comment', $this->translate('Last Comment: ') . $service->service_last_comment) ?>
                 <?php endif ?>
             </td>
-            <td><?= $this->escape($service->getName()); ?></td>
-            <td><?= $this->escape($service->getHost()->getName()); ?></b></td>
-            <td><p class="pluginoutput collapse"><?= $this->escape($service->service_output) ?></p></td>
+            <td class="name oneline"><?= $this->escape($service->getName()); ?></td>
+            <td class="name oneline"><?= $this->escape($service->getHost()->getName()); ?></b></td>
+            <td><?= $this->escape($service->service_output) ?></td>
         </tr>
     <?php endforeach ?>
 
     <?php if (count($hidden)): ?>
         <tr>
-        <td>
-        <div class="selection-info" data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
+        <td class="state">
+        <div data-title-rich="<span align='left'><?= join('<br>', $hiddenRich) ?></span>"
               title="<?= join(', ', $hidden) ?>">
               <?= sprintf(t('%d more ...'), count($hidden)) ?>
         </div>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 2933e6623..8ee61859a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -12,7 +12,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\DeleteCommentCommandForm;
     <?= $this->render('partials/service/objects-header.phtml'); ?>
 
 </div>
-<div class="content">
+<div class="content no-padding-top">
     <h3>
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index a8f135712..3aa7da077 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -370,3 +370,7 @@ html {
   position: absolute;
   width: 1px;
 }
+
+.no-padding-top {
+  padding-top: 0em;
+}
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 609b3451c..ad80fbb45 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -929,10 +929,6 @@ table.statesummary {
   width: auto;
   border-collapse: separate;
 
-  tbody {
-    white-space: nowrap;
-  }
-
   td {
     padding: 0em 0.4em 0em 0.4em;
     line-height: 1.2em;
@@ -943,29 +939,27 @@ table.statesummary {
     font-weight: bold;
   }
 
-  td .pluginoutput {
-    font-size: 0.8em;
+  td {
+    font-size: 0.85em;
     line-height: 1.2em;
-    padding-left: 0;
+    padding-left: 0.2em;
     margin: 0;
   }
 
   td.state {
+    padding: 0.2em;
     min-width: 75px;
-    font-size: 0.7em;
+    font-size: 0.75em;
     text-align: center;
   }
 
+  td.name {
+    font-weight: bold;
+  }
+
   td a {
     color: inherit;
     text-decoration: none;
   }
 }
 
-/* Up to 576px for 1em=16px, should fit 320px devices */
-@media screen and (max-width: 97em) {
-
-  table.statesummary .collapse {
-    display: none;
-  }
-}
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index b6a41c234..7aaf8385e 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -272,6 +272,10 @@ li li .badge {
   background-color: @colorOk;
 }
 
+.badge-up {
+  background-color: @colorOk;
+}
+
 .badge-pending {
   background-color: @colorPending;
 }
@@ -323,3 +327,4 @@ li li .badge {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+