diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/frontpage.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/frontpage.less
index ddae5b5..fc1c1b5 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/frontpage.less
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/frontpage.less
@@ -8,8 +8,8 @@
 
 h4{
     display: block;
-    margin-block-start: 1.33em;
-    margin-block-end: 1.33em;
+    margin-block-start: 0.33em;
+    margin-block-end: 0.33em;
     margin-inline-start: 0px;
     margin-inline-end: 0px;
 }
@@ -21,10 +21,3 @@ h2{
     margin-inline-end: 0px;
 }
 
-p{
-    display: block;
-    margin-block-start: 1em;
-    margin-block-end: 1em;
-    margin-inline-start: 0px;
-    margin-inline-end: 0px;
-}
diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/macros.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/macros.less
new file mode 100644
index 0000000..dc7072e
--- /dev/null
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/macros.less
@@ -0,0 +1,18 @@
+/*
+ *   Copyright (C) 2020 TUGRAZ.
+ *   Copyright (C) 2020 mojib wali.
+ *
+ * invenio-theme-tugraz  is free software; you can redistribute it and/or modify it
+ * under the terms of the MIT License; see LICENSE file for more details.
+ */
+
+/*
+* authors.html
+*/
+.inline-orcid {
+    height: 14px;
+}
+
+.text-muted {
+    color: #777;
+}
diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less
index 03b19e2..db2edaa 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less
@@ -10,6 +10,7 @@
 @import "footer";
 @import "overrides";
 @import "frontpage";
+@import "macros";
 @import (css)
   url("https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap");
 
diff --git a/invenio_theme_tugraz/static/orcid.png b/invenio_theme_tugraz/static/orcid.png
new file mode 100644
index 0000000..78e6050
Binary files /dev/null and b/invenio_theme_tugraz/static/orcid.png differ
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/benefits.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/benefits.html
new file mode 100644
index 0000000..94c6d87
--- /dev/null
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/benefits.html
@@ -0,0 +1,10 @@
+
+<ul>
+    <li><strong>{{_('Safe')}}</strong> &mdash; {{_('your research is stored safely for the future in CERN’s Data Centre for as long as CERN exists.')}}</li>
+    <li><strong>{{_('Trusted')}}</strong> &mdash; {{_('built and operated by CERN and OpenAIRE to ensure that everyone can join in Open Science.')}}</li>
+    <li><strong>{{_('Citeable')}}</strong> &mdash; {{_('every upload is assigned a Digital Object Identifier (DOI), to make them citable and trackable.')}}</li>
+    <li><strong>{{_('No waiting time')}}</strong> &mdash; {{_('Uploads are made available online as soon as you hit publish, and your DOI is registered within seconds.')}}</li>
+    <li><strong>{{_('Open or closed')}}</strong> &mdash; {{_('Share e.g. anonymized clinical trial data with only medical professionals via our restricted access mode.')}}</li>
+    <li><strong>{{_('Versioning')}}</strong> &mdash; {{_("Easily update your dataset with our versioning feature.")}}</li>
+    <li><strong>{{_('Usage statisics')}}</strong> &mdash; {{_("All uploads display standards compliant usage statistics")}}</li>
+  </ul>
\ No newline at end of file
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
index 79ed2c5..cd80cc9 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
@@ -9,7 +9,7 @@
 
 {%- extends config.INVENIO_THEME_TUGRAZ_BASE_TEMPLATE %}
 
-{%- from "invenio_theme_tugraz/macros/authors.html" import authors -%}
+{%- from "invenio_theme_tugraz/macros/authors.html" import creators -%}
 
 
 {%- block page_body %}
@@ -46,12 +46,12 @@
       </div>
 
       <h4><a href="{{ record_url }}">{{r.titles[0].title}}</a></h4>
-      <p>{{ authors(r.creators) }}</p>
+      <p>{{ creators(r.creators) }}</p>
 
       <p class="hidden-xs"><a href="{{record_url}}">{{ r.descriptions[0].description|striptags|truncate(300) }}</a></p>
 
-      <div class="ui tiny header">{% trans user=userprofile, date=creation_date|dateformat('long') %}Uploaded on
-        {{date}}{% endtrans %}</div>
+      <small>{% trans user=userprofile, date=creation_date|dateformat('long') %}Uploaded on
+        {{date}}{% endtrans %}</small>
 
       {%- if not loop.last %}
       <div class="ui divider"></div>
@@ -85,20 +85,7 @@
 
       <div class="ui segment" style="padding-bottom: 10px;">
         <h4>Why use {{config.THEME_SITENAME}}?</h4>
-        <ul>
-          <li><strong>Safe</strong> — your research is stored safely for the future in CERN’s Data Centre for as long as
-            CERN exists.</li>
-          <li><strong>Trusted</strong> — built and operated by CERN and OpenAIRE to ensure that everyone can join in
-            Open Science.</li>
-          <li><strong>Citeable</strong> — every upload is assigned a Digital Object Identifier (DOI), to make them
-            citable and trackable.</li>
-          <li><strong>No waiting time</strong> — Uploads are made available online as soon as you hit publish, and your
-            DOI is registered within seconds.</li>
-          <li><strong>Open or closed</strong> — Share e.g. anonymized clinical trial data with only medical
-            professionals via our restricted access mode.</li>
-          <li><strong>Versioning</strong> — Easily update your dataset with our versioning feature.</li>
-          <li><strong>Usage statisics</strong> — All uploads display standards compliant usage statistics</li>
-        </ul>
+        {% include "invenio_theme_tugraz/benefits.html" %}
       </div>
 
 
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
index 4105f32..d3a9d63 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
@@ -8,16 +8,21 @@
     details.
   #}
 
-{%- macro authors(authors_list) %}
-{%- for author in authors_list %}
-{%- if author.orcid %}
-<a href="{{author.orcid|pid_url('orcid')}}"><img class="inline-orcid" src="{{ url_for('static', filename='extra/orcid.png')}}" /></a>
+{%- macro creators (authors_list) %}
+
+{%- for creators in authors_list %}
+
+{%- if creators.identifiers.Orcid %}
+<a href="{{creators.identifiers.Orcid|pid_url('orcid')}}"><img class="inline-orcid" src="{{ url_for('static', filename='extra/orcid.png')}}" /></a>
 {%- endif %}
-<span class="text-muted" {% if author.affiliation %}data-toggle="tooltip" title="{{author.affiliation}}"{% endif %}>{{author.name}}</span>{% if not loop.last %}; {% endif %}
+
+<span class="text-muted" {% if creators.affiliations %} {% for affiliation in creators.affiliations %} data-toggle="tooltip" title="{{affiliation.name}}" {%- endfor %} {% endif %}>{{creators.name}}</span>
+{% if not loop.last %}; {% endif %}
+
 {%- endfor %}
 {%- endmacro %}
 
-
+<!--TODO: contributers-->
 {%- macro contributors(contributors_list) %}
 {%- for group in contributors_list|groupby('type')%}
 <h5>{{group.grouper|contributortype_title}}(s)</h5>
diff --git a/setup.py b/setup.py
index 3e5db2a..2128e88 100644
--- a/setup.py
+++ b/setup.py
@@ -17,12 +17,13 @@ history = open('CHANGES.rst').read()
 
 tests_require = [
     'check-manifest>=0.25',
-    'coverage>=4.0',
+    # coverage pinned because of https://github.com/nedbat/coveragepy/issues/716
+    'coverage>=4.0,<5.0.0',
     'isort>=4.3.3, <5.0.0',
     'pydocstyle>=2.0.0',
     'pytest-cov>=2.5.1',
     'pytest-pep8>=1.0.6',
-    'pytest-invenio>=1.2.1',
+    'pytest-invenio>=1.3.2',
 ]
 
 extras_require = {