diff --git a/_data/lang/en/roadmap.yml b/_data/lang/en/roadmap.yml
index 5aeeac928d1752b75bfb14c5d3db2abbc86a87f9..762f38df55948bb96daec6e27aea30c223f27f28 100644
--- a/_data/lang/en/roadmap.yml
+++ b/_data/lang/en/roadmap.yml
@@ -255,6 +255,8 @@
     - name: Second-layer solutions for speed and scalability
       date:
       status: upcoming
+- year: future
+  accomplishments:
     - name: Return addresses
       date:
       status: upcoming
diff --git a/resources/roadmap/index.md b/resources/roadmap/index.md
index eba395b6799a07b1927d4ff265b0143626534ab1..57276162d892fe92a7bae9f776ce8b72816f8cc2 100644
--- a/resources/roadmap/index.md
+++ b/resources/roadmap/index.md
@@ -24,8 +24,9 @@ permalink: /resources/roadmap/index.html
                 <div class="tabPanel-widget">
                     <label for="tab-1" tabindex="0"></label>
                     <input id="tab-1" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2014</h2>
-                    <div class="tabPanel-content">              
+                    <h2>2014-2015</h2>
+                    <div class="tabPanel-content">
+                        <h2>2014</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}    
                             {% if toplevel.year == 2014 %}
                                 {% for roadlist in toplevel.accomplishments %}
@@ -40,13 +41,29 @@ permalink: /resources/roadmap/index.html
                                 {%endfor%}
                             {%endif%}
                         {%endfor%}
+                        <h2>2015</h2>
+                        {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% if toplevel.year == 2015 %}
+                                {% for roadlist in toplevel.accomplishments %}
+                                    <div class="row start-xs middle-xs">
+                                        <div class="col-xs-1">
+                                            <span class="{{roadlist.status}}"></span>
+                                        </div>
+                                        <div class="col-xs-11">
+                                            <p>{{roadlist.date}}: {{roadlist.name}}</p>
+                                        </div>
+                                    </div>
+                                {%endfor%}
+                            {%endif%}
+                        {%endfor%}
                     </div>
                     <label for="tab-2" tabindex="0"></label>
                     <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2015</h2>
+                    <h2>2016</h2>
                     <div class="tabPanel-content">
+                        <h2>2016</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
-                            {% if toplevel.year == 2015 %}
+                            {% if toplevel.year == 2016 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                     <div class="row start-xs middle-xs">
                                         <div class="col-xs-1">
@@ -62,17 +79,22 @@ permalink: /resources/roadmap/index.html
                     </div>
                     <label for="tab-3" tabindex="0"></label>
                     <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2016</h2>
+                    <h2>2017</h2>
                     <div class="tabPanel-content">
+                        <h2>2017</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
-                            {% if toplevel.year == 2016 %}
+                            {% if toplevel.year == 2017 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                     <div class="row start-xs middle-xs">
                                         <div class="col-xs-1">
                                             <span class="{{roadlist.status}}"></span>
                                         </div>
                                         <div class="col-xs-11">
-                                            <p>{{roadlist.date}}: {{roadlist.name}}</p>
+                                            {% if roadlist.date %}
+                                                <p>{{roadlist.date}}: {{roadlist.name}}</p>
+                                            {%else%}
+                                                <p>{{roadlist.name}}</p>
+                                            {%endif%}
                                         </div>
                                     </div>
                                 {%endfor%}
@@ -81,10 +103,11 @@ permalink: /resources/roadmap/index.html
                     </div>
                     <label for="tab-4" tabindex="0"></label>
                     <input id="tab-4" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2017</h2>
+                    <h2>2018</h2>
                     <div class="tabPanel-content">
+                        <h2>2018</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
-                            {% if toplevel.year == 2017 %}
+                            {% if toplevel.year == 2018 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                     <div class="row start-xs middle-xs">
                                         <div class="col-xs-1">
@@ -104,10 +127,11 @@ permalink: /resources/roadmap/index.html
                     </div>
                     <label for="tab-5" tabindex="0"></label>
                     <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2018</h2>
+                    <h2>2019</h2>
                     <div class="tabPanel-content">
+                        <h2>2019</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
-                            {% if toplevel.year == 2018 %}
+                            {% if toplevel.year == 2019 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                     <div class="row start-xs middle-xs">
                                         <div class="col-xs-1">
@@ -127,10 +151,11 @@ permalink: /resources/roadmap/index.html
                     </div>
                     <label for="tab-6" tabindex="0"></label>
                     <input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
-                    <h2>2019</h2>
+                    <h2>2020</h2>
                     <div class="tabPanel-content">
+                        <h2>2020</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
-                            {% if toplevel.year == 2019 %}
+                            {% if toplevel.year == 2020 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                     <div class="row start-xs middle-xs">
                                         <div class="col-xs-1">
@@ -152,8 +177,9 @@ permalink: /resources/roadmap/index.html
                     <input id="tab-7" type="radio" name="tabs" aria-hidden="true">
                     <h2>{% t roadmap.future %}</h2>
                     <div class="tabPanel-content">
+                        <h2>{% t roadmap.future %}</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
-                            {% if toplevel.year == 2020 %}
+                            {% if toplevel.year == "future" %}
                                 {% for roadlist in toplevel.accomplishments %}
                                     <div class="row start-xs middle-xs">
                                         <div class="col-xs-1">