diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index c92b69a..6cdec80 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -4,9 +4,113 @@
     repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %}
 {% set tag = "home"%}
 
-
 {% block repo %}
 
+{% macro render_issue_list(issues, title, id, milestone) %}
+<div class="card m-t-1">
+  <div class="card-block">
+    <table id="pagure-issues-list-{{ id }}" class="table table-hover table-striped m-b-0 milestone-table">
+      <thead class="thead-default">
+        <tr>
+          <th>{{ title }}
+            {% if milestone and repo.milestones[milestone] %}
+              <span style="font-weight:normal">&nbsp (Due: {{ repo.milestones[milestone] }})</span>
+            {% endif %}
+          </th>
+          <th class="open_date">Opened</th>
+          {% if status and status|lower == 'closed' %}
+            <th class="close_date">Closed</th>
+          {% else %}
+            <th class="mod_date">Modified</th>
+          {% endif %}
+          <th class="priority" data-sort="int">
+            Priority
+          </th>
+            <th class="assigned">
+              Assignee
+            </th>
+          <th class="issue_status">Status</th>
+        </tr>
+      </thead>
+      <tfoot></tfoot>
+      <tbody>
+      {% for issue in issues |sort(attribute='priority') %}
+        {% if status is none or status|lower == 'all' or issue.status == status %}
+          <tr {% if issue.status == 'Closed' %}class="text-muted"{% endif %}>
+            <td>
+              <span class="label label-default">#{{ issue.id }}</span>
+              {% if issue.private %}
+              <span class="oi red-icon" data-glyph="lock-locked" title="Private issue"></span>
+              {% endif %}
+              <a {% if issue.status == 'Closed' %}class="text-muted"{% endif %} href="{{ url_for(
+                  'view_issue',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  issueid=issue.id) }}">
+                {{ issue.title | noJS("img") | safe }}
+              </a>
+              &nbsp;&nbsp;
+              {% if issue.comments | count > 0 %}
+              <span class="text-muted">
+                <span class="oi" data-glyph="comment-square"
+                    title="Comments on the ticket"></span>
+                  {{ issue.comments | count }}
+              </span>
+              {% endif %}
+              {% for tag in issue.tags %}
+                <span class="label label-info"
+                style="background-color:{{ tag.tag_color
+                }}">{{ tag.tag }}</span>
+              {% endfor %}
+            </td>
+            <td class="td-open_date nowrap">
+              <span title="{{ issue.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
+                      issue.date_created | humanize }}</span>
+            </td>
+            <td class="td-mod_date nowrap">
+              {% if status and status|lower == 'closed' %}
+                <span title="{{ issue.closed_at.strftime('%Y-%m-%d %H:%M:%S')}}">{{
+                      issue.closed_at | humanize }}</span>
+              {% else %}
+              <span title="{{ issue.last_updated.strftime('%Y-%m-%d %H:%M:%S')}}">{{
+                      issue.last_updated | humanize }}</span>
+              {% endif %}
+            </td>
+            <td class="td-priority nowrap" data-sort-value="{{
+              issue.priority
+              if issue.priority
+              else repo.priorities | increment_largest_priority | string }}">
+              {% if issue.priority %}
+                {{ repo.priorities[issue.priority | string] }}
+              {% endif %}
+            </td>
+            <td class="nowrap">
+              {% if issue.assignee %}
+                {{ issue.assignee.default_email | avatar(16) | safe }}
+                {{ issue.assignee.user }}
+              {% else %}
+                 <span class="text-muted">unassigned</span>
+              {% endif %}
+            </td>
+            <td class="nowrap">
+              <span class="label {%
+                if issue.status != 'Open' -%}label-danger{%
+                else %}label-success{% endif %}">{{ issue.status }}</span>
+            </td>
+          </tr>
+        {% endif %}
+        {% else %}
+          <tr>
+            <td colspan="5" class="noresult">No issues found</td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>
+{% endmacro %}
+
 
 <h2>
   Milestone Roadmap
@@ -150,218 +254,23 @@
 
 {% if not issues %}
   <div class="card-block">
-  <tr>
-    <td colspan="5" class="noresult"><b><i>No issues found</i></b></td>
-  </tr>
+    <tr>
+      <td colspan="5" class="noresult"><b><i>No issues found</i></b></td>
+    </tr>
   </div>
 {% endif %}
 
 {% if no_stones %}
-    <div class="card m-t-1">
-      <div class="card-block">
-        <table id="pagure-issues-list-nostone" class="table table-hover table-striped m-b-0 milestone-table">
-          <thead class="thead-default">
-            <tr>
-              <th>No Milestone
-              </th>
-              <th class="open_date">Opened</th>
-              {% if status and status|lower == 'closed' %}
-                <th class="close_date">Closed</th>
-              {% else %}
-                <th class="mod_date">Modified</th>
-              {% endif %}
-              <th class="priority" data-sort="int">
-                Priority
-              </th>
-                <th class="assigned">
-                  Assignee
-                </th>
-              <th class="issue_status">Status</th>
-            </tr>
-          </thead>
-          <tfoot></tfoot>
-          <tbody>
-          {% for issue in issues |sort(attribute='priority') %}
-            {% if status is none or status|lower == 'all' or issue.status == status %}
-              <tr {% if issue.status == 'Closed' %}class="text-muted"{% endif %}>
-                <td>
-                  <span class="label label-default">#{{ issue.id }}</span>
-                  {% if issue.private %}
-                  <span class="oi red-icon" data-glyph="lock-locked" title="Private issue"></span>
-                  {% endif %}
-                  <a {% if issue.status == 'Closed' %}class="text-muted"{% endif %} href="{{ url_for(
-                      'view_issue',
-                      repo=repo.name,
-                      username=username,
-                      namespace=repo.namespace,
-                      issueid=issue.id) }}">
-                    {{ issue.title | noJS("img") | safe }}
-                  </a>
-                  &nbsp;&nbsp;
-                  {% if issue.comments|count > 0 %}
-                  <span class="text-muted">
-                    <span class="oi" data-glyph="comment-square"
-                        title="Comments on the ticket"></span>
-                      {{issue.comments|count}}
-                  </span>
-                  {% endif %}
-                  {% for tag in issue.tags%}
-                    <span class="label label-info"
-                    style="background-color:{{ tag.tag_color
-                    }}">{{tag.tag}}</span>
-                  {% endfor%}
-                </td>
-                <td class="td-open_date nowrap">
-                  <span title="{{ issue.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
-                          issue.date_created | humanize}}</span>
-                </td>
-                <td class="td-mod_date nowrap">
-                  {% if status and status|lower == 'closed' %}
-                    <span title="{{ issue.closed_at.strftime('%Y-%m-%d %H:%M:%S')}}">{{
-                          issue.closed_at | humanize}}</span>
-                  {% else %}
-                  <span title="{{ issue.last_updated.strftime('%Y-%m-%d %H:%M:%S')}}">{{
-                          issue.last_updated | humanize}}</span>
-                  {% endif %}
-                </td>
-                <td class="td-priority nowrap" data-sort-value="{{
-                  issue.priority
-                  if issue.priority
-                  else repo.priorities | increment_largest_priority | string }}">
-                  {% if issue.priority %}
-                    {{ repo.priorities[issue.priority | string] }}
-                  {% endif %}
-                </td>
-                <td class="nowrap">
-                  {% if issue.assignee %}
-                    {{ issue.assignee.default_email | avatar(16) | safe }}
-                    {{ issue.assignee.user }}
-                  {% else %}
-                     <span class="text-muted">unassigned</span>
-                  {% endif %}
-                </td>
-                <td class="nowrap">
-                  <span class="label {%
-                    if issue.status != 'Open' -%}label-danger{%
-                    else %}label-success{% endif %}">{{ issue.status }}</span>
-                </td>
-              </tr>
-            {% endif %}
-            {% else %}
-              <tr>
-                <td colspan="5" class="noresult">No issues found</td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      </div>
-    </div>
+  {{ render_issue_list(
+      issues, title='No Milestone',
+      id='no_stones', milestone=None) }}
 {% endif %}
 
 {% for milestone in milestones %}
   {% if issues[milestone] %}
-    <div class="card m-t-1">
-      <div class="card-block">
-        <table id="pagure-issues-list-{{ loop.index }}" class="table table-hover table-striped m-b-0 milestone-table">
-          <thead class="thead-default">
-            <tr>
-              <th>{{ milestone }}
-                {% if repo.milestones[milestone] %}
-                  <span style="font-weight:normal">&nbsp (Due: {{ repo.milestones[milestone] }})</span>
-                {% endif %}
-              </th>
-              <th class="open_date">Opened</th>
-              {% if status and status|lower == 'closed' %}
-                <th class="close_date">Closed</th>
-              {% else %}
-                <th class="mod_date">Modified</th>
-              {% endif %}
-              <th class="priority" data-sort="int">
-                Priority
-              </th>
-                <th class="assigned">
-                  Assignee
-                </th>
-              <th class="issue_status">Status</th>
-            </tr>
-          </thead>
-          <tfoot></tfoot>
-          <tbody>
-          {% for issue in issues[milestone] |sort(attribute='priority') %}
-            {% if status is none or status|lower == 'all' or issue.status == status %}
-              <tr {% if issue.status == 'Closed' %}class="text-muted"{% endif %}>
-                <td>
-                  <span class="label label-default">#{{ issue.id }}</span>
-                  {% if issue.private %}
-                  <span class="oi red-icon" data-glyph="lock-locked" title="Private issue"></span>
-                  {% endif %}
-                  <a {% if issue.status == 'Closed' %}class="text-muted"{% endif %} href="{{ url_for(
-                      'view_issue',
-                      repo=repo.name,
-                      username=username,
-                      namespace=repo.namespace,
-                      issueid=issue.id) }}">
-                    {{ issue.title | noJS("img") | safe }}
-                  </a>
-                  &nbsp;&nbsp;
-                  {% if issue.comments|count > 0 %}
-                  <span class="text-muted">
-                    <span class="oi" data-glyph="comment-square"
-                        title="Comments on the ticket"></span>
-                      {{issue.comments|count}}
-                  </span>
-                  {% endif %}
-                  {% for tag in issue.tags%}
-                    <span class="label label-info"
-                    style="background-color:{{ tag.tag_color
-                    }}">{{tag.tag}}</span>
-                  {% endfor%}
-                </td>
-                <td class="td-open_date nowrap">
-                  <span title="{{ issue.date_created.strftime('%Y-%m-%d %H:%M:%S')}}">{{
-                          issue.date_created | humanize}}</span>
-                </td>
-                <td class="td-mod_date nowrap">
-                  {% if status and status|lower == 'closed' %}
-                    <span title="{{ issue.closed_at.strftime('%Y-%m-%d %H:%M:%S')}}">{{
-                          issue.closed_at | humanize}}</span>
-                  {% else %}
-                  <span title="{{ issue.last_updated.strftime('%Y-%m-%d %H:%M:%S')}}">{{
-                          issue.last_updated | humanize}}</span>
-                  {% endif %}
-                </td>
-                <td class="td-priority nowrap" data-sort-value="{{
-                  issue.priority
-                  if issue.priority
-                  else repo.priorities | increment_largest_priority | string }}">
-                  {% if issue.priority %}
-                    {{ repo.priorities[issue.priority | string] }}
-                  {% endif %}
-                </td>
-                <td class="nowrap">
-                  {% if issue.assignee %}
-                    {{ issue.assignee.default_email | avatar(16) | safe }}
-                    {{ issue.assignee.user }}
-                  {% else %}
-                     <span class="text-muted">unassigned</span>
-                  {% endif %}
-                </td>
-                <td class="nowrap">
-                  <span class="label {%
-                    if issue.status != 'Open' -%}label-danger{%
-                    else %}label-success{% endif %}">{{ issue.status }}</span>
-                </td>
-              </tr>
-            {% endif %}
-            {% else %}
-              <tr>
-                <td colspan="5" class="noresult">No issues found</td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      </div>
-    </div>
+    {{ render_issue_list(
+        issues[milestone], title=milestone,
+        id=loop.index, milestone=milestone) }}
   {% endif %}
 {% endfor %}
 {% endblock %}