diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index 7a882236..2fcddd51 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -72,13 +72,15 @@
                     </div>
                     <br/>
                     <form method="post">
-                    {% csrf_token %}
-                    <div class="col-md-8 col-xs-7 pull-left tbl-no-padding">
-                        <p class="dcl-place-order-text">{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.</p>
-                    </div>
-                    <div class="col-md-4 col-xs-5 content tbl-no-padding">
-                        <a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a>
-                    </div>
+                        {% csrf_token %}
+                        <div class="row">
+                            <div class="col-sm-8">
+                                <p class="dcl-place-order-text">{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.</p>
+                            </div>
+                            <div class="col-sm-4 content">
+                                <a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a>
+                            </div>
+                        </div>
                     </form>
                 </div>
             </div>
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index d510b2ca..fac8cc5a 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/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-08-31 18:00+0530\n"
+"POT-Creation-Date: 2017-08-31 23:46+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,436 +18,290 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\hosting\forms.py:29
 msgid "Your username and/or password were incorrect."
 msgstr "Dein Benutzername und/oder Dein Passwort ist falsch."
 
-#: .\hosting\forms.py:32
 msgid "Your account is not activated yet."
 msgstr "Dein Account wurde noch nicht aktiviert."
 
-#: .\hosting\forms.py:68
 msgid "Paste here your public key"
 msgstr "Füge deinen Public Key ein"
 
-#: .\hosting\forms.py:74
 msgid "Give a name to your key"
 msgstr "Gebe deinem SSH-Key einen Name"
 
-#: .\hosting\forms.py:79
 msgid "Key name"
 msgstr "Key-Name"
 
-#: .\hosting\templates\hosting\base_short.html:75
 msgid "My Virtual Machines"
 msgstr "Meine virtuellen Maschinen"
 
-#: .\hosting\templates\hosting\base_short.html:80
-#: .\hosting\templates\hosting\orders.html:8
 msgid "My Orders"
 msgstr "Meine Bestellungen"
 
-#: .\hosting\templates\hosting\base_short.html:89
 msgid "SSH Keys"
 msgstr "SSH Key"
 
-#: .\hosting\templates\hosting\base_short.html:94
 msgid "Notifications "
 msgstr "Benachrichtigungen"
 
-#: .\hosting\templates\hosting\base_short.html:97
 msgid "Logout"
 msgstr "Abmelden"
 
-#: .\hosting\templates\hosting\base_short.html:119
-#: .\hosting\templates\hosting\includes\_footer.html:29
 msgid "All Rights Reserved"
 msgstr "Alle Rechte vorbehalten"
 
-#: .\hosting\templates\hosting\bill_detail.html:11 .\hosting\views.py:687
 msgid "Invoice"
 msgstr "Rechnung"
 
-#: .\hosting\templates\hosting\bill_detail.html:11
-#: .\hosting\templates\hosting\order_detail.html:23
 msgid "Order #"
 msgstr "Bestellung #"
 
-#: .\hosting\templates\hosting\bill_detail.html:25
 msgid "ungleich GmbH"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:26
 msgid "buchhaltung@ungleich.ch"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:27
 msgid "Hauptstrasse 14"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:28
 msgid "CH-8775 Luchsingen"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:29
 msgid "Mwst-Nummer: CHE-109.549.333 MWST"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:60
 msgid "Total:"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:68
 #, python-format
 msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
 msgstr "All prices in CHF including 8%% VAT"
 
-#: .\hosting\templates\hosting\bill_detail.html:69
 msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang."
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:70
 msgid "Kontoverbindung:"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:73
 msgid "IBAN:"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:76
 msgid "BIC:"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:81
 msgid "CH02 0900 0000 6071 8848 8"
 msgstr ""
 
-#: .\hosting\templates\hosting\bill_detail.html:84
 msgid "POFICHBEXXX"
 msgstr ""
 
-#: .\hosting\templates\hosting\bills.html:12
 msgid "Customers"
 msgstr "Kunden"
 
-#: .\hosting\templates\hosting\bills.html:16
-#: .\hosting\templates\hosting\user_keys.html:25
 msgid "Name"
 msgstr ""
 
-#: .\hosting\templates\hosting\bills.html:17
 msgid "Email"
 msgstr ""
 
-#: .\hosting\templates\hosting\bills.html:28
 msgid "View Bill"
 msgstr "Rechnung anzeigen"
 
-#: .\hosting\templates\hosting\bills.html:41
-#: .\hosting\templates\hosting\orders.html:54
-#: .\hosting\templates\hosting\virtual_machines.html:65
 msgid "previous"
 msgstr "vorherige"
 
-#: .\hosting\templates\hosting\bills.html:47
-#: .\hosting\templates\hosting\orders.html:60
-#: .\hosting\templates\hosting\virtual_machines.html:71
 msgid "next"
 msgstr "nächste"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:8
 msgid "SSH Key"
 msgstr "SSH Key"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:9
 msgid "Choose a key option in order to access your VM"
 msgstr "Wähle eine Option um Zugriff auf deine VM zu erhalten"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:20
 msgid "Generating a new key pair"
 msgstr "Neuen SSH-Key erstellen"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:21
 msgid "I want to generate a new key pair"
 msgstr "Ich möchte einen neuen SSH-Key erstellen"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:25
-#: .\hosting\templates\hosting\user_key.html:36
 msgid "Generate"
 msgstr "Generieren"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:31
 msgid "Using existing key"
 msgstr "Nutzung eines existierenden SSH-Keys"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:32
 msgid "I want to use my existing public key"
 msgstr "Ich möchte einen existierenden SSH-Key nutzen"
 
-#: .\hosting\templates\hosting\choice_ssh_keys.html:35
 msgid "Upload"
 msgstr "Hochladen"
 
-#: .\hosting\templates\hosting\confirm_reset_password.html:14
-#: .\hosting\templates\hosting\login.html:14
-#: .\hosting\templates\hosting\reset_password.html:15
-#: .\hosting\templates\hosting\signup.html:13
-#: .\hosting\templates\hosting\signup_validate.html:9
 msgid "Your VM hosted in Switzerland"
 msgstr "deine VM in der Schweiz"
 
-#: .\hosting\templates\hosting\confirm_reset_password.html:18
 msgid "Set your new password"
 msgstr "Setze dein neues Passwort"
 
-#: .\hosting\templates\hosting\confirm_reset_password.html:33
-#: .\hosting\templates\hosting\reset_password.html:27
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: .\hosting\templates\hosting\confirm_reset_password.html:39
-#: .\hosting\templates\hosting\reset_password.html:33
-#: .\hosting\templates\hosting\signup.html:31
 msgid "Already have an account ?"
 msgstr "Hast Du bereits ein Benutzerkonto?"
 
-#: .\hosting\templates\hosting\confirm_reset_password.html:42
-#: .\hosting\templates\hosting\login.html:18
-#: .\hosting\templates\hosting\login.html:34
-#: .\hosting\templates\hosting\reset_password.html:36
-#: .\hosting\templates\hosting\signup.html:34
 msgid "Login"
 msgstr "Anmelden"
 
-#: .\hosting\templates\hosting\create_virtual_machine.html:20
 msgid "New Virtual Machine"
 msgstr "Neue virtuelle Maschine"
 
-#: .\hosting\templates\hosting\create_virtual_machine.html:28
 msgid "Step 1. Select VM Template:"
 msgstr "Wähle eine Vorlage"
 
-#: .\hosting\templates\hosting\create_virtual_machine.html:42
 msgid "Step2. Select VM Configuration"
 msgstr "Wähle eine Konfiguration"
 
-#: .\hosting\templates\hosting\create_virtual_machine.html:59
 msgid "Price "
 msgstr "Preis"
 
-#: .\hosting\templates\hosting\create_virtual_machine.html:59
 msgid "CHF/Month"
 msgstr "CHF/Monat"
 
-#: .\hosting\templates\hosting\create_virtual_machine.html:61
 msgid "Start VM"
 msgstr "VM jetzt starten"
 
-#: .\hosting\templates\hosting\dashboard.html:8
 msgid "My Dashboard"
 msgstr "Mein Dashboard"
 
-#: .\hosting\templates\hosting\dashboard.html:12
 msgid "Create VM"
 msgstr "VM erstellen"
 
-#: .\hosting\templates\hosting\dashboard.html:18
 msgid "My VMs"
 msgstr "Meine VMs"
 
-#: .\hosting\templates\hosting\dashboard.html:24
-#: .\hosting\templates\hosting\user_keys.html:6
 msgid "My SSH Keys"
 msgstr "Meine SSH Keys"
 
-#: .\hosting\templates\hosting\dashboard.html:30
 msgid "My Bills"
 msgstr "Meine Rechnungen"
 
-#: .\hosting\templates\hosting\dashboard.html:36
 msgid "My Settings"
 msgstr "Meine Einstellungen"
 
-#: .\hosting\templates\hosting\dashboard.html:42
-#: .\hosting\templates\hosting\virtual_machine_detail.html:74
 msgid "Support / Contact"
 msgstr "Support / Kontakt"
 
-#: .\hosting\templates\hosting\emails\password_reset_email.html:2
-#: .\hosting\templates\hosting\emails\password_reset_email.txt:2
 #, python-format
 msgid ""
 "You're receiving this email because you requested a password reset for your "
 "user account at %(site_name)s."
 msgstr ""
 
-#: .\hosting\templates\hosting\emails\password_reset_email.html:4
-#: .\hosting\templates\hosting\emails\password_reset_email.txt:4
 msgid "Please go to the following page and choose a new password:"
 msgstr ""
 
-#: .\hosting\templates\hosting\emails\password_reset_email.html:9
-#: .\hosting\templates\hosting\emails\password_reset_email.txt:9
 msgid "Thanks for using our site!"
 msgstr ""
 
-#: .\hosting\templates\hosting\emails\password_reset_email.html:11
-#: .\hosting\templates\hosting\emails\password_reset_email.txt:11
 #, python-format
 msgid "The %(site_name)s team"
 msgstr ""
 
-#: .\hosting\templates\hosting\login.html:41
 msgid "Don't have an account yet ? "
 msgstr "Besitzt du kein Benutzerkonto?"
 
-#: .\hosting\templates\hosting\login.html:44
-#: .\hosting\templates\hosting\signup.html:17
-#: .\hosting\templates\hosting\signup.html:25 .\hosting\views.py:238
 msgid "Sign up"
 msgstr "Registrieren"
 
-#: .\hosting\templates\hosting\login.html:46
 msgid "Forgot your password ? "
 msgstr "Passwort vergessen?"
 
-#: .\hosting\templates\hosting\notifications.html:9
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: .\hosting\templates\hosting\notifications.html:16
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: .\hosting\templates\hosting\notifications.html:26
 msgid "All"
 msgstr "Alle"
 
-#: .\hosting\templates\hosting\notifications.html:38
 msgid "Unread notifications"
 msgstr "Ungelesene Benachrichtigungen"
 
-#: .\hosting\templates\hosting\notifications.html:48
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: .\hosting\templates\hosting\notifications.html:59
 msgid "All notifications"
 msgstr "Alle Benachrichtigungen"
 
-#: .\hosting\templates\hosting\order_detail.html:29
-#: .\hosting\templates\hosting\orders.html:23
-#: .\hosting\templates\hosting\orders.html:33
 msgid "Date"
 msgstr "Datum"
 
-#: .\hosting\templates\hosting\order_detail.html:31
 msgid "Status:"
 msgstr ""
 
-#: .\hosting\templates\hosting\order_detail.html:41
 msgid "Billed To:"
 msgstr "Rechnungsadresse"
 
-#: .\hosting\templates\hosting\order_detail.html:52
 msgid "Payment Method:"
 msgstr "Bezahlmethode"
 
-#: .\hosting\templates\hosting\order_detail.html:63
 msgid "Order summary"
 msgstr "Bestellungsübersicht"
 
-#: .\hosting\templates\hosting\order_detail.html:66
-#: .\hosting\templates\hosting\payment.html:13
-#: .\hosting\templates\hosting\virtual_machine_detail.html:38
 msgid "Cores"
 msgstr "Prozessorkerne"
 
-#: .\hosting\templates\hosting\order_detail.html:68
-#: .\hosting\templates\hosting\payment.html:16
-#: .\hosting\templates\hosting\virtual_machine_detail.html:39
 msgid "Memory"
 msgstr "Arbeitsspeicher"
 
-#: .\hosting\templates\hosting\order_detail.html:70
-#: .\hosting\templates\hosting\payment.html:19
 msgid "Disk space"
 msgstr "Festplattenkapazität"
 
-#: .\hosting\templates\hosting\order_detail.html:72
-#: .\hosting\templates\hosting\payment.html:41
 msgid "Total"
 msgstr "Gesamt"
 
-#: .\hosting\templates\hosting\order_detail.html:78
 msgid "Finish Configuration"
 msgstr "Konfiguration beenden"
 
-#: .\hosting\templates\hosting\orders.html:22
-#: .\hosting\templates\hosting\orders.html:32
 msgid "Order Nr."
 msgstr "Bestellung Nr."
 
-#: .\hosting\templates\hosting\orders.html:24
-#: .\hosting\templates\hosting\orders.html:34
 msgid "Amount"
 msgstr "Betrag"
 
-#: .\hosting\templates\hosting\orders.html:25
-#: .\hosting\templates\hosting\orders.html:35
-#: .\hosting\templates\hosting\virtual_machine_detail.html:53
-#: .\hosting\templates\hosting\virtual_machines.html:31
-#: .\hosting\templates\hosting\virtual_machines.html:43
 msgid "Status"
 msgstr ""
 
-#: .\hosting\templates\hosting\orders.html:43
-#: .\hosting\templates\hosting\virtual_machine_detail.html:49
 msgid "See Invoice"
 msgstr "Rechnung"
 
-#: .\hosting\templates\hosting\orders.html:43
-#: .\hosting\templates\hosting\virtual_machines.html:53
-msgid "View Detail"
-msgstr "Details anzeigen"
-
-#: .\hosting\templates\hosting\orders.html:57
-#: .\hosting\templates\hosting\virtual_machines.html:68
 msgid "Page"
 msgstr ""
 
-#: .\hosting\templates\hosting\orders.html:57
-#: .\hosting\templates\hosting\virtual_machines.html:68
 msgid "of"
 msgstr ""
 
-#: .\hosting\templates\hosting\payment.html:10
 msgid "Your Order"
 msgstr "Deine Bestellung"
 
-#: .\hosting\templates\hosting\payment.html:22
-#: .\hosting\templates\hosting\virtual_machine_detail.html:41
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: .\hosting\templates\hosting\payment.html:41
 msgid "including VAT"
 msgstr "inkl. Mehrwertsteuer"
 
-#: .\hosting\templates\hosting\payment.html:46
-#: .\hosting\templates\hosting\virtual_machine_detail.html:48
 msgid "Month"
 msgstr "Monat"
 
-#: .\hosting\templates\hosting\payment.html:55
 msgid "Billing Address"
 msgstr "Rechnungsadresse"
 
-#: .\hosting\templates\hosting\payment.html:65
 msgid "Credit Card"
 msgstr "Kreditkarte"
 
-#: .\hosting\templates\hosting\payment.html:70
 msgid ""
 "\n"
 "                                Please fill in your credit card information "
@@ -462,8 +316,6 @@ msgstr ""
 "\"https://stripe.com\" target=\"_blank\">Stripe</a> für die Bezahlung und "
 "speichern keine Informationen in unserer Datenbank."
 
-#: .\hosting\templates\hosting\payment.html:90
-#: .\hosting\templates\hosting\payment.html:147
 msgid ""
 "You are not making any payment yet. After submitting your card information, "
 "you will be taken to the Confirm Order Page."
@@ -471,200 +323,152 @@ msgstr ""
 "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
 "nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
 
-#: .\hosting\templates\hosting\payment.html:112
-#: .\hosting\templates\hosting\payment.html:168
 msgid "Submit"
 msgstr "Absenden"
 
-#: .\hosting\templates\hosting\payment.html:124
 msgid "Card Number"
 msgstr "Kreditkartennummer"
 
-#: .\hosting\templates\hosting\payment.html:128
 msgid "Expiry Date"
 msgstr "Ablaufdatum"
 
-#: .\hosting\templates\hosting\payment.html:133
 msgid "CVC"
 msgstr ""
 
-#: .\hosting\templates\hosting\payment.html:137
 msgid "Card Type"
 msgstr "Kartentyp"
 
-#: .\hosting\templates\hosting\payment.html:194
 msgid "Processing"
 msgstr "Weiter"
 
-#: .\hosting\templates\hosting\payment.html:195
 msgid "Enter your credit card number"
 msgstr "Deine Kreditkartennummer"
 
-#: .\hosting\templates\hosting\reset_password.html:19
 msgid "Reset your password"
 msgstr "Passwort zurücksetzen"
 
-#: .\hosting\templates\hosting\user_key.html:11
 msgid "Add your public SSH key"
 msgstr "Füge deinen öffentlichen SSH-Key hinzu"
 
-#: .\hosting\templates\hosting\user_key.html:25
 msgid "Use your created key to access to the VM"
 msgstr "Benutze deinen erstellten SSH-Key um auf deine VM zugreifen zu können"
 
-#: .\hosting\templates\hosting\user_key.html:28
-#: .\hosting\templates\hosting\user_keys.html:17
 msgid "Add SSH Key"
 msgstr "Hinzufügen"
 
-#: .\hosting\templates\hosting\user_key.html:33
 msgid "Or you can generate a new key pair"
 msgstr "Erstelle dein neues Keypaar"
 
-#: .\hosting\templates\hosting\user_key.html:45
 msgid "Warning!"
 msgstr "Achtung!"
 
-#: .\hosting\templates\hosting\user_key.html:45
 msgid "You can download your SSH  private key once. Don't loose your key"
 msgstr ""
 "Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn "
 "sicher auf."
 
-#: .\hosting\templates\hosting\user_keys.html:15
 msgid ""
 "To generate a new key pair or to upload your existing key, click 'Add Key'"
 msgstr ""
 "Um einen neuen SSH-Key zu erstellen oder um einen vorhandenen SSH-Key "
 "hinzuzufügen, klicke auf 'Hinzufügen'"
 
-#: .\hosting\templates\hosting\user_keys.html:26
 msgid "Delete Key"
 msgstr "Löschen"
 
-#: .\hosting\templates\hosting\user_keys.html:27
 msgid "Public Key"
 msgstr ""
 
-#: .\hosting\templates\hosting\user_keys.html:28
 msgid "Private Key"
 msgstr ""
 
-#: .\hosting\templates\hosting\user_keys.html:38
-#: .\hosting\templates\hosting\user_keys.html:57
 msgid "Delete"
 msgstr "Löschen"
 
-#: .\hosting\templates\hosting\user_keys.html:52
 msgid "Delete SSH Key"
 msgstr "SSH Key löschen"
 
-#: .\hosting\templates\hosting\user_keys.html:53
 msgid "Do you want to delete this key?"
 msgstr "Möchtest Du den Schlüssel löschen?"
 
-#: .\hosting\templates\hosting\user_keys.html:68
 msgid "Show"
 msgstr "Anzeigen"
 
-#: .\hosting\templates\hosting\user_keys.html:80
 msgid "Public SSH Key"
 msgstr "Public SSH Key"
 
-#: .\hosting\templates\hosting\user_keys.html:95
 msgid "Download"
 msgstr ""
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:14
 msgid "Your Virtual Machine Detail"
 msgstr "Virtuelle Maschinen Detail"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:17
 msgid "VM Settings"
 msgstr "VM Einstellungen"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:24
-#: .\hosting\templates\hosting\virtual_machine_detail.html:31
 msgid "Copied"
 msgstr "Kopiert"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:40
 msgid "Disk"
 msgstr "Festplatte"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:45
 msgid "Billing"
 msgstr "Abrechnungen"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:47
 msgid "Current Pricing"
 msgstr "Aktueller Preis"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:55
 msgid "Your VM is"
 msgstr "Deine VM ist"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:57
 msgid "Pending"
 msgstr "In Vorbereitung"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:59
 msgid "Online"
 msgstr ""
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:61
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:67
 msgid "Terminate VM"
 msgstr "VM Beenden"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:79
 msgid "Something doesn't work?"
 msgstr "Etwas funktioniert nicht?"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:79
 msgid "We are here to help you!"
 msgstr "Wir sind hier, um Dir zu helfen!"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:83
 msgid "CONTACT"
 msgstr "KONTACT"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:87
 msgid "BACK TO LIST"
 msgstr "ZURÜCK ZUR LISTE"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:99
 msgid "Terminate your Virtual Machine"
 msgstr "Deine Virtuelle Maschine beenden"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:101
 msgid "Do you want to cancel your Virtual Machine"
 msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst"
 
-#: .\hosting\templates\hosting\virtual_machine_detail.html:106
 msgid "OK"
 msgstr ""
 
-#: .\hosting\templates\hosting\virtual_machines.html:6
 msgid "Virtual Machines"
 msgstr "Virtuelle Maschinen"
 
-#: .\hosting\templates\hosting\virtual_machines.html:16
 msgid "To create a new virtual machine, click \"Create VM\""
 msgstr ""
 
-#: .\hosting\templates\hosting\virtual_machines.html:18
 msgid "CREATE VM"
 msgstr "NEUE VM"
 
-#: .\hosting\views.py:225 .\hosting\views.py:249
+msgid "View Detail"
+msgstr "Details anzeigen"
+
 msgid "login"
 msgstr "Einloggen"
 
-#: .\hosting\views.py:231
 msgid ""
 "Thank you for signing up. We have sent an email to you. Please follow the "
 "instructions in it to activate your account. Once activated, you can login "
@@ -674,35 +478,27 @@ msgstr ""
 "den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über "
 "diesen"
 
-#: .\hosting\views.py:233 .\hosting\views.py:263
 msgid "Go back to"
 msgstr "Zurück"
 
-#: .\hosting\views.py:250
 msgid "Account activation"
 msgstr "Accountaktivierung"
 
-#: .\hosting\views.py:254
 msgid "Your account has been activated."
 msgstr "Dein Account wurde aktiviert."
 
-#: .\hosting\views.py:255
 msgid "You can now"
 msgstr "Du kannst dich nun"
 
-#: .\hosting\views.py:262
 msgid "Sorry. Your request is invalid."
 msgstr "Entschuldigung, deine Anfrage ist ungültig."
 
-#: .\hosting\views.py:572
 msgid "Invalid credit card"
 msgstr "Ungültige Kreditkarte"
 
-#: .\hosting\views.py:685
 msgid "Confirm Order"
 msgstr "Bestellung Bestätigen"
 
-#: .\hosting\views.py:823
 msgid ""
 "We could not find the requested VM. Please                            "
 "contact Data Center Light Support."
diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index a6c14844..3672552e 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -536,6 +536,7 @@ a.unlink:hover {
 .dcl-place-order-text{
    font-size: 13px;
    color: #808080;
+   margin-bottom: 15px;
 }
 
 .dcl-order-table-total .tbl-total {
diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index ea4ded94..5515a0ab 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -40,7 +40,7 @@
                         {% endif %}
                     </td>
                     <td class="text-right last-td">
-                        <a class="btn btn-order-detail alt-text" href="{% url 'hosting:orders' order.pk %}" data-alt="{% trans 'See Invoice' %}">{% trans "View Detail" %}</a>
+                        <a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a>
                     </td>
                 </tr>
             {% endfor %}