diff --git a/datacenterlight/templates/datacenterlight/home.html b/datacenterlight/templates/datacenterlight/home.html
index 6ab7eb18..eb2decd2 100755
--- a/datacenterlight/templates/datacenterlight/home.html
+++ b/datacenterlight/templates/datacenterlight/home.html
@@ -11,7 +11,7 @@
                 <div class="col-lg-12">
     
                     <div class="intro-message">
-                      <h1>DataCenterLight </h1>
+                      <h1>DataCenterLight</h1>
                         <h3>{% trans "Finally, an affordable VM hosting in Switzerland!" %}</h3>
                         <hr class="intro-divider">
                         <ul class="list-inline intro-social-buttons">
diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html
index 17ba6b64..5d94624d 100644
--- a/datacenterlight/templates/datacenterlight/includes/_footer.html
+++ b/datacenterlight/templates/datacenterlight/includes/_footer.html
@@ -4,30 +4,48 @@
         <div class="container">
             <div class="row">
                 <div class="col-lg-12">
-                    {% if request.resolver_match.url_name == "index" %}
+                    
                     <ul class="list-inline">
-                        <li>
-                            <a href="#">{% trans "Home" %}</a>
+                        {% if request.resolver_match.url_name == "index" %}
+                         <li>
+                            <a class="url" href="javascript:void(0)" data-url="#how" >{% trans "What is it" %}</a>
                         </li>
-                        <li class="footer-menu-divider">&sdot;</li>
                         <li>
-                            <a href="#about">{% trans "What is it" %}</a></li>
-                        <li class="footer-menu-divider">&sdot;</li>
-                        <li>
-                            <a href="#about">{% trans "Scale out" %}</a></li>
-                        <li>&sdot;</li>
-                        <li>
-                            <a href="#about">{% trans "Reliable and light" %}</a></li>
-                        <li class="footer-menu-divider">&sdot;</li>
-                        <li>
-                            <a href="#services">{% trans "Pricing" %}</a>
+                            <a class="url" href="javascript:void(0)" data-url="#your"  >{% trans "Scale out" %}</a>
                         </li>
-                        <li class="footer-menu-divider">&sdot;</li>
-                        <li>
-                            <a href="#contact">{% trans "Contact" %}</a>
+                       <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="javascript:void(0)" data-url="#contact"  >{% trans "Contact" %}</a>
+                         </li>
+                         {% else %}
+                            <li>
+                               <a href="{% url 'datacenterlight:index' %}">{% trans "Home" %}</a>
+                            </li>
+                            <li class="footer-menu-divider">&sdot;</li>
+                            <li>
+                                <a href="{% url 'datacenterlight:index' %}#how">{% trans "What is it" %}</a></li>
+                            <li class="footer-menu-divider">&sdot;</li>
+                            <li>
+                                <a href="{% url 'datacenterlight:index' %}#your">{% trans "Scale out" %}</a></li>
+                            <li>&sdot;</li>
+                            <li>
+                                <a href="{% url 'datacenterlight:index' %}#our">{% trans "Reliable and light" %}</a></li>
+                            <li class="footer-menu-divider">&sdot;</li>
+                            <li>
+                                <a href="{% url 'datacenterlight:index' %}#price">{% trans "Pricing" %}</a>
+                            </li>
+                            <li class="footer-menu-divider">&sdot;</li>
+                            <li>
+                                <a href="{% url 'datacenterlight:index' %}#contact">{% trans "Contact" %}</a>
+                            </li>
+                        {% endif %}
                     </ul>
-                    {% endif %}
+                          
                     <p class="copyright text-muted small">Copyright &copy; ungleich GmbH {% now "Y" %}. All Rights Reserved</p>
                 </div>
             </div>
diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar.html b/datacenterlight/templates/datacenterlight/includes/_navbar.html
index 899757b2..a8939080 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar.html
@@ -49,9 +49,26 @@
                       </div>
                       <div class="drop-language">
                           {% if LANGUAGE_CODE == 'en-us'%} 
-                          <a class="url" href="{{base_url}}/de/datacenterlight" >Deutsch</a>
+                            {% if request.resolver_match.url_name == "index" %}
+                              <a class="url" href="{{base_url}}/de/datacenterlight" >Deutsch</a>
+                            {% endif %}
+                             {% if request.resolver_match.url_name == "order" %}
+                              <a class="url" href="{{base_url}}/de/datacenterlight/order" >Deutsch</a>
+                            {% endif %}
+                             {% if request.resolver_match.url_name == "pricing" %}
+                              <a class="url" href="{{base_url}}/de/datacenterlight/pricing" >Deutsch</a>
+                            {% endif %}
                           {% else %}
-                          <a class="url" href="{{base_url}}/en-us/datacenterlight" >English</a>
+                            {% if request.resolver_match.url_name == "index" %}
+                              <a class="url" href="{{base_url}}/en-us/datacenterlight" >English</a>
+                            {% endif %}
+                             {% if request.resolver_match.url_name == "order" %}
+                              <a class="url" href="{{base_url}}/en-us/datacenterlight/order" >Deutsch</a>
+                            {% endif %}
+                             {% if request.resolver_match.url_name == "pricing" %}
+                              <a class="url" href="{{base_url}}/en-us/datacenterlight/pricing" >Deutsch</a>
+                            {% endif %}
+                          <a class="url" href="{{base_url}}/en-us/datacenterlight" ></a>
                           {% endif %}
                         
                       </div>
diff --git a/datacenterlight/templates/datacenterlight/order.html b/datacenterlight/templates/datacenterlight/order.html
index a9137d6f..f6caff6a 100644
--- a/datacenterlight/templates/datacenterlight/order.html
+++ b/datacenterlight/templates/datacenterlight/order.html
@@ -90,14 +90,6 @@
 	</div>
 
 
-    <!-- jQuery -->
-    <script src="{% static 'datacenterlight/js/jquery.js' %}"></script>
-    
-
-    <!-- Bootstrap Core JavaScript -->
-    <script src="{% static 'datacenterlight/js/bootstrap.min.js' %}"></script>
-    <script src="{% static 'datacenterlight/js/main.js' %}"></script>
-
 {% endblock %}
 
 </html>