diff --git a/templates/macros/cards_pages.html b/templates/macros/cards_pages.html
index 1d003a9..bb37cc1 100644
--- a/templates/macros/cards_pages.html
+++ b/templates/macros/cards_pages.html
@@ -3,15 +3,20 @@
 <div class="cards">
     {%- for page in pages %}
     <div class="card">
-        <a rel="noopener noreferrer" target="_blank" href={{ page.extra.link_to }}>
+        {% if page.extra.link_to %}
+            <a rel="noopener noreferrer" target="_blank" href={{ page.extra.link_to }}>
+        {% endif %}
         {% if page.extra.local_image %}
-            <img class="card-image" alt={{ page.extra.local_image }} src="{{ get_url(path=page.extra.local_image) }}">
+            {% set meta = get_image_metadata(path=page.extra.local_image) %}
+            <img class="card-image" alt={{ page.extra.local_image }} src="{{ get_url(path=page.extra.local_image) }}" {% if meta.width %}width="{{ meta.width }}" {% endif %} {% if meta.height %}height="{{ meta.height }}" {% endif %}>
         {% elif page.extra.remote_image %}
             <img class="card-image" alt={{ page.extra.remote_image }} src="{{ page.extra.remote_image }}">
         {% else %}
             <div class="card-image-placeholder"></div>
         {% endif %}
-        </a>
+        {% if page.extra.link_to %}
+            </a>
+        {% endif %}
 
         <div class="card-info">
             <h1 class="card-title">