diff --git a/src/IDF/templates/idf/issues/by-label.html b/src/IDF/templates/idf/issues/by-label.html
index 28edd41..6c631e1 100644
--- a/src/IDF/templates/idf/issues/by-label.html
+++ b/src/IDF/templates/idf/issues/by-label.html
@@ -10,12 +10,10 @@
 {block context}
 {aurl 'open_url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
 {aurl 'closed_url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'closed')}
+{aurl 'overdue_url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'overdue')}
 {blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>
-<p>
-    {aurl 'overdue_url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'overdue')}
-    <span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a>
-</p>
+<p><span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a></p>
 {/blocktrans}
 <p><strong>{trans 'Label:'}</strong>
 {aurl 'url', 'IDF_Views_Issue::listLabel', array($project.shortname, $label.id, 'open')}
diff --git a/src/IDF/templates/idf/issues/forge-watchlist.html b/src/IDF/templates/idf/issues/forge-watchlist.html
index c8db450..3e192ac 100644
--- a/src/IDF/templates/idf/issues/forge-watchlist.html
+++ b/src/IDF/templates/idf/issues/forge-watchlist.html
@@ -7,11 +7,8 @@
 {block context}
 {aurl 'open_url', 'IDF_Views_Issue::forgeWatchList', array('open')}
 {aurl 'closed_url', 'IDF_Views_Issue::forgeWatchList', array('closed')}
+{aurl 'overdue_url', 'IDF_Views_Issue::forgeWatchList', array('overdue')}
 {blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>
-<p>
-    {aurl 'overdue_url', 'IDF_Views_Issue::forgeWatchList', array('overdue')}
-    <span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a>
-</p>
-{/blocktrans}
-{/block}
+<p><span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a></p>{/blocktrans}
+{/block}
\ No newline at end of file
diff --git a/src/IDF/templates/idf/issues/index.html b/src/IDF/templates/idf/issues/index.html
index b34245a..1e1e647 100644
--- a/src/IDF/templates/idf/issues/index.html
+++ b/src/IDF/templates/idf/issues/index.html
@@ -10,12 +10,10 @@
 {block context}
 {aurl 'open_url', 'IDF_Views_Issue::index', array($project.shortname)}
 {aurl 'closed_url', 'IDF_Views_Issue::listStatus', array($project.shortname, 'closed')}
+{aurl 'overdue_url', 'IDF_Views_Issue::listOverdue', array($project.shortname, 'Overdue', 'overdue')}
 {blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>
-<p>
-    {aurl 'overdue_url', 'IDF_Views_Issue::listOverdue', array($project.shortname, 'Overdue', 'overdue')}
-    <span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a>
-</p>{/blocktrans}
+<p><span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a></p>{/blocktrans}
 {assign $cloud_url = 'IDF_Views_Issue::listLabel'}
 {include 'idf/tags-cloud.html'}
 {/block}
diff --git a/src/IDF/templates/idf/issues/project-watchlist.html b/src/IDF/templates/idf/issues/project-watchlist.html
index 6fc638b..8acecf0 100644
--- a/src/IDF/templates/idf/issues/project-watchlist.html
+++ b/src/IDF/templates/idf/issues/project-watchlist.html
@@ -12,10 +12,8 @@
 {block context}
 {aurl 'open_url', 'IDF_Views_Issue::watchList', array($project.shortname, 'open')}
 {aurl 'closed_url', 'IDF_Views_Issue::watchList', array($project.shortname, 'closed')}
+{aurl 'overdue_url', 'IDF_Views_Issue::watchList', array($project.shortname, 'overdue')}
 {blocktrans}<p><strong>Open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>
-<p>
-    {aurl 'overdue_url', 'IDF_Views_Issue::watchList', array($project.shortname, 'overdue')}
-    <span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a>
-</p>{/blocktrans}
-{/block}
+<p><span>Overdue:</span> <a href="{$overdue_url}">{$overdue}</a></p>{/blocktrans}
+{/block}
\ No newline at end of file