diff --git a/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
index 34e31f897..1359e5f36 100644
--- a/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/object-command-form.phtml
@@ -1,21 +1,17 @@
 <?php use Icinga\Data\Filter\Filter; ?>
-
 <div class="controls">
-  <?php if (! $this->compact): ?>
-    <?= $this->tabs; ?>
-  <?php endif ?>
-  <?php if ($object->getType() === $object::TYPE_HOST): ?>
-    <?= $this->render('partials/object/host-header.phtml'); ?>
-    <?php
+<?php if (! $this->compact): ?>
+    <?= $this->tabs ?>
+<?php endif ?>
+<?php if ($object->getType() === $object::TYPE_HOST) {
+    echo $this->render('partials/object/host-header.phtml');
     $this->baseFilter = Filter::where('host', $object->host_name);
     $this->stats = $object->stats;
     echo $this->render('list/components/servicesummary.phtml');
-    ?>
-  <?php else: ?>
-    <?= $this->render('partials/object/service-header.phtml'); ?>
-    <hr class="command-separator">
-  <?php endif ?>
+} else {
+    echo $this->render('partials/object/service-header.phtml');
+} ?>
 </div>
 <div class="content object-command">
-    <?= $form; ?>
+    <?= $form ?>
 </div>
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index dbb8829fe..8d241eed0 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -1,19 +1,15 @@
 <div class="controls">
-
-   <?php if (! $this->compact): ?>
-       <?= $tabs; ?>
-   <?php endif ?>
-
-  <?php if (isset($serviceStates)): ?>
-    <?= $this->render('list/components/servicesummary.phtml'); ?>
-    <?= $this->render('partials/service/objects-header.phtml'); ?>
-  <?php else: ?>
+<?php if (! $this->compact): ?>
+    <?= $tabs ?>
+<?php endif ?>
+<?php if (isset($serviceStates)): ?>
+    <?= $this->render('list/components/servicesummary.phtml') ?>
+    <?= $this->render('partials/service/objects-header.phtml') ?>
+<?php else: ?>
     <?= $this->render('list/components/hostssummary.phtml') ?>
-    <?= $this->render('partials/host/objects-header.phtml'); ?>
-  <?php endif ?>
+    <?= $this->render('partials/host/objects-header.phtml') ?>
+<?php endif ?>
 </div>
-
 <div class="content objects-command">
-    <hr class="command-separator">
-    <?= $form; ?>
+    <?= $form ?>
 </div>
diff --git a/public/css/icinga/responsive.less b/public/css/icinga/responsive.less
index 7c759c1ec..2d23a2562 100644
--- a/public/css/icinga/responsive.less
+++ b/public/css/icinga/responsive.less
@@ -102,7 +102,7 @@
 }
 
 #layout.twocols #col2 {
-  border-left: 1px solid @gray-light;
+  border-left: 1px solid @gray-lighter;
   display: block;
 }