diff --git a/Changelog b/Changelog
index 3687dd23..eadfa034 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+1.0.6: 2017-06-06
+    * [datacenterlight] Hotfix, feature/manualorder added
 1.0.5: 2017-06-06
     * [all] General cleanup
     * [datacenterlight] Add German translations
diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo
index 7fcdecb8..53f38e09 100644
Binary files a/datacenterlight/locale/de/LC_MESSAGES/django.mo and b/datacenterlight/locale/de/LC_MESSAGES/django.mo differ
diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index db372410..debe4a7a 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-30 13:47+0000\n"
+"POT-Creation-Date: 2017-06-07 02:09+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: datacenterlight/templates/datacenterlight/beta_access.html:13
+#: templates/datacenterlight/beta_access.html:13
 msgid "Enter name"
 msgstr "Name"
 
-#: datacenterlight/templates/datacenterlight/beta_access.html:17
+#: templates/datacenterlight/beta_access.html:17
 msgid "Enter email"
 msgstr "E-Mail-Adresse"
 
-#: datacenterlight/templates/datacenterlight/beta_access.html:21
-msgid "Request Newsletter"
-msgstr "Newsletter abonnieren"
+#: templates/datacenterlight/beta_access.html:21
+msgid "Request Beta Access"
+msgstr "Beantrage Beta-Zugang"
 
-#: datacenterlight/templates/datacenterlight/beta_success.html:9
+#: templates/datacenterlight/beta_success.html:9
 msgid "Request Sent"
 msgstr "Anfrage verschickt"
 
-#: datacenterlight/templates/datacenterlight/beta_success.html:12
+#: templates/datacenterlight/beta_success.html:12
 msgid ""
 "Thank you for your subscription! You will receive a confirmation mail from "
 "our team"
@@ -42,27 +42,27 @@ msgstr ""
 "Vielen dank für Ihre Anmeldung. Sie erhalten in kürze eine Bestätigungsmail "
 "von unserem Team"
 
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:99
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:99
+#: templates/datacenterlight/emails/request_access_confirmation.html:99
+#: templates/datacenterlight/emails/request_access_confirmation.txt:99
 msgid "Thank you for your request."
 msgstr "Vielen Dank für Ihre Anfrage."
 
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:104
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:104
+#: templates/datacenterlight/emails/request_access_confirmation.html:104
+#: templates/datacenterlight/emails/request_access_confirmation.txt:104
 msgid "You are one step away from being our beta tester!"
 msgstr ""
 "Sie sind nur noch einen Schritt davon entfernt, unser Beta-Tester zu werden!"
 
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:105
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:105
+#: templates/datacenterlight/emails/request_access_confirmation.html:105
+#: templates/datacenterlight/emails/request_access_confirmation.txt:105
 msgid ""
 "Currently we are running our tests to make sure everything runs perfectly."
 msgstr ""
 "Momentan testen wir die Beta-Umgebung um sie für Ihren Gebrauch "
 "sicherzustellen."
 
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:106
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:106
+#: templates/datacenterlight/emails/request_access_confirmation.html:106
+#: templates/datacenterlight/emails/request_access_confirmation.txt:106
 msgid ""
 "In the meantime, we would like to ask you a little patience<br/> until our "
 "team contacts you with beta access."
@@ -70,77 +70,97 @@ msgstr ""
 "Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie "
 "daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld."
 
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:107
-#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:107
+#: templates/datacenterlight/emails/request_access_confirmation.html:107
+#: templates/datacenterlight/emails/request_access_confirmation.txt:107
 msgid "Thank you!"
 msgstr "Vielen Dank!"
 
-#: datacenterlight/templates/datacenterlight/index.html:62
-#: datacenterlight/templates/datacenterlight/index.html:160
-#: datacenterlight/templates/datacenterlight/index.html:346
-#: datacenterlight/templates/datacenterlight/pricing.html:62
-#: datacenterlight/templates/datacenterlight/pricing.html:190
+#: templates/datacenterlight/index.html:62
+#: templates/datacenterlight/index.html:160
+#: templates/datacenterlight/index.html:345
+#: templates/datacenterlight/new-order.html:62
+#: templates/datacenterlight/new-order.html:203
+#: templates/datacenterlight/order.html:62
+#: templates/datacenterlight/order.html:203
+#: templates/datacenterlight/pricing.html:62
+#: templates/datacenterlight/pricing.html:190
+#: templates/datacenterlight/success.html:62
 msgid "What is it"
 msgstr "Was ist es?"
 
-#: datacenterlight/templates/datacenterlight/index.html:65
-#: datacenterlight/templates/datacenterlight/index.html:189
-#: datacenterlight/templates/datacenterlight/index.html:349
-#: datacenterlight/templates/datacenterlight/pricing.html:65
-#: datacenterlight/templates/datacenterlight/pricing.html:193
+#: templates/datacenterlight/index.html:65
+#: templates/datacenterlight/index.html:189
+#: templates/datacenterlight/index.html:348
+#: templates/datacenterlight/new-order.html:65
+#: templates/datacenterlight/new-order.html:206
+#: templates/datacenterlight/order.html:65
+#: templates/datacenterlight/order.html:206
+#: templates/datacenterlight/pricing.html:65
+#: templates/datacenterlight/pricing.html:193
+#: templates/datacenterlight/success.html:65
 msgid "Scale out"
 msgstr "Skalierung"
 
-#: datacenterlight/templates/datacenterlight/index.html:68
-#: datacenterlight/templates/datacenterlight/index.html:215
-#: datacenterlight/templates/datacenterlight/index.html:352
-#: datacenterlight/templates/datacenterlight/pricing.html:68
-#: datacenterlight/templates/datacenterlight/pricing.html:196
+#: templates/datacenterlight/index.html:68
+#: templates/datacenterlight/index.html:215
+#: templates/datacenterlight/index.html:351
+#: templates/datacenterlight/new-order.html:68
+#: templates/datacenterlight/new-order.html:209
+#: templates/datacenterlight/order.html:68
+#: templates/datacenterlight/order.html:209
+#: templates/datacenterlight/pricing.html:68
+#: templates/datacenterlight/pricing.html:196
+#: templates/datacenterlight/success.html:68
 msgid "Reliable and light"
 msgstr "Zuverlässig und leicht"
 
-#: datacenterlight/templates/datacenterlight/index.html:71
+#: templates/datacenterlight/index.html:71
 msgid "Order VM"
 msgstr "VM bestellen"
 
-#: datacenterlight/templates/datacenterlight/index.html:74
-#: datacenterlight/templates/datacenterlight/index.html:359
-#: datacenterlight/templates/datacenterlight/pricing.html:74
-#: datacenterlight/templates/datacenterlight/pricing.html:203
+#: templates/datacenterlight/index.html:74
+#: templates/datacenterlight/index.html:358
+#: templates/datacenterlight/new-order.html:74
+#: templates/datacenterlight/new-order.html:216
+#: templates/datacenterlight/order.html:74
+#: templates/datacenterlight/order.html:216
+#: templates/datacenterlight/pricing.html:74
+#: templates/datacenterlight/pricing.html:203
+#: templates/datacenterlight/success.html:74
 msgid "Contact"
 msgstr "Kontakt"
 
-#: datacenterlight/templates/datacenterlight/index.html:127
+#: templates/datacenterlight/index.html:127
 msgid "Finally, an affordable VM hosting in Switzerland!"
 msgstr "Endlich: bezahlbares VM Hosting in der Schweiz"
 
-#: datacenterlight/templates/datacenterlight/index.html:131
+#: templates/datacenterlight/index.html:131
 msgid "What is it?"
 msgstr "Was ist es?"
 
-#: datacenterlight/templates/datacenterlight/index.html:134
+#: templates/datacenterlight/index.html:134
 msgid "I want it!"
 msgstr "Das will ich haben!"
 
-#: datacenterlight/templates/datacenterlight/index.html:165
+#: templates/datacenterlight/index.html:165
 msgid "Reuse existing factory halls intead of building an expensive building."
 msgstr ""
 "Nachhaltigkeit: Wiederverwendung ehemaliger Fabrikhallen an Stelle der "
 "Errichtung eines neuen Gebäudes"
 
-#: datacenterlight/templates/datacenterlight/index.html:168
+#: templates/datacenterlight/index.html:168
 msgid "Being creative, using modern and alternative design for a datacenter."
 msgstr ""
 "Kreativität: Verwendung eines modernen und alternativen Designs für unser "
 "Datencenter"
 
-#: datacenterlight/templates/datacenterlight/index.html:170
+#: templates/datacenterlight/index.html:170
 msgid "Being open: Using FOSS exclusively, we can save money for licenses."
 msgstr ""
 "Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, "
 "erspart Lizenzgebühren"
 
-#: datacenterlight/templates/datacenterlight/index.html:192
+#: templates/datacenterlight/index.html:192
 msgid ""
 "We don't use special hardware. We use commodity hardware: we buy computers "
 "that you buy. Just many more and put them in a cozy home for computers "
@@ -150,7 +170,7 @@ msgstr ""
 "erschwingliche Systeme. Bei grösserer Auslastung werden mehr Standard "
 "komponenten hinzugekauft und skalieren so das Datencenter."
 
-#: datacenterlight/templates/datacenterlight/index.html:218
+#: templates/datacenterlight/index.html:218
 msgid ""
 "Our VMs are located in Switzerland, with reliable power supply and fast "
 "internet connection. Our VM costs less thanks to our featherlight "
@@ -160,82 +180,99 @@ msgstr ""
 "Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser "
 "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig."
 
-#: datacenterlight/templates/datacenterlight/index.html:236
-#: datacenterlight/templates/datacenterlight/pricing.html:106
+#: templates/datacenterlight/index.html:236
+#: templates/datacenterlight/new-order.html:106
+#: templates/datacenterlight/order.html:106
+#: templates/datacenterlight/pricing.html:106
 msgid "We are cutting down the costs significantly!"
 msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen"
 
-#: datacenterlight/templates/datacenterlight/index.html:237
+#: templates/datacenterlight/index.html:237
 msgid "Affordable VM hosting based in Switzerland"
 msgstr "Bezahlbares VM Hosting in der Schweiz"
 
-#: datacenterlight/templates/datacenterlight/index.html:238
-msgid "More Info"
-msgstr "Weitere Informationen"
-
-#: datacenterlight/templates/datacenterlight/index.html:245
-#: datacenterlight/templates/datacenterlight/pricing.html:119
+#: templates/datacenterlight/index.html:244
+#: templates/datacenterlight/new-order.html:119
+#: templates/datacenterlight/order.html:119
+#: templates/datacenterlight/pricing.html:119
 msgid "VM hosting"
 msgstr "VM Hosting"
 
-#: datacenterlight/templates/datacenterlight/index.html:252
+#: templates/datacenterlight/index.html:251
 msgid "Based in Switzerland"
 msgstr "Standort des Datacenters ist in der Schweiz"
 
-#: datacenterlight/templates/datacenterlight/index.html:261
+#: templates/datacenterlight/index.html:260
 msgid "10 GB Storage (SSD)"
 msgstr "10 GB Storage (SSD)"
 
-#: datacenterlight/templates/datacenterlight/index.html:264
-#: datacenterlight/templates/datacenterlight/pricing.html:161
+#: templates/datacenterlight/index.html:263
+#: templates/datacenterlight/new-order.html:171
+#: templates/datacenterlight/order.html:171
+#: templates/datacenterlight/pricing.html:161
 msgid "Order Now!"
 msgstr "Bestelle jetzt!"
 
-#: datacenterlight/templates/datacenterlight/index.html:280
-msgid "Want to know more? Subscribe to our newsletter!"
-msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
+#: templates/datacenterlight/index.html:279
+msgid "I want to have it!"
+msgstr "Das möchte ich haben!"
 
-#: datacenterlight/templates/datacenterlight/index.html:307
+#: templates/datacenterlight/index.html:306
 msgid "Switzerland "
 msgstr "Schweiz"
 
-#: datacenterlight/templates/datacenterlight/index.html:324
+#: templates/datacenterlight/index.html:323
 msgid "Questions?"
 msgstr "Fragen?"
 
-#: datacenterlight/templates/datacenterlight/index.html:324
+#: templates/datacenterlight/index.html:323
 msgid "Contact us!"
 msgstr "Kontaktiere uns!"
 
-#: datacenterlight/templates/datacenterlight/index.html:342
-#: datacenterlight/templates/datacenterlight/pricing.html:186
+#: templates/datacenterlight/index.html:341
+#: templates/datacenterlight/new-order.html:199
+#: templates/datacenterlight/order.html:199
+#: templates/datacenterlight/pricing.html:186
 msgid "Home"
 msgstr "Home"
 
-#: datacenterlight/templates/datacenterlight/index.html:355
-#: datacenterlight/templates/datacenterlight/pricing.html:199
+#: templates/datacenterlight/index.html:354
+#: templates/datacenterlight/new-order.html:212
+#: templates/datacenterlight/order.html:212
+#: templates/datacenterlight/pricing.html:199
 msgid "Pricing"
 msgstr "Preise"
 
-#: datacenterlight/templates/datacenterlight/pricing.html:71
+#: templates/datacenterlight/new-order.html:71
+#: templates/datacenterlight/order.html:71
+#: templates/datacenterlight/pricing.html:71
+#: templates/datacenterlight/success.html:71
 msgid "Buy VM"
 msgstr "VM Kaufen"
 
-#: datacenterlight/templates/datacenterlight/pricing.html:127
+#: templates/datacenterlight/new-order.html:127
+#: templates/datacenterlight/order.html:127
+#: templates/datacenterlight/pricing.html:127
 msgid "Hosted in Switzerland"
 msgstr "Standort des Datacenters ist in der Schweiz"
 
-#: datacenterlight/templates/datacenterlight/pricing.html:144
+#: templates/datacenterlight/new-order.html:144
+#: templates/datacenterlight/order.html:144
+#: templates/datacenterlight/pricing.html:144
 msgid "GB Storage (SSD)"
 msgstr "GB Storage (SSD)"
 
-#: datacenterlight/templates/datacenterlight/pricing.html:168
+#: templates/datacenterlight/new-order.html:181
+#: templates/datacenterlight/order.html:181
+#: templates/datacenterlight/pricing.html:168
 msgid "Simple and affordable: Try our virtual machine with featherlight price."
 msgstr ""
 "Simpel und bezahlbar: Testen Sie unsere virtuelen Machinen mit  "
 "federleichten Preisen"
 
-#: datacenterlight/templates/datacenterlight/pricing.html:171
+#: templates/datacenterlight/new-order.html:184
+#: templates/datacenterlight/order.html:184
+#: templates/datacenterlight/pricing.html:171
 msgid ""
 "Our VMs are hosted in Glarus, Switzerland, and our website is currently "
 "running in BETA mode. If you want more information that you did not find on "
@@ -251,9 +288,28 @@ msgstr ""
 "uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein "
 "Anliegen kümmern!"
 
+#: templates/datacenterlight/success.html:101
+msgid "Thank you for order! Our team will contact you via email"
+msgstr ""
+"Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit "
+"Ihnen via E-Mail in Verbindung."
+
+#: templates/datacenterlight/success.html:103
+msgid "as soon as possible!"
+msgstr ""
+
+#~ msgid "Request Newsletter"
+#~ msgstr "Newsletter abonnieren"
+
 #~ msgid "How it works"
 #~ msgstr "Wie es funktioniert"
 
+#~ msgid "More Info"
+#~ msgstr "Weitere Informationen"
+
+#~ msgid "Want to know more? Subscribe to our newsletter!"
+#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
+
 #~ msgid "Our VMs are hosted in Glarus, Switzerland."
 #~ msgstr "Standort des Datacenters ist in der Schweiz"
 
@@ -266,18 +322,9 @@ msgstr ""
 #~ "davon nichts mitbekommen, falls doch melden Sie sich bitte via "
 #~ "support@datacenterlight.ch"
 
-#~ msgid "Request Beta Access"
-#~ msgstr "Beantrage Beta-Zugang"
-
-#~ msgid "Thank you, we will contact you as soon as possible"
-#~ msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren."
-
 #~ msgid "Buy Now!"
 #~ msgstr "Kaufe jetzt!"
 
-#~ msgid "I want to try!"
-#~ msgstr "Das möchte ich haben"
-
 #~ msgid "Email address"
 #~ msgstr "E-Mail Adresse"
 
diff --git a/datacenterlight/templates/datacenterlight/emails/new_order_notification.html b/datacenterlight/templates/datacenterlight/emails/new_order_notification.html
new file mode 100644
index 00000000..5f14c983
--- /dev/null
+++ b/datacenterlight/templates/datacenterlight/emails/new_order_notification.html
@@ -0,0 +1,137 @@
+{% load static from staticfiles %}
+<!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Oxygen Invoice</title>
+</head>
+<body bgcolor="#ffffff" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; color: white; margin: 0;">
+<style type="text/css">
+@media only screen and (max-width: 480px) {
+  table[class*="container-for-gmail-android"] {
+    min-width: 290px !important; width: 100% !important;
+  }
+  img[class="force-width-gmail"] {
+    display: none !important; width: 0 !important; height: 0 !important;
+  }
+  table[class="w320"] {
+    width: 320px !important;
+  }
+  td[class*="mobile-header-padding-left"] {
+    width: 160px !important; padding-left: 0 !important;
+  }
+  td[class*="mobile-header-padding-right"] {
+    width: 160px !important; padding-right: 0 !important;
+  }
+  td[class="header-lg"] {
+    font-size: 24px !important; padding-bottom: 5px !important;
+  }
+  td[class="content-padding"] {
+    padding: 5px 0 5px !important;
+  }
+  td[class="button"] {
+    padding: 5px 5px 30px !important;
+  }
+  td[class*="free-text"] {
+    padding: 10px 18px 30px !important;
+  }
+  td[class~="mobile-hide-img"] {
+    display: none !important; height: 0 !important; width: 0 !important; line-height: 0 !important;
+  }
+  td[class~="item"] {
+    width: 140px !important; vertical-align: top !important;
+  }
+  td[class~="quantity"] {
+    width: 50px !important;
+  }
+  td[class~="price"] {
+    width: 90px !important;
+  }
+  td[class="item-table"] {
+    padding: 30px 20px !important;
+  }
+  td[class="mini-container-left"] {
+    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
+  }
+  td[class="mini-container-right"] {
+    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
+  }
+}
+</style>
+<table align="center" cellpadding="0" cellspacing="0" class="container-for-gmail-android" width="100%" style="border-collapse: collapse !important; min-width: 600px; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td align="left" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff url(http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg) repeat-x;" bgcolor="#ffffff">
+      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+      <table cellspacing="0" cellpadding="0" width="100%" bgcolor="#ffffff" background="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; background: transparent;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td width="100%" height="80" valign="top" style="text-align: center; vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; line-height: 21px; background-color: #ffffff" align="center">
+            <!--[if gte mso 9]>
+            <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="mso-width-percent:1000;height:80px; v-text-anchor:middle;">
+              <v:fill type="tile" src="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" color="#ffffff" />
+              <v:textbox inset="0,0,0,0">
+            <![endif]-->
+              <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+                <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
+                      <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
+                    </td>
+                    <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
+                    </td>
+                  </tr></table>
+</center>
+              <!--[if gte mso 9]>
+              </v:textbox>
+            </v:rect>
+            <![endif]-->
+            </td>
+          </tr></table>
+</center>
+    </td>
+  </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td align="center" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff; padding: 20px 0 5px;" class="content-padding" bgcolor="#f7f7f7">
+      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+        <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
+              We have received a new order.
+            </td>
+          </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
+             <p>
+                <h4>User details</h4>
+                Name: {{name}} <br/>
+                Email: {{email}} <br/>
+                
+                <h4>VM details</h4>
+                Cores: {{cores}} <br/>
+                Memory: {{memory}} <br/>
+                Storage: {{storage}} <br/>
+                Price: {{price}} <br/>
+                Template: {{template}} <br/>
+             
+             </p></td>
+          </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="button" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; padding: 0;" align="center">&nbsp;</td>
+          </tr>
+</table>
+</center>
+    </td>
+  </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
+      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+        <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+</td>
+          </tr></table>
+</center>
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+
diff --git a/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt b/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt
new file mode 100644
index 00000000..5f14c983
--- /dev/null
+++ b/datacenterlight/templates/datacenterlight/emails/new_order_notification.txt
@@ -0,0 +1,137 @@
+{% load static from staticfiles %}
+<!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Oxygen Invoice</title>
+</head>
+<body bgcolor="#ffffff" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; color: white; margin: 0;">
+<style type="text/css">
+@media only screen and (max-width: 480px) {
+  table[class*="container-for-gmail-android"] {
+    min-width: 290px !important; width: 100% !important;
+  }
+  img[class="force-width-gmail"] {
+    display: none !important; width: 0 !important; height: 0 !important;
+  }
+  table[class="w320"] {
+    width: 320px !important;
+  }
+  td[class*="mobile-header-padding-left"] {
+    width: 160px !important; padding-left: 0 !important;
+  }
+  td[class*="mobile-header-padding-right"] {
+    width: 160px !important; padding-right: 0 !important;
+  }
+  td[class="header-lg"] {
+    font-size: 24px !important; padding-bottom: 5px !important;
+  }
+  td[class="content-padding"] {
+    padding: 5px 0 5px !important;
+  }
+  td[class="button"] {
+    padding: 5px 5px 30px !important;
+  }
+  td[class*="free-text"] {
+    padding: 10px 18px 30px !important;
+  }
+  td[class~="mobile-hide-img"] {
+    display: none !important; height: 0 !important; width: 0 !important; line-height: 0 !important;
+  }
+  td[class~="item"] {
+    width: 140px !important; vertical-align: top !important;
+  }
+  td[class~="quantity"] {
+    width: 50px !important;
+  }
+  td[class~="price"] {
+    width: 90px !important;
+  }
+  td[class="item-table"] {
+    padding: 30px 20px !important;
+  }
+  td[class="mini-container-left"] {
+    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
+  }
+  td[class="mini-container-right"] {
+    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
+  }
+}
+</style>
+<table align="center" cellpadding="0" cellspacing="0" class="container-for-gmail-android" width="100%" style="border-collapse: collapse !important; min-width: 600px; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td align="left" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff url(http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg) repeat-x;" bgcolor="#ffffff">
+      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+      <table cellspacing="0" cellpadding="0" width="100%" bgcolor="#ffffff" background="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; background: transparent;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td width="100%" height="80" valign="top" style="text-align: center; vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; line-height: 21px; background-color: #ffffff" align="center">
+            <!--[if gte mso 9]>
+            <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="mso-width-percent:1000;height:80px; v-text-anchor:middle;">
+              <v:fill type="tile" src="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" color="#ffffff" />
+              <v:textbox inset="0,0,0,0">
+            <![endif]-->
+              <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+                <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
+                      <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
+                    </td>
+                    <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
+                    </td>
+                  </tr></table>
+</center>
+              <!--[if gte mso 9]>
+              </v:textbox>
+            </v:rect>
+            <![endif]-->
+            </td>
+          </tr></table>
+</center>
+    </td>
+  </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td align="center" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff; padding: 20px 0 5px;" class="content-padding" bgcolor="#f7f7f7">
+      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+        <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
+              We have received a new order.
+            </td>
+          </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
+             <p>
+                <h4>User details</h4>
+                Name: {{name}} <br/>
+                Email: {{email}} <br/>
+                
+                <h4>VM details</h4>
+                Cores: {{cores}} <br/>
+                Memory: {{memory}} <br/>
+                Storage: {{storage}} <br/>
+                Price: {{price}} <br/>
+                Template: {{template}} <br/>
+             
+             </p></td>
+          </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td class="button" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; padding: 0;" align="center">&nbsp;</td>
+          </tr>
+</table>
+</center>
+    </td>
+  </tr>
+<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
+      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+        <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+</td>
+          </tr></table>
+</center>
+    </td>
+  </tr>
+</table>
+</body>
+</html>
+
diff --git a/datacenterlight/templates/datacenterlight/success.html b/datacenterlight/templates/datacenterlight/success.html
new file mode 100644
index 00000000..44cb619b
--- /dev/null
+++ b/datacenterlight/templates/datacenterlight/success.html
@@ -0,0 +1,134 @@
+{% load staticfiles i18n%}
+{% get_current_language as LANGUAGE_CODE %}
+<!DOCTYPE html>
+<html lang="{{LANGUAGE_CODE}}">
+
+<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>datacenterlight.ch - Featherlight Swiss VM</title>
+
+    <!-- Bootstrap Core CSS -->
+    <link href="{% static 'datacenterlight/css/bootstrap.min.css' %}" rel="stylesheet">
+
+
+    
+
+    <!-- Custom Fonts -->
+    <!--Import Google Icon Font-->
+     <link href="//fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="{% static 'datacenterlight/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
+    <link href="//fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
+    <link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon" />
+    <link href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.min.css" rel="stylesheet">
+
+    <!-- Custom CSS -->
+    <link href="{% static 'datacenterlight/css/landing-page.css' %}" rel="stylesheet">
+
+    <!-- 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]-->
+
+</head>
+
+<body>
+
+    <!-- Navigation -->
+    <nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
+        <div class="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 id="logoBlack" class="navbar-brand topnav url" href="{% url 'datacenterlight:index' %}" ><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
+                <a id="logoWhite" class="navbar-brand topnav url" href="{% url 'datacenterlight:index' %}" ><img src="{% static 'datacenterlight/img/logo_white.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 class="url" href="javascript:void(0)" data-url="#how" >{% trans "What is it" %}</a>
+                    </li>
+                    <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 "Buy VM" %}</a>
+                    </li>
+                    <li>
+                        <a class="url" href="javascript:void(0)" data-url="#contact"  >{% trans "Contact" %}</a>
+                     </li> -->
+
+                    <select class="selectpicker" data-width="fit" onchange="location = this.value;" style="margin-top:10px;">
+                        {% if LANGUAGE_CODE == 'en-us'%} 
+                            <option selected="selected" value="{{base_url}}/en-us/datacenterlight/order-success/">English</option>
+                        {% else %}
+                            <option value="{{base_url}}/en-us/datacenterlight/order-success/">English</option>
+                        {% endif %}
+                        {% if LANGUAGE_CODE == 'de'%} 
+                            <option selected="selected" value="{{base_url}}/de/datacenterlight/order-success/">Deutsch</option>
+                        {% else %}
+                            <option value="{{base_url}}/de/datacenterlight/order-success/">Deutsch</option>
+                        {% endif %}         
+                        
+                      </select> 
+                </ul>
+
+
+            </div>
+            <!-- /.navbar-collapse -->
+        </div>
+        <!-- /.container -->
+    </nav>
+	<div class="intro-pricing success-pricing">
+
+		<div class="intro-message">
+			<h2 class="section-heading">{% trans "Thank you for order! Our team will contact you via email" %}</h2>
+			{% if LANGUAGE_CODE == 'en-us'%} 
+			<h2 class="section-heading">{% trans "as soon as possible!" %}</h2>
+			{% endif %} 
+		</div>
+		
+	</div>
+    <script src="{% static 'datacenterlight/js/jquery.js' %}"></script>
+
+<script type="text/javascript">
+      window.onload=function(){
+        $('.selectpicker').selectpicker({
+             style: 'btn-link',
+             windowPadding: 10,
+        });
+
+        var hash = window.location.hash.substr(1);
+        console.log(hash);
+        if (hash == 'requestform'){
+            $('#reques-success-message').modal('show');
+        }
+
+       };
+</script>
+
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
+
+    <!-- Bootstrap Core JavaScript -->
+    <script src="{% static 'datacenterlight/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'datacenterlight/js/main.js' %}"></script>
+
+</body>
+
+</html>
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 19591339..d7b6a3e5 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -41,6 +41,7 @@ class PricingView(TemplateView):
 
         return render(request, self.template_name, context)
 
+
     def post(self, request):
 
         cores = request.POST.get('cpu')
@@ -58,7 +59,7 @@ class PricingView(TemplateView):
         if not request.user.is_authenticated():
             request.session['next'] = reverse('hosting:payment')
 
-        request.session['specs'] = {
+        request.session['specs'] = { 
             'cpu':cores,
             'memory': memory,
             'disk_size': storage,
@@ -283,5 +284,3 @@ class IndexView(CreateView):
 
         messages.add_message(self.request, messages.SUCCESS, self.success_message)
         return super(IndexView, self).form_valid(form)
-
-