diff --git a/datacenterlight/static/datacenterlight/css/glasfaser.css b/datacenterlight/static/datacenterlight/css/glasfaser.css
index d0650317..f7c46c44 100644
--- a/datacenterlight/static/datacenterlight/css/glasfaser.css
+++ b/datacenterlight/static/datacenterlight/css/glasfaser.css
@@ -59,6 +59,7 @@
     flex-direction: column;
     margin-right: 8%;
     margin-left: 10px;
+    margin-bottom: 20px;
     justify-content: center;
     position: relative;
 }
diff --git a/datacenterlight/templates/datacenterlight/glasfaser.html b/datacenterlight/templates/datacenterlight/glasfaser.html
index 42bfb4fe..462ebbaa 100644
--- a/datacenterlight/templates/datacenterlight/glasfaser.html
+++ b/datacenterlight/templates/datacenterlight/glasfaser.html
@@ -101,7 +101,7 @@
       <div class="container">
         <div class="text-center wow fadeInDown">
           <h2 class="section-heading">Wie funktioniert es?</h2>
-          <h3 class="section-subheading text-muted">So kommen Sie in wenigen einfachen Schritten zu ihrem High-Speed-Internet</h3>
+          <h3 class="section-subheading text-muted">So kommen Sie in wenigen einfachen Schritten zu Ihrem High-Speed-Internet</h3>
         </div>
         <div class="row">
           <div class="col-lg-12">
@@ -132,7 +132,7 @@
                 </div>
                 <div class="timeline-panel wow slideInLeft">
                   <div class="timeline-body">
-                    <p>Sollten Sie dem Angebot zustimmen, wird die Glasfaser zu Ihrem Standort verlegt und ein Endgerät installiert.</p>
+                    <p>Sollten Sie dem Angebot zustimmen, wird die Glasfaser zu Ihrem Standort verlegt und die Endgeräte installiert.</p>
                   </div>
                 </div>
               </li>
@@ -142,7 +142,7 @@
                 </div>
                 <div class="timeline-panel wow slideInDown">
                   <div class="timeline-body">
-                    <p>Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen sie bllitzschnell im Internet!</p>
+                    <p>Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie bllitzschnell im Internet!</p>
                   </div>
                 </div>
               </li>
@@ -153,20 +153,20 @@
     </section>
 
     <!-- / contact section -->
-    <div class="full-contact-section">
+    <div id="contact" class="full-contact-section">
       <div class="intro-header-2 contact-section" id="contact">
         <div class="container">
           <div class="row">
             <div class="col-sm-6">
               <div class="title">
-                <h2>{% trans "Contact us" %}</h2>
+                <h2>Kontakt</h2>
               </div>
               <div class="contact-details">
                 <div class="subtitle">
                   <h3>ungleich GmbH</h3>
                 </div>
                 <div class="description">
-                  <p>info@ungleich.ch</p>
+                  <p>glasfaser@ungleich.ch</p>
                   <p>In der Au 7, Schwanden 8762</p>
                   <p>{% trans "Switzerland " %}</p>
                 </div>
@@ -179,7 +179,54 @@
             </div>
             <div class="col-sm-6">
               <div id="contact-form" class="contact-form">
-                {% include "datacenterlight/contact_form.html" %}
+                {% if success %}
+                    <div class="contact-form-success">
+                        <div class="subtitle text-center">
+                            <h3>{% trans "Thank you for contacting us." %}</h3>
+                        </div>
+                        <p>
+                            {% trans "Your message was successfully sent to our team." %}
+                        </p>
+                    </div>
+                {% else %}
+                    <div class="row">
+                        <div class="col-sm-offset-2 col-sm-10">
+                            <div class="subtitle">
+                                <h3>Senden Sie uns eine Nachricht.</h3>
+                            </div>
+                        </div>
+                    </div>
+                    <form class="form-horizontal ajax-form" method="POST" action="{% url 'datacenterlight:contact_us' %}" data-toggle="validator" data-response="#contact-form">
+                        {% csrf_token %}
+                        <div class="form-group">
+                            <label class="control-label col-sm-2" for="name">{% trans "Name" %}</label>
+                            <div class="col-sm-10">
+                                <input type="text" name="name" class="form-control" data-minlength="3" data-error="{% trans 'Please enter your name.' %}" required>
+                                {{contact_form.name.errors}}
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="control-label col-sm-2" for="email">{% trans "Email" %}</label>
+                            <div class="col-sm-10">
+                                <input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" data-error="{% trans 'Please enter a valid email address.' %}" required>
+                                {{contact_form.email.errors}}
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="control-label col-sm-2" for="message">{% trans "Message" %}</label>
+                            <div class="col-sm-10">
+                                <textarea class="form-control" name="message" id="message" rows="6" required></textarea>
+                                {{contact_form.message.errors}}
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-sm-offset-2 col-sm-10 text-right">
+                                <div class="form-error hide">{% trans "Sorry, there was an unexpected error. Kindly retry." %}</div>
+                                <button type="submit" class="btn btn-default">{% trans "SUBMIT" %}</button>
+                            </div>
+                        </div>
+                    </form>
+                {% endif %}
               </div>
             </div>
           </div>
diff --git a/datacenterlight/templates/datacenterlight/includes/_navbar_glasfaser.html b/datacenterlight/templates/datacenterlight/includes/_navbar_glasfaser.html
index cdd66610..aef0c93b 100644
--- a/datacenterlight/templates/datacenterlight/includes/_navbar_glasfaser.html
+++ b/datacenterlight/templates/datacenterlight/includes/_navbar_glasfaser.html
@@ -18,21 +18,13 @@
             <!-- Start Navbar collapse-->
             <ul class="nav navbar-nav navbar-right">
                 <li>
-                    <a class="page-scroll" href="#services">{% trans "Services"%}</a></li>
-                <li>
-                    <a class="page-scroll" href="#portfolio">{% trans "products"%}</a></li>
-                <li></li>
-                <li>
-                    <a class="page-scroll" href="#about">{% trans "About"%}</a>
+                    <a class="page-scroll" href="#services">{% trans "Technische Details" %}</a>
                 </li>
                 <li>
-                    <a class="page-scroll" href="#team">{% trans "WHY UNGLEICH?"%}</a>
+                    <a class="page-scroll" href="#about">{% trans "Wie funktioniert es?" %}</a>
                 </li>
                 <li>
-                    <a class="page-scroll" href="http://blog.ungleich.ch">{% trans "BLOG"%}</a>
-                </li>
-                <li>
-                    <a class="page-scroll" href="#contact">{% trans "CONTACT"%} </a>
+                    <a class="page-scroll" href="#contact">{% trans "CONTACT" %} </a>
                 </li>
             </ul>
             <!-- /.navbar-collapse -->
diff --git a/ungleich_page/static/ungleich_page/img/glasfaser/ip.png b/ungleich_page/static/ungleich_page/img/glasfaser/ip.png
index c8a01158..d20bff19 100644
Binary files a/ungleich_page/static/ungleich_page/img/glasfaser/ip.png and b/ungleich_page/static/ungleich_page/img/glasfaser/ip.png differ