diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 12f9a1738..588d39712 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -7,6 +7,7 @@ if ($this->compact): ?>
 <div class="controls">
   <?= $this->tabs ?>
   <div style="margin: 1em;" class="dontprint">
+    <?= $this->render('list/components/selectioninfo.phtml') ?>
     <?= $this->render('list/components/hostssummary.phtml') ?>
     <?= $this->translate('Sort by') ?> <?= $this->sortControl->render($this) ?>
   </div>
@@ -14,7 +15,6 @@ if ($this->compact): ?>
 <?= $this->widget('limiter')->setMaxLimit($this->hosts->count()) ?>
 <?= $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
 <?= $this->selectionToolbar('multi', $this->href('monitoring/hosts/show?' . $this->filter->toQueryString())) ?>
-<?= $this->render('list/components/selectioninfo.phtml') ?>
 </div>
 
 <div class="content">
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 7a21bf617..2ea125527 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -7,6 +7,7 @@ if (!$this->compact): ?>
 <div class="controls">
 <?= $this->tabs ?>
 <div style="margin: 1em;" class="dontprint">
+<?= $this->render('list/components/selectioninfo.phtml') ?>
 <?= $this->render('list/components/servicesummary.phtml') ?>
 <div style="float: right">
 <?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
@@ -18,10 +19,6 @@ if (!$this->compact): ?>
 <?= $this->widget('limiter')->setCurrentPageCount($this->services->count()) ?>
 <?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)) ?>
 <?php endif ?>
-<!--
-<?= $this->selectionToolbar('multi', $this->href('monitoring/services/show?' . $this->filterEditor->getFilter()->toQueryString())) ?>
-<?= $this->render('list/components/selectioninfo.phtml') ?>
--->
 </div>
 
 <div class="content">
diff --git a/modules/monitoring/application/views/scripts/show/components/output.phtml b/modules/monitoring/application/views/scripts/show/components/output.phtml
index d482a4d66..fcae644cc 100644
--- a/modules/monitoring/application/views/scripts/show/components/output.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/output.phtml
@@ -1,2 +1,5 @@
+<div class="pluginoutput">
+<h4>Pluginoutput</h4>
 <?= $this->pluginOutput($object->output) ?>
 <?= $this->pluginOutput($object->long_output) ?>
+</div>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 1b2a5b67d..65150c5e2 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -20,16 +20,21 @@ p.pluginoutput {
   white-space: pre-wrap;
 }
 
-pre.pluginoutput {
-  font-family: Courier;
-  background: #eee;
-  font-size: 0.7em;
+div.pluginoutput {
+  border-right: solid 5px @colorPetrol;
   overflow: auto; 
-  white-space: pre-wrap;
-  margin: 0em;
-  padding: 1em;
-  margin-bottom: 0.5em;
   color: black;
+  margin-bottom: 1em;
+  padding: 0.2em;
+}
+
+div.pluginoutput h4 {
+  font-size: 0.875em;
+  margin: 0em;
+}
+
+div.pluginoutput pre{
+  white-space: pre-wrap;
 }
 
 table.objecthistory td {
@@ -156,5 +161,6 @@ table.avp .customvar ul {
 }
 
 div.selection-info {
-  padding-top:1em;
+  padding-top:0.5em;
+  float: right;
 }