diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig
index 077741a7c80d1366204e8b11350de81ba48e9905..c1fd550842477b6a38f77bb857f574eb872cbb76 100644
--- a/source/_patterns/04-components/card/card.twig
+++ b/source/_patterns/04-components/card/card.twig
@@ -1,6 +1,8 @@
 {% import '@base/macros/uw.macro.twig' as macros %}
+
 <article class="card {{ modifier_classes }} {% if show_hover %} card--show-hover {% endif %} {{ type }}" >
   <div class="card__body">
+
     {% if title or author or date or sub_title %}
       <div class="card__header">
         {% if date %}
@@ -38,62 +40,62 @@
             <span class="sub-title">{{ sub_title }}</span>
           {% endif %}
         {% endif %}
-        {% if author_name %}
+
+        {% if author %}
           <div class="card__author">
-            {% if author_link %}
             by
-            <a href="{{ author_link }}">
-              {% endif %}
-
-              {{ author_name }}
-
-              {% if author_link %}
-            </a>
+            {% if author.link %}
+              <a href="{{ author.link }}">{{ author.name }}</a>
+            {% else %}
+              {{ author.name }}
             {% endif %}
           </div>
         {% endif %}
+
       </div>
     {% endif %}
-    {% if sources or img_element %}
-      <div class="card__media">
-        {% if url %}
-        <a href="{{ url }}">
+    <div class="card__content">
+      {% if sources or img_element %}
+        <div class="card__media">
+          {% if url %}
+          <a href="{{ url }}">
           {% endif %}
           {% include "@components/responsive-image/responsive-image.twig" with {
-            sources: sources,
-            img_element: img_element,
-            alt: alt
+              sources: sources,
+              img_element: img_element,
+              alt: alt
           }%}
           {% if url %}
-        </a>
-        {% endif %}
+          </a>
+          {% endif %}
+        </div>
+      {% endif %}
+        <div class="card_summary">
+          {{ content }}
+        </div>
       </div>
-    {% endif %}
-    <div class="card__content">
-      {{ content }}
-    </div>
-    {% if footer or read_more or tags or social_media %}
+      {% if footer or read_more or tags or card_social_media %}
       <div class="card__footer">
-        {{ footer }}
-        {% if tags %}
-          <div class="card__tags">
-            {% for tag in tags %}
-              {% include "@components/tag-list/tag-list.twig" with {
-                items: tag
-              } %}
-            {% endfor %}
-          </div>
-        {% endif %}
-        {% if read_more and url %}
-          <div class="card__readmore">
-            {{ macros.readmore(url, title) }}
-          </div>
-        {% endif %}
-        {%  if social_media %}
-          <div class="card__social {{ social_media_placement }}">
-            {% include "@components/menu/menu--social/menu--social.twig" %}
+          {{ footer }}
+          {% if tags %}
+            <div class="card__tags">
+              {% for tag in tags %}
+                {% include "@components/tag-list/tag-list.twig" with {
+                  items: tag
+                } %}
+              {% endfor %}
           </div>
         {% endif %}
+      {% if read_more and url %}
+        <div class="card__readmore">
+          {{ macros.readmore(url, title) }}
+        </div>
+      {% endif %}
+      {%  if social_media %}
+        <div class="card__social {{ social_media_placement }}">
+          {% include "@components/menu/menu--social/menu--social.twig" %}
+        </div>
+      {% endif %}
       </div>
     {% endif %}
   </div>