diff --git a/_data/lang/en/roadmap.yml b/_data/lang/en/roadmap.yml
index 5aeeac92..762f38df 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 eba395b6..57276162 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,11 +41,7 @@ permalink: /resources/roadmap/index.html
                                 {%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>
-                    <div class="tabPanel-content">
+                        <h2>2015</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
                             {% if toplevel.year == 2015 %}
                                 {% for roadlist in toplevel.accomplishments %}
@@ -60,10 +57,11 @@ permalink: /resources/roadmap/index.html
                             {%endif%}
                         {%endfor%}
                     </div>
-                    <label for="tab-3" tabindex="0"></label>
-                    <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
+                    <label for="tab-2" tabindex="0"></label>
+                    <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
                     <h2>2016</h2>
                     <div class="tabPanel-content">
+                        <h2>2016</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
                             {% if toplevel.year == 2016 %}
                                 {% for roadlist in toplevel.accomplishments %}
@@ -79,10 +77,11 @@ permalink: /resources/roadmap/index.html
                             {%endif%}
                         {%endfor%}
                     </div>
-                    <label for="tab-4" tabindex="0"></label>
-                    <input id="tab-4" type="radio" name="tabs" aria-hidden="true">
+                    <label for="tab-3" tabindex="0"></label>
+                    <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
                     <h2>2017</h2>
                     <div class="tabPanel-content">
+                        <h2>2017</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
                             {% if toplevel.year == 2017 %}
                                 {% for roadlist in toplevel.accomplishments %}
@@ -102,10 +101,11 @@ permalink: /resources/roadmap/index.html
                             {%endif%}
                         {%endfor%}
                     </div>
-                    <label for="tab-5" tabindex="0"></label>
-                    <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
+                    <label for="tab-4" tabindex="0"></label>
+                    <input id="tab-4" type="radio" name="tabs" aria-hidden="true">
                     <h2>2018</h2>
                     <div class="tabPanel-content">
+                        <h2>2018</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
                             {% if toplevel.year == 2018 %}
                                 {% for roadlist in toplevel.accomplishments %}
@@ -125,10 +125,11 @@ permalink: /resources/roadmap/index.html
                             {%endif%}
                         {%endfor%}
                     </div>
-                    <label for="tab-6" tabindex="0"></label>
-                    <input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
+                    <label for="tab-5" tabindex="0"></label>
+                    <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
                     <h2>2019</h2>
                     <div class="tabPanel-content">
+                        <h2>2019</h2>
                         {% for toplevel in site.data.lang[site.lang].roadmap %}
                             {% if toplevel.year == 2019 %}
                                 {% for roadlist in toplevel.accomplishments %}
@@ -148,12 +149,37 @@ permalink: /resources/roadmap/index.html
                             {%endif%}
                         {%endfor%}
                     </div>
+                    <label for="tab-6" tabindex="0"></label>
+                    <input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
+                    <h2>2020</h2>
+                    <div class="tabPanel-content">
+                        <h2>2020</h2>
+                        {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% if toplevel.year == 2020 %}
+                                {% 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">
+                                            {% if roadlist.date %}
+                                                <p>{{roadlist.date}}: {{roadlist.name}}</p>
+                                            {%else%}
+                                                <p>{{roadlist.name}}</p>
+                                            {%endif%}
+                                        </div>
+                                    </div>
+                                {%endfor%}
+                            {%endif%}
+                        {%endfor%}
+                    </div>
                     <label for="tab-7" tabindex="0"></label>
                     <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">