diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css
index 5acf4d5..c52a4df 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -10,6 +10,9 @@
 #content .comment-wrapper h2.comment-form__title {
   margin-bottom: 1em;
 }
+.comment-wrapper {
+  clear: both;
+}
 .field-node--comment {
   font-size: 0.934em;
 }
diff --git a/core/themes/bartik/css/components/field.css b/core/themes/bartik/css/components/field.css
index a358e1a..ed10e70 100644
--- a/core/themes/bartik/css/components/field.css
+++ b/core/themes/bartik/css/components/field.css
@@ -47,10 +47,17 @@
   .node .field--type-image {
     float: left; /* LTR */
     margin: 0 1em 0 0; /* LTR */
+    position: relative;
+    z-index: 120;  /* Keep below Toolbar and Quickedit. */
   }
   [dir="rtl"] .node .field--type-image {
     float: right;
     margin: 0 0 0 1em;
+    position: relative;
+    z-index: 120;  /* Keep below Toolbar and Quickedit. */
+  }
+  .quickedit-form-container {
+    z-index: 130; /* Quickedit form has to be above image field. */
   }
   .node .field--type-image + .field--type-image {
     clear: both;
diff --git a/core/themes/bartik/css/components/node.css b/core/themes/bartik/css/components/node.css
index 96dfb16..2d14ccf 100644
--- a/core/themes/bartik/css/components/node.css
+++ b/core/themes/bartik/css/components/node.css
@@ -54,6 +54,7 @@
 .node__links {
   text-align: right; /* LTR */
   font-size: 0.93em;
+  clear: both;
 }
 [dir="rtl"] .node__links {
   text-align: left;