diff --git a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
index 6f727232ff..722f8d0b38 100644
--- a/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
@@ -63,7 +63,7 @@ public function createElements(array $formData = array())
         if ((bool) $this->status->notifications_enabled) {
             if ($this->hasPermission('monitoring/command/feature/instance')) {
                 $notificationDescription = sprintf(
-                    '<a aria-label="%1$s" title="%1$s" href="%2$s" data-base-target="_next">%3$s</a>',
+                    '<a aria-label="%1$s" class="action-link" title="%1$s" href="%2$s" data-base-target="_next">%3$s</a>',
                     $this->translate('Disable notifications for a specific time on a program-wide basis'),
                     $this->getView()->href('monitoring/health/disable-notifications'),
                     $this->translate('Disable temporarily')
@@ -126,14 +126,15 @@ public function createElements(array $formData = array())
                 'autosubmit'    => true,
                 'description'   => $notificationDescription,
                 'decorators'    => array(
-                    'ViewHelper',
-                    'Errors',
+                    array('Label', array('tag'=>'span', 'separator' => '', 'class' => 'control-label')),
                     array(
                         'Description',
                         array('tag' => 'span', 'class' => 'description', 'escape' => false)
                     ),
-                    'Label',
-                    array('HtmlTag', array('tag' => 'div'))
+                    array(array('labelWrap' => 'HtmlTag'), array('tag' => 'div', 'class' => 'control-label-group')),
+                    array('ViewHelper', array('separator' => '')),
+                    array('Errors', array('separator' => '')),
+                    array('HtmlTag', array('tag' => 'div', 'class' => 'control-group'))
                 ),
                 'disabled'      => $toggleDisabled
             )
diff --git a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
index 7b8ee9738f..34e36d3105 100644
--- a/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
+++ b/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
@@ -19,9 +19,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
     public function init()
     {
         $this->setUseFormAutosubmit();
-        $this->setTitle('Feature Commands');
         $this->setAttrib('class', 'inline object-features');
-        $this->loadDefaultDecorators()->getDecorator('description')->setTag('h2');
     }
 
     /**
diff --git a/modules/monitoring/application/views/scripts/host/show.phtml b/modules/monitoring/application/views/scripts/host/show.phtml
index ed5aebf8e2..badf7ffcf0 100644
--- a/modules/monitoring/application/views/scripts/host/show.phtml
+++ b/modules/monitoring/application/views/scripts/host/show.phtml
@@ -1,9 +1,9 @@
 <?php use Icinga\Data\Filter\Filter; ?>
 
 <div class="controls separated">
-  <?php if (! $this->compact): ?>
-    <?= $this->tabs; ?>
-  <?php endif ?>
+<?php if (! $this->compact): ?>
+    <?= $this->tabs ?>
+<?php endif ?>
     <?= $this->render('partials/object/host-header.phtml') ?>
     <?php
     $this->stats = $object->stats;
diff --git a/modules/monitoring/application/views/scripts/service/show.phtml b/modules/monitoring/application/views/scripts/service/show.phtml
index 2e8c851029..9dd139430a 100644
--- a/modules/monitoring/application/views/scripts/service/show.phtml
+++ b/modules/monitoring/application/views/scripts/service/show.phtml
@@ -3,7 +3,6 @@
     <?= $this->tabs ?>
 <?php endif ?>
     <?= $this->render('partials/object/service-header.phtml') ?>
-    <h1><?= $this->translate('Service detail information') ?></h1>
 </div>
 
 <?= $this->render('partials/object/detail-content.phtml') ?>