diff --git a/modules/monitoring/application/views/scripts/show/components/grapher.phtml b/modules/monitoring/application/views/scripts/show/components/grapher.phtml
index 2d8d3e4bd..b46ad6113 100644
--- a/modules/monitoring/application/views/scripts/show/components/grapher.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/grapher.phtml
@@ -1 +1,4 @@
-<?= $this->grapherHtml ?>
+<?php if (isset($grapher)) {
+  echo $grapher->getPreviewHtml($object);
+} ?>
+
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 4ee048529..5ab6d9c82 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -117,7 +117,7 @@ span.state.warning {
 
 span.state.handled.warning {
     background: @colorWarningHandled;
-}   
+}
 
 span.state.unknown {
     background: @colorUnknown;
@@ -130,3 +130,7 @@ span.state.handled.unknown {
 span.state.pending {
     background: @colorPending;
 }
+
+form.instance-features span.description, form.object-features span.description {
+  display: inline;
+}
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 4712f4951..b201df7c6 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -97,7 +97,7 @@ form.inline {
   display: inline;
 }
 
-button.link-like, input.link-like {
+form.link-like input[type="submit"] {
   color: @colorLinkDefault;
   font-weight: normal;
   border: none;
@@ -107,7 +107,7 @@ button.link-like, input.link-like {
   cursor: pointer;
 }
 
-button.link-like:hover, input.link-like:hover, input.link-like:focus {
+form.link-like input[type="submit"]:hover, form.link-like input[type="submit"]:focus {
   text-decoration: underline;
   background: none;
   color: @colorLinkDefault;
@@ -140,4 +140,39 @@ form ul.errors li {
   font-size: 0.8em;
 }
 
+.description {
+  display: block;
+}
 
+textarea {
+  height: 4em;
+
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+
+  width: 100%;
+}
+
+input, select, textarea {
+  display: inline;
+}
+
+.control-group {
+  display: -webkit-flex;
+  display: flex;
+  -webkit-flex-flow: row wrap;
+  flex-flow: row wrap;
+}
+
+.control-group > div {
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+}
+
+@media (min-width: 480px) {
+  .control-group > div {
+    width: auto;
+  }
+}