diff --git a/journals/migrations/0007_auto_20180129_1814.py b/journals/migrations/0007_auto_20180129_1814.py
new file mode 100644
index 0000000000000000000000000000000000000000..a4b27d63bcaed2fd792e3958580c5a2938d5c070
--- /dev/null
+++ b/journals/migrations/0007_auto_20180129_1814.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-01-29 17:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journals', '0006_merge_20180123_2040'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reference',
+            name='vor',
+            field=models.CharField(blank=True, max_length=128),
+        ),
+        migrations.AlterField(
+            model_name='reference',
+            name='vor_url',
+            field=models.URLField(blank=True),
+        ),
+    ]
diff --git a/journals/models.py b/journals/models.py
index 5ca16ad8fe0dbe6dab6e636209d9ff728154e276..a79b7e3ed746cb3302b93e2c600677da896fdc50 100644
--- a/journals/models.py
+++ b/journals/models.py
@@ -335,8 +335,8 @@ class Reference(models.Model):
     title = models.CharField(max_length=512)
     citation = models.CharField(max_length=512, blank=True)
 
-    vor = models.CharField(max_length=128)
-    vor_url = models.URLField()
+    vor = models.CharField(blank=True, max_length=128)
+    vor_url = models.URLField(blank=True)
 
     class Meta:
         unique_together = ('reference_number', 'publication')
diff --git a/journals/templates/journals/publication_detail.html b/journals/templates/journals/publication_detail.html
index 67fbaf1ab5263eba5682c59cc0dcf7b7f3dcbcf0..56ed342a757de2b909f8ebac9ccf157cb6ee8e7f 100644
--- a/journals/templates/journals/publication_detail.html
+++ b/journals/templates/journals/publication_detail.html
@@ -90,11 +90,13 @@
                 {% endfor %}
             </ul>
 
-            {% include 'partials/journals/references.html' with publication=publication %}
+
 
             {% if is_edcol_admin %}
                 {# This function is not available for public yet! #}
                 <em>The following is not available for the public yet:</em>
+                {% include 'partials/journals/references.html' with publication=publication %}
+                
                 {% if publication.funders_generic.exists %}
                     <h3>Funder{{ publication.funders_generic.count|pluralize }} for this publication:</h3>
                     <ul>
diff --git a/journals/templates/partials/journals/references.html b/journals/templates/partials/journals/references.html
index 6467b62ea35106c4f7295bb502a4ac5954e4adac..97f8a5e55a23325db01acdcf0a76c932fdf350c6 100644
--- a/journals/templates/partials/journals/references.html
+++ b/journals/templates/partials/journals/references.html
@@ -7,7 +7,11 @@
                 <span class="counter">[{{ reference.reference_number }}]</span>
                 <span class="authors">{{ reference.authors }}</span>,
                 <span class="title">{{ reference.title }}</span>{% if reference.citation %}, <span class="citation">{{ reference.citation|safe }}</span>{% endif %}
-                <span class="doi">doi: <a href="{{ reference.vor_url }}" target="_blank">{{ reference.vor }}</a></span>
+                {% if reference.vor_url and reference.vor %}
+                    <span class="doi">doi: <a href="{{ reference.vor_url }}" target="_blank">{{ reference.vor }}</a></span>
+                {% elif reference.vor_url %}
+                    <span class="doi"><a href="{{ reference.vor_url }}" target="_blank">link</a></span>
+                {% endif %}
             </li>
         {% endfor %}
     </ul>
diff --git a/scipost/static/scipost/assets/css/_list_group.scss b/scipost/static/scipost/assets/css/_list_group.scss
index 6bf5d2d7e491a3d7bcfea4be366bfaa8f00d9884..b598898a08caa9faf14f2f59088a2c2f1045e000 100644
--- a/scipost/static/scipost/assets/css/_list_group.scss
+++ b/scipost/static/scipost/assets/css/_list_group.scss
@@ -42,6 +42,6 @@ ul.references {
     }
     .doi {
         display: block;
-        margin: 0 0 0.2rem 1.5rem;
+        margin: 0 0 0.2rem 2rem;
     }
 }
diff --git a/scipost/static/scipost/assets/js/dynamic_loading.js b/scipost/static/scipost/assets/js/dynamic_loading.js
index f7cd54c7384f91c03420ffc389d6c8b3d4d5907c..8b7d43de70cc45ce5a726183b757d474e181444b 100644
--- a/scipost/static/scipost/assets/js/dynamic_loading.js
+++ b/scipost/static/scipost/assets/js/dynamic_loading.js
@@ -22,7 +22,7 @@ function dynamic_load_tab( target_tab ) {
 
 $(function(){
     // Change `tab` GET parameter for page-reload
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+    $('.tab-nav-container.dynamic a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         dynamic_load_tab( e.target )
     })
     $('[data-toggle="tab"][sp-autoload="true"]').tab('show');
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 07ef2154191f647be2d7e03d1addc02b35542ea6..d76a139812f815609e76571cf0e32d251cc28a70 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -40,7 +40,7 @@
 
         <div class="row">
             <div class="col-12">
-                <div class="tab-nav-container">
+                <div class="tab-nav-container dynamic">
                     <div class="tab-nav-inner">
                         <!-- Nav tabs -->
                         <ul class="nav btn-group personal-page-nav" role="tablist">