diff --git a/cps/static/js/shelforder.js b/cps/static/js/shelforder.js
index ea970f9a..1e4ac82d 100644
--- a/cps/static/js/shelforder.js
+++ b/cps/static/js/shelforder.js
@@ -1,3 +1,7 @@
+document.ontouchmove = function(e){
+    return true;
+};
+
 Sortable.create(sortTrue, {
   group: "sorting",
   sort: true
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 50f3af80..d9091534 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -29,7 +29,6 @@
     <script src="{{ url_for('static', filename='js/context.js') }}"></script>
     <script src="{{ url_for('static', filename='js/plugins.js') }}"></script>
     <script src="{{ url_for('static', filename='js/main.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/Sortable.min.js') }}"></script>
 
     {% block header %}{% endblock %}
   </head>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 0a05a8d0..3074f742 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -5,7 +5,7 @@
   {% if g.user.is_authenticated %}
   <a href="{{ url_for('delete_shelf', shelf_id=shelf.id) }}" class="btn btn-danger">{{ _('Delete this Shelf') }} </a>
   <a href="{{ url_for('edit_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Edit Shelf name') }} </a>
-  <a href="{{ url_for('order_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('change order') }} </a>
+  <a href="{{ url_for('order_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Change order') }} </a>
   
   {% endif %}
   <div class="row">
diff --git a/cps/templates/order_shelf.html b/cps/templates/shelf_order.html
similarity index 83%
rename from cps/templates/order_shelf.html
rename to cps/templates/shelf_order.html
index 2e41ef27..1200a345 100644
--- a/cps/templates/order_shelf.html
+++ b/cps/templates/shelf_order.html
@@ -2,6 +2,7 @@
 {% block body %}
   <div class="col-sm-6 col-lg-6 col-xs-6">
     <h2>{{title}}</h2>
+    <div>{{_('Drag \'n drop to rearrange order')}}</div>
       <div id="sortTrue" class="list-group">
         {% for entry in entries %}
           <div id="{{entry.id}}" class="list-group-item">{{entry.title}}</div>
@@ -13,6 +14,7 @@
 {% endblock %}
 
 {% block js %}
+<script src="{{ url_for('static', filename='js/Sortable.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/shelforder.js') }}"></script>
 {% endblock %}
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index a4d6af27..1ec3dc07 100644
Binary files a/cps/translations/de/LC_MESSAGES/messages.mo and b/cps/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index d0a1a1fb..526b0281 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-23 08:39+0100\n"
+"POT-Creation-Date: 2017-01-03 19:50+0100\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -18,276 +18,396 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:108 cps/book_formats.py:112 cps/web.py:923
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:928
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/helper.py:93
+#: cps/helper.py:98
 msgid "Calibre-web test email"
 msgstr "Calibre-web Test E-Mail"
 
-#: cps/helper.py:94 cps/helper.py:147
+#: cps/helper.py:99 cps/helper.py:152
 msgid "This email has been sent via calibre web."
 msgstr "Die E-Mail wurde via calibre-web versendet"
 
-#: cps/helper.py:128 cps/helper.py:216
+#: cps/helper.py:133 cps/helper.py:221
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "E-Mail: %s konnte nicht gesendet werden"
 
-#: cps/helper.py:146 cps/templates/detail.html:113
+#: cps/helper.py:151 cps/templates/detail.html:124
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:169 cps/helper.py:184
+#: cps/helper.py:174 cps/helper.py:189
 msgid "Could not find any formats suitable for sending by email"
-msgstr ""
-"Konnte keine Formate finden welche für das versenden per E-Mail geeignet "
-"sind"
+msgstr "Konnte keine Formate finden welche für das versenden per E-Mail geeignet sind"
 
-#: cps/helper.py:178
+#: cps/helper.py:183
 msgid "Could not convert epub to mobi"
 msgstr "Konnte .epub nicht nach .mobi konvertieren"
 
-#: cps/helper.py:236
+#: cps/helper.py:241
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Die angeforderte Datei konnte nicht gelesen werden. Falsche Dateirechte?"
 
-#: cps/web.py:717
+#: cps/web.py:722
 msgid "Latest Books"
 msgstr "Letzte Bücher"
 
-#: cps/web.py:742
+#: cps/web.py:747
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/templates/index.xml:41 cps/web.py:750
+#: cps/templates/index.xml:29 cps/web.py:755
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:763
+#: cps/web.py:768
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:780
+#: cps/web.py:785
 #, python-format
 msgid "Author: %(nam)s"
 msgstr "Autor: %(nam)s"
 
-#: cps/templates/index.xml:65 cps/web.py:793
+#: cps/templates/index.xml:50 cps/web.py:798
 msgid "Series list"
 msgstr "Liste Serien"
 
-#: cps/web.py:804
+#: cps/web.py:809
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:806 cps/web.py:902 cps/web.py:1061 cps/web.py:1729
+#: cps/web.py:811 cps/web.py:907 cps/web.py:1102 cps/web.py:1838
 msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr ""
-"Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
-"zugänglich."
+msgstr "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht zugänglich."
 
-#: cps/web.py:837
+#: cps/web.py:842
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"
 
-#: cps/web.py:852
+#: cps/web.py:857
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/index.xml:57 cps/web.py:865
+#: cps/templates/index.xml:43 cps/web.py:870
 msgid "Category list"
 msgstr "Kategorieliste"
 
-#: cps/web.py:875
+#: cps/web.py:880
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:931
+#: cps/web.py:936
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:939
+#: cps/web.py:944
 msgid "Server restarts"
 msgstr "Server startet neu"
 
-#: cps/web.py:1037 cps/web.py:1044 cps/web.py:1051 cps/web.py:1058
+#: cps/web.py:1078 cps/web.py:1085 cps/web.py:1092 cps/web.py:1099
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1100 cps/web.py:1365
+#: cps/web.py:1141 cps/web.py:1474
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:1116
+#: cps/web.py:1157
 msgid "An unknown error occured. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:1121
+#: cps/web.py:1162
 msgid "This username or email address is already in use."
 msgstr "Der Benutzername oder die E-Mailadresse ist in bereits in Benutzung."
 
-#: cps/web.py:1124
+#: cps/web.py:1165
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1140
+#: cps/web.py:1181
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1143
+#: cps/web.py:1185
 msgid "Wrong Username or Password"
-msgstr "Flascher Benutzername oder Passwort"
+msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1145
+#: cps/web.py:1187
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1162
+#: cps/web.py:1204
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:1166
+#: cps/web.py:1208
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Buch erfolgreich versandt an %(kindlemail)s"
 
-#: cps/web.py:1170
+#: cps/web.py:1212
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
-#: cps/web.py:1172
+#: cps/web.py:1214
 msgid "Please configure your kindle email address first..."
 msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."
 
-#: cps/web.py:1188
+#: cps/web.py:1234
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Das Buch wurde dem Bücherregal: %(sname)s hinzugefügt"
 
-#: cps/web.py:1209
+#: cps/web.py:1255
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
-#: cps/web.py:1226
+#: cps/web.py:1273 cps/web.py:1294
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereits ein Bücheregal mit dem Titel '%(title)s'"
 
-#: cps/web.py:1231
+#: cps/web.py:1278
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:1233
+#: cps/web.py:1280 cps/web.py:1305
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:1234 cps/web.py:1236
+#: cps/web.py:1281 cps/web.py:1283
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:1256
+#: cps/web.py:1303
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Bücherregal %(title)s verändert"
+
+#: cps/web.py:1306 cps/web.py:1308
+msgid "Edit a shelf"
+msgstr "Bücherregal editieren"
+
+#: cps/web.py:1329
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:1277
+#: cps/web.py:1350
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:1332
+#: cps/web.py:1378
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
+
+#: cps/web.py:1433
 msgid "Found an existing account for this email address."
 msgstr "Es existiert ein Benutzerkonto für diese E-Mailadresse"
 
-#: cps/web.py:1334 cps/web.py:1337
+#: cps/web.py:1435 cps/web.py:1438
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1335
+#: cps/web.py:1436
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1346
-msgid "User list"
-msgstr "Benutzerliste"
+#: cps/web.py:1447 cps/web.py:1455
+msgid "Admin page"
+msgstr "Admin Seite"
 
-#: cps/templates/user_list.html:32 cps/web.py:1366
+#: cps/templates/admin.html:32 cps/web.py:1475
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:1399
+#: cps/web.py:1508
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:1403
+#: cps/web.py:1512
 msgid "Found an existing account for this email address or nickname."
-msgstr ""
-"Es existiert ein Benutzerkonto für diese Emailadresse oder den "
-"Benutzernamen"
+msgstr "Es existiert ein Benutzerkonto für diese Emailadresse oder den Benutzernamen."
 
-#: cps/web.py:1426 cps/web.py:1437
+#: cps/web.py:1535 cps/web.py:1546
 msgid "Mail settings updated"
 msgstr "E-Mail Einstellungen aktualisiert"
 
-#: cps/web.py:1432
+#: cps/web.py:1541
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:1435
+#: cps/web.py:1544
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Fehler beim versenden der Test E-Mail: %(res)s"
 
-#: cps/web.py:1438
+#: cps/web.py:1547
 msgid "Edit mail settings"
 msgstr "E-Mail Einstellungen editieren"
 
-#: cps/web.py:1461
+#: cps/web.py:1570
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:1516
+#: cps/web.py:1625
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:1519
+#: cps/web.py:1628
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:1521
+#: cps/web.py:1630
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:1759
+#: cps/web.py:1868
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:1764
+#: cps/web.py:1873
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:1769
+#: cps/web.py:1878
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
 
+#: cps/templates/admin.html:4
+msgid "User list"
+msgstr "Benutzerliste"
+
+#: cps/templates/admin.html:7
+msgid "Nickname"
+msgstr "Benutzername"
+
+#: cps/templates/admin.html:8
+msgid "Email"
+msgstr "E-Mail"
+
+#: cps/templates/admin.html:9
+msgid "Kindle"
+msgstr "Kindle"
+
+#: cps/templates/admin.html:10
+msgid "DLS"
+msgstr "DLS"
+
+#: cps/templates/admin.html:11 cps/templates/layout.html:83
+msgid "Admin"
+msgstr "Admin"
+
+#: cps/templates/admin.html:12 cps/templates/detail.html:114
+msgid "Download"
+msgstr "Download"
+
+#: cps/templates/admin.html:13 cps/templates/layout.html:76
+msgid "Upload"
+msgstr "Hochladen"
+
+#: cps/templates/admin.html:14
+msgid "Edit"
+msgstr "Editieren"
+
+#: cps/templates/admin.html:15
+msgid "Passwd"
+msgstr "Passwort"
+
+#: cps/templates/admin.html:33
+msgid "SMTP mail settings"
+msgstr "SMTP Mail Einstellungen"
+
+#: cps/templates/admin.html:36 cps/templates/email_edit.html:7
+msgid "SMTP hostname"
+msgstr "SMTP Hostname"
+
+#: cps/templates/admin.html:37
+msgid "SMTP port"
+msgstr "SMTP Port"
+
+#: cps/templates/admin.html:38
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/admin.html:39 cps/templates/email_edit.html:19
+msgid "SMTP login"
+msgstr "SMTP Login"
+
+#: cps/templates/admin.html:40 cps/templates/email_edit.html:23
+msgid "SMTP password"
+msgstr "SMTP Passwort"
+
+#: cps/templates/admin.html:41
+msgid "From mail"
+msgstr "Absenderadresse"
+
+#: cps/templates/admin.html:53
+msgid "Change SMTP settings"
+msgstr "SMTP Einstellungen ändern"
+
+#: cps/templates/admin.html:55
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: cps/templates/admin.html:58
+msgid "Log File"
+msgstr "Log Datei"
+
+#: cps/templates/admin.html:59
+msgid "Log Level"
+msgstr "Log Level"
+
+#: cps/templates/admin.html:60
+msgid "Port"
+msgstr "Port"
+
+#: cps/templates/admin.html:61
+msgid "Books per page"
+msgstr "Bücher pro Seite"
+
+#: cps/templates/admin.html:62
+msgid "Uploading"
+msgstr "Hochladen"
+
+#: cps/templates/admin.html:63
+msgid "Public registration"
+msgstr "Öffentliche Registrierung"
+
+#: cps/templates/admin.html:64
+msgid "Anonymous browsing"
+msgstr "Anonymer Zugriff"
+
+#: cps/templates/admin.html:75
+msgid "Administration"
+msgstr "Administration"
+
+#: cps/templates/admin.html:77
+msgid "Restart Calibre-web"
+msgstr "Calibre-web Neustarten"
+
 #: cps/templates/detail.html:38
 msgid "Book"
 msgstr "Buch"
@@ -300,23 +420,19 @@ msgstr "von"
 msgid "language"
 msgstr "Sprache"
 
-#: cps/templates/detail.html:92
+#: cps/templates/detail.html:103
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: cps/templates/detail.html:103 cps/templates/user_list.html:12
-msgid "Download"
-msgstr "Download"
-
-#: cps/templates/detail.html:117
+#: cps/templates/detail.html:128
 msgid "Read in browser"
 msgstr "Im Browser lesen"
 
-#: cps/templates/detail.html:136
+#: cps/templates/detail.html:147
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
-#: cps/templates/detail.html:176
+#: cps/templates/detail.html:187
 msgid "Edit metadata"
 msgstr "Metadaten bearbeiten"
 
@@ -336,7 +452,8 @@ msgstr "Beschreibung"
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:131
+#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/search_form.html:33
 msgid "Series"
 msgstr "Serien"
 
@@ -369,20 +486,17 @@ msgid "view book after edit"
 msgstr "Buch nach Bearbeitung ansehen"
 
 #: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:33 cps/templates/shelf_edit.html:15
+#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
 #: cps/templates/user_edit.html:94
 msgid "Submit"
 msgstr "Abschicken"
 
 #: cps/templates/edit_book.html:106 cps/templates/email_edit.html:32
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:96
 msgid "Back"
 msgstr "Zurück"
 
-#: cps/templates/email_edit.html:7 cps/templates/user_list.html:36
-msgid "SMTP hostname"
-msgstr "SMTP Hostname"
-
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 587 for SSL)"
 msgstr "SMTP Port (normalerweise 25 für unverschlüsseltes SMTP und 587 für SSL)"
@@ -391,14 +505,6 @@ msgstr "SMTP Port (normalerweise 25 für unverschlüsseltes SMTP und 587 für SS
 msgid "Server uses SSL (StartTLS)"
 msgstr "Server benutzt SSL (StartTLS)"
 
-#: cps/templates/email_edit.html:19 cps/templates/user_list.html:39
-msgid "SMTP login"
-msgstr "SMTP Login"
-
-#: cps/templates/email_edit.html:23 cps/templates/user_list.html:40
-msgid "SMTP password"
-msgstr "SMTP Passwort"
-
 #: cps/templates/email_edit.html:27
 msgid "From e-mail"
 msgstr "Absenderadresse"
@@ -419,111 +525,103 @@ msgstr "Nächste"
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufälliges Buch)"
 
-#: cps/templates/index.xml:8
+#: cps/templates/index.xml:5
 msgid "Start"
 msgstr "Start"
 
-#: cps/templates/index.xml:12 cps/templates/layout.html:59
+#: cps/templates/index.xml:7 cps/templates/layout.html:61
 msgid "Search"
 msgstr "Suche"
 
-#: cps/templates/index.xml:23 cps/templates/layout.html:122
+#: cps/templates/index.xml:15 cps/templates/layout.html:124
 msgid "Hot Books"
 msgstr "Beliebte Bücher"
 
-#: cps/templates/index.xml:28
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Beliebte Veröffentlichungen dieses Katalogs basierend auf Bewertungen"
 
-#: cps/templates/index.xml:32 cps/templates/layout.html:120
+#: cps/templates/index.xml:22 cps/templates/layout.html:122
 msgid "New Books"
 msgstr "Neue Bücher"
 
-#: cps/templates/index.xml:37
+#: cps/templates/index.xml:26
 msgid "The latest Books"
 msgstr "Die neuesten Bücher"
 
-#: cps/templates/index.xml:46
+#: cps/templates/index.xml:33
 msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
-#: cps/templates/index.xml:49 cps/templates/layout.html:133
+#: cps/templates/index.xml:36 cps/templates/layout.html:135
 msgid "Authors"
 msgstr "Autoren"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:40
 msgid "Books ordered by Author"
 msgstr "Bücher nach Autoren sortiert"
 
-#: cps/templates/index.xml:62
+#: cps/templates/index.xml:47
 msgid "Books ordered by category"
 msgstr "Bücher nach Kategorien sortiert"
 
-#: cps/templates/index.xml:70
+#: cps/templates/index.xml:54
 msgid "Books ordered by series"
 msgstr "Bücher nach Reihen geordnet"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:48
 msgid "Toggle navigation"
 msgstr "Nagivation umschalten"
 
-#: cps/templates/layout.html:61
+#: cps/templates/layout.html:63
 msgid "Go!"
 msgstr "Los!"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:66
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: cps/templates/layout.html:74 cps/templates/user_list.html:13
-msgid "Upload"
-msgstr "Hochladen"
-
-#: cps/templates/layout.html:81 cps/templates/user_list.html:11
-msgid "Admin"
-msgstr "Admin"
-
-#: cps/templates/layout.html:85
+#: cps/templates/layout.html:87
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:89 cps/templates/login.html:4
+#: cps/templates/layout.html:91 cps/templates/login.html:4
 msgid "Login"
 msgstr "Login"
 
-#: cps/templates/layout.html:90 cps/templates/register.html:18
+#: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:121
 msgid "Browse"
 msgstr "Browsen"
 
-#: cps/templates/layout.html:125
+#: cps/templates/layout.html:127
 msgid "Discover"
 msgstr "Entdecke"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:130
 msgid "Categories"
 msgstr "Kategorien"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:137 cps/templates/search_form.html:54
 msgid "Languages"
 msgstr "Sprachen"
 
-#: cps/templates/layout.html:138
+#: cps/templates/layout.html:140
 msgid "Public Shelves"
 msgstr "Öffentiche Bücherregale"
 
-#: cps/templates/layout.html:142
+#: cps/templates/layout.html:144
 msgid "Your Shelves"
 msgstr "Deine Bücherregale"
 
-#: cps/templates/layout.html:147
+#: cps/templates/layout.html:149
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/templates/layout.html:150
+#: cps/templates/layout.html:152
 msgid "About"
 msgstr "Über"
 
@@ -549,6 +647,10 @@ msgstr "Text umbrechen wenn Seitenleiste geöffnet ist"
 msgid "PDF.js viewer"
 msgstr "PDF.js Viewer"
 
+#: cps/templates/readtxt.html:6
+msgid "Basic txt Reader"
+msgstr "Basis Txt Reader"
+
 #: cps/templates/register.html:4
 msgid "Register a new account"
 msgstr "Neues Benutzerkonto erzeugen"
@@ -585,6 +687,14 @@ msgstr "Ergebnisse für:"
 msgid "Exclude Tags"
 msgstr "Tags ausschließen"
 
+#: cps/templates/search_form.html:43
+msgid "Exclude Series"
+msgstr "Serie ausschließen"
+
+#: cps/templates/search_form.html:64
+msgid "Exclude Languages"
+msgstr "Sprache ausschließen"
+
 #: cps/templates/shelf.html:6
 msgid "Delete this Shelf"
 msgstr "Lösche dieses Bücherregal"
@@ -593,6 +703,10 @@ msgstr "Lösche dieses Bücherregal"
 msgid "Edit Shelf name"
 msgstr "Bücherregal umbenennen"
 
+#: cps/templates/shelf.html:8
+msgid "change order"
+msgstr "Reihenfolge ändern"
+
 #: cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
@@ -601,6 +715,14 @@ msgstr "Titel"
 msgid "should the shelf be public?"
 msgstr "Soll das Bücherregal öffentlich sein?"
 
+#: cps/templates/shelf_order.html:5
+msgid "Drag 'n drop to rearrange order"
+msgstr "Drag 'n drop um Reihenfolge zu ändern"
+
+#: cps/templates/shelf_order.html:11
+msgid "Change order"
+msgstr "Reihenfolge ändern"
+
 #: cps/templates/stats.html:3
 msgid "Linked libraries"
 msgstr "Dynamische Bibliotheken"
@@ -613,18 +735,30 @@ msgstr "Programm Bibliotheken"
 msgid "Installed Version"
 msgstr "Installierte Version"
 
-#: cps/templates/stats.html:32
+#: cps/templates/stats.html:36
 msgid "Calibre library statistics"
 msgstr "Calibre Bibliothek Statistiken"
 
-#: cps/templates/stats.html:37
+#: cps/templates/stats.html:41
 msgid "Books in this Library"
 msgstr "Bücher in dieser Bibliothek"
 
-#: cps/templates/stats.html:41
+#: cps/templates/stats.html:45
 msgid "Authors in this Library"
 msgstr "Autoren in dieser Bibliothek"
 
+#: cps/templates/stats.html:49
+msgid "Series in this Library"
+msgstr "Serien in dieser Bibliothek"
+
+#: cps/templates/stats.html:53
+msgid "Tags in this Library"
+msgstr "Tags in dieser Bibliothek"
+
+#: cps/templates/stats.html:57
+msgid "Usercount for calibre web"
+msgstr "Anzahl Benutzer calibreweb"
+
 #: cps/templates/user_edit.html:23
 msgid "Kindle E-Mail"
 msgstr "Kindle E-Mail"
@@ -685,51 +819,6 @@ msgstr "Benutzer löschen"
 msgid "Recent Downloads"
 msgstr "Letzte Downloads"
 
-#: cps/templates/user_list.html:7
-msgid "Nickname"
-msgstr "Benutzername"
-
-#: cps/templates/user_list.html:8
-msgid "Email"
-msgstr "E-Mail"
-
-#: cps/templates/user_list.html:9
-msgid "Kindle"
-msgstr "Kindle"
-
-#: cps/templates/user_list.html:10
-msgid "DLS"
-msgstr "DLS"
-
-#: cps/templates/user_list.html:14
-msgid "Edit"
-msgstr "Editieren"
-
-#: cps/templates/user_list.html:15
-msgid "Passwd"
-msgstr "Passwort"
-
-#: cps/templates/user_list.html:33
-msgid "SMTP mail settings"
-msgstr "SMTP Mail Einstellungen"
-
-#: cps/templates/user_list.html:37
-msgid "SMTP port"
-msgstr "SMTP Port"
-
-#: cps/templates/user_list.html:38
-msgid "SSL"
-msgstr "SSL"
-
-#: cps/templates/user_list.html:41
-msgid "From mail"
-msgstr "Absenderadresse"
-
-#: cps/templates/user_list.html:53
-msgid "Change SMTP settings"
-msgstr "SMTP Einstellungen ändern"
-
-
 #. name for aaa
 msgid "Ghotuo"
 msgstr "Ghotuo"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index cc83c3b0..4351f5c9 100644
Binary files a/cps/translations/es/LC_MESSAGES/messages.mo and b/cps/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index dd186336..8f557626 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-23 08:39+0100\n"
+"POT-Creation-Date: 2017-01-03 19:50+0100\n"
 "PO-Revision-Date: 2016-11-13 18:35+0100\n"
 "Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n"
 "Language: es\n"
@@ -16,272 +16,398 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Notepad++\n"
+"Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:108 cps/book_formats.py:112 cps/web.py:923
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:928
 msgid "not installed"
 msgstr "No instalado"
 
-#: cps/helper.py:93
+#: cps/helper.py:98
 msgid "Calibre-web test email"
 msgstr "Prueba de Correo Calibre-web"
 
-#: cps/helper.py:94 cps/helper.py:147
+#: cps/helper.py:99 cps/helper.py:152
 msgid "This email has been sent via calibre web."
 msgstr "Este mensaje ha sido enviado via Calibre Web."
 
-#: cps/helper.py:128 cps/helper.py:216
+#: cps/helper.py:133 cps/helper.py:221
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "Fallo al enviar el correo : %s"
 
-#: cps/helper.py:146 cps/templates/detail.html:113
+#: cps/helper.py:151 cps/templates/detail.html:124
 msgid "Send to Kindle"
 msgstr "Enviar a Kindle"
 
-#: cps/helper.py:169 cps/helper.py:184
+#: cps/helper.py:174 cps/helper.py:189
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Formato no compatible para enviar por correo electronico"
 
-#: cps/helper.py:178
+#: cps/helper.py:183
 msgid "Could not convert epub to mobi"
 msgstr "No fue posible convertir de epub a mobi"
 
-#: cps/helper.py:236
+#: cps/helper.py:241
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "El fichero solicitado no puede ser leido. Problema de permisos?"
 
-#: cps/web.py:717
+#: cps/web.py:722
 msgid "Latest Books"
 msgstr "Libros recientes"
 
-#: cps/web.py:742
+#: cps/web.py:747
 msgid "Hot Books (most downloaded)"
 msgstr "Libros Populares (los mas descargados)"
 
-#: cps/templates/index.xml:41 cps/web.py:750
+#: cps/templates/index.xml:29 cps/web.py:755
 msgid "Random Books"
 msgstr "Libros al Azar"
 
-#: cps/web.py:763
+#: cps/web.py:768
 msgid "Author list"
 msgstr "Lista de Autores"
 
-#: cps/web.py:780
+#: cps/web.py:785
 #, python-format
 msgid "Author: %(nam)s"
 msgstr "Autor : %(nam)s"
 
-#: cps/templates/index.xml:65 cps/web.py:793
+#: cps/templates/index.xml:50 cps/web.py:798
 msgid "Series list"
 msgstr "lista de Series"
 
-#: cps/web.py:804
+#: cps/web.py:809
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series : %(serie)s"
 
-#: cps/web.py:806 cps/web.py:902 cps/web.py:1061 cps/web.py:1729
+#: cps/web.py:811 cps/web.py:907 cps/web.py:1102 cps/web.py:1838
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Error en apertura del Objeto. El archivo no existe o no es accesible"
 
-#: cps/web.py:837
+#: cps/web.py:842
 msgid "Available languages"
 msgstr "Lenguajes disponibles"
 
-#: cps/web.py:852
+#: cps/web.py:857
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lenguaje: %(name)s"
 
-#: cps/templates/index.xml:57 cps/web.py:865
+#: cps/templates/index.xml:43 cps/web.py:870
 msgid "Category list"
 msgstr "Lista de Categorias"
 
-#: cps/web.py:875
+#: cps/web.py:880
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"
 
-#: cps/web.py:931
+#: cps/web.py:936
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: cps/web.py:939
+#: cps/web.py:944
 msgid "Server restarts"
 msgstr "Reinicio del Servidor"
 
-#: cps/web.py:1037 cps/web.py:1044 cps/web.py:1051 cps/web.py:1058
+#: cps/web.py:1078 cps/web.py:1085 cps/web.py:1092 cps/web.py:1099
 msgid "Read a Book"
 msgstr "Leer un Libro"
 
-#: cps/web.py:1100 cps/web.py:1365
+#: cps/web.py:1141 cps/web.py:1474
 msgid "Please fill out all fields!"
 msgstr "Por favor llenar todos los campos!"
 
-#: cps/web.py:1116
+#: cps/web.py:1157
 msgid "An unknown error occured. Please try again later."
 msgstr "Ocurrio un error. Intentar de nuevo mas tarde."
 
-#: cps/web.py:1121
+#: cps/web.py:1162
 msgid "This username or email address is already in use."
 msgstr "Usuario o direccion de correo en uso."
 
-#: cps/web.py:1124
+#: cps/web.py:1165
 msgid "register"
 msgstr "Registrarse"
 
-#: cps/web.py:1140
+#: cps/web.py:1181
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"
 
-#: cps/web.py:1143
+#: cps/web.py:1185
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"
 
-#: cps/web.py:1145
+#: cps/web.py:1187
 msgid "login"
 msgstr "Iniciar Sesion"
 
-#: cps/web.py:1162
+#: cps/web.py:1204
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."
 
-#: cps/web.py:1166
+#: cps/web.py:1208
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Envio de Libro a %(kindlemail)s correctamente"
 
-#: cps/web.py:1170
+#: cps/web.py:1212
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ha sucedido un error en el envio del Libro: %(res)s"
 
-#: cps/web.py:1172
+#: cps/web.py:1214
 msgid "Please configure your kindle email address first..."
 msgstr "Configurar primero la dirección de correo Kindle por favor..."
 
-#: cps/web.py:1188
+#: cps/web.py:1234
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1255
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"
 
-#: cps/web.py:1226
+#: cps/web.py:1273 cps/web.py:1294
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Une étagère de ce nom '%(title)s' existe déjà."
 
-#: cps/web.py:1231
+#: cps/web.py:1278
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/web.py:1233
+#: cps/web.py:1280 cps/web.py:1305
 msgid "There was an error"
 msgstr "Hemos tenido un error"
 
-#: cps/web.py:1234 cps/web.py:1236
+#: cps/web.py:1281 cps/web.py:1283
 msgid "create a shelf"
 msgstr "Crear un Estante"
 
-#: cps/web.py:1256
+#: cps/web.py:1303
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr ""
+
+#: cps/web.py:1306 cps/web.py:1308
+msgid "Edit a shelf"
+msgstr ""
+
+#: cps/web.py:1329
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"
 
-#: cps/web.py:1277
+#: cps/web.py:1350
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/web.py:1332
+#: cps/web.py:1378
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr ""
+
+#: cps/web.py:1433
 msgid "Found an existing account for this email address."
 msgstr "Existe una cuenta vinculada a esta cuenta de correo."
 
-#: cps/web.py:1334 cps/web.py:1337
+#: cps/web.py:1435 cps/web.py:1438
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1335
+#: cps/web.py:1436
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1346
-msgid "User list"
-msgstr "lista de usuarios"
+#: cps/web.py:1447 cps/web.py:1455
+msgid "Admin page"
+msgstr ""
 
-#: cps/templates/user_list.html:32 cps/web.py:1366
+#: cps/templates/admin.html:32 cps/web.py:1475
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:1399
+#: cps/web.py:1508
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:1403
+#: cps/web.py:1512
 msgid "Found an existing account for this email address or nickname."
 msgstr "Se ha encontrado una cuenta vinculada a esta cuenta de correo o usuario."
 
-#: cps/web.py:1426 cps/web.py:1437
+#: cps/web.py:1535 cps/web.py:1546
 msgid "Mail settings updated"
 msgstr "Parametros de correo actualizados"
 
-#: cps/web.py:1432
+#: cps/web.py:1541
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Exito al realizar envio de prueba a %(kindlemail)s"
 
-#: cps/web.py:1435
+#: cps/web.py:1544
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Error al realizar envio de prueba a E-Mail: %(res)s"
 
-#: cps/web.py:1438
+#: cps/web.py:1547
 msgid "Edit mail settings"
 msgstr "Editar parametros de correo"
 
-#: cps/web.py:1461
+#: cps/web.py:1570
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:1516
+#: cps/web.py:1625
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  Actualizado"
 
-#: cps/web.py:1519
+#: cps/web.py:1628
 msgid "An unknown error occured."
 msgstr "Oups ! Error inesperado."
 
-#: cps/web.py:1521
+#: cps/web.py:1630
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:1759
+#: cps/web.py:1868
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"
 
-#: cps/web.py:1764
+#: cps/web.py:1873
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"
 
-#: cps/web.py:1769
+#: cps/web.py:1878
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
 
+#: cps/templates/admin.html:4
+msgid "User list"
+msgstr "lista de usuarios"
+
+#: cps/templates/admin.html:7
+msgid "Nickname"
+msgstr "Nickname"
+
+#: cps/templates/admin.html:8
+msgid "Email"
+msgstr "Correo"
+
+#: cps/templates/admin.html:9
+msgid "Kindle"
+msgstr "Kindle"
+
+#: cps/templates/admin.html:10
+msgid "DLS"
+msgstr "DLS"
+
+#: cps/templates/admin.html:11 cps/templates/layout.html:83
+msgid "Admin"
+msgstr "Administracion"
+
+#: cps/templates/admin.html:12 cps/templates/detail.html:114
+msgid "Download"
+msgstr "Descarga"
+
+#: cps/templates/admin.html:13 cps/templates/layout.html:76
+msgid "Upload"
+msgstr "Subir archivo"
+
+#: cps/templates/admin.html:14
+msgid "Edit"
+msgstr "Editar"
+
+#: cps/templates/admin.html:15
+msgid "Passwd"
+msgstr "Clave"
+
+#: cps/templates/admin.html:33
+msgid "SMTP mail settings"
+msgstr "Parametros smtp del correo"
+
+#: cps/templates/admin.html:36 cps/templates/email_edit.html:7
+msgid "SMTP hostname"
+msgstr "Servidor smtp"
+
+#: cps/templates/admin.html:37
+msgid "SMTP port"
+msgstr "Puerto smtp"
+
+#: cps/templates/admin.html:38
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/admin.html:39 cps/templates/email_edit.html:19
+msgid "SMTP login"
+msgstr "Login SMTP"
+
+#: cps/templates/admin.html:40 cps/templates/email_edit.html:23
+msgid "SMTP password"
+msgstr "Clave SMTP"
+
+#: cps/templates/admin.html:41
+msgid "From mail"
+msgstr "Desde el correo"
+
+#: cps/templates/admin.html:53
+msgid "Change SMTP settings"
+msgstr "Cambiar parametros smtp"
+
+#: cps/templates/admin.html:55
+msgid "Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:58
+msgid "Log File"
+msgstr ""
+
+#: cps/templates/admin.html:59
+msgid "Log Level"
+msgstr ""
+
+#: cps/templates/admin.html:60
+msgid "Port"
+msgstr ""
+
+#: cps/templates/admin.html:61
+msgid "Books per page"
+msgstr ""
+
+#: cps/templates/admin.html:62
+msgid "Uploading"
+msgstr ""
+
+#: cps/templates/admin.html:63
+msgid "Public registration"
+msgstr ""
+
+#: cps/templates/admin.html:64
+msgid "Anonymous browsing"
+msgstr ""
+
+#: cps/templates/admin.html:75
+msgid "Administration"
+msgstr ""
+
+#: cps/templates/admin.html:77
+msgid "Restart Calibre-web"
+msgstr ""
+
 #: cps/templates/detail.html:38
 msgid "Book"
 msgstr "Libro"
@@ -294,23 +420,19 @@ msgstr "de"
 msgid "language"
 msgstr "Lenguaje"
 
-#: cps/templates/detail.html:92
+#: cps/templates/detail.html:103
 msgid "Description:"
 msgstr "Descripcion :"
 
-#: cps/templates/detail.html:103 cps/templates/user_list.html:12
-msgid "Download"
-msgstr "Descarga"
-
-#: cps/templates/detail.html:117
+#: cps/templates/detail.html:128
 msgid "Read in browser"
 msgstr "Ver en el navegador"
 
-#: cps/templates/detail.html:136
+#: cps/templates/detail.html:147
 msgid "Add to shelf"
 msgstr "Agregar al estante"
 
-#: cps/templates/detail.html:176
+#: cps/templates/detail.html:187
 msgid "Edit metadata"
 msgstr "Editar la metadata"
 
@@ -330,7 +452,8 @@ msgstr "Descripcion"
 msgid "Tags"
 msgstr "Etiqueta"
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:131
+#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/search_form.html:33
 msgid "Series"
 msgstr "Series"
 
@@ -363,20 +486,17 @@ msgid "view book after edit"
 msgstr "Ver libro tras la edicion"
 
 #: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:33 cps/templates/shelf_edit.html:15
+#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
 #: cps/templates/user_edit.html:94
 msgid "Submit"
 msgstr "Enviar"
 
 #: cps/templates/edit_book.html:106 cps/templates/email_edit.html:32
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:96
 msgid "Back"
 msgstr "Regresar"
 
-#: cps/templates/email_edit.html:7 cps/templates/user_list.html:36
-msgid "SMTP hostname"
-msgstr "Servidor smtp"
-
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 587 for SSL)"
 msgstr "Puerto smtp"
@@ -385,14 +505,6 @@ msgstr "Puerto smtp"
 msgid "Server uses SSL (StartTLS)"
 msgstr "El Servidor utiliza SSL (StartTLS)"
 
-#: cps/templates/email_edit.html:19 cps/templates/user_list.html:39
-msgid "SMTP login"
-msgstr "Login SMTP"
-
-#: cps/templates/email_edit.html:23 cps/templates/user_list.html:40
-msgid "SMTP password"
-msgstr "Clave SMTP"
-
 #: cps/templates/email_edit.html:27
 msgid "From e-mail"
 msgstr "Desde el correo"
@@ -413,111 +525,103 @@ msgstr "Siguiente"
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/templates/index.xml:8
+#: cps/templates/index.xml:5
 msgid "Start"
 msgstr "Iniciar"
 
-#: cps/templates/index.xml:12 cps/templates/layout.html:59
+#: cps/templates/index.xml:7 cps/templates/layout.html:61
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/templates/index.xml:23 cps/templates/layout.html:122
+#: cps/templates/index.xml:15 cps/templates/layout.html:124
 msgid "Hot Books"
 msgstr "Libros Populares"
 
-#: cps/templates/index.xml:28
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Publicaciones populares del catalogo basados en el puntaje."
 
-#: cps/templates/index.xml:32 cps/templates/layout.html:120
+#: cps/templates/index.xml:22 cps/templates/layout.html:122
 msgid "New Books"
 msgstr "Nuevos Libros"
 
-#: cps/templates/index.xml:37
+#: cps/templates/index.xml:26
 msgid "The latest Books"
 msgstr "Libros Recientes"
 
-#: cps/templates/index.xml:46
+#: cps/templates/index.xml:33
 msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
-#: cps/templates/index.xml:49 cps/templates/layout.html:133
+#: cps/templates/index.xml:36 cps/templates/layout.html:135
 msgid "Authors"
 msgstr "Autores"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:40
 msgid "Books ordered by Author"
 msgstr "Libros ordenados por Autor"
 
-#: cps/templates/index.xml:62
+#: cps/templates/index.xml:47
 msgid "Books ordered by category"
 msgstr "Libros ordenados por Categorias"
 
-#: cps/templates/index.xml:70
+#: cps/templates/index.xml:54
 msgid "Books ordered by series"
 msgstr "Libros ordenados por Series"
 
-#: cps/templates/layout.html:46
-msgid "Cambiar navegación"
-msgstr "Basculer la navigation"
+#: cps/templates/layout.html:48
+msgid "Toggle navigation"
+msgstr ""
 
-#: cps/templates/layout.html:61
+#: cps/templates/layout.html:63
 msgid "Go!"
 msgstr "Vamos!"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:66
 msgid "Advanced Search"
 msgstr "Busqueda avanzada"
 
-#: cps/templates/layout.html:74 cps/templates/user_list.html:13
-msgid "Upload"
-msgstr "Subir archivo"
-
-#: cps/templates/layout.html:81 cps/templates/user_list.html:11
-msgid "Admin"
-msgstr "Administracion"
-
-#: cps/templates/layout.html:85
+#: cps/templates/layout.html:87
 msgid "Logout"
 msgstr "Cerrar Sesion"
 
-#: cps/templates/layout.html:89 cps/templates/login.html:4
+#: cps/templates/layout.html:91 cps/templates/login.html:4
 msgid "Login"
 msgstr "Inicio de Sesion"
 
-#: cps/templates/layout.html:90 cps/templates/register.html:18
+#: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr "Registro"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:121
 msgid "Browse"
 msgstr "Explorar"
 
-#: cps/templates/layout.html:125
+#: cps/templates/layout.html:127
 msgid "Discover"
 msgstr "Descubrir"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:130
 msgid "Categories"
 msgstr "Categoria"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:137 cps/templates/search_form.html:54
 msgid "Languages"
 msgstr "Lenguaje"
 
-#: cps/templates/layout.html:138
+#: cps/templates/layout.html:140
 msgid "Public Shelves"
 msgstr "Estantes Publicos"
 
-#: cps/templates/layout.html:142
+#: cps/templates/layout.html:144
 msgid "Your Shelves"
 msgstr "Sus Estantes"
 
-#: cps/templates/layout.html:147
+#: cps/templates/layout.html:149
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
-#: cps/templates/layout.html:150
+#: cps/templates/layout.html:152
 msgid "About"
 msgstr "Acerca de"
 
@@ -543,6 +647,10 @@ msgstr "Redimensionar el texto cuando las barras laterales estan abiertas"
 msgid "PDF.js viewer"
 msgstr "Visor PDF.js"
 
+#: cps/templates/readtxt.html:6
+msgid "Basic txt Reader"
+msgstr ""
+
 #: cps/templates/register.html:4
 msgid "Register a new account"
 msgstr "Registre una cuenta nueva"
@@ -579,14 +687,26 @@ msgstr "Resultados para:"
 msgid "Exclude Tags"
 msgstr "Excluir etiquetas"
 
-msgid "Delete this Shelf"
+#: cps/templates/search_form.html:43
+msgid "Exclude Series"
+msgstr ""
+
+#: cps/templates/search_form.html:64
+msgid "Exclude Languages"
+msgstr ""
+
 #: cps/templates/shelf.html:6
+msgid "Delete this Shelf"
 msgstr "Borrar este estante"
 
 #: cps/templates/shelf.html:7
 msgid "Edit Shelf name"
 msgstr "Editar nombre del estante"
 
+#: cps/templates/shelf.html:8
+msgid "change order"
+msgstr ""
+
 #: cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titulo"
@@ -595,6 +715,14 @@ msgstr "Titulo"
 msgid "should the shelf be public?"
 msgstr "Debe ser el estante publico?"
 
+#: cps/templates/shelf_order.html:5
+msgid "Drag 'n drop to rearrange order"
+msgstr ""
+
+#: cps/templates/shelf_order.html:11
+msgid "Change order"
+msgstr ""
+
 #: cps/templates/stats.html:3
 msgid "Linked libraries"
 msgstr "Librerias vinculadas"
@@ -607,18 +735,30 @@ msgstr "Librerias del programa"
 msgid "Installed Version"
 msgstr "Version instalada"
 
-#: cps/templates/stats.html:32
+#: cps/templates/stats.html:36
 msgid "Calibre library statistics"
 msgstr "Estadisticas de la Biblioteca"
 
-#: cps/templates/stats.html:37
+#: cps/templates/stats.html:41
 msgid "Books in this Library"
 msgstr "Libros en esta Biblioteca"
 
-#: cps/templates/stats.html:41
+#: cps/templates/stats.html:45
 msgid "Authors in this Library"
 msgstr "Autores en esta Biblioteca"
 
+#: cps/templates/stats.html:49
+msgid "Series in this Library"
+msgstr ""
+
+#: cps/templates/stats.html:53
+msgid "Tags in this Library"
+msgstr ""
+
+#: cps/templates/stats.html:57
+msgid "Usercount for calibre web"
+msgstr ""
+
 #: cps/templates/user_edit.html:23
 msgid "Kindle E-Mail"
 msgstr "Correo del Kindle"
@@ -679,49 +819,9 @@ msgstr "Borrar este usuario"
 msgid "Recent Downloads"
 msgstr "Descargas Recientes"
 
-#: cps/templates/user_list.html:7
-msgid "Nickname"
-msgstr "Nickname"
-
-#: cps/templates/user_list.html:8
-msgid "Email"
-msgstr "Correo"
-
-#: cps/templates/user_list.html:9
-msgid "Kindle"
-msgstr "Kindle"
-
-#: cps/templates/user_list.html:10
-msgid "DLS"
-msgstr "DLS"
-
-#: cps/templates/user_list.html:14
-msgid "Edit"
-msgstr "Editar"
-
-#: cps/templates/user_list.html:15
-msgid "Passwd"
-msgstr "Clave"
-
-#: cps/templates/user_list.html:33
-msgid "SMTP mail settings"
-msgstr "Parametros smtp del correo"
-
-#: cps/templates/user_list.html:37
-msgid "SMTP port"
-msgstr "Puerto smtp"
-
-#: cps/templates/user_list.html:38
-msgid "SSL"
-msgstr "SSL"
-
-#: cps/templates/user_list.html:41
-msgid "From mail"
-msgstr "Desde el correo"
-
-#: cps/templates/user_list.html:53
-msgid "Change SMTP settings"
-msgstr "Cambiar parametros smtp"
-
 msgid "Latin"
 msgstr "Latin"
+
+#~ msgid "Cambiar navegación"
+#~ msgstr "Basculer la navigation"
+
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 83cec987..50bbfd18 100644
Binary files a/cps/translations/fr/LC_MESSAGES/messages.mo and b/cps/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index fa75ccdb..30e60352 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-23 08:39+0100\n"
+"POT-Creation-Date: 2017-01-03 19:50+0100\n"
 "PO-Revision-Date: 2016-11-13 18:35+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -18,274 +18,400 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:108 cps/book_formats.py:112 cps/web.py:923
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:928
 msgid "not installed"
 msgstr ""
 
-#: cps/helper.py:93
+#: cps/helper.py:98
 msgid "Calibre-web test email"
 msgstr ""
 
-#: cps/helper.py:94 cps/helper.py:147
+#: cps/helper.py:99 cps/helper.py:152
 msgid "This email has been sent via calibre web."
 msgstr "Ce message a été envoyé depuis calibre web."
 
-#: cps/helper.py:128 cps/helper.py:216
+#: cps/helper.py:133 cps/helper.py:221
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "Impossible d'envoyer le courriel : %s"
 
-#: cps/helper.py:146 cps/templates/detail.html:113
+#: cps/helper.py:151 cps/templates/detail.html:124
 msgid "Send to Kindle"
 msgstr "Envoyer ver Kindle"
 
-#: cps/helper.py:169 cps/helper.py:184
+#: cps/helper.py:174 cps/helper.py:189
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossible de trouver un format adapté à envoyer par courriel"
 
-#: cps/helper.py:178
+#: cps/helper.py:183
 msgid "Could not convert epub to mobi"
 msgstr "Impossible de convertir epub vers mobi"
 
-#: cps/helper.py:236
+#: cps/helper.py:241
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 "Le fichier demandé ne peux pas être lu. Peut-être de mauvaises "
 "permissions ?"
 
-#: cps/web.py:717
+#: cps/web.py:722
 msgid "Latest Books"
 msgstr "Derniers livres"
 
-#: cps/web.py:742
+#: cps/web.py:747
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/templates/index.xml:41 cps/web.py:750
+#: cps/templates/index.xml:29 cps/web.py:755
 msgid "Random Books"
 msgstr "Livres au hasard"
 
-#: cps/web.py:763
+#: cps/web.py:768
 msgid "Author list"
 msgstr "Liste des auteurs"
 
-#: cps/web.py:780
+#: cps/web.py:785
 #, python-format
 msgid "Author: %(nam)s"
 msgstr "Auteur : %(nam)s"
 
-#: cps/templates/index.xml:65 cps/web.py:793
+#: cps/templates/index.xml:50 cps/web.py:798
 msgid "Series list"
 msgstr "Liste des séries"
 
-#: cps/web.py:804
+#: cps/web.py:809
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:806 cps/web.py:902 cps/web.py:1061 cps/web.py:1729
+#: cps/web.py:811 cps/web.py:907 cps/web.py:1102 cps/web.py:1838
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est "
 "pas accessible :"
 
-#: cps/web.py:837
+#: cps/web.py:842
 msgid "Available languages"
 msgstr "Langues disponibles"
 
-#: cps/web.py:852
+#: cps/web.py:857
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/index.xml:57 cps/web.py:865
+#: cps/templates/index.xml:43 cps/web.py:870
 msgid "Category list"
 msgstr "Liste des catégories"
 
-#: cps/web.py:875
+#: cps/web.py:880
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:931
+#: cps/web.py:936
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:939
+#: cps/web.py:944
 msgid "Server restarts"
 msgstr ""
 
-#: cps/web.py:1037 cps/web.py:1044 cps/web.py:1051 cps/web.py:1058
+#: cps/web.py:1078 cps/web.py:1085 cps/web.py:1092 cps/web.py:1099
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:1100 cps/web.py:1365
+#: cps/web.py:1141 cps/web.py:1474
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/web.py:1116
+#: cps/web.py:1157
 msgid "An unknown error occured. Please try again later."
 msgstr "Une erreur a eu lieu. Merci de réessayez plus tard."
 
-#: cps/web.py:1121
+#: cps/web.py:1162
 msgid "This username or email address is already in use."
 msgstr "Ce nom d'utilisateur ou cette adresse de courriel est déjà utilisée."
 
-#: cps/web.py:1124
+#: cps/web.py:1165
 msgid "register"
 msgstr "S'enregistrer"
 
-#: cps/web.py:1140
+#: cps/web.py:1181
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:1143
+#: cps/web.py:1185
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1145
+#: cps/web.py:1187
 msgid "login"
 msgstr "Connexion"
 
-#: cps/web.py:1162
+#: cps/web.py:1204
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veillez configurer les paramètres smtp d'abord..."
 
-#: cps/web.py:1166
+#: cps/web.py:1208
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Livres envoyés à %(kindlemail)s avec succès"
 
-#: cps/web.py:1170
+#: cps/web.py:1212
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
 
-#: cps/web.py:1172
+#: cps/web.py:1214
 msgid "Please configure your kindle email address first..."
 msgstr "Veuillez configurer votre adresse kindle d'abord..."
 
-#: cps/web.py:1188
+#: cps/web.py:1234
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
 
-#: cps/web.py:1209
+#: cps/web.py:1255
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 
-#: cps/web.py:1226
+#: cps/web.py:1273 cps/web.py:1294
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Une étagère de ce nom '%(title)s' existe déjà."
 
-#: cps/web.py:1231
+#: cps/web.py:1278
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/web.py:1233
+#: cps/web.py:1280 cps/web.py:1305
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/web.py:1234 cps/web.py:1236
+#: cps/web.py:1281 cps/web.py:1283
 msgid "create a shelf"
 msgstr "Créer une étagère"
 
-#: cps/web.py:1256
+#: cps/web.py:1303
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr ""
+
+#: cps/web.py:1306 cps/web.py:1308
+msgid "Edit a shelf"
+msgstr ""
+
+#: cps/web.py:1329
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "L'étagère %(name)s a été supprimé avec succès"
 
-#: cps/web.py:1277
+#: cps/web.py:1350
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/web.py:1332
+#: cps/web.py:1378
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr ""
+
+#: cps/web.py:1433
 msgid "Found an existing account for this email address."
 msgstr "Un compte avec cette adresse de courriel existe déjà."
 
-#: cps/web.py:1334 cps/web.py:1337
+#: cps/web.py:1435 cps/web.py:1438
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1335
+#: cps/web.py:1436
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1346
-msgid "User list"
-msgstr "Liste des ustilisateurs"
+#: cps/web.py:1447 cps/web.py:1455
+msgid "Admin page"
+msgstr ""
 
-#: cps/templates/user_list.html:32 cps/web.py:1366
+#: cps/templates/admin.html:32 cps/web.py:1475
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:1399
+#: cps/web.py:1508
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:1403
+#: cps/web.py:1512
 msgid "Found an existing account for this email address or nickname."
 msgstr "Un compte avec cette adresse de courriel ou ce surnom existe déjà."
 
-#: cps/web.py:1426 cps/web.py:1437
+#: cps/web.py:1535 cps/web.py:1546
 msgid "Mail settings updated"
 msgstr "Paramètres de courriel mis à jour"
 
-#: cps/web.py:1432
+#: cps/web.py:1541
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1435
+#: cps/web.py:1544
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1438
+#: cps/web.py:1547
 msgid "Edit mail settings"
 msgstr "Éditer les paramètres de courriel"
 
-#: cps/web.py:1461
+#: cps/web.py:1570
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:1516
+#: cps/web.py:1625
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:1519
+#: cps/web.py:1628
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:1521
+#: cps/web.py:1630
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:1759
+#: cps/web.py:1868
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"
 
-#: cps/web.py:1764
+#: cps/web.py:1873
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
 
-#: cps/web.py:1769
+#: cps/web.py:1878
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
 
+#: cps/templates/admin.html:4
+msgid "User list"
+msgstr "Liste des ustilisateurs"
+
+#: cps/templates/admin.html:7
+msgid "Nickname"
+msgstr "Surnom"
+
+#: cps/templates/admin.html:8
+msgid "Email"
+msgstr "Courriel"
+
+#: cps/templates/admin.html:9
+msgid "Kindle"
+msgstr "Kindle"
+
+#: cps/templates/admin.html:10
+msgid "DLS"
+msgstr "DLS"
+
+#: cps/templates/admin.html:11 cps/templates/layout.html:83
+msgid "Admin"
+msgstr "Administration"
+
+#: cps/templates/admin.html:12 cps/templates/detail.html:114
+msgid "Download"
+msgstr "Télécharger"
+
+#: cps/templates/admin.html:13 cps/templates/layout.html:76
+msgid "Upload"
+msgstr "Téléverser"
+
+#: cps/templates/admin.html:14
+msgid "Edit"
+msgstr "Éditer"
+
+#: cps/templates/admin.html:15
+msgid "Passwd"
+msgstr "Mot de passe"
+
+#: cps/templates/admin.html:33
+msgid "SMTP mail settings"
+msgstr "Paramètres smtp"
+
+#: cps/templates/admin.html:36 cps/templates/email_edit.html:7
+msgid "SMTP hostname"
+msgstr "Serveur smtp"
+
+#: cps/templates/admin.html:37
+msgid "SMTP port"
+msgstr "Port smtp"
+
+#: cps/templates/admin.html:38
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/admin.html:39 cps/templates/email_edit.html:19
+msgid "SMTP login"
+msgstr "Login smtp"
+
+#: cps/templates/admin.html:40 cps/templates/email_edit.html:23
+msgid "SMTP password"
+msgstr "Mot de passe smtp"
+
+#: cps/templates/admin.html:41
+msgid "From mail"
+msgstr "Expéditeur des courriels"
+
+#: cps/templates/admin.html:53
+msgid "Change SMTP settings"
+msgstr "Changer les paramètre smtp"
+
+#: cps/templates/admin.html:55
+msgid "Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:58
+msgid "Log File"
+msgstr ""
+
+#: cps/templates/admin.html:59
+msgid "Log Level"
+msgstr ""
+
+#: cps/templates/admin.html:60
+msgid "Port"
+msgstr ""
+
+#: cps/templates/admin.html:61
+msgid "Books per page"
+msgstr ""
+
+#: cps/templates/admin.html:62
+msgid "Uploading"
+msgstr ""
+
+#: cps/templates/admin.html:63
+msgid "Public registration"
+msgstr ""
+
+#: cps/templates/admin.html:64
+msgid "Anonymous browsing"
+msgstr ""
+
+#: cps/templates/admin.html:75
+msgid "Administration"
+msgstr ""
+
+#: cps/templates/admin.html:77
+msgid "Restart Calibre-web"
+msgstr ""
+
 #: cps/templates/detail.html:38
 msgid "Book"
 msgstr "Livre"
@@ -298,23 +424,19 @@ msgstr ""
 msgid "language"
 msgstr "Langue"
 
-#: cps/templates/detail.html:92
+#: cps/templates/detail.html:103
 msgid "Description:"
 msgstr "Description :"
 
-#: cps/templates/detail.html:103 cps/templates/user_list.html:12
-msgid "Download"
-msgstr "Télécharger"
-
-#: cps/templates/detail.html:117
+#: cps/templates/detail.html:128
 msgid "Read in browser"
 msgstr "Lire dans le navigateur"
 
-#: cps/templates/detail.html:136
+#: cps/templates/detail.html:147
 msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
-#: cps/templates/detail.html:176
+#: cps/templates/detail.html:187
 msgid "Edit metadata"
 msgstr "Éditer les métadonnées"
 
@@ -334,7 +456,8 @@ msgstr "Description"
 msgid "Tags"
 msgstr "Étiquette"
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:131
+#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/search_form.html:33
 msgid "Series"
 msgstr "Séries"
 
@@ -367,20 +490,17 @@ msgid "view book after edit"
 msgstr "Voir le livre après l'édition"
 
 #: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:33 cps/templates/shelf_edit.html:15
+#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
 #: cps/templates/user_edit.html:94
 msgid "Submit"
 msgstr "Soumettre"
 
 #: cps/templates/edit_book.html:106 cps/templates/email_edit.html:32
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:96
 msgid "Back"
 msgstr "Retour"
 
-#: cps/templates/email_edit.html:7 cps/templates/user_list.html:36
-msgid "SMTP hostname"
-msgstr "Serveur smtp"
-
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 587 for SSL)"
 msgstr "Port smtp"
@@ -389,14 +509,6 @@ msgstr "Port smtp"
 msgid "Server uses SSL (StartTLS)"
 msgstr "Le serveur utilise SSL (StartTLS)"
 
-#: cps/templates/email_edit.html:19 cps/templates/user_list.html:39
-msgid "SMTP login"
-msgstr "Login smtp"
-
-#: cps/templates/email_edit.html:23 cps/templates/user_list.html:40
-msgid "SMTP password"
-msgstr "Mot de passe smtp"
-
 #: cps/templates/email_edit.html:27
 msgid "From e-mail"
 msgstr "Expéditeur des courriels"
@@ -417,111 +529,103 @@ msgstr "Suivant"
 msgid "Discover (Random Books)"
 msgstr "Découverte (livres au hasard)"
 
-#: cps/templates/index.xml:8
+#: cps/templates/index.xml:5
 msgid "Start"
 msgstr "Démarrer"
 
-#: cps/templates/index.xml:12 cps/templates/layout.html:59
+#: cps/templates/index.xml:7 cps/templates/layout.html:61
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/templates/index.xml:23 cps/templates/layout.html:122
+#: cps/templates/index.xml:15 cps/templates/layout.html:124
 msgid "Hot Books"
 msgstr "Livres populaires"
 
-#: cps/templates/index.xml:28
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Publications populaires de ce catalogue sur la base de notes."
 
-#: cps/templates/index.xml:32 cps/templates/layout.html:120
+#: cps/templates/index.xml:22 cps/templates/layout.html:122
 msgid "New Books"
 msgstr "Nouveaux livres"
 
-#: cps/templates/index.xml:37
+#: cps/templates/index.xml:26
 msgid "The latest Books"
 msgstr "Les derniers livres"
 
-#: cps/templates/index.xml:46
+#: cps/templates/index.xml:33
 msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/templates/index.xml:49 cps/templates/layout.html:133
+#: cps/templates/index.xml:36 cps/templates/layout.html:135
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:40
 msgid "Books ordered by Author"
 msgstr "Livres classés par auteur"
 
-#: cps/templates/index.xml:62
+#: cps/templates/index.xml:47
 msgid "Books ordered by category"
 msgstr "Livres classés par catégorie"
 
-#: cps/templates/index.xml:70
+#: cps/templates/index.xml:54
 msgid "Books ordered by series"
 msgstr "Livres classés par série"
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:48
 msgid "Toggle navigation"
 msgstr "Basculer la navigation"
 
-#: cps/templates/layout.html:61
+#: cps/templates/layout.html:63
 msgid "Go!"
 msgstr "Allez !"
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:66
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: cps/templates/layout.html:74 cps/templates/user_list.html:13
-msgid "Upload"
-msgstr "Téléverser"
-
-#: cps/templates/layout.html:81 cps/templates/user_list.html:11
-msgid "Admin"
-msgstr "Administration"
-
-#: cps/templates/layout.html:85
+#: cps/templates/layout.html:87
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: cps/templates/layout.html:89 cps/templates/login.html:4
+#: cps/templates/layout.html:91 cps/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
 
-#: cps/templates/layout.html:90 cps/templates/register.html:18
+#: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:121
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:125
+#: cps/templates/layout.html:127
 msgid "Discover"
 msgstr "Découvrir"
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:130
 msgid "Categories"
 msgstr "Catégories"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:137 cps/templates/search_form.html:54
 msgid "Languages"
 msgstr "Langues"
 
-#: cps/templates/layout.html:138
+#: cps/templates/layout.html:140
 msgid "Public Shelves"
 msgstr "Étagères publiques"
 
-#: cps/templates/layout.html:142
+#: cps/templates/layout.html:144
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
-#: cps/templates/layout.html:147
+#: cps/templates/layout.html:149
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
-#: cps/templates/layout.html:150
+#: cps/templates/layout.html:152
 msgid "About"
 msgstr "À popos"
 
@@ -547,6 +651,10 @@ msgstr ""
 msgid "PDF.js viewer"
 msgstr ""
 
+#: cps/templates/readtxt.html:6
+msgid "Basic txt Reader"
+msgstr ""
+
 #: cps/templates/register.html:4
 msgid "Register a new account"
 msgstr "Enregistrer un nouveau compte"
@@ -583,6 +691,14 @@ msgstr "Résultats pour :"
 msgid "Exclude Tags"
 msgstr "Exclure des étiquettes"
 
+#: cps/templates/search_form.html:43
+msgid "Exclude Series"
+msgstr ""
+
+#: cps/templates/search_form.html:64
+msgid "Exclude Languages"
+msgstr ""
+
 #: cps/templates/shelf.html:6
 msgid "Delete this Shelf"
 msgstr "Effacer cette étagère"
@@ -591,6 +707,10 @@ msgstr "Effacer cette étagère"
 msgid "Edit Shelf name"
 msgstr ""
 
+#: cps/templates/shelf.html:8
+msgid "change order"
+msgstr ""
+
 #: cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titre"
@@ -599,6 +719,14 @@ msgstr "Titre"
 msgid "should the shelf be public?"
 msgstr "Cette étagère doit-elle être publique ?"
 
+#: cps/templates/shelf_order.html:5
+msgid "Drag 'n drop to rearrange order"
+msgstr ""
+
+#: cps/templates/shelf_order.html:11
+msgid "Change order"
+msgstr ""
+
 #: cps/templates/stats.html:3
 msgid "Linked libraries"
 msgstr ""
@@ -611,18 +739,30 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
-#: cps/templates/stats.html:32
+#: cps/templates/stats.html:36
 msgid "Calibre library statistics"
 msgstr ""
 
-#: cps/templates/stats.html:37
+#: cps/templates/stats.html:41
 msgid "Books in this Library"
 msgstr "Livres dans la bibiothèque"
 
-#: cps/templates/stats.html:41
+#: cps/templates/stats.html:45
 msgid "Authors in this Library"
 msgstr "Auteurs dans la bibliothèque"
 
+#: cps/templates/stats.html:49
+msgid "Series in this Library"
+msgstr ""
+
+#: cps/templates/stats.html:53
+msgid "Tags in this Library"
+msgstr ""
+
+#: cps/templates/stats.html:57
+msgid "Usercount for calibre web"
+msgstr ""
+
 #: cps/templates/user_edit.html:23
 msgid "Kindle E-Mail"
 msgstr "Courriel Kindle"
@@ -683,50 +823,6 @@ msgstr "Supprimer cet utilisateur"
 msgid "Recent Downloads"
 msgstr "Téléchargements récents"
 
-#: cps/templates/user_list.html:7
-msgid "Nickname"
-msgstr "Surnom"
-
-#: cps/templates/user_list.html:8
-msgid "Email"
-msgstr "Courriel"
-
-#: cps/templates/user_list.html:9
-msgid "Kindle"
-msgstr "Kindle"
-
-#: cps/templates/user_list.html:10
-msgid "DLS"
-msgstr "DLS"
-
-#: cps/templates/user_list.html:14
-msgid "Edit"
-msgstr "Éditer"
-
-#: cps/templates/user_list.html:15
-msgid "Passwd"
-msgstr "Mot de passe"
-
-#: cps/templates/user_list.html:33
-msgid "SMTP mail settings"
-msgstr "Paramètres smtp"
-
-#: cps/templates/user_list.html:37
-msgid "SMTP port"
-msgstr "Port smtp"
-
-#: cps/templates/user_list.html:38
-msgid "SSL"
-msgstr "SSL"
-
-#: cps/templates/user_list.html:41
-msgid "From mail"
-msgstr "Expéditeur des courriels"
-
-#: cps/templates/user_list.html:53
-msgid "Change SMTP settings"
-msgstr "Changer les paramètre smtp"
-
 msgid "Latin"
 msgstr "Latin"
 
diff --git a/cps/web.py b/cps/web.py
index fff84f37..281173e5 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1375,7 +1375,7 @@ def order_shelf(shelf_id):
         for book in books_in_shelf2:
             cur_book = db.session.query(db.Books).filter(db.Books.id == book.book_id).first()
             result.append(cur_book)
-    return render_template('order_shelf.html', entries=result, title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name), shelf=shelf)
+    return render_template('shelf_order.html', entries=result, title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name), shelf=shelf)
 
 
 @app.route("/me", methods=["GET", "POST"])
diff --git a/messages.pot b/messages.pot
index 69854d44..b53a0fda 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-23 08:39+0100\n"
+"POT-Creation-Date: 2017-01-03 19:50+0100\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"
@@ -17,270 +17,396 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:108 cps/book_formats.py:112 cps/web.py:923
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:928
 msgid "not installed"
 msgstr ""
 
-#: cps/helper.py:93
+#: cps/helper.py:98
 msgid "Calibre-web test email"
 msgstr ""
 
-#: cps/helper.py:94 cps/helper.py:147
+#: cps/helper.py:99 cps/helper.py:152
 msgid "This email has been sent via calibre web."
 msgstr ""
 
-#: cps/helper.py:128 cps/helper.py:216
+#: cps/helper.py:133 cps/helper.py:221
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr ""
 
-#: cps/helper.py:146 cps/templates/detail.html:113
+#: cps/helper.py:151 cps/templates/detail.html:124
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:169 cps/helper.py:184
+#: cps/helper.py:174 cps/helper.py:189
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 
-#: cps/helper.py:178
+#: cps/helper.py:183
 msgid "Could not convert epub to mobi"
 msgstr ""
 
-#: cps/helper.py:236
+#: cps/helper.py:241
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/web.py:717
+#: cps/web.py:722
 msgid "Latest Books"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:747
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/templates/index.xml:41 cps/web.py:750
+#: cps/templates/index.xml:29 cps/web.py:755
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:763
+#: cps/web.py:768
 msgid "Author list"
 msgstr ""
 
-#: cps/web.py:780
+#: cps/web.py:785
 #, python-format
 msgid "Author: %(nam)s"
 msgstr ""
 
-#: cps/templates/index.xml:65 cps/web.py:793
+#: cps/templates/index.xml:50 cps/web.py:798
 msgid "Series list"
 msgstr ""
 
-#: cps/web.py:804
+#: cps/web.py:809
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:806 cps/web.py:902 cps/web.py:1061 cps/web.py:1729
+#: cps/web.py:811 cps/web.py:907 cps/web.py:1102 cps/web.py:1838
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
-#: cps/web.py:837
+#: cps/web.py:842
 msgid "Available languages"
 msgstr ""
 
-#: cps/web.py:852
+#: cps/web.py:857
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/index.xml:57 cps/web.py:865
+#: cps/templates/index.xml:43 cps/web.py:870
 msgid "Category list"
 msgstr ""
 
-#: cps/web.py:875
+#: cps/web.py:880
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:931
+#: cps/web.py:936
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:939
+#: cps/web.py:944
 msgid "Server restarts"
 msgstr ""
 
-#: cps/web.py:1037 cps/web.py:1044 cps/web.py:1051 cps/web.py:1058
+#: cps/web.py:1078 cps/web.py:1085 cps/web.py:1092 cps/web.py:1099
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1100 cps/web.py:1365
+#: cps/web.py:1141 cps/web.py:1474
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:1116
+#: cps/web.py:1157
 msgid "An unknown error occured. Please try again later."
 msgstr ""
 
-#: cps/web.py:1121
+#: cps/web.py:1162
 msgid "This username or email address is already in use."
 msgstr ""
 
-#: cps/web.py:1124
+#: cps/web.py:1165
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1140
+#: cps/web.py:1181
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1185
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1145
+#: cps/web.py:1187
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1162
+#: cps/web.py:1204
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:1166
+#: cps/web.py:1208
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1170
+#: cps/web.py:1212
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1172
+#: cps/web.py:1214
 msgid "Please configure your kindle email address first..."
 msgstr ""
 
-#: cps/web.py:1188
+#: cps/web.py:1234
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:1209
+#: cps/web.py:1255
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:1226
+#: cps/web.py:1273 cps/web.py:1294
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:1231
+#: cps/web.py:1278
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:1233
+#: cps/web.py:1280 cps/web.py:1305
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:1234 cps/web.py:1236
+#: cps/web.py:1281 cps/web.py:1283
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:1256
+#: cps/web.py:1303
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr ""
+
+#: cps/web.py:1306 cps/web.py:1308
+msgid "Edit a shelf"
+msgstr ""
+
+#: cps/web.py:1329
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:1277
+#: cps/web.py:1350
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1332
+#: cps/web.py:1378
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr ""
+
+#: cps/web.py:1433
 msgid "Found an existing account for this email address."
 msgstr ""
 
-#: cps/web.py:1334 cps/web.py:1337
+#: cps/web.py:1435 cps/web.py:1438
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1335
+#: cps/web.py:1436
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1346
-msgid "User list"
+#: cps/web.py:1447 cps/web.py:1455
+msgid "Admin page"
 msgstr ""
 
-#: cps/templates/user_list.html:32 cps/web.py:1366
+#: cps/templates/admin.html:32 cps/web.py:1475
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:1399
+#: cps/web.py:1508
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:1403
+#: cps/web.py:1512
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 
-#: cps/web.py:1426 cps/web.py:1437
+#: cps/web.py:1535 cps/web.py:1546
 msgid "Mail settings updated"
 msgstr ""
 
-#: cps/web.py:1432
+#: cps/web.py:1541
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1435
+#: cps/web.py:1544
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1438
+#: cps/web.py:1547
 msgid "Edit mail settings"
 msgstr ""
 
-#: cps/web.py:1461
+#: cps/web.py:1570
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:1516
+#: cps/web.py:1625
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:1519
+#: cps/web.py:1628
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:1521
+#: cps/web.py:1630
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:1759
+#: cps/web.py:1868
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:1764
+#: cps/web.py:1873
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:1769
+#: cps/web.py:1878
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
 
+#: cps/templates/admin.html:4
+msgid "User list"
+msgstr ""
+
+#: cps/templates/admin.html:7
+msgid "Nickname"
+msgstr ""
+
+#: cps/templates/admin.html:8
+msgid "Email"
+msgstr ""
+
+#: cps/templates/admin.html:9
+msgid "Kindle"
+msgstr ""
+
+#: cps/templates/admin.html:10
+msgid "DLS"
+msgstr ""
+
+#: cps/templates/admin.html:11 cps/templates/layout.html:83
+msgid "Admin"
+msgstr ""
+
+#: cps/templates/admin.html:12 cps/templates/detail.html:114
+msgid "Download"
+msgstr ""
+
+#: cps/templates/admin.html:13 cps/templates/layout.html:76
+msgid "Upload"
+msgstr ""
+
+#: cps/templates/admin.html:14
+msgid "Edit"
+msgstr ""
+
+#: cps/templates/admin.html:15
+msgid "Passwd"
+msgstr ""
+
+#: cps/templates/admin.html:33
+msgid "SMTP mail settings"
+msgstr ""
+
+#: cps/templates/admin.html:36 cps/templates/email_edit.html:7
+msgid "SMTP hostname"
+msgstr ""
+
+#: cps/templates/admin.html:37
+msgid "SMTP port"
+msgstr ""
+
+#: cps/templates/admin.html:38
+msgid "SSL"
+msgstr ""
+
+#: cps/templates/admin.html:39 cps/templates/email_edit.html:19
+msgid "SMTP login"
+msgstr ""
+
+#: cps/templates/admin.html:40 cps/templates/email_edit.html:23
+msgid "SMTP password"
+msgstr ""
+
+#: cps/templates/admin.html:41
+msgid "From mail"
+msgstr ""
+
+#: cps/templates/admin.html:53
+msgid "Change SMTP settings"
+msgstr ""
+
+#: cps/templates/admin.html:55
+msgid "Configuration"
+msgstr ""
+
+#: cps/templates/admin.html:58
+msgid "Log File"
+msgstr ""
+
+#: cps/templates/admin.html:59
+msgid "Log Level"
+msgstr ""
+
+#: cps/templates/admin.html:60
+msgid "Port"
+msgstr ""
+
+#: cps/templates/admin.html:61
+msgid "Books per page"
+msgstr ""
+
+#: cps/templates/admin.html:62
+msgid "Uploading"
+msgstr ""
+
+#: cps/templates/admin.html:63
+msgid "Public registration"
+msgstr ""
+
+#: cps/templates/admin.html:64
+msgid "Anonymous browsing"
+msgstr ""
+
+#: cps/templates/admin.html:75
+msgid "Administration"
+msgstr ""
+
+#: cps/templates/admin.html:77
+msgid "Restart Calibre-web"
+msgstr ""
+
 #: cps/templates/detail.html:38
 msgid "Book"
 msgstr ""
@@ -293,23 +419,19 @@ msgstr ""
 msgid "language"
 msgstr ""
 
-#: cps/templates/detail.html:92
+#: cps/templates/detail.html:103
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:103 cps/templates/user_list.html:12
-msgid "Download"
-msgstr ""
-
-#: cps/templates/detail.html:117
+#: cps/templates/detail.html:128
 msgid "Read in browser"
 msgstr ""
 
-#: cps/templates/detail.html:136
+#: cps/templates/detail.html:147
 msgid "Add to shelf"
 msgstr ""
 
-#: cps/templates/detail.html:176
+#: cps/templates/detail.html:187
 msgid "Edit metadata"
 msgstr ""
 
@@ -329,7 +451,8 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:131
+#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/search_form.html:33
 msgid "Series"
 msgstr ""
 
@@ -362,20 +485,17 @@ msgid "view book after edit"
 msgstr ""
 
 #: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:33 cps/templates/shelf_edit.html:15
+#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
 #: cps/templates/user_edit.html:94
 msgid "Submit"
 msgstr ""
 
 #: cps/templates/edit_book.html:106 cps/templates/email_edit.html:32
+#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
 #: cps/templates/user_edit.html:96
 msgid "Back"
 msgstr ""
 
-#: cps/templates/email_edit.html:7 cps/templates/user_list.html:36
-msgid "SMTP hostname"
-msgstr ""
-
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 587 for SSL)"
 msgstr ""
@@ -384,14 +504,6 @@ msgstr ""
 msgid "Server uses SSL (StartTLS)"
 msgstr ""
 
-#: cps/templates/email_edit.html:19 cps/templates/user_list.html:39
-msgid "SMTP login"
-msgstr ""
-
-#: cps/templates/email_edit.html:23 cps/templates/user_list.html:40
-msgid "SMTP password"
-msgstr ""
-
 #: cps/templates/email_edit.html:27
 msgid "From e-mail"
 msgstr ""
@@ -412,111 +524,103 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/templates/index.xml:8
+#: cps/templates/index.xml:5
 msgid "Start"
 msgstr ""
 
-#: cps/templates/index.xml:12 cps/templates/layout.html:59
+#: cps/templates/index.xml:7 cps/templates/layout.html:61
 msgid "Search"
 msgstr ""
 
-#: cps/templates/index.xml:23 cps/templates/layout.html:122
+#: cps/templates/index.xml:15 cps/templates/layout.html:124
 msgid "Hot Books"
 msgstr ""
 
-#: cps/templates/index.xml:28
+#: cps/templates/index.xml:19
 msgid "Popular publications from this catalog based on Rating."
 msgstr ""
 
-#: cps/templates/index.xml:32 cps/templates/layout.html:120
+#: cps/templates/index.xml:22 cps/templates/layout.html:122
 msgid "New Books"
 msgstr ""
 
-#: cps/templates/index.xml:37
+#: cps/templates/index.xml:26
 msgid "The latest Books"
 msgstr ""
 
-#: cps/templates/index.xml:46
+#: cps/templates/index.xml:33
 msgid "Show Random Books"
 msgstr ""
 
-#: cps/templates/index.xml:49 cps/templates/layout.html:133
+#: cps/templates/index.xml:36 cps/templates/layout.html:135
 msgid "Authors"
 msgstr ""
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:40
 msgid "Books ordered by Author"
 msgstr ""
 
-#: cps/templates/index.xml:62
+#: cps/templates/index.xml:47
 msgid "Books ordered by category"
 msgstr ""
 
-#: cps/templates/index.xml:70
+#: cps/templates/index.xml:54
 msgid "Books ordered by series"
 msgstr ""
 
-#: cps/templates/layout.html:46
+#: cps/templates/layout.html:48
 msgid "Toggle navigation"
 msgstr ""
 
-#: cps/templates/layout.html:61
+#: cps/templates/layout.html:63
 msgid "Go!"
 msgstr ""
 
-#: cps/templates/layout.html:64
+#: cps/templates/layout.html:66
 msgid "Advanced Search"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/user_list.html:13
-msgid "Upload"
-msgstr ""
-
-#: cps/templates/layout.html:81 cps/templates/user_list.html:11
-msgid "Admin"
-msgstr ""
-
-#: cps/templates/layout.html:85
+#: cps/templates/layout.html:87
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:89 cps/templates/login.html:4
+#: cps/templates/layout.html:91 cps/templates/login.html:4
 msgid "Login"
 msgstr ""
 
-#: cps/templates/layout.html:90 cps/templates/register.html:18
+#: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr ""
 
-#: cps/templates/layout.html:119
+#: cps/templates/layout.html:121
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:125
+#: cps/templates/layout.html:127
 msgid "Discover"
 msgstr ""
 
-#: cps/templates/layout.html:128
+#: cps/templates/layout.html:130
 msgid "Categories"
 msgstr ""
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:137 cps/templates/search_form.html:54
 msgid "Languages"
 msgstr ""
 
-#: cps/templates/layout.html:138
+#: cps/templates/layout.html:140
 msgid "Public Shelves"
 msgstr ""
 
-#: cps/templates/layout.html:142
+#: cps/templates/layout.html:144
 msgid "Your Shelves"
 msgstr ""
 
-#: cps/templates/layout.html:147
+#: cps/templates/layout.html:149
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/templates/layout.html:150
+#: cps/templates/layout.html:152
 msgid "About"
 msgstr ""
 
@@ -542,6 +646,10 @@ msgstr ""
 msgid "PDF.js viewer"
 msgstr ""
 
+#: cps/templates/readtxt.html:6
+msgid "Basic txt Reader"
+msgstr ""
+
 #: cps/templates/register.html:4
 msgid "Register a new account"
 msgstr ""
@@ -578,6 +686,14 @@ msgstr ""
 msgid "Exclude Tags"
 msgstr ""
 
+#: cps/templates/search_form.html:43
+msgid "Exclude Series"
+msgstr ""
+
+#: cps/templates/search_form.html:64
+msgid "Exclude Languages"
+msgstr ""
+
 #: cps/templates/shelf.html:6
 msgid "Delete this Shelf"
 msgstr ""
@@ -586,6 +702,10 @@ msgstr ""
 msgid "Edit Shelf name"
 msgstr ""
 
+#: cps/templates/shelf.html:8
+msgid "change order"
+msgstr ""
+
 #: cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr ""
@@ -594,6 +714,14 @@ msgstr ""
 msgid "should the shelf be public?"
 msgstr ""
 
+#: cps/templates/shelf_order.html:5
+msgid "Drag 'n drop to rearrange order"
+msgstr ""
+
+#: cps/templates/shelf_order.html:11
+msgid "Change order"
+msgstr ""
+
 #: cps/templates/stats.html:3
 msgid "Linked libraries"
 msgstr ""
@@ -606,18 +734,30 @@ msgstr ""
 msgid "Installed Version"
 msgstr ""
 
-#: cps/templates/stats.html:32
+#: cps/templates/stats.html:36
 msgid "Calibre library statistics"
 msgstr ""
 
-#: cps/templates/stats.html:37
+#: cps/templates/stats.html:41
 msgid "Books in this Library"
 msgstr ""
 
-#: cps/templates/stats.html:41
+#: cps/templates/stats.html:45
 msgid "Authors in this Library"
 msgstr ""
 
+#: cps/templates/stats.html:49
+msgid "Series in this Library"
+msgstr ""
+
+#: cps/templates/stats.html:53
+msgid "Tags in this Library"
+msgstr ""
+
+#: cps/templates/stats.html:57
+msgid "Usercount for calibre web"
+msgstr ""
+
 #: cps/templates/user_edit.html:23
 msgid "Kindle E-Mail"
 msgstr ""
@@ -678,47 +818,5 @@ msgstr ""
 msgid "Recent Downloads"
 msgstr ""
 
-#: cps/templates/user_list.html:7
-msgid "Nickname"
+msgid "Latin"
 msgstr ""
-
-#: cps/templates/user_list.html:8
-msgid "Email"
-msgstr ""
-
-#: cps/templates/user_list.html:9
-msgid "Kindle"
-msgstr ""
-
-#: cps/templates/user_list.html:10
-msgid "DLS"
-msgstr ""
-
-#: cps/templates/user_list.html:14
-msgid "Edit"
-msgstr ""
-
-#: cps/templates/user_list.html:15
-msgid "Passwd"
-msgstr ""
-
-#: cps/templates/user_list.html:33
-msgid "SMTP mail settings"
-msgstr ""
-
-#: cps/templates/user_list.html:37
-msgid "SMTP port"
-msgstr ""
-
-#: cps/templates/user_list.html:38
-msgid "SSL"
-msgstr ""
-
-#: cps/templates/user_list.html:41
-msgid "From mail"
-msgstr ""
-
-#: cps/templates/user_list.html:53
-msgid "Change SMTP settings"
-msgstr ""
-