diff --git a/modules/card/config.yaml b/modules/card/config.yaml
index a5a3c7f..e54d8d3 100644
--- a/modules/card/config.yaml
+++ b/modules/card/config.yaml
@@ -67,6 +67,13 @@ module:
             primary_button_class:
                 type: 'class'
 
+            card_is_link:
+                type: 'choice'
+                type_options:
+                    choices:
+                        "card.form.card_is_link.values.no": 'no'
+                        "card.form.card_is_link.values.yes": 'yes'
+
             content_position:
                 type: 'choice'
                 type_options:
diff --git a/modules/card/form.html.twig b/modules/card/form.html.twig
index 2ad6099..c401631 100644
--- a/modules/card/form.html.twig
+++ b/modules/card/form.html.twig
@@ -47,10 +47,13 @@
 <div class="col-12 mb-3">
     {{ form_widget(form.primary_button_class) }}
 </div>
+<div class="col-12">
+    {{ form_widget(form.card_is_link) }}
+</div>
 <div class="col-12 mb-3">
     {{ form_widget(form.primary_button_text) }}
 </div>
 <div class="col-12">
     {{ form_widget(form.primary_button_link) }}
 </div>
-{{ sfs_cms_admin_module_accordion_block_end() }}
\ No newline at end of file
+{{ sfs_cms_admin_module_accordion_block_end() }}
diff --git a/modules/card/render.html.twig b/modules/card/render.html.twig
index 7466d4e..ca87df2 100644
--- a/modules/card/render.html.twig
+++ b/modules/card/render.html.twig
@@ -20,13 +20,16 @@
 
 {% import '@SfsCms/macros/modules_render.html.twig' as module %}
 
+{% if card_is_link == 'yes' and sfs_cms_link_attr(primary_button_link) != 'href="#"' %}
+<a {{ sfs_cms_link_attr(primary_button_link) }}  {{ module.class([class, content_position], containerDivClass|default('sfs-card sfs-card--link h-100')) }} {{ module.id(id) }} {{ module.bg_color(bg_color) }}>
+{% else %}
 <div {{ module.class([class, content_position], containerDivClass|default('sfs-card h-100')) }} {{ module.id(id) }} {{ module.bg_color(bg_color) }}>
+{% endif %}
     {% if background[app.request.locale].media|default(false) %}
         <div class="{{ backgroundDivClass|default('sfs-card__bg-media') }}">
             {{ background[app.request.locale].media|sfs_media_render(background[app.request.locale].version) }}
         </div>
     {% endif %}
-
     <div {{ module.class([content_position], contentDivClass|default('sfs-card__content')) }}>
         {% if media[app.request.locale].media|default(false) %}
             <div class="{{ mediaDivClass|default('sfs-card__media') }}">{{ media[app.request.locale].media|sfs_media_render(media[app.request.locale].version, {'class':'img-fluid'}) }}</div>
@@ -35,15 +38,22 @@
         <div class="{{ textsContainerClass|default('sfs-card__texts') }}">
             {{ module.start_tag_type(title_type, [module.class(title_class, titleClass|default('sfs-card__title'))]) }}{{ title|sfs_cms_trans|raw }}{{ module.end_tag_type(title_type) }}
 
-            {% if description|default(false) %}
+            {% if description|default(false) and description|sfs_cms_trans is not empty %}
                 <div class="{{ descriptionClass|default('sfs-card__desc mb-4') }}">{{ description|sfs_cms_trans|raw }}</div>
             {% endif %}
-
-            <div class="{{ ctaContainerClass|default('sfs-card__cta') }}">
-                {% if primary_button_text|sfs_cms_trans %}
-                    <a {{ sfs_cms_link_attr(primary_button_link) }} {{ module.class(primary_button_class, primaryButtonClass|default('btn btn-primary')) }}>{{ primary_button_text|sfs_cms_trans|raw }}</a>
-                {% endif %}
-            </div>
+            {% if primary_button_text|default(false) and primary_button_text|sfs_cms_trans is not empty %}
+                <div class="{{ ctaContainerClass|default('sfs-card__cta') }}">
+                    {% if card_is_link == 'yes' and sfs_cms_link_attr(primary_button_link) != 'href="#"' %}
+                        <button type="button" {{ module.class(primary_button_class, primaryButtonClass|default('btn btn-primary')) }}>{{ primary_button_text|sfs_cms_trans|raw }}</button>
+                    {% else %}
+                        <a {{ sfs_cms_link_attr(primary_button_link) }} {{ module.class(primary_button_class, primaryButtonClass|default('btn btn-primary')) }}>{{ primary_button_text|sfs_cms_trans|raw }}</a>
+                    {% endif %}
+                </div>
+            {% endif %}
         </div>
     </div>
+{% if card_is_link == 'yes' and sfs_cms_link_attr(primary_button_link) != 'href="#"' %}
+</a>
+{% else %}
 </div>
+{% endif %}
diff --git a/modules/card/translations/sfs_cms_modules.en.yaml b/modules/card/translations/sfs_cms_modules.en.yaml
index a3d6d56..a688a2f 100644
--- a/modules/card/translations/sfs_cms_modules.en.yaml
+++ b/modules/card/translations/sfs_cms_modules.en.yaml
@@ -42,6 +42,10 @@ card:
             target.label: "Target"
             custom_target.label: "Target id"
             url.label: "Direct URL"
+        card_is_link.label: "All Card is a link"
+        card_is_link.values:
+            yes: "Yes"
+            no: "No"
         bg_color.label: "Background color"
         primary_button_class.label: "Classes"
         content_position.label: "Content position"
diff --git a/modules/card/translations/sfs_cms_modules.es.yaml b/modules/card/translations/sfs_cms_modules.es.yaml
index a33fdee..c3ff233 100644
--- a/modules/card/translations/sfs_cms_modules.es.yaml
+++ b/modules/card/translations/sfs_cms_modules.es.yaml
@@ -42,6 +42,10 @@ card:
             target.label: "Target"
             custom_target.label: "Identificador de target"
             url.label: "URL directa"
+        card_is_link.label: "Toda la tarjeta es un enlace"
+        card_is_link.values:
+            yes: "Sí"
+            no: "No"
         bg_color.label: "Color de fondo"
         primary_button_class.label: "Classes"
         content_position.label: "Posición del contenido"
diff --git a/modules/hero/render.html.twig b/modules/hero/render.html.twig
index e6d3fe5..f0ad668 100644
--- a/modules/hero/render.html.twig
+++ b/modules/hero/render.html.twig
@@ -18,7 +18,9 @@
         {% endif %}
         <{{ title_type|default('h1') }} {{ module.class(title_class, 'sfs-hero__title') }}>{{ title|sfs_cms_trans|raw }}</{{ title_type|default('h1') }}>
         <div class="col-md-10 col-lg-8 mx-auto">
-            {% if description|default(false) %}<div class="lead mb-4">{{ description|sfs_cms_trans|raw }}</div>{% endif %}
+            {% if description|default(false) and description|sfs_cms_trans is not empty %}<div class="lead mb-4">{{ description|sfs_cms_trans|raw }}</div>{% endif %}
+            {% if (primary_button_text|default(false) and primary_button_text|sfs_cms_trans is not empty) or
+                (secondary_button_text|default(false) and secondary_button_text|sfs_cms_trans is not empty) %}
             <div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
                 {% if primary_button_text|default(false) and primary_button_text|sfs_cms_trans is not empty %}
                     <a {{ sfs_cms_link_attr(primary_button_link) }} class="btn btn-primary btn-lg px-4 gap-3">{{ primary_button_text|sfs_cms_trans|raw }}</a>
@@ -28,6 +30,7 @@
                     <a {{ sfs_cms_link_attr(secondary_button_link) }} class="btn btn-outline-secondary btn-lg px-4">{{ secondary_button_text|sfs_cms_trans|raw }}</a>
                 {% endif %}
             </div>
+            {% endif %}
         </div>
     </div>
 </section>
diff --git a/modules/text_section/render.html.twig b/modules/text_section/render.html.twig
index ca8e708..b9824e4 100644
--- a/modules/text_section/render.html.twig
+++ b/modules/text_section/render.html.twig
@@ -25,7 +25,7 @@
                 <div class="sfs-text-section__body">{{ description|raw }}</div>
             {% endif %}
             {% if (primary_button_text|default(false) and primary_button_text|sfs_cms_trans is not empty) %}
-                <a {{ sfs_cms_link_attr(primary_button_link) }} {{ module.class(primary_button_class, 'sfs-text-section__cta btn btn-primary') }}>{{ primary_button_text|sfs_cms_trans|raw }}</a>
+                <a {{ sfs_cms_link_attr(primary_button_link) }} {{ module.class(primary_button_class, 'sfs-text-section__cta btn'~ (primary_button_class is empty ? ' btn-primary' : '')) }}>{{ primary_button_text|sfs_cms_trans|raw }}</a>
             {% endif %}
         </div>
     </div>
diff --git a/modules/two_columns/render.html.twig b/modules/two_columns/render.html.twig
index ee39e85..4435fb8 100644
--- a/modules/two_columns/render.html.twig
+++ b/modules/two_columns/render.html.twig
@@ -36,10 +36,12 @@
             </div>
             <div class="col-12 col-md-6">
                 <{{ title_type|default('h2') }} class="sfs-two-columns__title {{ title_class|default('') }}">{{ title|sfs_cms_trans|raw }}</{{ title_type|default('h2') }}>
+                {% if description|default(false) and description|sfs_cms_trans is not empty %}
                 <div class="sfs-two-columns__desc">
                     {{ description|sfs_cms_trans|raw }}
                 </div>
-                {% if primary_button_text|sfs_cms_trans|default(false) %}
+                {% endif %}
+                {% if primary_button_text|sfs_cms_trans|default(false) and primary_button_text|sfs_cms_trans is not empty %}
                     <div class="sfs-two-columns__cta">
                         <a {{ sfs_cms_link_attr(primary_button_link) }} class="btn btn-primary">{{ primary_button_text|sfs_cms_trans|raw }}</a>
                     </div>