diff --git a/_data/lang/en/roadmap.yml b/_data/lang/en/roadmap.yml
index 4852b209..527be8e7 100644
--- a/_data/lang/en/roadmap.yml
+++ b/_data/lang/en/roadmap.yml
@@ -78,32 +78,28 @@
     - name: 0MQ/ZeroMQ
       date: September, 2017
       status: completed
-    - name: Fluffy blocks
-      date:
-      status: ongoing
-    - name: GUI port to android
-      date:
-      status: ongoing
+    - name: Subaddresses
+      date: October, 2017
+      status: completed
+    - name: Multi-signatures (multisig)
+      date: December, 2017
+      status: completed
+- year: 2018
+  accomplishments:
     - name: Forum Funding System redesign
       date:
       status: ongoing
-    - name: Subaddresses
-      date:
-      status: ongoing
-    - name: Multi-signatures (multisig)
-      date:
-      status: ongoing
-    - name: Kovri alpha release
-      date:
-      status: upcoming
-- year: 2018
-  accomplishments:
-    - name: Additional MRL research papers
-      date:
-      status: upcoming
-    - name: Second-layer solutions for speed and scalability
-      date:
-      status: upcoming
     - name: More efficient range proofs for RingCT to reduce transaction sizes
       date:
       status: upcoming
+    - name: Kovri alpha release
+      date:
+      status: upcoming
+- year: 2019
+  accomplishments:
+    - name: Second-layer solutions for speed and scalability
+      date:
+      status: upcoming
+    - name: Additional MRL research papers
+      date:
+      status: upcoming
diff --git a/_i18n/en/resources/roadmap.md b/_i18n/en/resources/roadmap.md
index 270031bc..b4082785 100644
--- a/_i18n/en/resources/roadmap.md
+++ b/_i18n/en/resources/roadmap.md
@@ -42,7 +42,8 @@
                         <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
                             <h2>2015</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% 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">
@@ -53,15 +54,18 @@
                                         <p>{{roadlist.date}}: {{roadlist.name}}</p>
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                             <label for="tab-3" tabindex="0"></label>
                             <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
                             <h2>2016</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
                               {% if toplevel.year == 2016 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs middle-xs">
@@ -72,15 +76,18 @@
                                         <p>{{roadlist.date}}: {{roadlist.name}}</p>
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                             <label for="tab-4" tabindex="0"></label>
                             <input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked>
                             <h2>2017</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
                               {% if toplevel.year == 2017 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs middle-xs">
@@ -95,16 +102,41 @@
                                         {%endif%}
                                      </div>
                                   </div>
+                             
+                              {%endfor%}
+                              {%endif%}
+                              
+                              {%endfor%}
+                            </div>
+                            <label for="tab-5" tabindex="0"></label>
+                            <input id="tab-5" type="radio" name="tabs" aria-hidden="true" checked>
+                            <h2>2018</h2>
+                            <div class="tabPanel-content">
+                            {% for toplevel in site.data.lang[site.lang].roadmap %} {% if toplevel.year == 2018 %} {% for roadlist in toplevel.accomplishments %}
+                              <div class="row start-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-5" tabindex="0"></label>
-                            <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
+                            <label for="tab-6" tabindex="0"></label>
+                            <input id="tab-6" type="radio" name="tabs" aria-hidden="true">
                             <h2>Future</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
-                              {% if toplevel.year == 2018 %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
+                              {% if toplevel.year == 2019 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs">
                                      <div class="col-xs-1">
@@ -118,12 +150,16 @@
                                         {%endif%}
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                           </div>
         </div>
     </div>
 </section>
-</div>
\ No newline at end of file
+
+
+</div>
diff --git a/_i18n/es/resources/roadmap.md b/_i18n/es/resources/roadmap.md
index 267b3867..d0eb16ab 100644
--- a/_i18n/es/resources/roadmap.md
+++ b/_i18n/es/resources/roadmap.md
@@ -43,7 +43,8 @@
                         <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
                             <h2>2015</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% 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">
@@ -54,15 +55,18 @@
                                         <p>{{roadlist.date}}: {{roadlist.name}}</p>
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                             <label for="tab-3" tabindex="0"></label>
                             <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
                             <h2>2016</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
                               {% if toplevel.year == 2016 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs middle-xs">
@@ -73,15 +77,18 @@
                                         <p>{{roadlist.date}}: {{roadlist.name}}</p>
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                             <label for="tab-4" tabindex="0"></label>
                             <input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked>
                             <h2>2017</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
                               {% if toplevel.year == 2017 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs middle-xs">
@@ -96,16 +103,41 @@
                                         {%endif%}
                                      </div>
                                   </div>
+                             
+                              {%endfor%}
+                              {%endif%}
+                              
+                              {%endfor%}
+                            </div>
+                            <label for="tab-5" tabindex="0"></label>
+                            <input id="tab-5" type="radio" name="tabs" aria-hidden="true" checked>
+                            <h2>2018</h2>
+                            <div class="tabPanel-content">
+                            {% for toplevel in site.data.lang[site.lang].roadmap %} {% if toplevel.year == 2018 %} {% for roadlist in toplevel.accomplishments %}
+                              <div class="row start-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-5" tabindex="0"></label>
-                            <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
+                            <label for="tab-6" tabindex="0"></label>
+                            <input id="tab-6" type="radio" name="tabs" aria-hidden="true">
                             <h2>Future</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
-                              {% if toplevel.year == 2018 %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
+                              {% if toplevel.year == 2019 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs">
                                      <div class="col-xs-1">
@@ -119,12 +151,16 @@
                                         {%endif%}
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                           </div>
         </div>
     </div>
 </section>
-</div>
\ No newline at end of file
+
+
+</div>
diff --git a/_i18n/template/resources/roadmap.md b/_i18n/template/resources/roadmap.md
index 267b3867..d0eb16ab 100644
--- a/_i18n/template/resources/roadmap.md
+++ b/_i18n/template/resources/roadmap.md
@@ -43,7 +43,8 @@
                         <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
                             <h2>2015</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% 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">
@@ -54,15 +55,18 @@
                                         <p>{{roadlist.date}}: {{roadlist.name}}</p>
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                             <label for="tab-3" tabindex="0"></label>
                             <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
                             <h2>2016</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
                               {% if toplevel.year == 2016 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs middle-xs">
@@ -73,15 +77,18 @@
                                         <p>{{roadlist.date}}: {{roadlist.name}}</p>
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                             <label for="tab-4" tabindex="0"></label>
                             <input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked>
                             <h2>2017</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
                               {% if toplevel.year == 2017 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs middle-xs">
@@ -96,16 +103,41 @@
                                         {%endif%}
                                      </div>
                                   </div>
+                             
+                              {%endfor%}
+                              {%endif%}
+                              
+                              {%endfor%}
+                            </div>
+                            <label for="tab-5" tabindex="0"></label>
+                            <input id="tab-5" type="radio" name="tabs" aria-hidden="true" checked>
+                            <h2>2018</h2>
+                            <div class="tabPanel-content">
+                            {% for toplevel in site.data.lang[site.lang].roadmap %} {% if toplevel.year == 2018 %} {% for roadlist in toplevel.accomplishments %}
+                              <div class="row start-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-5" tabindex="0"></label>
-                            <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
+                            <label for="tab-6" tabindex="0"></label>
+                            <input id="tab-6" type="radio" name="tabs" aria-hidden="true">
                             <h2>Future</h2>
                             <div class="tabPanel-content">
-                               {% for toplevel in site.data.lang[site.lang].roadmap %}
-                              {% if toplevel.year == 2018 %}
+                            {% for toplevel in site.data.lang[site.lang].roadmap %}    
+                              
+                              {% if toplevel.year == 2019 %}
                                 {% for roadlist in toplevel.accomplishments %}
                                   <div class="row start-xs">
                                      <div class="col-xs-1">
@@ -119,12 +151,16 @@
                                         {%endif%}
                                      </div>
                                   </div>
+                             
                               {%endfor%}
                               {%endif%}
+                              
                               {%endfor%}
                             </div>
                           </div>
         </div>
     </div>
 </section>
-</div>
\ No newline at end of file
+
+
+</div>
diff --git a/css/custom.css b/css/custom.css
index 13fccf17..f2128947 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -2986,7 +2986,7 @@ footer {
 .tabPanel-widget > label,
 .tabPanel-widget > h2 {
   font-size: 1.1rem;
-  width: 20%;
+  width: calc(100% / 6);
   height: 2rem;
   line-height: 2rem;
   padding: 1rem 0;
@@ -3017,22 +3017,27 @@ footer {
 
 .tabPanel-widget label:nth-child(5),
 .tabPanel-widget h2:nth-child(7) {
-  left: 20%;
+  left: calc(1 * (100% / 6));
 }
 
 .tabPanel-widget label:nth-child(9),
 .tabPanel-widget h2:nth-child(11) {
-  left: 40%;
+  left: calc(2 * (100% / 6));
 }
 
 .tabPanel-widget label:nth-child(13),
 .tabPanel-widget h2:nth-child(15) {
-  right: 20%;
+  left: calc(3 * (100% / 6));
 }
 
 .tabPanel-widget label:nth-child(17),
 .tabPanel-widget h2:nth-child(19) {
-  right: 0;
+  left: calc(4 * (100% / 6));
+}
+
+.tabPanel-widget label:nth-child(21),
+.tabPanel-widget h2:nth-child(23) {
+  left: calc(5 * (100% / 6));
 }
 
 .tabPanel-widget input + h2 + div.tabPanel-content {
diff --git a/resources/roadmap/index.md b/resources/roadmap/index.md
index b9618689..2f5ceb83 100644
--- a/resources/roadmap/index.md
+++ b/resources/roadmap/index.md
@@ -3,4 +3,4 @@ layout: custom
 title: titles.roadmap
 permalink: /resources/roadmap/index.html
 ---
-{% tf resources/roadmap.md %}
\ No newline at end of file
+{% tf resources/roadmap.md %}