diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 78773cac..2be9028e 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -1,105 +1,124 @@
 {% extends "layout.html" %}
 {% block body %}
-<div class="discover">
-  <h2>{{_('User list')}}</h2>
-  <table class="table table-striped" id="table_user">
-    <tr>
-        <th>{{_('Nickname')}}</th>
-        <th>{{_('E-mail')}}</th>
-        <th>{{_('Kindle')}}</th>
-        <th>{{_('DLS')}}</th>
-        <th class="hidden-xs">{{_('Admin')}}</th>
-        <th class="hidden-xs">{{_('Download')}}</th>
-        <th class="hidden-xs">{{_('Upload')}}</th>
-        <th class="hidden-xs">{{_('Edit')}}</th>
-    </tr>
-    {% for user in content %}
-      {% if not user.role_anonymous() or config.config_anonbrowse %}
-      <tr>
-        <td><a href="{{url_for('edit_user', user_id=user.id)}}">{{user.nickname}}</a></td>
-        <td>{{user.email}}</td>
-        <td>{{user.kindle_mail}}</td>
-        <td>{{user.downloads.count()}}</td>
-        <td class="hidden-xs">{% if user.role_admin() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td class="hidden-xs">{% if user.role_download() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td class="hidden-xs">{% if user.role_upload() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-        <td class="hidden-xs">{% if user.role_edit() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
-      </tr>
-      {% endif %}
-    {% endfor %}
-  </table>
-    <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('new_user')}}">{{_('Add new user')}}</a></div>
-  <h2>{{_('SMTP e-mail server settings')}}</h2>
-  <table class="table table-striped" id="table_email">
-    <tr>
-        <th>{{_('SMTP hostname')}}</th>
-        <th>{{_('SMTP port')}}</th>
-        <th>{{_('SSL')}}</th>
-        <th>{{_('SMTP login')}}</th>
-        <th class="hidden-xs">{{_('From 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>
-  </table>
-    <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
-<div id="container">
-  <h2>{{_('Configuration')}}</h2>
-  <div class="col-xs-12 col-sm-6">
-    <div class="Row">
-        <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
-        <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
-    </div>
-    <div class="Row">  
-        <div class="col-xs-6 col-sm-6">{{_('Log level')}}</div>
-        <div class="col-xs-6 col-sm-6">{{config.get_Log_Level()}}</div>
-    </div>
-    <div class="Row">    
-        <div class="col-xs-6 col-sm-6">{{_('Port')}}</div>
-        <div class="col-xs-6 col-sm-6">{{config.config_port}}</div>
+<div class="container">
+  <div class="row">
+    <div class="col">
+      <h2>{{_('User list')}}</h2>
+      <table class="table table-striped" id="table_user">
+        <tr>
+            <th>{{_('Nickname')}}</th>
+            <th>{{_('E-mail')}}</th>
+            <th>{{_('Kindle')}}</th>
+            <th>{{_('DLS')}}</th>
+            <th class="hidden-xs">{{_('Admin')}}</th>
+            <th class="hidden-xs">{{_('Download')}}</th>
+            <th class="hidden-xs">{{_('Upload')}}</th>
+            <th class="hidden-xs">{{_('Edit')}}</th>
+        </tr>
+        {% for user in content %}
+          {% if not user.role_anonymous() or config.config_anonbrowse %}
+          <tr>
+            <td><a href="{{url_for('edit_user', user_id=user.id)}}">{{user.nickname}}</a></td>
+            <td>{{user.email}}</td>
+            <td>{{user.kindle_mail}}</td>
+            <td>{{user.downloads.count()}}</td>
+            <td class="hidden-xs">{% if user.role_admin() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
+            <td class="hidden-xs">{% if user.role_download() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
+            <td class="hidden-xs">{% if user.role_upload() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
+            <td class="hidden-xs">{% if user.role_edit() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
+          </tr>
+          {% endif %}
+        {% endfor %}
+      </table>
+      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('new_user')}}">{{_('Add new user')}}</a></div>
     </div>
   </div>
-  <div class="col-xs-12 col-sm-6">
-    <div class="Row">
-        <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
-        <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
-    </div>
-    <div class="Row">
-        <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
-        <div class="col-xs-6 col-sm-5">{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
-    </div>
-    <div class="Row">
-        <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div>
-        <div class="col-xs-6 col-sm-5">{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
-    </div>
-    <div class="Row">
-        <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
-        <div class="col-xs-6 col-sm-5">{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
-    </div>
-    <div class="Row">
-        <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div>
-        <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+
+  <div class="row">
+    <div class="col">
+      <h2>{{_('SMTP e-mail server settings')}}</h2>
+      <table class="table table-striped" id="table_email">
+        <tr>
+          <th>{{_('SMTP hostname')}}</th>
+          <th>{{_('SMTP port')}}</th>
+          <th>{{_('SSL')}}</th>
+          <th>{{_('SMTP login')}}</th>
+          <th class="hidden-xs">{{_('From 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('edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
     </div>
   </div>
-</div>
-    <div class="col-xs-12 col-sm-12">
-        <p></p>
-  <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Basic Configuration')}}</a></div>
-  <div class="btn btn-default"><a href="{{url_for('view_configuration')}}">{{_('UI Configuration')}}</a></div>
+
+  <div class="row">
+    <div class="col">
+      <h2>{{_('Configuration')}}</h2>
+      <div class="col-xs-12 col-sm-6">
+        <div class="row">
+            <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
+            <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-6">{{_('Log level')}}</div>
+            <div class="col-xs-6 col-sm-6">{{config.get_Log_Level()}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-6">{{_('Port')}}</div>
+            <div class="col-xs-6 col-sm-6">{{config.config_port}}</div>
+        </div>
+      </div>
+      <div class="col-xs-12 col-sm-6">
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
+            <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+        <div class="row">
+            <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div>
+            <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div>
+        </div>
+      </div>
+      <div class="col-xs-12 col-sm-12">
+        <div class="row">
+          <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Basic Configuration')}}</a></div>
+          <div class="btn btn-default"><a href="{{url_for('view_configuration')}}">{{_('UI Configuration')}}</a></div>
+        </div>
+      </div>
     </div>
-  <h2>{{_('Administration')}}</h2>
-    <div>{{_('Current commit timestamp')}}: <span>{{commit}} </span></div>
-    <div class="hidden" id="update_info">{{_('Newest commit timestamp')}}: <span></span></div>
-    <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
-    <p></p>
-    <div class="btn btn-default" id="restart_database">{{_('Reconnect to Calibre DB')}}</div>
-    <div class="btn btn-default" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-Web')}}</div>
-    <div class="btn btn-default" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-Web')}}</div>
-    <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
-    <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
+  </div>
+
+  <div class="row">
+    <div class="col">
+      <h2>{{_('Administration')}}</h2>
+      <div>{{_('Current commit timestamp')}}: <span>{{commit}} </span></div>
+      <div class="hidden" id="update_info">{{_('Newest commit timestamp')}}: <span></span></div>
+      <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
+      <p></p>
+      <div class="btn btn-default" id="restart_database">{{_('Reconnect to Calibre DB')}}</div>
+      <div class="btn btn-default" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-Web')}}</div>
+      <div class="btn btn-default" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-Web')}}</div>
+      <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
+      <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
+    </div>
+  </div>
 </div>
 <!-- Modal -->
 <div id="RestartDialog" class="modal fade" role="dialog">
@@ -131,7 +150,6 @@
         <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
       </div>
     </div>
-
   </div>
 </div>
 <div id="UpdateprogressDialog" class="modal fade" role="dialog">