diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index dc06b6b4..eeeccf81 100644
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@@ -2,9 +2,11 @@ from django.conf.urls import url
 
 from django.utils.translation import ugettext_lazy as _
 from . import views
-from .views import ContactView
+from .views import ContactView, IndexView, AboutView
 
 urlpatterns = [
+    url(_(r'index/?$'), IndexView.as_view(), name='index'),
+    url(_(r'about/?$'), AboutView.as_view(), name='about'),
     url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
     url(_(r'supporters/?$'), views.supporters, name='supporters'),
     url(_(r'support-us/?$'), views.support, name='support'),
diff --git a/digitalglarus/views.py b/digitalglarus/views.py
index 05437941..b1ad3e6d 100644
--- a/digitalglarus/views.py
+++ b/digitalglarus/views.py
@@ -5,7 +5,7 @@ from django.forms import ModelForm
 from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
-
+from django.views.generic import TemplateView
 from django.utils.translation import get_language
 from djangocms_blog.models import Post
 from django.contrib import messages
@@ -29,6 +29,13 @@ class ContactView(FormView):
         return super(ContactView, self).form_valid(form)
 
 
+class IndexView(TemplateView):
+    template_name = "index.html"
+
+
+class AboutView(TemplateView):
+    template_name = "about.html"
+
 def detail(request, message_id):
     p = get_object_or_404(Message, pk=message_id)
 
@@ -38,6 +45,8 @@ def detail(request, message_id):
 def about(request):
     return render(request, 'digitalglarus/about.html')
 
+
+
 #def index(request):
 #    return render(request, 'digitalglarus/index.html')
 #
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 0b1bad0b..7df39009 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -19,12 +19,12 @@ urlpatterns = [
 # note the django CMS URLs included via i18n_patterns
 urlpatterns += i18n_patterns('',
                              # url(r'^$',include('ungleich.urls')),
-                             url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
-                             url(r'^',include('ungleich_page.urls',namespace='ungleich_page')),
-                             url(r'^login/',include(membership_urls)),
-                             url(r'^admin/', include(admin.site.urls)),
                              url(r'^digitalglarus/', include('digitalglarus.urls',
                                                              namespace="digitalglarus"),name='digitalglarus'),
+                             url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
+                             url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name="ungleich_page"),
+                             url(r'^login/',include(membership_urls)),
+                             url(r'^admin/', include(admin.site.urls)),
                              url(r'^', include('cms.urls')),
                              )
 
diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html
new file mode 100644
index 00000000..75ae0539
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_about.html
@@ -0,0 +1,80 @@
+{% load static %}
+
+<section id="about">
+    <div class="container">
+        <div class="row">
+          <div class="col-lg-12 text-center wow fadeInDown">
+            <h2 class="section-heading">ABOUT</h2>
+            <h3 class="section-subheading text-muted">The timeline of ungleich</h3>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-lg-12">
+            <ul class="timeline">
+              <li>
+            <div class="timeline-image">
+              <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/1.jpg' %}" alt="">
+            </div>
+            <div class="timeline-panel wow slideInLeft">
+              <div class="timeline-heading">
+                <h4>2000</h4>
+              </div>
+              <div class="timeline-body">
+                <p>The first incarnation of ungleich</p>
+                <p>in Germany                              </p>
+              </div>
+              </div></li>
+              <li class="timeline-inverted">
+            <div class="timeline-image">
+              <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/2.jpg' %}" alt="">
+            </div>
+            <div class="timeline-panel wow slideInRight">
+              <div class="timeline-heading">
+                <h4>2013</h4>
+              </div>
+              <div class="timeline-body">
+                <p>ungleich founded </p>
+                <p>in Switzerland                                </p>
+              </div>
+            </div>
+              </li>
+              <li>
+            <div class="timeline-image">
+              <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/6.jpg' %}" alt="">
+            </div>
+            <div class="timeline-panel wow slideInLeft">
+              <div class="timeline-heading">
+                <h4>2014</h4>
+              </div>
+              <div class="timeline-body">
+                <p>ungleich present at various conferences :<br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a><br>
+                </p>
+              </div>
+            </div>
+              </li>
+              <li class="timeline-inverted">
+            <div class="timeline-image">
+              <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/4.jpg' %}" alt="">
+            </div>
+            <div class="timeline-panel wow slideInRight">
+              <div class="timeline-heading">
+                <h4> 2015</h4>
+              </div>
+              <div class="timeline-body">
+                <p>ungleich introduces HA-Hosting </p>
+                <p>and introduces affordable 24X7 support.</p>
+                <p>ungleich launches <a href="https://digitalglarus.ungleich.ch/digitalglarus/">Digital Glarus project</a></p>
+              </div>
+            </div>
+              </li>
+              <li class="timeline-inverted">
+            <div class="timeline-image wow slideInDown">
+              <h4>and<br>the story continues!</h4>
+              <p>&nbsp;</p>
+            </div>
+              </li>
+            </ul>
+          </div>
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html
new file mode 100644
index 00000000..c14e6bd9
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html
@@ -0,0 +1,29 @@
+{% load static %}
+
+<section id="contact">
+    <div class="container">
+		<div class="row" class="wow fadeInDown">
+		  <div class="col-lg-12 text-center wow fadeInDown">
+		    <h2 class="section-heading">Contact Us</h2>
+		    <br>
+		    <h3 class="intro-smallcap">Join us at <a href="{% url 'digitalglarus:index'%}">Digital Glarus</a>,
+		      a great co-working space in the middle of Alps! <p></p> You can contact us at </h3>
+		    <h3 class="intro-smallcap"><a href="mailto:info@ungleich.ch"><i class="fa fa-envelope">info@ungleich.ch</i></a></h3>
+		    <h3 class="intro-smallcap"><a href="{% url 'ungleich_page:contact' %}"><i class="fa fa-envelope">Contact Us</i></a></h3>
+		    <h3 class="intro-smallcap">
+		      <p></p>
+		    </h3>
+		    <br>
+		    <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3>
+		    <br>
+		    <p>&nbsp;</p>
+		  </div>
+		  <p>&nbsp;</p>
+		</div>
+		<div class="row">
+		  <div class="col-lg-12">
+
+		  </div>
+		</div>
+  	</div>
+</section>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_footer.html b/ungleich_page/templates/ungleich_page/includes/_footer.html
new file mode 100644
index 00000000..238a6dcc
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_footer.html
@@ -0,0 +1,26 @@
+{% load static %}
+<footer>
+	<div class="container">
+		<div class="row">
+		  <div class="col-md-4">
+		    <span class="copyright">Copyright © ungleich GmbH {% now "Y" %}</span>
+		  </div>
+		  <div class="col-md-4">
+		    <ul class="list-inline social-buttons">
+		      <li><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
+		      </li>
+		      <li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>
+		      </li>
+		      <li><a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a>
+		      </li>
+		    </ul>
+		  </div>
+		  <div class="col-md-4">
+		    <ul class="list-inline quicklinks">
+		      <li><a href="http://www.ungleich.ch/">ungleich Home</a>
+		      </li>
+		    </ul>
+		  </div>
+		</div>
+	</div>
+</footer>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html
new file mode 100644
index 00000000..e6fecfe9
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_header.html
@@ -0,0 +1,16 @@
+{% load static %}
+<header>
+    <div class="container">
+		<div class="intro-text">
+		  <img  src="{% static 'ungleich_page/img/logo_200x200.svg'%}" heigh="300" alt="" class="logo-image" img-responsive="" width="300" />
+		  <p></p><p></p><br>
+		  <div class="intro-cap">
+		    <span class="intro-cap">
+		      We  Design, Configure &amp; Maintain <br>
+		      Your Linux Infrastructure
+		    </span>
+		  </div>
+
+		</div>
+    </div>
+</header>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html
new file mode 100644
index 00000000..f0dd04f4
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html
@@ -0,0 +1,38 @@
+{% load static %}
+
+<section id="portfolio" class="bg-light-gray">
+	<div class="container">
+		<div class="row">
+		  <div class="col-lg-12 text-center wow fadeInDown">
+		    <h2 class="section-heading">Hosting Products</h2>
+		    <h3 class="section-subheading text-muted">Our Hosting Products: </h3>
+		  </div>
+		</div>
+		<div class="row">
+		  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="0.5s">
+		    <img src="{% static 'ungleich_page/img/portfolio/roundicons.png' %}" class="img-responsive inline-block" alt="">
+		    <div class="portfolio-caption inline-block">
+		      <h4>HA Hosting</h4>
+		      <p class="text-muted">&nbsp;</p>
+		      <p class="text-muted">We offer high availablity hosting (HA) in Germany and in Switzerland. Our infrastructure is powered by Free and Open Source Software like OpenNebula, Qemu and GlusterFS.</p>
+		    </div>
+		  </div>
+		  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1s">
+		    <img src="{% static 'ungleich_page/img/portfolio/startup-framework.png' %}" class="img-responsive inline-block" alt="">
+		    <div class="portfolio-caption inline-block">
+		      <h4>Rails Hosting</h4>
+		      <p class="text-muted">&nbsp;</p>
+		      <p class="text-muted">Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails.</p>
+		    </div>
+		  </div>
+		  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1.5s">
+		    <img src="{% static 'ungleich_page/img/portfolio/treehouse.png' %}" class="img-responsive inline-block" alt="">
+		    <div class="portfolio-caption inline-block">
+		      <h4>Configuration as a Service</h4>
+		      <p class="text-muted">&nbsp;</p>
+		      <p class="text-muted">You are in need for a configuration?<br>With ungleich you have found an experienced team that configure your systems to provide service like DNS, E-Mail, Databases or Webservers.</p>
+		    </div>
+		  </div>
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html
new file mode 100644
index 00000000..39f5c7cc
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_services.html
@@ -0,0 +1,46 @@
+{% load static %}
+
+<section id="services">
+    <div class="container">
+		<div class="row">
+		  <div class="col-lg-12 text-center wow fadeInDown">
+		    <h2 class="section-heading">our services</h2>
+		    <h3 class="section-subheading text-muted">We support our clients in all areas of Unix infrastructure.<p></p>
+		      Our top notch configuration management is refreshingly simple and reliable. </h3>
+		  </div>
+		</div>
+		<div class="row text-center">
+		  <div class="col-sm-4">
+		    <div class="team-member wow fadeInDown" data-wow-delay="0.5s">
+		      <img src="{% static 'ungleich_page/img/team/5.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/hosting.png' %}" class="img-responsive img-circle img-toggle" alt="">
+		      <div class="team-member-caption inline-block">
+			<h4 class="portfolio-caption">Hosting</h4>
+			<p>&nbsp;</p>
+			<p><span class="text-muted">Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe.</span></p>
+		      </div>
+		    </div>
+		  </div>
+		  <div class="col-sm-4">
+		    <div class="team-member wow fadeInDown" data-wow-delay="1s">
+		      <img src="{% static 'ungleich_page/img/team/4.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/configuration.png' %}" class="img-responsive img-circle img-toggle" alt="">
+		      <div class="team-member-caption inline-block">
+			<h4 class="portfolio-caption">Configuration as a Service</h4>
+			<p>&nbsp;</p>
+			<p><span class="text-muted">Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you.</span></p>
+			<p class="text-muted">&nbsp;</p>
+		      </div>
+		    </div>
+		  </div>
+		  <div class="col-sm-4">
+		    <div class="team-member wow fadeInDown" data-wow-delay="1.5s">
+		      <img src="{% static 'ungleich_page/img/team/6.jpg' %}"  data-replaced="{% static 'ungleich_page/img/services/linux.png' %}" class="img-responsive img-circle img-toggle cursor-pointer" alt="">
+		      <h4 class="portfolio-caption">Linux System Engineering</h4>
+		      <p class="text-muted">&nbsp;</p>
+		      <div class="team-member-caption inline-block">
+			<p class="text-muted">Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more.</p>
+		      </div>
+		    </div>
+		  </div>
+		</div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_softwares.html b/ungleich_page/templates/ungleich_page/includes/_softwares.html
new file mode 100644
index 00000000..b5ece4d8
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_softwares.html
@@ -0,0 +1,117 @@
+{% load static %}
+
+<aside class="clients">
+	<div class="container">
+		<div class="row">
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/envato.jpg' %}" class="img-responsive img-centered" alt="">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/designmodo.jpg' %}" alt="" class="img-responsive img-centered" height="51">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/themeforest.jpg' %}" class="img-responsive img-centered" alt="">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/creative-market.jpg' %}" class="img-responsive img-centered" alt="">
+		    </a>
+		  </div>
+		</div>
+		<div class="row">
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/logobig.jpg' %}" alt="" class="img-responsive img-centered" height="61" width="196">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/Gentoo-site_logo.png' %}" alt="" class="img-responsive img-centered" height="50">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/debian.jpg' %}" alt="" class="img-responsive img-centered" height="36" width="145">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/CentOS.jpg' %}" alt="" class="img-responsive img-centered" height="50" width="147">
+		    </a>
+		  </div>
+		</div>
+
+		<div class="row">
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/cdistbyungleich.jpg' %}" alt="" class="img-responsive img-centered" height="50" width="101">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/Puppet.png' %}" alt="" class="img-responsive img-centered" height="50" width="161">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/freebsd.png' %}" alt="" class="img-responsive img-centered" height="58" width="175">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/NetBSD.png' %}" alt="" class="img-responsive img-centered" height="60" width="85">
+		    </a>
+		  </div>
+		</div>
+		<div class="row">
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/openbsd.png' %}" alt="" class="img-responsive img-centered" height="50" width="196">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/postsql.jpg' %}" alt="" class="img-responsive img-centered" height="72" width="197">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/mysql.png' %}" alt="" class="img-responsive img-centered" height="59" width="130">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/apache.png' %}" alt="" class="img-responsive img-centered" height="50" width="173">
+		    </a>
+		  </div>
+		</div>
+		<div class="row">
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/opennebula.png' %}" alt="" class="img-responsive img-centered" height="50" width="196">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/gluster.png' %}" alt="" class="img-responsive img-centered" height="51" width="185">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/ceph.jpg' %}" alt="" class="img-responsive img-centered" height="40" width="145">
+		    </a>
+		  </div>
+		  <div class="col-xs-3 col-md-3">
+		    <a href="#">
+		      <img src="{% static 'ungleich_page/img/logos/qemu.png' %}" alt="" class="img-responsive img-centered" height="44" width="133">
+		    </a>
+		  </div>
+		</div>
+	</div>
+</aside>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/includes/_team.html b/ungleich_page/templates/ungleich_page/includes/_team.html
new file mode 100644
index 00000000..5339793f
--- /dev/null
+++ b/ungleich_page/templates/ungleich_page/includes/_team.html
@@ -0,0 +1,88 @@
+{% load static %}
+
+<section id="team" class="bg-light-gray">
+	<div class="container">
+		<div class="row">
+		  <div class="col-sm-16 text-center center-block wow fadeInDown">
+		    <h2 class="section-heading">Why ungleich?*</h2>
+		    <h3 class="text-muted">What our customers say</h3>
+		  </div>
+		</div>
+
+		<div class="row">
+		  <div class="col-sm-10 center-block wow fadeInDown">
+		    <!-- start:recommendationSlider -->
+		    <div id="carousel-recommendation-ungleich" class="carousel slide ungleich ungleich-gallery ungleich-gallery-text-carousel" data-ride="carousel" data-interval="3000">
+		      <!-- Indicators -->
+		      <ol class="carousel-indicators">
+			<li data-target="#carousel-recommendation-ungleich" data-slide-to="0" class="active"></li>
+			<li data-target="#carousel-recommendation-ungleich" data-slide-to="1"></li>
+			<li data-target="#carousel-recommendation-ungleich" data-slide-to="2"></li>
+		      </ol>
+
+		      <!-- Wrapper for slides -->
+		      <div class="carousel-inner" role="listbox">
+			<div class="item active">
+			  <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/teralytics.png' %}" />
+			  <p class="carousel-text text-muted text-center">
+			    "ungleich helped us getting started with our internal
+			    infrastructure, hosted on physical servers in a
+			    co-location data centre in Zurich. From planning the
+			    network layout and virtualisation setup,
+			    inviting offers and securing a great deal from a
+			    hardware vendor, all the way to the installation of
+			    basic services like DNS, VPN and firewalls using the
+			    configuration management software cdist, we could
+			    count on the support of ungleich. At the end, we got
+			    a high availability infrastructure setup enabling our
+			    engineers to work more efficiently and comfortable
+			    than before."
+			  </p>
+			  <p class="text-center">
+			    <strong>- Luciano Franceschina</strong>, CTO at Teralytics
+			  </p>
+			</div>
+			<div class="item">
+			  <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/panter.png' %}" />
+			  <p class="carousel-text text-muted text-center">
+			    "Thanks to ungleich team, who has designed and
+			    configured our company's Linux infrastructure, our
+			    systems are very easy to maintain. Their innovative
+			    configuration management system cdist helped us
+			    significantly not only in cost but also in time
+			    saving, which is crucial for IT companies like ours."
+			  </p>
+			  <p class="text-center">
+			    <strong> - Beat Seeliger </strong>, CTO at Panter AG
+			  </p>
+			</div>
+			<div class="item">
+			  <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/logo_ruag.png' %}" />
+			  <p class="carousel-text text-muted text-center">
+			    "ungleich provided an excellent service in designing
+			    our system architecture and created secure and stable
+			    appliance. For us it is important to have an enduring
+			    stability in our system, and ungleich's configuration
+			    management system cdist is easy to adapt for our
+			    system administrators. We had a successful
+			    collaboration with ungleich in the time of very
+			    high workload, and their project leading was
+			    high-skilled and very reliable. I would definitely
+			    recommend them to any companies with high demand in
+			    solid infrastructures."
+			  </p>
+			  <p class="text-center">
+			    <strong>- Sebastian Plattner,</strong>
+			    Teamleader Development Cyber Security Products at RUAG
+			  </p>
+			</div>
+		      </div>
+		    </div>
+		    <!-- end:recommendationSlider -->
+		  </div>
+		</div>
+	</div>
+	<div class="col-sm-16 text-center center-block">
+	<h3 class="section-subheading text-muted">*ungleich means not equal to (≠) U+2260. </h3>
+	</div>
+</section>
\ No newline at end of file
diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html
index f689e861..f2578fc3 100644
--- a/ungleich_page/templates/ungleich_page/landing.html
+++ b/ungleich_page/templates/ungleich_page/landing.html
@@ -98,444 +98,30 @@
     </nav>
 
     <!-- Header -->
-    <header>
-      <div class="container">
-	<div class="intro-text">
-	  <img  src="{% static 'ungleich_page/img/logo_200x200.svg'%}" heigh="300" alt="" class="logo-image" img-responsive="" width="300" />
-	  <p></p><p></p><br>
-	  <div class="intro-cap">
-	    <span class="intro-cap">
-	      We  Design, Configure &amp; Maintain <br>
-	      Your Linux Infrastructure
-	    </span>
-	  </div>
+    {% include "ungleich_page/includes/_header.html" %}
 
-	</div>
-      </div>
-    </header>
 
     <!-- Services Section -->
-    <section id="services">
-      <div class="container">
-	<div class="row">
-	  <div class="col-lg-12 text-center wow fadeInDown">
-	    <h2 class="section-heading">our services</h2>
-	    <h3 class="section-subheading text-muted">We support our clients in all areas of Unix infrastructure.<p></p>
-	      Our top notch configuration management is refreshingly simple and reliable. </h3>
-	  </div>
-	</div>
-	<div class="row text-center">
-	  <div class="col-sm-4">
-	    <div class="team-member wow fadeInDown" data-wow-delay="0.5s">
-	      <img src="{% static 'ungleich_page/img/team/5.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/hosting.png' %}" class="img-responsive img-circle img-toggle" alt="">
-	      <div class="team-member-caption inline-block">
-		<h4 class="portfolio-caption">Hosting</h4>
-		<p>&nbsp;</p>
-		<p><span class="text-muted">Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe.</span></p>
-	      </div>
-	    </div>
-	  </div>
-	  <div class="col-sm-4">
-	    <div class="team-member wow fadeInDown" data-wow-delay="1s">
-	      <img src="{% static 'ungleich_page/img/team/4.jpg' %}" data-replaced="{% static 'ungleich_page/img/services/configuration.png' %}" class="img-responsive img-circle img-toggle" alt="">
-	      <div class="team-member-caption inline-block">
-		<h4 class="portfolio-caption">Configuration as a Service</h4>
-		<p>&nbsp;</p>
-		<p><span class="text-muted">Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you.</span></p>
-		<p class="text-muted">&nbsp;</p>
-	      </div>
-	    </div>
-	  </div>
-	  <div class="col-sm-4">
-	    <div class="team-member wow fadeInDown" data-wow-delay="1.5s">
-	      <img src="{% static 'ungleich_page/img/team/6.jpg' %}"  data-replaced="{% static 'ungleich_page/img/services/linux.png' %}" class="img-responsive img-circle img-toggle cursor-pointer" alt="">
-	      <h4 class="portfolio-caption">Linux System Engineering</h4>
-	      <p class="text-muted">&nbsp;</p>
-	      <div class="team-member-caption inline-block">
-		<p class="text-muted">Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more.</p>
-	      </div>
-	    </div>
-	  </div>
-	</div>
-    </div></section>
+    {% include "ungleich_page/includes/_services.html" %}
 
     <!-- Portfolio Grid Section -->
-    <section id="portfolio" class="bg-light-gray">
-      <div class="container">
-	<div class="row">
-	  <div class="col-lg-12 text-center wow fadeInDown">
-	    <h2 class="section-heading">Hosting Products</h2>
-	    <h3 class="section-subheading text-muted">Our Hosting Products: </h3>
-	  </div>
-	</div>
-	<div class="row">
-	  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="0.5s">
-	    <img src="{% static 'ungleich_page/img/portfolio/roundicons.png' %}" class="img-responsive inline-block" alt="">
-	    <div class="portfolio-caption inline-block">
-	      <h4>HA Hosting</h4>
-	      <p class="text-muted">&nbsp;</p>
-	      <p class="text-muted">We offer high availablity hosting (HA) in Germany and in Switzerland. Our infrastructure is powered by Free and Open Source Software like OpenNebula, Qemu and GlusterFS.</p>
-	    </div>
-	  </div>
-	  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1s">
-	    <img src="{% static 'ungleich_page/img/portfolio/startup-framework.png' %}" class="img-responsive inline-block" alt="">
-	    <div class="portfolio-caption inline-block">
-	      <h4>Rails Hosting</h4>
-	      <p class="text-muted">&nbsp;</p>
-	      <p class="text-muted">Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails.</p>
-	    </div>
-	  </div>
-	  <div class="col-md-4 col-sm-6 portfolio-item wow fadeInDown" data-wow-delay="1.5s">
-	    <img src="{% static 'ungleich_page/img/portfolio/treehouse.png' %}" class="img-responsive inline-block" alt="">
-	    <div class="portfolio-caption inline-block">
-	      <h4>Configuration as a Service</h4>
-	      <p class="text-muted">&nbsp;</p>
-	      <p class="text-muted">You are in need for a configuration?<br>With ungleich you have found an experienced team that configure your systems to provide service like DNS, E-Mail, Databases or Webservers.</p>
-	    </div>
-	  </div>
-	</div>
-      </div>
+    {% include "ungleich_page/includes/_portfolio.html" %}
 
-    </section>
 
     <!-- About Section -->
-    <section id="about">
-      <div class="container">
-	<div class="row">
-	  <div class="col-lg-12 text-center wow fadeInDown">
-	    <h2 class="section-heading">ABOUT</h2>
-	    <h3 class="section-subheading text-muted">The timeline of ungleich</h3>
-	  </div>
-	</div>
-	<div class="row">
-	  <div class="col-lg-12">
-	    <ul class="timeline">
-	      <li>
-		<div class="timeline-image">
-		  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/1.jpg' %}" alt="">
-		</div>
-		<div class="timeline-panel wow slideInLeft">
-		  <div class="timeline-heading">
-		    <h4>2000</h4>
-		  </div>
-		  <div class="timeline-body">
-		    <p>The first incarnation of ungleich</p>
-		    <p>in Germany                              </p>
-		  </div>
-	      </div></li>
-	      <li class="timeline-inverted">
-		<div class="timeline-image">
-		  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/2.jpg' %}" alt="">
-		</div>
-		<div class="timeline-panel wow slideInRight">
-		  <div class="timeline-heading">
-		    <h4>2013</h4>
-		  </div>
-		  <div class="timeline-body">
-		    <p>ungleich founded </p>
-		    <p>in Switzerland                                </p>
-		  </div>
-		</div>
-	      </li>
-	      <li>
-		<div class="timeline-image">
-		  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/6.jpg' %}" alt="">
-		</div>
-		<div class="timeline-panel wow slideInLeft">
-		  <div class="timeline-heading">
-		    <h4>2014</h4>
-		  </div>
-		  <div class="timeline-body">
-		    <p>ungleich present at various conferences :<br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a><br>
-		    </p>
-		  </div>
-		</div>
-	      </li>
-	      <li class="timeline-inverted">
-		<div class="timeline-image">
-		  <img class="img-circle img-responsive" src="{% static 'ungleich_page/img/about/4.jpg' %}" alt="">
-		</div>
-		<div class="timeline-panel wow slideInRight">
-		  <div class="timeline-heading">
-		    <h4> 2015</h4>
-		  </div>
-		  <div class="timeline-body">
-		    <p>ungleich introduces HA-Hosting </p>
-		    <p>and introduces affordable 24X7 support.</p>
-		    <p>ungleich launches <a href="https://digitalglarus.ungleich.ch/digitalglarus/">Digital Glarus project</a></p>
-		  </div>
-		</div>
-	      </li>
-	      <li class="timeline-inverted">
-		<div class="timeline-image wow slideInDown">
-		  <h4>and<br>the story continues!</h4>
-		  <p>&nbsp;</p>
-		</div>
-	      </li>
-	    </ul>
-	  </div>
-	</div>
-      </div>
-    </section>
-
+    {% include "ungleich_page/includes/_about.html" %}
 
     <!-- Team Section -->
-    <section id="team" class="bg-light-gray">
-      <div class="container">
-	<div class="row">
-	  <div class="col-sm-16 text-center center-block wow fadeInDown">
-	    <h2 class="section-heading">Why ungleich?*</h2>
-	    <h3 class="text-muted">What our customers say</h3>
-	  </div>
-	</div>
+    {% include "ungleich_page/includes/_team.html" %}
 
-	<div class="row">
-	  <div class="col-sm-10 center-block wow fadeInDown">
-	    <!-- start:recommendationSlider -->
-	    <div id="carousel-recommendation-ungleich" class="carousel slide ungleich ungleich-gallery ungleich-gallery-text-carousel" data-ride="carousel" data-interval="3000">
-	      <!-- Indicators -->
-	      <ol class="carousel-indicators">
-		<li data-target="#carousel-recommendation-ungleich" data-slide-to="0" class="active"></li>
-		<li data-target="#carousel-recommendation-ungleich" data-slide-to="1"></li>
-		<li data-target="#carousel-recommendation-ungleich" data-slide-to="2"></li>
-	      </ol>
+    <!-- Software We Use Section -->
+    {% include "ungleich_page/includes/_softwares.html" %}
 
-	      <!-- Wrapper for slides -->
-	      <div class="carousel-inner" role="listbox">
-		<div class="item active">
-		  <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/teralytics.png' %}" />
-		  <p class="carousel-text text-muted text-center">
-		    "ungleich helped us getting started with our internal
-		    infrastructure, hosted on physical servers in a
-		    co-location data centre in Zurich. From planning the
-		    network layout and virtualisation setup,
-		    inviting offers and securing a great deal from a
-		    hardware vendor, all the way to the installation of
-		    basic services like DNS, VPN and firewalls using the
-		    configuration management software cdist, we could
-		    count on the support of ungleich. At the end, we got
-		    a high availability infrastructure setup enabling our
-		    engineers to work more efficiently and comfortable
-		    than before."
-		  </p>
-		  <p class="text-center">
-		    <strong>- Luciano Franceschina</strong>, CTO at Teralytics
-		  </p>
-		</div>
-		<div class="item">
-		  <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/panter.png' %}" />
-		  <p class="carousel-text text-muted text-center">
-		    "Thanks to ungleich team, who has designed and
-		    configured our company's Linux infrastructure, our
-		    systems are very easy to maintain. Their innovative
-		    configuration management system cdist helped us
-		    significantly not only in cost but also in time
-		    saving, which is crucial for IT companies like ours."
-		  </p>
-		  <p class="text-center">
-		    <strong> - Beat Seeliger </strong>, CTO at Panter AG
-		  </p>
-		</div>
-		<div class="item">
-		  <img class="center-block img-client img-responsive" src="{% static 'ungleich_page/img/client-logos/logo_ruag.png' %}" />
-		  <p class="carousel-text text-muted text-center">
-		    "ungleich provided an excellent service in designing
-		    our system architecture and created secure and stable
-		    appliance. For us it is important to have an enduring
-		    stability in our system, and ungleich's configuration
-		    management system cdist is easy to adapt for our
-		    system administrators. We had a successful
-		    collaboration with ungleich in the time of very
-		    high workload, and their project leading was
-		    high-skilled and very reliable. I would definitely
-		    recommend them to any companies with high demand in
-		    solid infrastructures."
-		  </p>
-		  <p class="text-center">
-		    <strong>- Sebastian Plattner,</strong>
-		    Teamleader Development Cyber Security Products at RUAG
-		  </p>
-		</div>
-	      </div>
-	    </div>
-	    <!-- end:recommendationSlider -->
-	  </div>
-	</div>
-      </div>
-      <div class="col-sm-16 text-center center-block">
-	<h3 class="section-subheading text-muted">*ungleich means not equal to (≠) U+2260. </h3>
-      </div>
-    </section>
-    <!-- Software we use -->
-    <aside class="clients">
-      <div class="container">
-	<div class="row">
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/envato.jpg' %}" class="img-responsive img-centered" alt="">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/designmodo.jpg' %}" alt="" class="img-responsive img-centered" height="51">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/themeforest.jpg' %}" class="img-responsive img-centered" alt="">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/creative-market.jpg' %}" class="img-responsive img-centered" alt="">
-	    </a>
-	  </div>
-	</div>
-	<div class="row">
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/logobig.jpg' %}" alt="" class="img-responsive img-centered" height="61" width="196">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/Gentoo-site_logo.png' %}" alt="" class="img-responsive img-centered" height="50">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/debian.jpg' %}" alt="" class="img-responsive img-centered" height="36" width="145">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/CentOS.jpg' %}" alt="" class="img-responsive img-centered" height="50" width="147">
-	    </a>
-	  </div>
-	</div>
+    <!-- Contact Us Section -->
+    {% include "ungleich_page/includes/_contact_us.html" %}
 
-	<div class="row">
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/cdistbyungleich.jpg' %}" alt="" class="img-responsive img-centered" height="50" width="101">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/Puppet.png' %}" alt="" class="img-responsive img-centered" height="50" width="161">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/freebsd.png' %}" alt="" class="img-responsive img-centered" height="58" width="175">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/NetBSD.png' %}" alt="" class="img-responsive img-centered" height="60" width="85">
-	    </a>
-	  </div>
-	</div>
-	<div class="row">
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/openbsd.png' %}" alt="" class="img-responsive img-centered" height="50" width="196">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/postsql.jpg' %}" alt="" class="img-responsive img-centered" height="72" width="197">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/mysql.png' %}" alt="" class="img-responsive img-centered" height="59" width="130">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/apache.png' %}" alt="" class="img-responsive img-centered" height="50" width="173">
-	    </a>
-	  </div>
-	</div>
-	<div class="row">
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/opennebula.png' %}" alt="" class="img-responsive img-centered" height="50" width="196">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/gluster.png' %}" alt="" class="img-responsive img-centered" height="51" width="185">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/ceph.jpg' %}" alt="" class="img-responsive img-centered" height="40" width="145">
-	    </a>
-	  </div>
-	  <div class="col-xs-3 col-md-3">
-	    <a href="#">
-	      <img src="{% static 'ungleich_page/img/logos/qemu.png' %}" alt="" class="img-responsive img-centered" height="44" width="133">
-	    </a>
-	  </div>
-	</div>
-      </div>
-
-    </aside>
-
-    <section id="contact">
-      <div class="container">
-	<div class="row" class="wow fadeInDown">
-	  <div class="col-lg-12 text-center wow fadeInDown">
-	    <h2 class="section-heading">Contact Us</h2>
-	    <br>
-	    <h3 class="intro-smallcap">Join us at <a href="http://www.digitalglarus.ch">Digital Glarus</a>,
-	      a great co-working space in the middle of Alps! <p></p> You can contact us at </h3>
-	    <h3 class="intro-smallcap"><a href="mailto:info@ungleich.ch"><i class="fa fa-envelope">info@ungleich.ch</i></a></h3>
-	    <h3 class="intro-smallcap">
-	      <p></p>
-	    </h3>
-	    <br>
-	    <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3>
-	    <br>
-	    <p>&nbsp;</p>
-	  </div>
-	  <p>&nbsp;</p>
-	</div>
-	<div class="row">
-	  <div class="col-lg-12">
-
-	  </div>
-	</div>
-      </div>
-    </section>
-
-    <footer>
-      <div class="container">
-	<div class="row">
-	  <div class="col-md-4">
-	    <span class="copyright">Copyright © ungleich GmbH 2015</span>
-	  </div>
-	  <div class="col-md-4">
-	    <ul class="list-inline social-buttons">
-	      <li><a href="https://twitter.com/ungleich"><i class="fa fa-twitter"></i></a>
-	      </li>
-	      <li><a href="https://github.com/ungleich"><i class="fa fa-github"></i></a>
-	      </li>
-	      <li><a href="https://www.linkedin.com/company/ungleich-gmbh?trk=nav_account_sub_nav_company_admin/"><i class="fa fa-linkedin"></i></a>
-	      </li>
-	    </ul>
-	  </div>
-	  <div class="col-md-4">
-	    <ul class="list-inline quicklinks">
-	      <li><a href="http://www.ungleich.ch/">ungleich Home</a>
-	      </li>
-	    </ul>
-	  </div>
-	</div>
-      </div>
-    </footer>
+    <!-- Footer -->
+    {% include "ungleich_page/includes/_footer.html" %}
 
     <!-- Portfolio Modals -->
     <!-- Use the modals below to showcase details about your portfolio projects! -->
diff --git a/ungleich_page/urls.py b/ungleich_page/urls.py
index c8215ab1..2176973d 100644
--- a/ungleich_page/urls.py
+++ b/ungleich_page/urls.py
@@ -5,5 +5,5 @@ from django.utils.translation import ugettext_lazy as _
 
 urlpatterns = [
     url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
-    url(_(r'landing/?$'), LandingView.as_view(), name='landing'),
+    url(_(r''), LandingView.as_view(), name='landing'),
 ]