diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index ddb853da..36a9cc09 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-24 11:12+0000\n"
+"POT-Creation-Date: 2017-08-29 14:38+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"
@@ -330,6 +330,25 @@ msgstr "Deine Kreditkartennummer"
 msgid "Reset your password"
 msgstr "Passwort zurücksetzen"
 
+#, fuzzy
+#| msgid "VM Settings"
+msgid "My Settings"
+msgstr "VM Einstellungen"
+
+msgid "Last"
+msgstr ""
+
+#, fuzzy
+#| msgid "Card Type"
+msgid "Type"
+msgstr "Kartentyp"
+
+msgid "You are not making any payment here."
+msgstr ""
+
+msgid "Add new Card"
+msgstr ""
+
 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 e8ba9ceb..4710b294 100644
--- a/hosting/static/hosting/css/commons.css
+++ b/hosting/static/hosting/css/commons.css
@@ -253,12 +253,24 @@
 .settings-container .card-cvc-element {
   padding: 0 15px;
 }
+.settings-container .card-cvc-element .my-input,
+.settings-container .card-cvc-element label {
+  padding-left: 0;
+}
 
 .settings-container .stripe-payment-btn {
   float: none;
   position: static;
 }
 
+.settings-container h3 {
+  font-weight: bold;
+}
+
+.settings-container hr {
+  margin-top: 15px;
+}
+
 .credit-card-form {
   max-width: 360px;
 }
\ No newline at end of file
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index c540918e..f044b4b6 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -26,16 +26,16 @@
                         <div>
                             {% if credit_card_data.last4 %}
                                 <form role="form" id="payment-form-with-creditcard" novalidate>
-                                    <h5 class="billing-head">Credit Card</h5>
-                                    <h5 class="membership-lead">Last 4: *****{{credit_card_data.last4}}</h5>
-                                    <h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
+                                    <h5 class="billing-head">{% trans "Credit Card" %}</h5>
+                                    <h5 class="membership-lead">{% trans "Last" %} 4: *****{{credit_card_data.last4}}</h5>
+                                    <h5 class="membership-lead">{% trans "Type" %}: {{credit_card_data.cc_brand}}</h5>
                                     <input type="hidden" name="credit_card_needed" value="false"/>
                                 </form>
                                 <div class="row">
                                     <div class="col-xs-12">
                                             {% if not messages and not form.non_field_errors %}
                                                 <p class="card-warning-content card-warning-addtional-margin">
-                                                    {% blocktrans %}You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page.{% endblocktrans %}
+                                                    {% blocktrans %}You are not making any payment here.{% endblocktrans %}
                                                 </p>
                                             {% endif %}
                                             <div id='payment_error'>
@@ -62,64 +62,65 @@
                                         </div>
                                     </div>
                                 </div>
-                            {% endif %}
-                            <h4>{% trans "Add new Card" %}</h4>
-                            <form action="" id="payment-form-new" class="credit-card-form" method="POST">
-                                <input type="hidden" name="token"/>
-                                <div class="credit-card-goup">
-                                   <div class="card-element card-number-element">
-                                       <label>{%trans "Card Number" %}</label>
-                                       <div id="card-number-element" class="field my-input"></div>
-                                   </div>
-                                   <div class="row">
-                                       <div class="col-xs-6 col-sm-4 card-element card-expiry-element">
-                                           <label>{%trans "Expiry Date" %}</label>
-                                           <div id="card-expiry-element" class="field my-input"></div>
+                            {% else %}
+                                <h4>{% trans "Add new Card" %}</h4>
+                                <form action="" id="payment-form-new" class="credit-card-form" method="POST">
+                                    <input type="hidden" name="token"/>
+                                    <div class="credit-card-goup">
+                                       <div class="card-element card-number-element">
+                                           <label>{%trans "Card Number" %}</label>
+                                           <div id="card-number-element" class="field my-input"></div>
                                        </div>
-                                       <div class="col-xs-6 col-sm-4 col-sm-offset-4 card-element card-cvc-element">
-                                           <label>{%trans "CVC" %}</label>
-                                           <div id="card-cvc-element" class="field my-input"></div>
+                                       <div class="row">
+                                           <div class="col-xs-6 col-sm-4 card-element card-expiry-element">
+                                               <label>{%trans "Expiry Date" %}</label>
+                                               <div id="card-expiry-element" class="field my-input"></div>
+                                           </div>
+                                           <div class="col-xs-6 col-sm-4 col-sm-offset-4 card-element card-cvc-element">
+                                               <label>{%trans "CVC" %}</label>
+                                               <div id="card-cvc-element" class="field my-input"></div>
+                                           </div>
+                                       </div>
+                                       <div class="card-element brand">
+                                           <label>{%trans "Card Type" %}</label>
+                                           <i class="pf pf-credit-card" id="brand-icon"></i>
                                        </div>
-                                   </div>
-                                   <div class="card-element brand">
-                                       <label>{%trans "Card Type" %}</label>
-                                       <i class="pf pf-credit-card" id="brand-icon"></i>
-                                   </div>
-                                </div>
-                                <div id="card-errors" role="alert"></div>
-                                <div>
-                                    {% if not messages and not form.non_field_errors %}
-                                        <p class="card-warning-content">
-                                            {% blocktrans %}You are not making any payment here. After submitting your card information, you will be taken to the Confirm Order Page.{% endblocktrans %}
-                                        </p>
-                                    {% endif %}
-                                    <div id='payment_error'>
-                                        {% for message in messages %}
-                                            {% if 'failed_payment' or 'make_charge_error' in message.tags %}
-                                             <ul class="list-unstyled"><li>
-                                                 <p class="card-warning-content card-warning-error">{{ message|safe }}</p>
-                                            </li></ul>
-                                            {% endif %}
-                                        {% endfor %}
-
-                                        {% for error in form.non_field_errors %}
-                                            <p class="card-warning-content card-warning-error">
-                                                {{ error|escape }}
-                                            </p>
-                                        {% endfor %}
                                     </div>
-                                    <div class="row">
-                                        <div class="col-xs-6 col-xs-offset-6 text-right">
-                                            <button class="btn btn-success stripe-payment-btn" type="submit">{%trans "Submit" %}
-                                            </button>
+                                    <div id="card-errors" role="alert"></div>
+                                    <div>
+                                        {% if not messages and not form.non_field_errors %}
+                                            <p class="card-warning-content">
+                                                {% blocktrans %}You are not making any payment here.{% endblocktrans %}
+                                            </p>
+                                        {% endif %}
+                                        <div id='payment_error'>
+                                            {% for message in messages %}
+                                                {% if 'failed_payment' or 'make_charge_error' in message.tags %}
+                                                 <ul class="list-unstyled"><li>
+                                                     <p class="card-warning-content card-warning-error">{{ message|safe }}</p>
+                                                </li></ul>
+                                                {% endif %}
+                                            {% endfor %}
+
+                                            {% for error in form.non_field_errors %}
+                                                <p class="card-warning-content card-warning-error">
+                                                    {{ error|escape }}
+                                                </p>
+                                            {% endfor %}
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-xs-6 col-xs-offset-6 text-right">
+                                                <button class="btn btn-success stripe-payment-btn" type="submit">{%trans "Submit" %}
+                                                </button>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
 
-                                <div style="display:none;">
-                                    <p class="payment-errors"></p>
-                                </div>
-                            </form>
+                                    <div style="display:none;">
+                                        <p class="payment-errors"></p>
+                                    </div>
+                                </form>
+                            {% endif %}
                         </div>
                     </div>
                 </div>