diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 726af613..a0f8506a 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-30 19:54+0530\n"
+"POT-Creation-Date: 2017-08-31 15:51+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"
@@ -365,30 +365,17 @@ msgstr ""
 msgid "Add a new Card."
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "                                Please fill in your credit card "
-#| "information below. We are using <a\n"
-#| "                                    href=\"https://stripe.com\" target="
-#| "\"_blank\">Stripe</a> for payment and do not store\n"
-#| "                                your information in our database.\n"
-#| "                                "
 msgid ""
-"\n"
-"                                    Please fill in your credit card "
-"information below. We are using <a href=\"https://stripe.com\" target="
-"\"_blank\">Stripe</a> for payment and do not store your information in our "
-"database.\n"
-"                                    "
+"Please fill in your credit card information below. We are using <a href="
+"\"https://stripe.com\" target=\"_blank\">Stripe</a> for payment and do not "
+"store your information in our database."
 msgstr ""
-"\n"
 "Bitte füll Deine Kreditkarteninformationen unten aus. Wir nutzen <a href="
 "\"https://stripe.com\" target=\"_blank\">Stripe</a> für die Bezahlung und "
 "speichern keine Informationen in unserer Datenbank."
 
 msgid "You are not making any payment here."
-msgstr ""
+msgstr "Es wird noch keine Bezahlung vorgenommen"
 
 msgid "Add your public SSH key"
 msgstr "Füge deinen öffentlichen SSH-Key hinzu"
diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css
index 2516ed24..efa47ec6 100644
--- a/hosting/static/hosting/css/commons.css
+++ b/hosting/static/hosting/css/commons.css
@@ -294,7 +294,7 @@
   font-weight: 600;
   color: #8da4c0;
   fill: #8da4c0;
-  padding: 6px 0;
+  padding: 8px 0;
   display: block;
 }
 .caps-link:hover {
@@ -309,13 +309,13 @@
 
 .caps-link .svg-img {
   margin-right: 5px;
-  height: 12px;
+  height: 11px;
   position: relative;
   top: 1px;
 }
 
 .settings-container .caps-link {
-  font-size: 12px;
+  font-size: 11px;
   letter-spacing: 1.1px;
 }
 
diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index 4dcf5074..18d8bc30 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -25,6 +25,8 @@
     <link href="{% static 'hosting/css/commons.css' %}" rel="stylesheet">
     <link href="{% static 'hosting/css/virtual-machine.css' %}" rel="stylesheet">
     <link href="{% static 'hosting/css/dashboard.css' %}" rel="stylesheet">
+    {% block css_extra %}
+    {% endblock css_extra %}
 
     <!-- Custom Fonts -->
     <link href='//fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index 543234f0..5d4c66e3 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -1,8 +1,12 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 i18n %}
+
+{% block css_extra %}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
+{% endblock css_extra %}
+
 {% block content %}
 <!-- Credit card form -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
 <div class="dcl-order-container">
     <div class="payment-container">
         <div class="row">
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index e841e534..fed85c9f 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -1,6 +1,10 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 i18n %}
 
+{% block css_extra %}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/paymentfont/1.1.2/css/paymentfont.min.css"/>
+{% endblock css_extra %}
+
 {% block content %}
     <div class="dashboard-container wide">
         <div class="dashboard-container-head">
@@ -15,7 +19,7 @@
                     <form role="form" id="billing-form" method="post" action="" novalidate>
                         {% for field in form %}
                             {% csrf_token %}
-                            {% bootstrap_field field show_label=False type='fields'%}
+                            {% bootstrap_field field show_label=False type='fields' bound_css_class='' %}
                         {% endfor %}
                         <div class="form-group text-right">
                             <button type="submit" class="btn btn-default btn-custom-delete btn-wide">Save</button>
@@ -46,9 +50,7 @@
                             {% else %}
                                 <h4>{% trans "Add a new Card." %}</h4>
                                 <p style="margin-bottom: 15px;">
-                                    {% blocktrans %}
-                                    Please fill in your credit card information below. We are using <a href="https://stripe.com" target="_blank">Stripe</a> for payment and do not store your information in our database.
-                                    {% endblocktrans %}
+                                    {% blocktrans %}Please fill in your credit card information below. We are using <a href="https://stripe.com" target="_blank">Stripe</a> for payment and do not store your information in our database.{% endblocktrans %}
                                 </p>
                                 <form action="" id="payment-form-new" class="credit-card-form" method="POST">
                                     <input type="hidden" name="token"/>
diff --git a/hosting/views.py b/hosting/views.py
index 1ee4c73b..47b18d2a 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -505,11 +505,9 @@ class SettingsView(LoginRequiredMixin, FormView):
         context = super(SettingsView, self).get_context_data(**kwargs)
         # Get user
         user = self.request.user
-
         # Get user last order
         last_hosting_order = HostingOrder.objects.filter(
             customer__user=user).last()
-
         # If user has already an hosting order, get the credit card data from
         # it
         if last_hosting_order:
@@ -517,7 +515,6 @@ class SettingsView(LoginRequiredMixin, FormView):
             context.update({
                 'credit_card_data': credit_card_data if credit_card_data else None,
             })
-
         context.update({
             'stripe_key': settings.STRIPE_API_PUBLIC_KEY
         })