diff --git a/railshosting/static/railshosting/img/how3.png b/railshosting/static/railshosting/img/how3.png
deleted file mode 100644
index 2f16f8f1..00000000
Binary files a/railshosting/static/railshosting/img/how3.png and /dev/null differ
diff --git a/railshosting/templates/railshosting/base.html b/railshosting/templates/railshosting/base.html
index 63a33048..236d99ca 100644
--- a/railshosting/templates/railshosting/base.html
+++ b/railshosting/templates/railshosting/base.html
@@ -11,7 +11,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>{% block title %} {%endblock%} as easy as possible</title>
+    <title>{{ domain }} - {{ hosting }} hosting as easy as possible</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="{% static 'railshosting/css/bootstrap.min.css' %}" rel="stylesheet">
@@ -32,8 +32,14 @@
         <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-    {% block customcss %} {%endblock%}
-
+    {% with 'railshosting/img/'|add:hosting|add:'-intro-bg.png' as image_static %}
+     alt="">   
+    <style media="screen" type="text/css">
+    .intro-header {
+        background: url("{% static image_static %}") no-repeat center center;
+    }
+</style>
+{% endwith %}   
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -133,9 +139,11 @@
   {% endblock %}
 </ul>
               </div>
-                <div class="col-lg-5 col-sm-pull-6  col-sm-6">
-                    <img class="img-responsive" src="{% static 'railshosting/img/how3.png' %}" alt="">
-                </div>
+                 {% with 'railshosting/img/card-'|add:hosting|add:'.png' as image_static %}
+                  <div class="col-lg-5 col-sm-pull-6  col-sm-6">
+                    <img class="img-responsive" src="{% static image_static %}" alt="">
+                  </div>
+                  {% endwith %}
             </div>
 
         </div>
@@ -173,7 +181,7 @@
                     <hr class="section-heading-spacer">
                     <div class="clearfix"></div>
                     <h2 class="section-heading">Option 2 : Our infrastructure</h2>
-                    <p class="lead">We take care of everything for you! You don't need your infrastructure. We give you everything you need in {{ hosting_long }}ls hosting. Full root access, 24x7 support.</p>
+                    <p class="lead">We take care of everything for you! You don't need your infrastructure. We give you everything you need in {{ hosting_long }} hosting. Full root access, 24x7 support.</p>
                 </div>
                 <div class="col-lg-5 col-sm-pull-6  col-sm-6">
                     <img class="img-responsive" src="{% static 'railshosting/img/dog.png' %}" alt="">
diff --git a/railshosting/templates/railshosting/django.html b/railshosting/templates/railshosting/django.html
index df2cf991..2782a12b 100644
--- a/railshosting/templates/railshosting/django.html
+++ b/railshosting/templates/railshosting/django.html
@@ -1,12 +1,6 @@
 {% extends "railshosting/base.html" %}
 {% load staticfiles %}
 
-{% block title %}django hosting.ch - django hosting{%endblock%}
-
-{%block customcss %} 
-<link href="{% static 'railshosting/css/djangohosting.css' %}" rel="stylesheet">
-{%endblock%}
-
 {%block specification %} 
   <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
   <p class="lead">Ubuntu 14.04 as the operating system, full root access!</p>
diff --git a/railshosting/templates/railshosting/django.html-before-nico b/railshosting/templates/railshosting/django.html-before-nico
new file mode 100644
index 00000000..31c757bb
--- /dev/null
+++ b/railshosting/templates/railshosting/django.html-before-nico
@@ -0,0 +1,393 @@
+{% load staticfiles %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>django hosting.ch - django hosting as easy as possible</title>
+
+    <!-- Bootstrap Core CSS -->
+    <link href="{% static 'railshosting/css/bootstrap.min.css' %}" rel="stylesheet">
+
+    <!-- Custom CSS -->
+    <link href="{% static 'railshosting/css/landing-page.css' %}" rel="stylesheet">
+    <link href="{% static 'railshosting/css/djangohosting.css' %}" rel="stylesheet">
+
+    <!-- Custom Fonts -->
+    <link href='http://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
+    <link href="{% static 'railshosting/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
+    <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
+    <link rel="shortcut icon" href="{% static 'railshosting/img/favicon.ico' %}" type="image/x-icon" />
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+        <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-62285904-6', 'auto');
+  ga('send', 'pageview');
+
+</script>
+
+</script>
+
+</head>
+
+<body>
+
+    <!-- Navigation -->
+    <nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
+        <div class="container topnav">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand topnav" href="#"><img src="{% static 'railshosting/img/logo_black.svg' %}"></a>
+            </div>
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav navbar-right">
+                    <li>
+                        <a href="#how">How it works</a>
+                    </li>
+                    <li>
+                        <a href="#your">Your infrastructure</a>
+                    </li>
+                   <li>
+                        <a href="#our">Our inftrastructure</a>
+                    </li>
+                    <li>
+                        <a href="#price">Pricing</a>
+                    </li>
+                    <li>
+                        <a href="#contact">Contact</a>
+                    </li>
+                </ul>
+            </div>
+            <!-- /.navbar-collapse -->
+        </div>
+        <!-- /.container -->
+    </nav>
+
+
+    <!-- Header -->
+    <a name="about"></a>
+    <div class="intro-header">
+        <div class="container">
+
+            <div class="row">
+                <div class="col-lg-12">
+    
+                    <div class="intro-message">
+                    <img class="responsive" src="{% static 'railshosting/img/Beta.png' %}">
+                        <h1>django-hosting.ch</h1>
+                        <h3>django hosting as easy as possible</h3>
+                        <hr class="intro-divider">
+                        <ul class="list-inline intro-social-buttons">
+                            <li>
+                                <a href="#howitworks" class="btn btn-default btn-lg"><i class="#Services"></i> <span class="network-name">tell me how it works</span></a>
+                            </li>
+                            <li>
+                                <a href="#own" class="btn btn-default btn-lg page-scroll"><span class="network-name">Let me start</span></a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <!-- /.container -->
+
+    </div>
+    <!-- /.intro-header -->
+
+    <!-- Page Content -->
+    <a name="how"></a>
+	<div class="content-section-b">
+
+        <div class="container">
+
+            <div class="row">
+              <div class="col-lg-5 col-lg-offset-1 col-sm-push-6  col-sm-6">
+                    <hr class="section-heading-spacer">
+                    <div class="clearfix"></div>
+                <h2 class="section-heading">How it works : </h2> <ul class="fa-ul">
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
+  <p class="lead">Ubuntu 14.04 as the operating system, full root access!</p>
+  </li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">nginx as the frontend Server (optional with SSL Support)</p></li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p>
+  </li></ul>
+              </div>
+                <div class="col-lg-5 col-sm-pull-6  col-sm-6">
+                    <img class="img-responsive" src="{% static 'railshosting/img/how3.png' %}" alt="">
+                </div>
+            </div>
+
+        </div>
+        <!-- /.container -->
+        <!-- /.option 1 -->
+    </div>
+    <a name="your"></a>
+    <div class="content-section-a" id="own">
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-5 col-sm-6">
+                    <hr class="section-heading-spacer">
+                    <div class="clearfix"></div>
+                    <h2 class="section-heading"> Option 1 : Your own infrastructure</h2>
+                    <p class="lead">We configure your own infrastructure for django. Keep the comfort and safety of being at your home, while we set things up for you.</p>
+                </div>
+                <div class="col-lg-5 col-lg-offset-2 col-sm-6">
+                    <img class="img-responsive" src="{% static 'railshosting/img/home.png' %}" alt="">
+                </div>
+            </div>
+
+        </div>
+        <!-- /.container -->
+    </div>
+    <!-- /.option 2 -->
+    <!-- /.content-section-a -->
+    <!-- / pricing -->
+    <a name="our"></a>
+    <div class="content-section-b">
+
+        <div class="container">
+
+            <div class="row">
+                <div class="col-lg-5 col-lg-offset-1 col-sm-push-6  col-sm-6">
+                    <hr class="section-heading-spacer">
+                    <div class="clearfix"></div>
+                    <h2 class="section-heading">Option 2 : Our infrastructure</h2>
+                    <p class="lead">We take care of everything for you! You don't need your infrastructure. We give you everything you need in django hosting. Full root access, 24x7 support.</p>
+                </div>
+                <div class="col-lg-5 col-sm-pull-6  col-sm-6">
+                    <img class="img-responsive" src="{% static 'railshosting/img/dog.png' %}" alt="">
+                </div>
+            </div>
+
+        </div>
+        <!-- /.container -->
+
+    </div>
+    
+    <!-- /.content-section-b -->
+    <a name="price"></a>
+    <div class="content-section-a">
+
+        <div class="container">
+
+            <div class="row">
+                <div class="col-lg-5 col-sm-6">
+                    <hr class="section-heading-spacer">
+                    <div class="clearfix"></div>
+                  <h2 class="section-heading">Hosting Price Samples</h2>
+                    <p class="lead">Here are samples of our django hosting offers, suited for different projects. Our offer examples come in different size, speed, and storage. </p>
+                </div>
+                  <!-- Title -->
+        <div class="row">
+            <div class="col-lg-12"></div>
+        </div>
+        <!-- /.row -->
+
+        <!-- Page Features -->
+        <div class="row text-center">
+
+            <div class="col-md-3 col-sm-6 hero-feature">
+                <div class="thumbnail">
+                    <img class="relsonsive" src="{% static 'railshosting/img/economy.jpg' %}" alt="">
+                    <div class="caption">
+                      <h3>Economy                      </h3>
+                      <p>Suited for smaller applications                      </p>
+                      <p>1 core, </p>
+                      <p>1 GiB RAM, </p>
+                      <p>10 GiB system image (25 CHF)</p>
+                        <p>
+                        <a href="#" class="btn btn-primary">Buy Now!</a> <a href="#" class="btn btn-default">More Info</a> </p>
+                  </div>
+                </div>
+            </div>
+
+            <div class="col-md-3 col-sm-6 hero-feature">
+                <div class="thumbnail">
+                    <img class="relsonsive" src="{% static 'railshosting/img/standardroom.jpg' %}" alt="">
+                    <div class="caption">
+                      <h3>Standard</h3>
+                      <p>Suited for standard Ruby on Rails applications</p>
+                        <p>1 core, </p>
+                        <p>2 GiB RAM,</p>
+                        <p> 10 GiB system image (30 CHF)</p>
+                        <p>
+                            <a href="#" class="btn btn-primary">Buy Now!</a> <a href="#" class="btn btn-default">More Info</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-3 col-sm-6 hero-feature">
+                <div class="thumbnail">
+                    <img class="reponsive" src="{% static 'railshosting/img/deluxeroom.jpg' %}" alt="">
+                    <div class="caption">
+                      <h3>Deluxe</h3>
+                      <p>Suited for performance critical project</p>
+                        <p>2 cores,</p>
+                      <p> 4 GiB Ram, </p>
+                        <p>10 GiB system image (50 CHF)                        </p>
+                        <p>
+                        <a href="#" class="btn btn-primary">Buy Now!</a> <a href="#" class="btn btn-default">More Info</a> </p>
+                  </div>
+                </div>
+            </div>
+
+            <div class="col-md-3 col-sm-6 hero-feature">
+                <div class="thumbnail">
+                    <img class="responsive" src="{% static 'railshosting/img/presidentialroom.jpg' %}" alt="">
+                    <div class="caption">
+                      <h3>Presidential Premium</h3>
+                        <p> Suited for performance critical &amp; </p>
+                      <p>high  storage demand projects</p>
+                        <p>4 Cores, 8 GiB RAM, 10 GiB System image, </p>
+                        <p>100 GiB Data image (190 CHF)</p>
+                        <p>
+                            <a href="#" class="btn btn-primary">Buy Now!</a> <a href="#" class="btn btn-default">More Info</a>
+                        </p>
+                  </div>
+                </div>
+            </div>
+
+        </div>
+        <!-- /.row -->
+            </div>
+
+        </div>
+        <!-- /.container -->
+
+    </div>
+        <!-- Configure -->
+    <a name="about"></a>
+    <div class="intro-header-1">
+        <div class="container">
+
+            <div class="row">
+                <div class="col-lg-12">
+    
+                    <div class="intro-message">
+                        <h1>Let me try!</h1>
+                        <p>&nbsp;</p>
+                        <p>&nbsp;</p>
+    {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+    {{ form.non_field_errors }}
+    {{ form.email.errors }}
+    <form action="{% url 'railshosting:index' %}" method="post" role="form" class="form-inline">
+    {% csrf_token %}
+  <div class="form-group">
+    <label class="sr-only" for="email">Email address</label>
+    <input type="email" name="email" class="form-control" id="id_email" placeholder="Enter email">
+  </div>
+  <button type="submit" class="btn btn-default">Request Beta Access</button>
+</form>
+                        
+                          
+                    </ul>
+                  </div>
+                </div>
+            </div>
+
+        </div>
+        <!-- /.container -->
+
+    </div>
+    <!-- /.content-section-a -->
+      <!-- / contact section -->
+	<a  name="contact"></a>
+    <div class="banner">
+
+        <div class="container">
+
+            <div class="row">
+                <div class="col-lg-6">
+                    <h2>QUESTIONS? </h2>
+                    <h2>CONTACT US!                </h2>
+                    <h3>ungleich GmbH </h3>
+                    <p><i class="fa fa-envelope-o"></i>  info@django-hosting.ch</p>
+                    <p>14 Hauptstrasse Luchsingen 8775</p>
+                    <p>Switzerland</p>
+                     
+                    <button type="button" class="btn btn-default">
+                    <a href="https://twitter.com/ungleich">
+                         <i class="fa fa-twitter fa-fw"></i><span class="network-name">Twitter</span></a>
+                    </button>
+                      <button type="button" class="btn btn-default"> 
+                      <a href="https://github.com/ungleich"><i class="fa fa-github fa-fw"></i><span class="network-name">Github</span></a></button>
+                </div>
+    
+            </div>
+
+        </div>
+        <!-- /.container -->
+
+    </div>
+    <!-- /.banner -->
+
+    <!-- Footer -->
+    <footer>
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-12">
+                    <ul class="list-inline">
+                        <li>
+                            <a href="#">Home</a>
+                        </li>
+                        <li class="footer-menu-divider">&sdot;</li>
+                        <li>
+                            <a href="#about">How it works</a></li>
+                        <li class="footer-menu-divider">&sdot;</li>
+                        <li>
+                            <a href="#about">Your infrastructure</a></li>
+                        <li>&sdot;</li>
+                        <li>
+                            <a href="#about">Our infrastructure</a></li>
+                        <li class="footer-menu-divider">&sdot;</li>
+                        <li>
+                            <a href="#services">Pricing</a>
+                        </li>
+                        <li class="footer-menu-divider">&sdot;</li>
+                        <li>
+                            <a href="#contact">Contact</a>
+                        </li>
+                    </ul>
+                    <p class="copyright text-muted small">Copyright &copy; ungleich GmbH 2015. All Rights Reserved</p>
+                </div>
+            </div>
+        </div>
+    </footer>
+
+    <!-- jQuery -->
+    <script src="{% static 'railshosting/js/jquery.js' %}"></script>
+
+    <!-- Bootstrap Core JavaScript -->
+    <script src="{% static 'railshosting/js/bootstrap.min.js' %}"></script>
+
+</body>
+
+</html>
diff --git a/railshosting/templates/railshosting/nodejs.html b/railshosting/templates/railshosting/nodejs.html
new file mode 100644
index 00000000..50b1a963
--- /dev/null
+++ b/railshosting/templates/railshosting/nodejs.html
@@ -0,0 +1,18 @@
+{% extends "railshosting/base.html" %}
+{% load staticfiles %}
+
+
+{%block customcss %} 
+<link href="{% static "railshosting/css/djangohosting.css" %}" rel="stylesheet">
+
+{%endblock%}
+
+{%block specification %} 
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
+  <p class="lead">Ubuntu 14.04 as the operating system, full root access!</p>
+  </li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">nginx as the frontend Server (optional with SSL Support)</p></li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p>
+  </li>
+{%endblock%}
\ No newline at end of file
diff --git a/railshosting/templates/railshosting/rails.html b/railshosting/templates/railshosting/rails.html
new file mode 100644
index 00000000..6afaec58
--- /dev/null
+++ b/railshosting/templates/railshosting/rails.html
@@ -0,0 +1,16 @@
+{% extends "railshosting/base.html" %}
+{% load staticfiles %}
+
+{%block customcss %} 
+<link href="{% static 'railshosting/css/railshosting.css' %}" rel="stylesheet">
+{%endblock%}
+
+{%block specification %} 
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i>
+  <p class="lead">Ubuntu 14.04 as the operating system, full root access!</p>
+  </li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">nginx as the frontend Server (optional with SSL Support)</p></li>
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">uwsgi to have your application talk to nginx and vice versa
+  <li><i class="fa-li fa fa-check-square-o fa-lg"></i><p class="lead">PostgreSQL as the database</p>
+  </li>
+{%endblock%}
\ No newline at end of file
diff --git a/railshosting/urls.py b/railshosting/urls.py
index 97e91151..3156082d 100644
--- a/railshosting/urls.py
+++ b/railshosting/urls.py
@@ -5,5 +5,7 @@ from . import views
 urlpatterns = [
     url(r'^$', views.index, name='index'),
     url(r'beta$', views.beta, name='beta'),
-    url(r'djangohosting$', views.djangohosting, name='djangohosting'),
+    url(r'djangohosting$', views.djangohosting, name='djangohosting'), 
+    url(r'nodejshosting$', views.nodejshosting, name='nodejshosting'),
+    url(r'railshosting$', views.railshosting, name='railshosting'),
 ]
diff --git a/railshosting/views.py b/railshosting/views.py
index b8e68192..6379149e 100644
--- a/railshosting/views.py
+++ b/railshosting/views.py
@@ -37,7 +37,6 @@ def index(request):
 def hosting(request, context, page):
     email = RailsBetaUser(received_date=datetime.datetime.now())
 
-
     if request.method == 'POST':
         context['form'] = RailsBetaUserForm(request.POST, instance=email)
         if context['form'].is_valid():
@@ -48,13 +47,12 @@ def hosting(request, context, page):
 
             mail_managers(subject, message)
 
-            # send_mail('(Rails-)Hosting request', "email: %s" % email, 'django@ungleich.ch', ['nico.schottelius@ungleich.ch'], fail_silently=False)
             return HttpResponseRedirect(reverse("railshosting:beta"))
         else:
             context['form'] = RailsBetaUserForm()
             context['error_message'] = "a problem"
 
-    page = "railshosting/%s" % page
+    page = "railshosting/%s.html" % page
 
     return render(request, page, context)
 
@@ -62,8 +60,6 @@ def hosting(request, context, page):
 # Hostings
 #
 def djangohosting(request):
-    page = 'django.html'
-
     context = {}
     context["hosting"]="django"
     context["hosting_long"]="Django"
@@ -71,11 +67,9 @@ def djangohosting(request):
     context["google_analytics"]="the right id"
     context["email"]="info@django-hosting.ch"
 
-    return hosting(request, page, context)
+    return hosting(request, context["hosting"], context)
 
 def railshosting(request):
-    page = 'rails.html'
-
     context = {}
     context["hosting"]="rails"
     context["hosting_long"]="Ruby On Rails"
@@ -83,7 +77,19 @@ def railshosting(request):
     context["google_analytics"]="the right id"
     context["email"]="info@rails-hosting.ch"
 
-    return hosting(request, page, context)
+    return hosting(request, context["hosting"], context)
+
+def nodejshosting(request):
+    context = {}
+
+    context["hosting"]="nodejs"
+    context["hosting_long"]="NodeJS"
+    context["domain"]="node-hosting.ch"
+    context["google_analytics"]="the right id"
+    context["email"]="info@node-hosting.ch"
+    
+    return hosting(request, context["hosting"], context)
 
 def beta(request):
     return render(request, 'railshosting/beta.html')
+