diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index ad89b66..1f69448 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -103,17 +103,6 @@ function bartik_preprocess_block(&$variables) {
 }
 
 /**
-+ * Implements hook_preprocess_HOOK() for comment.html.twig.
-+ */
-function bartik_preprocess_comment(&$variables) {
-  if (isset($variables['content']['links'])) {
-    // Add NAV wrapper element for comment links.
-    $variables['content']['links']['#prefix'] = '<nav>';
-    $variables['content']['links']['#suffix'] = '</nav>';
-  }
-}
-
-/**
  * Implements hook_preprocess_HOOK() for menu.html.twig.
  */
 function bartik_preprocess_menu(&$variables) {
diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css
index 0e89e78..47b0eed 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -12,14 +12,11 @@
   display: table;
   vertical-align: top;
 }
-.comment__attribution {
-  display: table-cell;
+.comment header {
   padding: 0 30px 0 0; /* LTR */
-  vertical-align: top;
   overflow: hidden;
 }
-[dir="rtl"] .comment__attribution {
-  float: right;
+[dir="rtl"] .comment header {
   padding: 0 0 0 30px;
 }
 .comment__attribution img {
@@ -48,8 +45,6 @@
 .comment__content {
   font-size: 0.929em;
   line-height: 1.6;
-}
-.comment__text {
   padding: 10px 25px;
   border: 1px solid #d3d7d9;
   display: table-cell;
@@ -57,10 +52,11 @@
   position: relative;
   width: 100%;
 }
-.comment__text h3 {
+.comment__content h3 {
+  /*line-height: 1.7;*/
   margin-top: 0;
 }
-.comment__text:before {
+.comment__content:before {
   content: '';
   position: absolute;
   right: 100%; /* LTR */
@@ -69,13 +65,13 @@
   border-right: 20px solid #d3d7d9; /* LTR */
   border-bottom: 20px solid transparent;
 }
-[dir="rtl"] .comment__text:before {
+[dir="rtl"] .comment__content:before {
   right: auto;
   left: 100%;
   border-right: none;
   border-left: 20px solid #d3d7d9;
 }
-.comment__text:after {
+.comment__content:after {
   content: '';
   position: absolute;
   right: 100%; /* LTR */
@@ -85,7 +81,7 @@
   border-bottom: 20px solid transparent;
   margin-right: -1px; /* LTR */
 }
-[dir="rtl"] .comment__text:after {
+[dir="rtl"] .comment__content:after {
   right: auto;
   left: 100%;
   border-right: none;
@@ -100,7 +96,8 @@
   margin-right: 40px;
   margin-left: 0;
 }
-.comment ul.links {
+.comment ul.links,
+[dir="rtl"] .comment ul.links {
   padding: 0 0 0.25em 0;
 }
 .comment ul.links li {
@@ -119,11 +116,11 @@
   margin-right: 0;
   padding: 5px 5px 5px 2px;
 }
-.comment--unpublished .comment__text:after,
-.node--unpublished .comment__text:after {
+.comment--unpublished .comment__content:after,
+.node--unpublished .comment__content:after {
   border-right-color: #fff4f4; /* LTR */
 }
-[dir="rtl"] .comment--unpublished .comment__text:after,
-[dir="rtl"] .node--unpublished .comment__text:after {
+[dir="rtl"] .comment--unpublished .comment__content:after,
+[dir="rtl"] .node--unpublished .comment__content:after {
   border-left-color: #fff4f4;
 }
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 216f3db..fe996cb 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -80,33 +80,30 @@
   #}
   <span class="hidden new" data-comment-timestamp="{{ new_indicator_timestamp }}"></span>
 
-  <header class="comment-header">
-    <div class="comment__attribution">
-      {{ user_picture }}
-      <div class="comment__submitted">
-        <p class="comment__author comment__submitted__data">{{ author }}</p>
-        <p class="comment__time comment__submitted__data">{{ created }}</p>
-        <p class="comment__permalink comment__submitted__data">{{ permalink }}</p>
-        {#
-          Indicate the semantic relationship between parent and child comments
-          for accessibility. The list is difficult to navigate in a screen
-          reader without this information.
-        #}
-        {% if parent %}
-          <p class="visually-hidden">{{ parent }}</p>
-        {% endif %}
-      </div>
-    </div>
+  <header>
+    {{ user_picture }}
+    <p class="comment__author comment__submitted__data">{{ author }}</p>
+    <p class="comment__time comment__submitted__data">{{ created }}</p>
+    <p class="comment__permalink comment__submitted__data">{{ permalink }}</p>
+    {#
+      Indicate the semantic relationship between parent and child comments
+      for accessibility. The list is difficult to navigate in a screen
+      reader without this information.
+    #}
+    {% if parent %}
+      <p class="visually-hidden">{{ parent }}</p>
+    {% endif %}
   </header>
 
-  <div class="comment__text">
+  <div{{ content_attributes.addClass('comment__content') }}>
     {% if title %}
       {{ title_prefix }}
       <h3{{ title_attributes }}>{{ title }}</h3>
       {{ title_suffix }}
     {% endif %}
-    <div{{ content_attributes.addClass('comment__content') }}>
-      {{ content }}
-    </div>
+    {{ content|without('links') }}
+    {% if content.links %}
+      <nav>{{ content.links }}</nav>
+    {% endif %}
   </div>
 </article>