diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/autonomic_hero.html b/themes/cloud.autonomic.zone/layouts/partials/index/autonomic_hero.html
index f86ee26..45ecf32 100644
--- a/themes/cloud.autonomic.zone/layouts/partials/index/autonomic_hero.html
+++ b/themes/cloud.autonomic.zone/layouts/partials/index/autonomic_hero.html
@@ -10,7 +10,7 @@
       </div>
       <div class="column is-half-widescreen is-two-thirds-tablet is-offset-1 is-desktop">
         <p class="is-size-4 block">{{ site.Data.who_is_involved.text }}</p>
-        <button class="button is-autonomic has-text-white is-large"><a href="{{ site.Params.links.autonomicSite }}">visit: autonomic.zone</a></button>
+        <a href="{{ site.Params.links.autonomicSite }}"></a><button class="button is-autonomic has-text-white is-large">visit: autonomic.zone</button></a>
       </div>
     </div>
   </div>
diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/community_project.html b/themes/cloud.autonomic.zone/layouts/partials/index/community_project.html
index e507252..e4fa21c 100644
--- a/themes/cloud.autonomic.zone/layouts/partials/index/community_project.html
+++ b/themes/cloud.autonomic.zone/layouts/partials/index/community_project.html
@@ -7,7 +7,7 @@
         This is a community project.
     </p>
     <div>
-      <button id="get-involved" class="button grey-button is-uppercase is-medium has-text-weight-bold"><a href="{{ site.Params.links.getinvolved}}">Get involved</a></button>
+      <a href="{{ site.Params.links.getinvolved}}"></a><button id="get-involved" class="button grey-button is-uppercase is-medium has-text-weight-bold">Get involved</button></a>
     </div>
   </div>
 </section>
\ No newline at end of file
diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html b/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html
index 7fd26b9..8f568a0 100644
--- a/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html
+++ b/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html
@@ -20,9 +20,11 @@
             <p class="block has-text-weight-light">{{ $item.right }}</p>
           </div>
           {{ if and (eq $amount (add $index 1)) (eq $title "faq") }}
+          <a href="{{ site.Params.links.docsfaq }}">
             <button id="faq-button" class="button grey-button is-medium">
-              <a href="{{ site.Params.links.docsfaq }}">Read all Frequently Asked Questions</a>
+              Read all Frequently Asked Questions
             </button>
+          </a>
           {{ end }}
         </div>
       </div>