diff --git a/_includes/cv_en.markdown b/_includes/cv_en.markdown
index de24455..766ce63 100644
--- a/_includes/cv_en.markdown
+++ b/_includes/cv_en.markdown
@@ -23,17 +23,21 @@ Non linear diffusion equations (fast diffusion equation), long time behaviour of
 {% for pub in site.data.published %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
 
+{% if site.data.accepted %}
 ## Articles accepted for publication
 
 <ol reversed>
 {% for pub in site.data.accepted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
+{% if site.data.submitted %}
 ## Submitted articles
 
 <ol reversed>
 {% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
 # Talks and visits
 
diff --git a/_includes/cv_fr.markdown b/_includes/cv_fr.markdown
index d73f46c..092dac3 100644
--- a/_includes/cv_fr.markdown
+++ b/_includes/cv_fr.markdown
@@ -23,17 +23,21 @@
 {% for pub in site.data.published %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
 
+{% if site.data.accepted %}
 ## Articles acceptés
 
 <ol reversed>
 {% for pub in site.data.accepted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
+{% if site.data.submitted %}
 ## Articles soumis
 
 <ol reversed>
 {% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
 # Exposés et séjours
 
diff --git a/_includes/publi_row.html b/_includes/publi_row.html
index c1741cf..155813c 100644
--- a/_includes/publi_row.html
+++ b/_includes/publi_row.html
@@ -1,8 +1,6 @@
 {% assign pub = include.pub %}{% assign authors = include.authors %}{% assign sources = site.data.sources %}
 <li value="{{pub.id}}">
     <p class="left">
-    <strong>{{pub.title}}</strong>
-    <span class="right">
         {% for a in pub.authors -%}
             {% assign ca = authors[a] -%}
             {% if ca.home -%}
@@ -12,14 +10,17 @@
             {% endif -%}
             {% if forloop.last -%}{% else -%}, {% endif -%}
         {% endfor -%}
-    </span>
+        <br>
+        <strong>{{pub.title}}</strong>
     </p>
+    <span class="right">
+    </span>
     <p class="clear">
-    {% if pub.journal %}<em>{{pub.journal}}</em>{% if pub.issue %} | {{pub.issue.year}} Vol. {{pub.issue.volume}} ({{pub.issue.number}}): {{pub.issue.pages}}{% else %} | {% if page.lang == "en" %}in press{% else %}à paraître{% endif %}{% endif -%}{% else %}{% if page.lang == "en" %}submitted{% else %}soumis{% endif %}{% endif %}
+    {% if pub.journal %}<em>{{pub.journal}}</em>{% if pub.issue %} | {{pub.issue.year}} Vol. {{pub.issue.volume}} {% if pub.issue.number %}({{pub.issue.number}}){% endif %}: {{pub.issue.pages}}{% else %} | {% if page.lang == "en" %}in press{% else %}à paraître{% endif %}{% endif -%}{% else %}{% if page.lang == "en" %}submitted{% else %}soumis{% endif %}{% endif %}
     <span class="right">
     {% for link in pub.links %}
     {% for l in link %}{% assign k = l[0] %}
-    <span class="paper_link"><a href="{{ sources[k].baseurl}}{{l[1]}}">{{ sources[k].name }}</a></span>
+    <span class="paper_link"><a title="{{ sources[k].baseurl}}{{l[1]}}" href="{{ sources[k].baseurl}}{{l[1]}}">{{ sources[k].name }}</a></span>
     {% endfor %}
     {% if forloop.last -%}{% else -%}&middot;{% endif -%}
     {% endfor %}
diff --git a/en/publications.markdown b/en/publications.markdown
index 3d5c9c6..072ba02 100644
--- a/en/publications.markdown
+++ b/en/publications.markdown
@@ -7,21 +7,26 @@ subtitle: 'Publications'
 
 {% assign authors = site.data.authors %}
 
+{% if site.data.submitted %}
 # Preprints
 
 <ol reversed>
 {% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
+{% if site.data.accepted %}
 # Articles accepted for publication
 
 <ol reversed>
 {% for pub in site.data.accepted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
+{% if site.data.published %}
 # Published articles
 
 <ol reversed>
 {% for pub in site.data.published %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
-
+{% endif %}
diff --git a/publications.markdown b/publications.markdown
index 172d303..e7c1f5f 100644
--- a/publications.markdown
+++ b/publications.markdown
@@ -6,21 +6,27 @@ subtitle: Publications
 
 {% assign authors = site.data.authors %}
 
+{% if site.data.submitted %}
 # Articles soumis (preprints)
 
 <ol reversed>
 {% for pub in site.data.submitted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
+{% if site.data.accepted %}
 # Articles acceptés
 
 <ol reversed>
 {% for pub in site.data.accepted %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}
 
 
+{% if site.data.published %}
 # Articles publiés
 
 <ol reversed>
 {% for pub in site.data.published %}{% include publi_row.html pub=pub authors=authors %}{% endfor %}
 </ol>
+{% endif %}