diff --git a/_includes/nav-desktop.html b/_includes/nav-desktop.html
index 5742a0f..54adc86 100644
--- a/_includes/nav-desktop.html
+++ b/_includes/nav-desktop.html
@@ -2,16 +2,20 @@
     <a href="#"><img src="/assets/img/logo-white.png" alt="Dash" class="logo"></a>
 
     <nav class="desktop">
-        <ul>
-            <li><a href="{{ site.baseurl_root }}">{% t nav.what-is-dash %}</a></li>
-            <li><a href="{{ site.baseurl_root }}get-dash/">{% t nav.get-dash %}</a></li>
-            <li><a href="{{ site.baseurl_root }}">{% t nav.participate %}</a></li>
-            <li><a href="{{ site.baseurl_root }}">{% t nav.currency %}</a></li>
-            <li><a href="{{ site.baseurl_root }}">{% t nav.community %}</a></li>
-            <li><a href="{{ site.baseurl_root }}">{% t nav.blog %}</a></li>
-            <li><a href="{{ site.baseurl_root }}">{% t nav.project %}</a></li>
-            <li><a href="{{ site.baseurl_root }}">{% t global.english %}</a></li>
-            <li><a href="{{ site.baseurl_root }}" title="{% t nav.search %}">S</a></li>
+        <ul class="menu">
+            {% capture base %}{% if site.lang != "en" %}/{{site.baseurl_root}}{{ site.lang }}{% endif %}{% endcapture %}
+            <li><a href="{{ base }}/">{% t nav.what-is-dash %}</a></li>
+            <li><a href="{{ base }}/get-dash/">{% t nav.get-dash %}</a></li>
+            <li><a href="{{ base }}/participate/">{% t nav.participate %}</a></li>
+            <li><a href="{{ base }}/currency/">{% t nav.currency %}</a></li>
+            <li><a href="{{ base }}/community">{% t nav.community %}</a></li>
+            <li><a href="{{ base }}">{% t nav.blog %}</a></li>
+            <li><a href="{{ base }}">{% t nav.project %}</a></li>
+            
+            <li><a href="{{ page.url }}">{% t global.english %}</a></li>
+            <li><a href="{{ site.baseurl_root }}/es{{ page.url  }}">{% t global.spanish %}</a></li>
+            
+            <li><a href="{{ base }}" title="{% t nav.search %}">S</a></li>
         </ul>
     </nav>
 
@@ -22,4 +26,4 @@
     </div>
     <span class="clear"></span>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/_includes/nav-mobile.html b/_includes/nav-mobile.html
index f0e62b3..f27e8ed 100644
--- a/_includes/nav-mobile.html
+++ b/_includes/nav-mobile.html
@@ -1,12 +1,15 @@
 <nav class="overlay-menu">
     <ul>
-        <li><a href="{{ site.baseurl_root }}">{% t nav.what-is-dash %}</a></li>
-        <li><a href="{{ site.baseurl_root }}get-dash/">{% t nav.get-dash %}</a></li>
-        <li><a href="{{ site.baseurl_root }}">{% t nav.participate %}</a></li>
-        <li><a href="{{ site.baseurl_root }}">{% t nav.currency %}</a></li>
-        <li><a href="{{ site.baseurl_root }}">{% t nav.community %}</a></li>
-        <li><a href="{{ site.baseurl_root }}">{% t nav.blog %}</a></li>
-        <li><a href="{{ site.baseurl_root }}">{% t nav.project %}</a></li>
-        <li><a href="{{ site.baseurl_root }}">{% t global.english %}</a></li>
+        {% capture base %}{% if site.lang != "en" %}/{{site.baseurl_root}}{{ site.lang }}{% endif %}{% endcapture %}
+        <li><a href="{{ base }}/">{% t nav.what-is-dash %}</a></li>
+        <li><a href="{{ base }}/get-dash/">{% t nav.get-dash %}</a></li>
+        <li><a href="{{ base }}/participate/">{% t nav.participate %}</a></li>
+        <li><a href="{{ base }}/currency/">{% t nav.currency %}</a></li>
+        <li><a href="{{ base }}/community">{% t nav.community %}</a></li>
+        <li><a href="{{ base }}">{% t nav.blog %}</a></li>
+        <li><a href="{{ base }}">{% t nav.project %}</a></li>
+        
+        <li><a href="{{ page.url }}">{% t global.english %}</a></li>
+        <li><a href="{{ site.baseurl_root }}/es{{ page.url  }}">{% t global.spanish %}</a></li>
     </ul>
 </nav>
\ No newline at end of file