diff --git a/templates/semantic-ui/zenodo_rdm/macros/record_item.html b/templates/semantic-ui/zenodo_rdm/macros/record_item.html
index e4c1a7e6..66b85da6 100644
--- a/templates/semantic-ui/zenodo_rdm/macros/record_item.html
+++ b/templates/semantic-ui/zenodo_rdm/macros/record_item.html
@@ -63,7 +63,7 @@
 
       {# Description #}
       <p class="description">
-        {% set description = record.ui.get("description_stripped", "No description") %}
+        {% set description = record.ui.get("description_stripped", "") %}
 
         {{ description | truncate(length=350, end='...') }}
       </p>
diff --git a/templates/themes/horizon/invenio_app_rdm/footer.html b/templates/themes/horizon/invenio_app_rdm/footer.html
index ef859282..d8c67f2f 100644
--- a/templates/themes/horizon/invenio_app_rdm/footer.html
+++ b/templates/themes/horizon/invenio_app_rdm/footer.html
@@ -32,20 +32,7 @@ <h2 class="ui small header">{{ _("Contact") }}</h2>
               <div class="ui grid">
                 <div class="three wide five wide tablet column">
                   <h2 class="ui small header">{{ _("About") }}</h2>
-                    <p><a href="{{ horizon_url }}">How it works?</a></p>
-                    <p><a href="{{ horizon_url }}">FAQ</a></p>
-                    <p><a href="https://about.zenodo.org/contact">Contact</a></p>
-                </div>
-                <div class="three wide computer five wide tablet column">
-                  <h2 class="ui small header">{{ _("FAIR publishing") }}</h2>
-                    <p><a href="{{ horizon_url }}">Getting started </a></p>
-                    <p><a href="{{community.slug}}/upload">Submit your research</a></p>
-                  </div>
-                  <div class="three wide computer five wide tablet column">
-                    <h2 class="ui small header">{{ _("Integrations") }}</h2>
-                    <p><a href="https://developers.zenodo.org/">REST API</a></p>
-                    <p><a href="https://developers.zenodo.org/#oai-pmh/">OAI-PMH</a></p>
-                    <p><a href="{{ horizon_url }}">FAIR Evaluation tools</a></p>
+                    <p><a href="https://open-research-europe.ec.europa.eu/">Learn more</a></p>
                 </div>
               </div>
             </div>
diff --git a/templates/themes/horizon/invenio_communities/details/header.html b/templates/themes/horizon/invenio_communities/details/header.html
index b77f1611..d73d8029 100644
--- a/templates/themes/horizon/invenio_communities/details/header.html
+++ b/templates/themes/horizon/invenio_communities/details/header.html
@@ -29,15 +29,22 @@
               </div>
 
               <div class="mobile only">
-                <h1 class="ui medium header mb-5">
-                  {{ community.metadata.title }}
-                </h1>
+                <a class="remove-default-style" href="{{ community.links.self_html }}">
+                  <h1 class="ui medium header mb-5">
+                    {{ community.metadata.title }}
+                  </h1>
+                </a>
               </div>
             </div>
 
             <div>
               <div class="flex align-items-center mb-5 tablet computer only">
-                <h1 class="ui medium header mb-0">{{ community.metadata.title }} </h1>
+
+                <a class="remove-default-style" href="{{ community.links.self_html }}">
+                  <h1 class="ui medium header mb-0">
+                    {{ community.metadata.title }}
+                  </h1>
+                </a>
 
                 {% if community.access.visibility == 'restricted' %}
                   <div class="rel-ml-1">
@@ -108,19 +115,17 @@ <h1 class="ui medium header mb-0">{{ community.metadata.title }} </h1>
 
       <div
         class="sixteen wide mobile sixteen wide tablet four wide computer right aligned middle aligned column">
-          {%- if not community_use_jinja_header %}
-            <a href="/uploads/new?community={{ community.slug }}"
-              class="ui positive button labeled icon rel-mt-1 theme-secondary">
-              <i class="upload icon" aria-hidden="true"></i>
-              {{ _("New upload") }}
-            </a>
-        {% endif %}
+          <a href="/uploads/new?community={{ community.slug }}"
+            class="ui positive button labeled icon rel-mt-1 theme-secondary">
+            <i class="upload icon" aria-hidden="true"></i>
+            {{ _("New upload") }}
+          </a>
           <a href="{{'/support/'}}"
-          target="_blank"
-          class="ui positive item button labeled theme-primary icon rel-mt-1">
-          <i class="users icon" aria-hidden="true"></i>
-          {{ _("Join waiting list") }}
-        </a>
+            target="_blank"
+            class="ui positive item button labeled theme-primary icon rel-mt-1">
+            <i class="users icon" aria-hidden="true"></i>
+            {{ _("Join waiting list") }}
+          </a>
           {% if permissions.can_moderate %}
             <a
                     href="{{ url_for('administration.communities', q='slug:'+community.slug) }}"
diff --git a/templates/themes/horizon/invenio_communities/details/home/index.html b/templates/themes/horizon/invenio_communities/details/home/index.html
index a985aef6..218abfb1 100644
--- a/templates/themes/horizon/invenio_communities/details/home/index.html
+++ b/templates/themes/horizon/invenio_communities/details/home/index.html
@@ -27,7 +27,6 @@ <h1 class="ui text-muted small header">Builtin compliance with EU open science
         <div class="ui rel-mt-2 rel-mb-4">
           <div class="ui fluid container row rel-mb-2">
             <a href="/uploads/new?community={{ community.slug }}"
-               target="_blank"
                class="ui positive button labeled theme-secondary icon rel-mt-1">
               <i class="upload icon" aria-hidden="true"></i>
               {{ _("New upload") }}
@@ -53,7 +52,7 @@ <h1 class="ui text-muted small header">Builtin compliance with EU open science
       <div class="ui stackable theme-font grid container ">
         <div class="column rel-mb-4">
         <div class="row item">
-        <h1 class="ui  large header">{{ title }}</h1>
+        <h1 class="ui large header">{{ title }}</h1>
         </div>
         <div class="ui divider"></div>
 
@@ -71,7 +70,7 @@ <h1 class="ui  large header">{{ title }}</h1>
     <div class="ui stackable theme-font grid container rel-mt-2">
       <div class="column">
         <div class="row item">
-          <h1 class="ui large header">{{ _('How it works?') }}</h1>
+          <h1 class="ui large header">{{ _('How it works') }}</h1>
         </div>
         <div class="ui divider"></div>
         <div class="center aligned ui equal width stackable grid rel-mt-4 rel-mb-2">