diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index 6a7e4002..69e07712 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -12,11 +12,11 @@
                     <span class="icon-bar"></span>
                 </button>
                 {% if request.resolver_match.url_name == "index" or request.resolver_match.url_name == "whydatacenterlight" %}
-                  <a id="logoBlack" class="navbar-brand topnav url" data-url="#home"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
-                  <a id="logoWhite" class="navbar-brand topnav url" data-url="#home"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
+                  <a href="{% url 'datacenterlight:index' %}" id="logoBlack" class="navbar-brand topnav url" data-url="#home"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
+                  <a href="{% url 'datacenterlight:index' %}" id="logoWhite" class="navbar-brand topnav url" data-url="#home"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
                 {% else %}
-                   <a id="logoBlack" class="navbar-brand topnav url" href="/datacenterlight"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
-                    <a id="logoWhite" class="navbar-brand topnav url" href="/datacenterlight"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
+                   <a href="{% url 'datacenterlight:index' %}" id="logoBlack" class="navbar-brand topnav url" href="#home"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
+                    <a href="{% url 'datacenterlight:index' %}" id="logoWhite" class="navbar-brand topnav url" href="#home"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
                 {% endif %}
             </div>
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -24,19 +24,19 @@
                 <ul class="nav navbar-nav navbar-right">
                 	{% if request.resolver_match.url_name == "index" or request.resolver_match.url_name == "whydatacenterlight" %}
                     <li class="dropdown">
-                        <a class="url dropdown-toggle" href="javascript:void(0)" data-toggle="dropdown" data-url="#how" >{% trans "Highlights" %}  <b class="caret"></b></a>
+                        <a class="url dropdown-toggle" href="{% url 'datacenterlight:index' %}#how" data-url="#how" >{% trans "Highlights" %}  <b class="caret"></b></a>
 							<ul class="dropdown-menu">
-								<li><a class="url" href="javascript:void(0)" data-url="#your"  >{% trans "Scale out" %}</a></li>
-								<li><a class="url" href="javascript:void(0)" data-url="#our">{% trans "Reliable and light" %}</a></li>
-								<li> <a class="url" href="javascript:void(0)" data-url="#price" >{% trans "Order VM" %}</a></li>
+								<li><a class="url" href="{% url 'datacenterlight:index' %}#your" data-url="#your"  >{% trans "Scale out" %}</a></li>
+								<li><a class="url" href="{% url 'datacenterlight:index' %}#our" data-url="#our">{% trans "Reliable and light" %}</a></li>
+								<li> <a class="url" href="{% url 'datacenterlight:index' %}#price" data-url="#price" >{% trans "Order VM" %}</a></li>
 							 </ul>
                     </li>
                     
                     <li>
-                        <a class="url" href="javascript:void(0)" data-url="#price" >{% trans "Why Data Center Light?" %}</a>
+                        <a class="url" href="{% url 'datacenterlight:index' %}/whydatacenterlight" >{% trans "Why Data Center Light?" %}</a>
                     </li>
                     <li>
-                        <a class="url" href="javascript:void(0)" data-url="#contact"  >{% trans "Contact" %}</a>
+                        <a class="url" href="{% url 'datacenterlight:index' %}#contact" data-url="#contact"  >{% trans "Contact" %}</a>
                      </li>
 					       {% endif %}
                     <li class="nav-language">