diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 3d6256b2..47b0c4cb 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -318,6 +318,7 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
 .editable-submit { margin-bottom: 0px !important; }
 .filterheader { margin-bottom: 20px; }
 .errorlink { margin-top: 20px; }
+.emailconfig { margin-top: 10px; }
 
 .modal-body .comments {
   max-height: 300px;
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index e014935b..3fa86722 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -51,23 +51,31 @@
   <div class="row">
     <div class="col">
       <h2>{{_('E-mail Server Settings')}}</h2>
-      <table class="table table-striped" id="table_email">
-        <tr>
-          <th>{{_('SMTP Hostname')}}</th>
-          <th>{{_('SMTP Port')}}</th>
-          <th>{{_('Encryption')}}</th>
-          <th>{{_('SMTP Login')}}</th>
-          <th class="hidden-xs">{{_('From E-mail')}}</th>
-        </tr>
-        <tr>
-          <td>{{email.mail_server}}</td>
-          <td>{{email.mail_port}}</td>
-          <td>{% if email.mail_use_ssl %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-          <td>{{email.mail_login}}</td>
-          <td class="hidden-xs">{{email.mail_from}}</td>
-        </tr>
-      </table>
-      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit E-mail Server Settings')}}</a></div>
+      {% if config.get_mail_server_configured() %}
+      <div class="col-xs-12 col-sm-12">
+        <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('SMTP Hostname')}}</div>
+            <div class="col-xs-6 col-sm-3">{{email.mail_server}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('SMTP Port')}}</div>
+            <div class="col-xs-6 col-sm-3">{{email.mail_port}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Encryption')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(email.mail_use_ssl) }}</div>
+        </div>
+        <div class="row">
+          <div class="col-xs-6 col-sm-3">{{_('SMTP Login')}}</div>
+          <div class="col-xs-6 col-sm-3">{{email.mail_login}}</div>
+        </div>
+        <div class="row">
+          <div class="col-xs-6 col-sm-3">{{_('From E-mail')}}</div>
+          <div class="col-xs-6 col-sm-3">{{email.mail_from}}</div>
+        </div>
+      </div>
+      {% endif %}
+      <div class="btn btn-default emailconfig"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Edit Basic Configuration')}}</a></div>
     </div>
   </div>
 
@@ -140,7 +148,6 @@
       <div class="btn btn-default" id="restart_database" data-toggle="modal" data-target="#StatusDialog">{{_('Reconnect Calibre Database')}}</div>
       <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
       <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
-
   </div>
 
   <div class="row">
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index 966abf2a..052c920a 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -26,7 +26,7 @@
   </tbody>
 </table>
 {% if g.user.role_admin() %}
-  <h3>{{_('Linked Libraries')}}</h3>
+  <h3>{{_('System Statistics')}}</h3>
 <table id="libs" class="table">
   <thead>
     <tr>
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 07c41adf..bb41c493 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -1251,7 +1251,7 @@ msgstr "Bücher pro Seite"
 
 #: cps/templates/admin.html:104
 msgid "Uploads"
-msgstr "Lade hoch"
+msgstr "Hochladen"
 
 #: cps/templates/admin.html:108
 msgid "Anonymous Browsing"