diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
index 4884dca..6dae71b 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
@@ -98,6 +98,10 @@
               <span class="access-right">
                 <i class="icon lock open"></i>
                 {{ r.access.access_right | make_dict_like('access_right') | vocabulary_title('access_right') }}
+                {%- for right in r.metadata.rights %}
+                <a target="_blank" href="{{right.url}}">{{ '(' ~ right.identifier ~ ')' }}</a>
+                {%- endfor %}
+
               </span>
             </div>
           </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 5253eb9..fc4e087 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/macros/authors.html
@@ -1,8 +1,7 @@
 {#
     Copyright (C) 2020 Zenodo
     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.
@@ -12,7 +11,7 @@
 
 {%- for creators in authors_list %}
 
-{%- if creators.identifiers.orcid %}
+{%- if creators.identifiers and creators.identifiers.orcid %}
 <a href="{{creators.identifiers.orcid|pid_url('orcid')}}" target="_blank" ><img class="inline-orcid" src="{{ url_for('static', filename='extra/orcid.png')}}" /></a>
 {%- endif %}
 
@@ -28,4 +27,4 @@
 <h5>{{group.grouper}}(s)</h5>
 {{authors(group.list)}}
 {%- endfor %}
-{%- endmacro %}
\ No newline at end of file
+{%- endmacro %}