diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index a65c8bea..9ba7f22b 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-09-02 03:08+0530\n"
+"POT-Creation-Date: 2017-09-05 00:59+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"
@@ -371,21 +371,17 @@ msgstr "KARTE ENTFERNEN"
 msgid "EDIT CARD"
 msgstr "BEARBEITEN"
 
-msgid "Add a new Card."
-msgstr "Neue Kreditkarte hinzufügen."
+msgid "No Credit Cards Added"
+msgstr "Es wurde keine Kreditkarte hinzugefügt"
 
 msgid ""
-"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."
+"We are using <a href=\"https://stripe.com\">Stripe</a> for payment and do "
+"not store your information in our database."
 msgstr ""
-"Bitte füll Deine Kreditkarteninformationen unten aus. Wir nutzen <a href="
+"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 "Es wird noch keine Bezahlung vorgenommen"
-
 msgid "Add your public SSH key"
 msgstr "Füge deinen öffentlichen SSH-Key hinzu"
 
@@ -543,6 +539,12 @@ msgid ""
 "contact Data Center Light Support."
 msgstr "Kontaktiere den Data Center Light Support."
 
+#~ msgid "Add a new Card."
+#~ msgstr "Neue Kreditkarte hinzufügen."
+
+#~ msgid "You are not making any payment here."
+#~ msgstr "Es wird noch keine Bezahlung vorgenommen"
+
 #~ msgid "Your SSH Keys"
 #~ msgstr "Deine SSH Keys"
 
diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css
index 5998b259..8c8a9470 100644
--- a/hosting/static/hosting/css/commons.css
+++ b/hosting/static/hosting/css/commons.css
@@ -336,4 +336,23 @@
 
 .btn-wide {
 	min-width: 100px;
+}
+
+.no-cards {
+  text-align: center;
+  color: #999;
+  padding: 15px;
+  background: rgba(0,0,0,0.02);
+  display: flex;
+  flex-direction: column;
+  height: 230px;
+  justify-content: center;
+}
+
+.no-cards h4 {
+  font-size: 24px;
+}
+
+.no-cards a {
+  color: #7ca3d0;
 }
\ No newline at end of file
diff --git a/hosting/templates/hosting/dashboard.html b/hosting/templates/hosting/dashboard.html
index 4d41874e..d12f75ee 100644
--- a/hosting/templates/hosting/dashboard.html
+++ b/hosting/templates/hosting/dashboard.html
@@ -32,7 +32,7 @@
                         <img class="svg-img" src="{% static 'hosting/img/billing.svg' %}">
                     </div>
                 </a>
-                <a href="" class="hosting-dashboard-item">
+                <a href="{% url 'hosting:settings' %}" class="hosting-dashboard-item">
                     <h2>{% trans "My Settings" %}</h2>
                     <div class="hosting-dashboard-image">
                         <img class="svg-img" src="{% static 'hosting/img/dashboard_settings.svg' %}">
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index e5c22e2b..3729ac80 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -30,24 +30,29 @@
                     <h3>{%trans "Credit Card"%}</h3>
                     <hr>
                     <div>
-                        <div>
-                            {% if credit_card_data.last4 %}
-                                <div class="credit-card-details">
-                                    <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>
-                                    <div class="credit-card-details-opt">
-                                        <div class="row">
-                                            <div class="col-xs-6">
-                                                <a class="caps-link" href=""><img src="{% static 'hosting/img/delete.svg' %}" class="svg-img">{% trans "REMOVE CARD" %}</a>
-                                            </div>
-                                            <div class="col-xs-6 text-right">
-                                                <a class="btn btn-vm-contact" href="">{% trans "EDIT CARD" %}</a>
-                                            </div>
+                        {% if credit_card_data.last4 %}
+                            <div class="credit-card-details">
+                                <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>
+                                <div class="credit-card-details-opt">
+                                    <div class="row">
+                                        <div class="col-xs-6">
+                                            <a class="caps-link" href=""><img src="{% static 'hosting/img/delete.svg' %}" class="svg-img">{% trans "REMOVE CARD" %}</a>
+                                        </div>
+                                        <div class="col-xs-6 text-right">
+                                            <a class="btn btn-vm-contact" href="">{% trans "EDIT CARD" %}</a>
                                         </div>
                                     </div>
                                 </div>
-                            {% else %}
+                            </div>
+                        {% else %}
+                            <div class="no-cards">
+                                <h4>{% trans "No Credit Cards Added" %}</h4>
+                                <p>{% blocktrans %}We are using <a href="https://stripe.com">Stripe</a> for payment and do not store your information in our database.{% endblocktrans %}</p>
+                            </div>
+
+                            {% comment %}
                                 <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 %}
@@ -108,14 +113,15 @@
                                         <p class="payment-errors"></p>
                                     </div>
                                 </form>
-                            {% endif %}
-                        </div>
+                            {% endcomment %}
+                        {% endif %}
                     </div>
                 </div>
             </div>
         </div>
     </div>
 
+    {% comment %}
     <!-- stripe key data -->
     {% if stripe_key %}
         {% get_current_language as LANGUAGE_CODE %}
@@ -137,4 +143,5 @@
             })();
         </script>
     {%endif%}
+    {% endcomment %}
 {%endblock%}