diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 75ef8b42..0737ddb7 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 2105ddce..5c1bf5c5 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2017-07-23 13:24+0200\n"
+"POT-Creation-Date: 2017-08-12 18:19+0200\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -32,7 +32,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.4.0\n"
 
-#: cps/book_formats.py:118 cps/book_formats.py:122 cps/web.py:1309
+#: cps/book_formats.py:118 cps/book_formats.py:122 cps/web.py:1374
 msgid "not installed"
 msgstr "Nicht installiert"
 
@@ -78,384 +78,379 @@ msgstr ""
 "Konnte keine Formate finden welche für das versenden per E-Mail geeignet "
 "sind"
 
-#: cps/ub.py:514
+#: cps/ub.py:542
 msgid "Guest"
 msgstr "Gast"
 
-#: cps/web.py:932
+#: cps/web.py:974
 msgid "Requesting update package"
 msgstr "Frage Update Paket an"
 
-#: cps/web.py:933
+#: cps/web.py:975
 msgid "Downloading update package"
 msgstr "Lade Update Paket herunter"
 
-#: cps/web.py:934
+#: cps/web.py:976
 msgid "Unzipping update package"
 msgstr "Entpacke Update Paket"
 
-#: cps/web.py:935
+#: cps/web.py:977
 msgid "Files are replaced"
 msgstr "Ersetze Dateien"
 
-#: cps/web.py:936
+#: cps/web.py:978
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/web.py:937
+#: cps/web.py:979
 msgid "Server is stopped"
 msgstr "Stoppe Server"
 
-#: cps/web.py:938
+#: cps/web.py:980
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/web.py:1012
+#: cps/web.py:1054
 msgid "Recently Added Books"
 msgstr "Kürzlich hinzugefügte Bücher"
 
-#: cps/web.py:1021
+#: cps/web.py:1063
 msgid "Newest Books"
 msgstr "Neueste Bücher"
 
-#: cps/web.py:1030
+#: cps/web.py:1072
 msgid "Oldest Books"
 msgstr "Älteste Bücher"
 
-#: cps/web.py:1039
+#: cps/web.py:1081
 msgid "Books (A-Z)"
 msgstr "Bücher (A-Z)"
 
-#: cps/web.py:1048
+#: cps/web.py:1090
 msgid "Books (Z-A)"
 msgstr "Bücher (Z-A)"
 
-#: cps/web.py:1079
+#: cps/web.py:1126
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/web.py:1089
+#: cps/web.py:1136
 msgid "Best rated books"
 msgstr "Best bewertete Bücher"
 
-#: cps/templates/index.xml:36 cps/web.py:1098
+#: cps/templates/index.xml:36 cps/web.py:1145
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:1111
+#: cps/web.py:1161
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:1123
-#, python-format
-msgid "Author: %(name)s"
-msgstr "Autor: %(name)s"
-
-#: cps/web.py:1125 cps/web.py:1153 cps/web.py:1286 cps/web.py:1767
+#: cps/web.py:1181 cps/web.py:1212 cps/web.py:1351 cps/web.py:1835
 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."
 
-#: cps/templates/index.xml:71 cps/web.py:1139
+#: cps/templates/index.xml:71 cps/web.py:1198
 msgid "Series list"
 msgstr "Liste Serien"
 
-#: cps/web.py:1151
+#: cps/web.py:1210
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:1184
+#: cps/web.py:1243
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"
 
-#: cps/web.py:1199
+#: cps/web.py:1258
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/index.xml:64 cps/web.py:1212
+#: cps/templates/index.xml:64 cps/web.py:1274
 msgid "Category list"
 msgstr "Kategorieliste"
 
-#: cps/web.py:1224
+#: cps/web.py:1286
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:1320
+#: cps/web.py:1385
 msgid "Excecution permissions missing"
 msgstr "Ausführungsberechtigung nicht vorhanden"
 
-#: cps/web.py:1334
+#: cps/web.py:1399
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:1498
+#: cps/web.py:1563
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"
 
-#: cps/web.py:1500
+#: cps/web.py:1565
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1516
+#: cps/web.py:1581
 msgid "Update done"
 msgstr "Update durchgeführt"
 
-#: cps/web.py:1594 cps/web.py:1607
+#: cps/web.py:1662 cps/web.py:1675
 msgid "search"
 msgstr "Suche"
 
 #: cps/templates/index.xml:43 cps/templates/index.xml:47
-#: cps/templates/layout.html:144 cps/web.py:1683
+#: cps/templates/layout.html:127 cps/web.py:1751
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
 #: cps/templates/index.xml:50 cps/templates/index.xml:54
-#: cps/templates/layout.html:145 cps/web.py:1686
+#: cps/templates/layout.html:128 cps/web.py:1754
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/web.py:1753 cps/web.py:1755 cps/web.py:1757 cps/web.py:1764
+#: cps/web.py:1821 cps/web.py:1823 cps/web.py:1825 cps/web.py:1832
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1820 cps/web.py:2432
+#: cps/web.py:1888 cps/web.py:2512
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:1821 cps/web.py:1837 cps/web.py:1842 cps/web.py:1844
+#: cps/web.py:1889 cps/web.py:1905 cps/web.py:1910 cps/web.py:1912
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1836
+#: cps/web.py:1904
 msgid "An unknown error occured. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:1841
+#: cps/web.py:1909
 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:1860 cps/web.py:1956
+#: cps/web.py:1928 cps/web.py:2024
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1865
+#: cps/web.py:1933
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1871 cps/web.py:1892
+#: cps/web.py:1939 cps/web.py:1960
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1904 cps/web.py:1935
+#: cps/web.py:1972 cps/web.py:2003
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:1912 cps/web.py:1943
+#: cps/web.py:1980 cps/web.py:2011
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:1920
+#: cps/web.py:1988
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:1970
+#: cps/web.py:2038
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:1974
+#: cps/web.py:2042
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Buch erfolgreich versandt an %(kindlemail)s"
 
-#: cps/web.py:1978
+#: cps/web.py:2046
 #, 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:1980 cps/web.py:2516
+#: cps/web.py:2048 cps/web.py:2597
 msgid "Please configure your kindle email address first..."
 msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."
 
-#: cps/web.py:2024
+#: cps/web.py:2092
 #, 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:2059
+#: cps/web.py:2127
 #, 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:2078 cps/web.py:2102
+#: cps/web.py:2146 cps/web.py:2170
 #, 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:2083
+#: cps/web.py:2151
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:2085 cps/web.py:2113
+#: cps/web.py:2153 cps/web.py:2181
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:2086 cps/web.py:2088
+#: cps/web.py:2154 cps/web.py:2156
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:2111
+#: cps/web.py:2179
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:2114 cps/web.py:2116
+#: cps/web.py:2182 cps/web.py:2184
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:2136
+#: cps/web.py:2204
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:2158
+#: cps/web.py:2226
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:2161
+#: cps/web.py:2229
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fehler beim Öffnen. Bücherregel exisitert nicht oder ist nicht zugänglich"
 
-#: cps/web.py:2193
+#: cps/web.py:2261
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:2257
+#: cps/web.py:2325
 msgid "Found an existing account for this email address."
 msgstr "Es existiert ein Benutzerkonto für diese E-Mailadresse"
 
-#: cps/web.py:2259 cps/web.py:2263
+#: cps/web.py:2327 cps/web.py:2331
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:2260
+#: cps/web.py:2328
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:2274
+#: cps/web.py:2342
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:2386
+#: cps/web.py:2466
 msgid "Calibre-web configuration updated"
 msgstr "Calibre-web Konfiguration wurde aktualisiert"
 
-#: cps/web.py:2393 cps/web.py:2399 cps/web.py:2413
+#: cps/web.py:2473 cps/web.py:2479 cps/web.py:2493
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:2397
+#: cps/web.py:2477
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren"
 
-#: cps/templates/admin.html:34 cps/web.py:2434 cps/web.py:2486
+#: cps/templates/admin.html:34 cps/web.py:2514 cps/web.py:2567
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:2478
+#: cps/web.py:2559
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:2482
+#: cps/web.py:2563
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "Es existiert ein Benutzerkonto für diese Emailadresse oder den "
 "Benutzernamen."
 
-#: cps/web.py:2504
+#: cps/web.py:2585
 msgid "Mail settings updated"
 msgstr "E-Mail Einstellungen aktualisiert"
 
-#: cps/web.py:2511
+#: cps/web.py:2592
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:2514
+#: cps/web.py:2595
 #, 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:2518
+#: cps/web.py:2599
 msgid "E-Mail settings updated"
 msgstr "E-Mail Einstellungen wurde aktualisiert"
 
-#: cps/web.py:2519
+#: cps/web.py:2600
 msgid "Edit mail settings"
 msgstr "E-Mail Einstellungen editieren"
 
-#: cps/web.py:2548
+#: cps/web.py:2629
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:2644
+#: cps/web.py:2727
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:2647
+#: cps/web.py:2730
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:2650
+#: cps/web.py:2733
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:2685 cps/web.py:2689
-msgid "unknown"
-msgstr "Unbekannt"
-
-#: cps/web.py:2848 cps/web.py:2851 cps/web.py:2961
-msgid "edit metadata"
-msgstr "Metadaten editieren"
-
-#: cps/web.py:2853
+#: cps/web.py:2755
 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"
 
-#: cps/web.py:2872
+#: cps/web.py:2770 cps/web.py:2953 cps/web.py:3077
+msgid "edit metadata"
+msgstr "Metadaten editieren"
+
+#: cps/web.py:2782 cps/web.py:2786
+msgid "unknown"
+msgstr "Unbekannt"
+
+#: cps/web.py:2971
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Die Dateiendung \"%s\" kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/web.py:2878
+#: cps/web.py:2977
 msgid "File to be uploaded must have an extension"
 msgstr "Datei müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/web.py:2895
+#: cps/web.py:2996
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:2900
+#: cps/web.py:3001
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:2905
+#: cps/web.py:3006
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
@@ -480,7 +475,7 @@ msgstr "Kindle"
 msgid "DLS"
 msgstr "DLS"
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:85
+#: cps/templates/admin.html:12 cps/templates/layout.html:68
 msgid "Admin"
 msgstr "Admin"
 
@@ -489,7 +484,7 @@ msgstr "Admin"
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:78
+#: cps/templates/admin.html:14 cps/templates/layout.html:61
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -541,7 +536,7 @@ msgstr "Konfiguration"
 msgid "Calibre DB dir"
 msgstr "Calibre DB Pfad"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:83
 msgid "Log Level"
 msgstr "Log Level"
 
@@ -611,10 +606,10 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:105 cps/templates/admin.html:119
-#: cps/templates/book_edit.html:120 cps/templates/book_edit.html:142
-#: cps/templates/config_edit.html:131 cps/templates/email_edit.html:36
+#: cps/templates/book_edit.html:127 cps/templates/book_edit.html:149
+#: cps/templates/config_edit.html:156 cps/templates/email_edit.html:36
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:128
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:131
 msgid "Back"
 msgstr "Zurück"
 
@@ -634,12 +629,12 @@ msgstr "Buch löschen"
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:26 cps/templates/book_edit.html:181
+#: cps/templates/book_edit.html:26 cps/templates/book_edit.html:188
 #: cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:30 cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:30 cps/templates/book_edit.html:190
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -647,7 +642,7 @@ msgstr "Beschreibung"
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:39 cps/templates/layout.html:154
+#: cps/templates/book_edit.html:39 cps/templates/layout.html:137
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr "Serien"
@@ -664,86 +659,90 @@ msgstr "Bewertung"
 msgid "Cover URL (jpg)"
 msgstr "Cover URL (jpg)"
 
-#: cps/templates/book_edit.html:56 cps/templates/user_edit.html:27
+#: cps/templates/book_edit.html:56 cps/templates/detail.html:130
+msgid "Publishing date"
+msgstr "Herausgabedatum"
+
+#: cps/templates/book_edit.html:63 cps/templates/user_edit.html:27
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:67
+#: cps/templates/book_edit.html:74
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:68
+#: cps/templates/book_edit.html:75
 msgid "No"
 msgstr "Nein"
 
-#: cps/templates/book_edit.html:115
+#: cps/templates/book_edit.html:122
 msgid "view book after edit"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:118 cps/templates/book_edit.html:154
+#: cps/templates/book_edit.html:125 cps/templates/book_edit.html:161
 msgid "Get metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:119 cps/templates/config_edit.html:129
+#: cps/templates/book_edit.html:126 cps/templates/config_edit.html:154
 #: cps/templates/login.html:20 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:126
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:129
 msgid "Submit"
 msgstr "Abschicken"
 
-#: cps/templates/book_edit.html:133
+#: cps/templates/book_edit.html:140
 msgid "Are really you sure?"
 msgstr "Sicher?"
 
-#: cps/templates/book_edit.html:136
+#: cps/templates/book_edit.html:143
 msgid "Book will be deleted from Calibre database"
 msgstr "Das Buch wird aus der Calibre Datenbank"
 
-#: cps/templates/book_edit.html:137
+#: cps/templates/book_edit.html:144
 msgid "and from hard disk"
 msgstr "und der Festplatte gelöscht"
 
-#: cps/templates/book_edit.html:141
+#: cps/templates/book_edit.html:148
 msgid "Delete"
 msgstr "Löschen"
 
-#: cps/templates/book_edit.html:157
+#: cps/templates/book_edit.html:164
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:158
+#: cps/templates/book_edit.html:165
 msgid " Search keyword "
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:160 cps/templates/layout.html:60
+#: cps/templates/book_edit.html:167 cps/templates/layout.html:43
 msgid "Go!"
 msgstr "Los!"
 
-#: cps/templates/book_edit.html:161
+#: cps/templates/book_edit.html:168
 msgid "Click the cover to load metadata to the form"
 msgstr "Klicke auf das Bild um die Metadaten zu übertragen"
 
-#: cps/templates/book_edit.html:165 cps/templates/book_edit.html:178
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:185
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:168
+#: cps/templates/book_edit.html:175 cps/templates/layout.html:199
 msgid "Close"
 msgstr "Schließen"
 
-#: cps/templates/book_edit.html:179
+#: cps/templates/book_edit.html:186
 msgid "Search error!"
 msgstr "Fehler bei Suche!"
 
-#: cps/templates/book_edit.html:180
+#: cps/templates/book_edit.html:187
 msgid "No Result! Please try anonther keyword."
 msgstr "Kein Ergebniss! Bitte anderen Begriff versuchen"
 
-#: cps/templates/book_edit.html:182 cps/templates/detail.html:126
+#: cps/templates/book_edit.html:189 cps/templates/detail.html:125
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: cps/templates/book_edit.html:184
+#: cps/templates/book_edit.html:191
 msgid "Source"
 msgstr "Quelle"
 
@@ -779,8 +778,8 @@ msgstr "Matadata Überwachungs-ID"
 msgid "Server Port"
 msgstr "Server Port"
 
-#: cps/templates/config_edit.html:56 cps/templates/layout.html:133
-#: cps/templates/layout.html:134 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/layout.html:116
+#: cps/templates/layout.html:117 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
 
@@ -796,55 +795,75 @@ msgstr "Regulärer Ausdruck um Spalten zu ignorien"
 msgid "Regular expression for title sorting"
 msgstr "Regulärer Ausdruck für Titelsortierung"
 
-#: cps/templates/config_edit.html:86
+#: cps/templates/config_edit.html:76
+msgid "Tags for Mature Content"
+msgstr "Kategorien für Erwachsenencontent"
+
+#: cps/templates/config_edit.html:93
 msgid "Enable uploading"
 msgstr "Hochladen aktivieren"
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Enable anonymous browsing"
 msgstr "Anonymes Browsen aktivieren"
 
-#: cps/templates/config_edit.html:94
+#: cps/templates/config_edit.html:101
 msgid "Enable public registration"
 msgstr "Öffentliche Registrierung aktivieren"
 
-#: cps/templates/config_edit.html:98
+#: cps/templates/config_edit.html:105
 msgid "Enable remote login (\"magic link\")"
 msgstr "Remote login aktivieren (\"Magischer Link\")"
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:110
+msgid "Use"
+msgstr "Benutze"
+
+#: cps/templates/config_edit.html:111
+msgid "Obtain an API Key"
+msgstr "Einen API Schlüssel erhalten"
+
+#: cps/templates/config_edit.html:115
+msgid "Goodreads API Key"
+msgstr "Öffentlicher Goodreads API Schlüssel"
+
+#: cps/templates/config_edit.html:119
+msgid "Goodreads API Secret"
+msgstr Geheimer Goodreads API Schlüssel"
+
+#: cps/templates/config_edit.html:125
 msgid "Default Settings for new users"
 msgstr "Default Einstellungen für neue Benutzer"
 
-#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:87
+#: cps/templates/config_edit.html:128 cps/templates/user_edit.html:90
 msgid "Admin user"
 msgstr "Admin Benutzer"
 
-#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:95
 msgid "Allow Downloads"
 msgstr "Downloads erlauben"
 
-#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:99
 msgid "Allow Uploads"
 msgstr "Uploads erlauben"
 
-#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:100
+#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:103
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/config_edit.html:119 cps/templates/user_edit.html:104
+#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:107
 msgid "Allow Delete books"
 msgstr "Bücher löschen erlauben"
 
-#: cps/templates/config_edit.html:123 cps/templates/user_edit.html:109
+#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:112
 msgid "Allow Changing Password"
 msgstr "Passwort ändern erlauben"
 
-#: cps/templates/config_edit.html:127 cps/templates/user_edit.html:113
+#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:116
 msgid "Allow Editing Public Shelfs"
 msgstr "Öffentliche Bücherregale editieren erlauben"
 
-#: cps/templates/config_edit.html:134 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:159 cps/templates/layout.html:76
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Login"
@@ -853,35 +872,31 @@ msgstr "Login"
 msgid "Read in browser"
 msgstr "Im Browser lesen"
 
-#: cps/templates/detail.html:88
+#: cps/templates/detail.html:87
 msgid "Book"
 msgstr "Buch"
 
-#: cps/templates/detail.html:88
+#: cps/templates/detail.html:87
 msgid "of"
 msgstr "von"
 
-#: cps/templates/detail.html:94
+#: cps/templates/detail.html:93
 msgid "language"
 msgstr "Sprache"
 
-#: cps/templates/detail.html:131
-msgid "Publishing date"
-msgstr "Herausgabedatum"
-
-#: cps/templates/detail.html:168
+#: cps/templates/detail.html:167
 msgid "Read"
 msgstr "Gelesen"
 
-#: cps/templates/detail.html:177
+#: cps/templates/detail.html:176
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:188
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
-#: cps/templates/detail.html:251
+#: cps/templates/detail.html:250
 msgid "Edit metadata"
 msgstr "Metadaten bearbeiten"
 
@@ -919,7 +934,7 @@ msgstr "Einstellungen speichern"
 msgid "Save settings and send Test E-Mail"
 msgstr "Einstellungen speichern und Test E-Mail versenden"
 
-#: cps/templates/feed.xml:20
+#: cps/templates/feed.xml:20 cps/templates/layout.html:183
 msgid "Next"
 msgstr "Nächste"
 
@@ -931,11 +946,12 @@ msgstr "Entdecke (Zufälliges Buch)"
 msgid "Start"
 msgstr "Start"
 
-#: cps/templates/index.xml:7 cps/templates/layout.html:58
+#: cps/templates/index.xml:7 cps/templates/layout.html:40
+#: cps/templates/layout.html:41
 msgid "Search"
 msgstr "Suche"
 
-#: cps/templates/index.xml:15 cps/templates/layout.html:138
+#: cps/templates/index.xml:15 cps/templates/layout.html:121
 msgid "Hot Books"
 msgstr "Beliebte Bücher"
 
@@ -943,7 +959,7 @@ msgstr "Beliebte Bücher"
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Beliebte Publikationen aus dieser Bibliothek basierend auf Downloadzahlen"
 
-#: cps/templates/index.xml:22 cps/templates/layout.html:141
+#: cps/templates/index.xml:22 cps/templates/layout.html:124
 msgid "Best rated Books"
 msgstr "Best bewertete Bücher"
 
@@ -963,7 +979,7 @@ msgstr "Die neuesten Bücher"
 msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
-#: cps/templates/index.xml:57 cps/templates/layout.html:156
+#: cps/templates/index.xml:57 cps/templates/layout.html:139
 msgid "Authors"
 msgstr "Autoren"
 
@@ -979,83 +995,91 @@ msgstr "Bücher nach Kategorien sortiert"
 msgid "Books ordered by series"
 msgstr "Bücher nach Reihen geordnet"
 
-#: cps/templates/layout.html:48
+#: cps/templates/layout.html:30
 msgid "Toggle navigation"
 msgstr "Nagivation umschalten"
 
-#: cps/templates/layout.html:68
+#: cps/templates/layout.html:51
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
-#: cps/templates/layout.html:89
+#: cps/templates/layout.html:72
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:94 cps/templates/register.html:18
+#: cps/templates/layout.html:77 cps/templates/register.html:18
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/templates/layout.html:123
+#: cps/templates/layout.html:106
 msgid "Browse"
 msgstr "Browsen"
 
-#: cps/templates/layout.html:124
+#: cps/templates/layout.html:107
 msgid "Recently Added"
 msgstr "Kürzlich hinzugefügt"
 
-#: cps/templates/layout.html:127
+#: cps/templates/layout.html:110
 msgid "Sorted Books"
 msgstr "Bücher Sortiert"
 
-#: cps/templates/layout.html:131 cps/templates/layout.html:132
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
+#: cps/templates/layout.html:114 cps/templates/layout.html:115
+#: cps/templates/layout.html:116 cps/templates/layout.html:117
 msgid "Sort By"
 msgstr "Sortiert nach"
 
-#: cps/templates/layout.html:131
+#: cps/templates/layout.html:114
 msgid "Newest"
 msgstr "Neueste"
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:115
 msgid "Oldest"
 msgstr "Älteste"
 
-#: cps/templates/layout.html:133
+#: cps/templates/layout.html:116
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: cps/templates/layout.html:134
+#: cps/templates/layout.html:117
 msgid "Descending"
 msgstr "Absteigend"
 
-#: cps/templates/layout.html:148
+#: cps/templates/layout.html:131
 msgid "Discover"
 msgstr "Entdecke"
 
-#: cps/templates/layout.html:151
+#: cps/templates/layout.html:134
 msgid "Categories"
 msgstr "Kategorien"
 
-#: cps/templates/layout.html:158 cps/templates/search_form.html:58
+#: cps/templates/layout.html:141 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr "Sprachen"
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:144
 msgid "Public Shelves"
 msgstr "Öffentiche Bücherregale"
 
-#: cps/templates/layout.html:165
+#: cps/templates/layout.html:148
 msgid "Your Shelves"
 msgstr "Deine Bücherregale"
 
-#: cps/templates/layout.html:170
+#: cps/templates/layout.html:153
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/templates/layout.html:171
+#: cps/templates/layout.html:154
 msgid "About"
 msgstr "Über"
 
+#: cps/templates/layout.html:168
+msgid "Previous"
+msgstr "Voerheriger"
+
+#: cps/templates/layout.html:195
+msgid "Book Details"
+msgstr "Buchdetails"
+
 #: cps/templates/login.html:8 cps/templates/login.html:9
 #: cps/templates/register.html:7 cps/templates/user_edit.html:8
 msgid "Username"
@@ -1218,47 +1242,51 @@ msgstr "Zeige nur Bücher mit dieser Sprache"
 msgid "Show all"
 msgstr "Zeige alle"
 
-#: cps/templates/user_edit.html:47
+#: cps/templates/user_edit.html:46
+msgid "Show mature content"
+msgstr "Erwachsenencontent anzeigen"
+
+#: cps/templates/user_edit.html:50
 msgid "Show random books"
 msgstr "Zeige Zufällige Bücher"
 
-#: cps/templates/user_edit.html:51
+#: cps/templates/user_edit.html:54
 msgid "Show hot books"
 msgstr "Zeige Auswahl Beliebte Bücher"
 
-#: cps/templates/user_edit.html:55
+#: cps/templates/user_edit.html:58
 msgid "Show best rated books"
 msgstr "Zeige am besten bewertete Bücher"
 
-#: cps/templates/user_edit.html:59
+#: cps/templates/user_edit.html:62
 msgid "Show language selection"
 msgstr "Zeige Sprachauswahl"
 
-#: cps/templates/user_edit.html:63
+#: cps/templates/user_edit.html:66
 msgid "Show series selection"
 msgstr "Zeige Serienauswahl"
 
-#: cps/templates/user_edit.html:67
+#: cps/templates/user_edit.html:70
 msgid "Show category selection"
 msgstr "Zeige Kategorienauswahl"
 
-#: cps/templates/user_edit.html:71
+#: cps/templates/user_edit.html:74
 msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
-#: cps/templates/user_edit.html:75
+#: cps/templates/user_edit.html:78
 msgid "Show read and unread"
 msgstr "Zeige Gelesen/Ungelesen Auswahl"
 
-#: cps/templates/user_edit.html:79
+#: cps/templates/user_edit.html:82
 msgid "Show random books in detail view"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/user_edit.html:120
+#: cps/templates/user_edit.html:123
 msgid "Delete this user"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:135
+#: cps/templates/user_edit.html:138
 msgid "Recent Downloads"
 msgstr "Letzte Downloads"
 
diff --git a/cps/ub.py b/cps/ub.py
index 8769572a..0f42ea0c 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -375,7 +375,7 @@ class Config:
                     (self.config_default_role & ROLE_DELETE_BOOKS == ROLE_DELETE_BOOKS))
 
     def mature_content_tags(self):
-        return self.config_mature_content_tags.split(",")
+        return list(map(unicode.lstrip, self.config_mature_content_tags.split(",")))
 
     def get_Log_Level(self):
         ret_value=""
diff --git a/cps/web.py b/cps/web.py
index bb000c91..72478fe0 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -2316,8 +2316,9 @@ def profile():
             content.sidebar_view += ub.SIDEBAR_READ_AND_UNREAD
         if "show_detail_random" in to_save:
             content.sidebar_view += ub.DETAIL_RANDOM
-        if "default_language" in to_save:
-            content.default_language = to_save["default_language"]
+
+        content.mature_content = "show_mature_content" in to_save
+
         try:
             ub.session.commit()
         except IntegrityError:
diff --git a/messages.pot b/messages.pot
index 321c5f65..f49b3465 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-07-23 13:24+0200\n"
+"POT-Creation-Date: 2017-08-12 18:19+0200\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,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.4.0\n"
 
-#: cps/book_formats.py:118 cps/book_formats.py:122 cps/web.py:1309
+#: cps/book_formats.py:118 cps/book_formats.py:122 cps/web.py:1374
 msgid "not installed"
 msgstr ""
 
@@ -61,378 +61,373 @@ msgstr ""
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 
-#: cps/ub.py:514
+#: cps/ub.py:542
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:932
+#: cps/web.py:974
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:933
+#: cps/web.py:975
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/web.py:934
+#: cps/web.py:976
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/web.py:935
+#: cps/web.py:977
 msgid "Files are replaced"
 msgstr ""
 
-#: cps/web.py:936
+#: cps/web.py:978
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/web.py:937
+#: cps/web.py:979
 msgid "Server is stopped"
 msgstr ""
 
-#: cps/web.py:938
+#: cps/web.py:980
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/web.py:1012
+#: cps/web.py:1054
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1021
+#: cps/web.py:1063
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1030
+#: cps/web.py:1072
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1039
+#: cps/web.py:1081
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1048
+#: cps/web.py:1090
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1079
+#: cps/web.py:1126
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/web.py:1089
+#: cps/web.py:1136
 msgid "Best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:36 cps/web.py:1098
+#: cps/templates/index.xml:36 cps/web.py:1145
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:1111
+#: cps/web.py:1161
 msgid "Author list"
 msgstr ""
 
-#: cps/web.py:1123
-#, python-format
-msgid "Author: %(name)s"
-msgstr ""
-
-#: cps/web.py:1125 cps/web.py:1153 cps/web.py:1286 cps/web.py:1767
+#: cps/web.py:1181 cps/web.py:1212 cps/web.py:1351 cps/web.py:1835
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
-#: cps/templates/index.xml:71 cps/web.py:1139
+#: cps/templates/index.xml:71 cps/web.py:1198
 msgid "Series list"
 msgstr ""
 
-#: cps/web.py:1151
+#: cps/web.py:1210
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:1184
+#: cps/web.py:1243
 msgid "Available languages"
 msgstr ""
 
-#: cps/web.py:1199
+#: cps/web.py:1258
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/index.xml:64 cps/web.py:1212
+#: cps/templates/index.xml:64 cps/web.py:1274
 msgid "Category list"
 msgstr ""
 
-#: cps/web.py:1224
+#: cps/web.py:1286
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1385
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/web.py:1334
+#: cps/web.py:1399
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:1498
+#: cps/web.py:1563
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1500
+#: cps/web.py:1565
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1516
+#: cps/web.py:1581
 msgid "Update done"
 msgstr ""
 
-#: cps/web.py:1594 cps/web.py:1607
+#: cps/web.py:1662 cps/web.py:1675
 msgid "search"
 msgstr ""
 
 #: cps/templates/index.xml:43 cps/templates/index.xml:47
-#: cps/templates/layout.html:144 cps/web.py:1683
+#: cps/templates/layout.html:127 cps/web.py:1751
 msgid "Read Books"
 msgstr ""
 
 #: cps/templates/index.xml:50 cps/templates/index.xml:54
-#: cps/templates/layout.html:145 cps/web.py:1686
+#: cps/templates/layout.html:128 cps/web.py:1754
 msgid "Unread Books"
 msgstr ""
 
-#: cps/web.py:1753 cps/web.py:1755 cps/web.py:1757 cps/web.py:1764
+#: cps/web.py:1821 cps/web.py:1823 cps/web.py:1825 cps/web.py:1832
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1820 cps/web.py:2432
+#: cps/web.py:1888 cps/web.py:2512
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:1821 cps/web.py:1837 cps/web.py:1842 cps/web.py:1844
+#: cps/web.py:1889 cps/web.py:1905 cps/web.py:1910 cps/web.py:1912
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1836
+#: cps/web.py:1904
 msgid "An unknown error occured. Please try again later."
 msgstr ""
 
-#: cps/web.py:1841
+#: cps/web.py:1909
 msgid "This username or email address is already in use."
 msgstr ""
 
-#: cps/web.py:1860 cps/web.py:1956
+#: cps/web.py:1928 cps/web.py:2024
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1865
+#: cps/web.py:1933
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1871 cps/web.py:1892
+#: cps/web.py:1939 cps/web.py:1960
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1904 cps/web.py:1935
+#: cps/web.py:1972 cps/web.py:2003
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:1912 cps/web.py:1943
+#: cps/web.py:1980 cps/web.py:2011
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:1920
+#: cps/web.py:1988
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:1970
+#: cps/web.py:2038
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:1974
+#: cps/web.py:2042
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1978
+#: cps/web.py:2046
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1980 cps/web.py:2516
+#: cps/web.py:2048 cps/web.py:2597
 msgid "Please configure your kindle email address first..."
 msgstr ""
 
-#: cps/web.py:2024
+#: cps/web.py:2092
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2059
+#: cps/web.py:2127
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2078 cps/web.py:2102
+#: cps/web.py:2146 cps/web.py:2170
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:2083
+#: cps/web.py:2151
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:2085 cps/web.py:2113
+#: cps/web.py:2153 cps/web.py:2181
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:2086 cps/web.py:2088
+#: cps/web.py:2154 cps/web.py:2156
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:2111
+#: cps/web.py:2179
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2114 cps/web.py:2116
+#: cps/web.py:2182 cps/web.py:2184
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:2136
+#: cps/web.py:2204
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2226
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2161
+#: cps/web.py:2229
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2193
+#: cps/web.py:2261
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2257
+#: cps/web.py:2325
 msgid "Found an existing account for this email address."
 msgstr ""
 
-#: cps/web.py:2259 cps/web.py:2263
+#: cps/web.py:2327 cps/web.py:2331
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:2260
+#: cps/web.py:2328
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:2274
+#: cps/web.py:2342
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:2386
+#: cps/web.py:2466
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:2393 cps/web.py:2399 cps/web.py:2413
+#: cps/web.py:2473 cps/web.py:2479 cps/web.py:2493
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:2397
+#: cps/web.py:2477
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:2434 cps/web.py:2486
+#: cps/templates/admin.html:34 cps/web.py:2514 cps/web.py:2567
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:2478
+#: cps/web.py:2559
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:2482
+#: cps/web.py:2563
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 
-#: cps/web.py:2504
+#: cps/web.py:2585
 msgid "Mail settings updated"
 msgstr ""
 
-#: cps/web.py:2511
+#: cps/web.py:2592
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2514
+#: cps/web.py:2595
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:2518
+#: cps/web.py:2599
 msgid "E-Mail settings updated"
 msgstr ""
 
-#: cps/web.py:2519
+#: cps/web.py:2600
 msgid "Edit mail settings"
 msgstr ""
 
-#: cps/web.py:2548
+#: cps/web.py:2629
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:2644
+#: cps/web.py:2727
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:2647
+#: cps/web.py:2730
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:2650
+#: cps/web.py:2733
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:2685 cps/web.py:2689
-msgid "unknown"
+#: cps/web.py:2755
+msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:2848 cps/web.py:2851 cps/web.py:2961
+#: cps/web.py:2770 cps/web.py:2953 cps/web.py:3077
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2853
-msgid "Error opening eBook. File does not exist or file is not accessible"
+#: cps/web.py:2782 cps/web.py:2786
+msgid "unknown"
 msgstr ""
 
-#: cps/web.py:2872
+#: cps/web.py:2971
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:2878
+#: cps/web.py:2977
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:2895
+#: cps/web.py:2996
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2900
+#: cps/web.py:3001
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2905
+#: cps/web.py:3006
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
@@ -457,7 +452,7 @@ msgstr ""
 msgid "DLS"
 msgstr ""
 
-#: cps/templates/admin.html:12 cps/templates/layout.html:85
+#: cps/templates/admin.html:12 cps/templates/layout.html:68
 msgid "Admin"
 msgstr ""
 
@@ -466,7 +461,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: cps/templates/admin.html:14 cps/templates/layout.html:78
+#: cps/templates/admin.html:14 cps/templates/layout.html:61
 msgid "Upload"
 msgstr ""
 
@@ -518,7 +513,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:83
 msgid "Log Level"
 msgstr ""
 
@@ -588,10 +583,10 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:105 cps/templates/admin.html:119
-#: cps/templates/book_edit.html:120 cps/templates/book_edit.html:142
-#: cps/templates/config_edit.html:131 cps/templates/email_edit.html:36
+#: cps/templates/book_edit.html:127 cps/templates/book_edit.html:149
+#: cps/templates/config_edit.html:156 cps/templates/email_edit.html:36
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:128
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:131
 msgid "Back"
 msgstr ""
 
@@ -611,12 +606,12 @@ msgstr ""
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:26 cps/templates/book_edit.html:181
+#: cps/templates/book_edit.html:26 cps/templates/book_edit.html:188
 #: cps/templates/search_form.html:10
 msgid "Author"
 msgstr ""
 
-#: cps/templates/book_edit.html:30 cps/templates/book_edit.html:183
+#: cps/templates/book_edit.html:30 cps/templates/book_edit.html:190
 msgid "Description"
 msgstr ""
 
@@ -624,7 +619,7 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: cps/templates/book_edit.html:39 cps/templates/layout.html:154
+#: cps/templates/book_edit.html:39 cps/templates/layout.html:137
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr ""
@@ -641,86 +636,90 @@ msgstr ""
 msgid "Cover URL (jpg)"
 msgstr ""
 
-#: cps/templates/book_edit.html:56 cps/templates/user_edit.html:27
+#: cps/templates/book_edit.html:56 cps/templates/detail.html:130
+msgid "Publishing date"
+msgstr ""
+
+#: cps/templates/book_edit.html:63 cps/templates/user_edit.html:27
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:67
+#: cps/templates/book_edit.html:74
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:68
+#: cps/templates/book_edit.html:75
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:115
+#: cps/templates/book_edit.html:122
 msgid "view book after edit"
 msgstr ""
 
-#: cps/templates/book_edit.html:118 cps/templates/book_edit.html:154
+#: cps/templates/book_edit.html:125 cps/templates/book_edit.html:161
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:119 cps/templates/config_edit.html:129
+#: cps/templates/book_edit.html:126 cps/templates/config_edit.html:154
 #: cps/templates/login.html:20 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:126
+#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:129
 msgid "Submit"
 msgstr ""
 
-#: cps/templates/book_edit.html:133
+#: cps/templates/book_edit.html:140
 msgid "Are really you sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:136
+#: cps/templates/book_edit.html:143
 msgid "Book will be deleted from Calibre database"
 msgstr ""
 
-#: cps/templates/book_edit.html:137
+#: cps/templates/book_edit.html:144
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:141
+#: cps/templates/book_edit.html:148
 msgid "Delete"
 msgstr ""
 
-#: cps/templates/book_edit.html:157
+#: cps/templates/book_edit.html:164
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:158
+#: cps/templates/book_edit.html:165
 msgid " Search keyword "
 msgstr ""
 
-#: cps/templates/book_edit.html:160 cps/templates/layout.html:60
+#: cps/templates/book_edit.html:167 cps/templates/layout.html:43
 msgid "Go!"
 msgstr ""
 
-#: cps/templates/book_edit.html:161
+#: cps/templates/book_edit.html:168
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:165 cps/templates/book_edit.html:178
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:185
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:168
+#: cps/templates/book_edit.html:175 cps/templates/layout.html:199
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:179
+#: cps/templates/book_edit.html:186
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:180
+#: cps/templates/book_edit.html:187
 msgid "No Result! Please try anonther keyword."
 msgstr ""
 
-#: cps/templates/book_edit.html:182 cps/templates/detail.html:126
+#: cps/templates/book_edit.html:189 cps/templates/detail.html:125
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr ""
 
-#: cps/templates/book_edit.html:184
+#: cps/templates/book_edit.html:191
 msgid "Source"
 msgstr ""
 
@@ -756,8 +755,8 @@ msgstr ""
 msgid "Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:56 cps/templates/layout.html:133
-#: cps/templates/layout.html:134 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/layout.html:116
+#: cps/templates/layout.html:117 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr ""
 
@@ -773,55 +772,75 @@ msgstr ""
 msgid "Regular expression for title sorting"
 msgstr ""
 
-#: cps/templates/config_edit.html:86
+#: cps/templates/config_edit.html:76
+msgid "Tags for Mature Content"
+msgstr ""
+
+#: cps/templates/config_edit.html:93
 msgid "Enable uploading"
 msgstr ""
 
-#: cps/templates/config_edit.html:90
+#: cps/templates/config_edit.html:97
 msgid "Enable anonymous browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:94
+#: cps/templates/config_edit.html:101
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:98
+#: cps/templates/config_edit.html:105
 msgid "Enable remote login (\"magic link\")"
 msgstr ""
 
-#: cps/templates/config_edit.html:100
+#: cps/templates/config_edit.html:110
+msgid "Use"
+msgstr ""
+
+#: cps/templates/config_edit.html:111
+msgid "Obtain an API Key"
+msgstr ""
+
+#: cps/templates/config_edit.html:115
+msgid "Goodreads API Key"
+msgstr ""
+
+#: cps/templates/config_edit.html:119
+msgid "Goodreads API Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:125
 msgid "Default Settings for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:87
+#: cps/templates/config_edit.html:128 cps/templates/user_edit.html:90
 msgid "Admin user"
 msgstr ""
 
-#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:132 cps/templates/user_edit.html:95
 msgid "Allow Downloads"
 msgstr ""
 
-#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:99
 msgid "Allow Uploads"
 msgstr ""
 
-#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:100
+#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:103
 msgid "Allow Edit"
 msgstr ""
 
-#: cps/templates/config_edit.html:119 cps/templates/user_edit.html:104
+#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:107
 msgid "Allow Delete books"
 msgstr ""
 
-#: cps/templates/config_edit.html:123 cps/templates/user_edit.html:109
+#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:112
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:127 cps/templates/user_edit.html:113
+#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:116
 msgid "Allow Editing Public Shelfs"
 msgstr ""
 
-#: cps/templates/config_edit.html:134 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:159 cps/templates/layout.html:76
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -830,35 +849,31 @@ msgstr ""
 msgid "Read in browser"
 msgstr ""
 
-#: cps/templates/detail.html:88
+#: cps/templates/detail.html:87
 msgid "Book"
 msgstr ""
 
-#: cps/templates/detail.html:88
+#: cps/templates/detail.html:87
 msgid "of"
 msgstr ""
 
-#: cps/templates/detail.html:94
+#: cps/templates/detail.html:93
 msgid "language"
 msgstr ""
 
-#: cps/templates/detail.html:131
-msgid "Publishing date"
-msgstr ""
-
-#: cps/templates/detail.html:168
+#: cps/templates/detail.html:167
 msgid "Read"
 msgstr ""
 
-#: cps/templates/detail.html:177
+#: cps/templates/detail.html:176
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:189
+#: cps/templates/detail.html:188
 msgid "Add to shelf"
 msgstr ""
 
-#: cps/templates/detail.html:251
+#: cps/templates/detail.html:250
 msgid "Edit metadata"
 msgstr ""
 
@@ -894,7 +909,7 @@ msgstr ""
 msgid "Save settings and send Test E-Mail"
 msgstr ""
 
-#: cps/templates/feed.xml:20
+#: cps/templates/feed.xml:20 cps/templates/layout.html:183
 msgid "Next"
 msgstr ""
 
@@ -906,11 +921,12 @@ msgstr ""
 msgid "Start"
 msgstr ""
 
-#: cps/templates/index.xml:7 cps/templates/layout.html:58
+#: cps/templates/index.xml:7 cps/templates/layout.html:40
+#: cps/templates/layout.html:41
 msgid "Search"
 msgstr ""
 
-#: cps/templates/index.xml:15 cps/templates/layout.html:138
+#: cps/templates/index.xml:15 cps/templates/layout.html:121
 msgid "Hot Books"
 msgstr ""
 
@@ -918,7 +934,7 @@ msgstr ""
 msgid "Popular publications from this catalog based on Downloads."
 msgstr ""
 
-#: cps/templates/index.xml:22 cps/templates/layout.html:141
+#: cps/templates/index.xml:22 cps/templates/layout.html:124
 msgid "Best rated Books"
 msgstr ""
 
@@ -938,7 +954,7 @@ msgstr ""
 msgid "Show Random Books"
 msgstr ""
 
-#: cps/templates/index.xml:57 cps/templates/layout.html:156
+#: cps/templates/index.xml:57 cps/templates/layout.html:139
 msgid "Authors"
 msgstr ""
 
@@ -954,83 +970,91 @@ msgstr ""
 msgid "Books ordered by series"
 msgstr ""
 
-#: cps/templates/layout.html:48
+#: cps/templates/layout.html:30
 msgid "Toggle navigation"
 msgstr ""
 
-#: cps/templates/layout.html:68
+#: cps/templates/layout.html:51
 msgid "Advanced Search"
 msgstr ""
 
-#: cps/templates/layout.html:89
+#: cps/templates/layout.html:72
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:94 cps/templates/register.html:18
+#: cps/templates/layout.html:77 cps/templates/register.html:18
 msgid "Register"
 msgstr ""
 
-#: cps/templates/layout.html:123
+#: cps/templates/layout.html:106
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:124
+#: cps/templates/layout.html:107
 msgid "Recently Added"
 msgstr ""
 
-#: cps/templates/layout.html:127
+#: cps/templates/layout.html:110
 msgid "Sorted Books"
 msgstr ""
 
-#: cps/templates/layout.html:131 cps/templates/layout.html:132
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
+#: cps/templates/layout.html:114 cps/templates/layout.html:115
+#: cps/templates/layout.html:116 cps/templates/layout.html:117
 msgid "Sort By"
 msgstr ""
 
-#: cps/templates/layout.html:131
+#: cps/templates/layout.html:114
 msgid "Newest"
 msgstr ""
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:115
 msgid "Oldest"
 msgstr ""
 
-#: cps/templates/layout.html:133
+#: cps/templates/layout.html:116
 msgid "Ascending"
 msgstr ""
 
-#: cps/templates/layout.html:134
+#: cps/templates/layout.html:117
 msgid "Descending"
 msgstr ""
 
-#: cps/templates/layout.html:148
+#: cps/templates/layout.html:131
 msgid "Discover"
 msgstr ""
 
-#: cps/templates/layout.html:151
+#: cps/templates/layout.html:134
 msgid "Categories"
 msgstr ""
 
-#: cps/templates/layout.html:158 cps/templates/search_form.html:58
+#: cps/templates/layout.html:141 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr ""
 
-#: cps/templates/layout.html:161
+#: cps/templates/layout.html:144
 msgid "Public Shelves"
 msgstr ""
 
-#: cps/templates/layout.html:165
+#: cps/templates/layout.html:148
 msgid "Your Shelves"
 msgstr ""
 
-#: cps/templates/layout.html:170
+#: cps/templates/layout.html:153
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/templates/layout.html:171
+#: cps/templates/layout.html:154
 msgid "About"
 msgstr ""
 
+#: cps/templates/layout.html:168
+msgid "Previous"
+msgstr ""
+
+#: cps/templates/layout.html:195
+msgid "Book Details"
+msgstr ""
+
 #: cps/templates/login.html:8 cps/templates/login.html:9
 #: cps/templates/register.html:7 cps/templates/user_edit.html:8
 msgid "Username"
@@ -1193,47 +1217,51 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: cps/templates/user_edit.html:47
+#: cps/templates/user_edit.html:46
+msgid "Show mature content"
+msgstr ""
+
+#: cps/templates/user_edit.html:50
 msgid "Show random books"
 msgstr ""
 
-#: cps/templates/user_edit.html:51
+#: cps/templates/user_edit.html:54
 msgid "Show hot books"
 msgstr ""
 
-#: cps/templates/user_edit.html:55
+#: cps/templates/user_edit.html:58
 msgid "Show best rated books"
 msgstr ""
 
-#: cps/templates/user_edit.html:59
+#: cps/templates/user_edit.html:62
 msgid "Show language selection"
 msgstr ""
 
-#: cps/templates/user_edit.html:63
+#: cps/templates/user_edit.html:66
 msgid "Show series selection"
 msgstr ""
 
-#: cps/templates/user_edit.html:67
+#: cps/templates/user_edit.html:70
 msgid "Show category selection"
 msgstr ""
 
-#: cps/templates/user_edit.html:71
+#: cps/templates/user_edit.html:74
 msgid "Show author selection"
 msgstr ""
 
-#: cps/templates/user_edit.html:75
+#: cps/templates/user_edit.html:78
 msgid "Show read and unread"
 msgstr ""
 
-#: cps/templates/user_edit.html:79
+#: cps/templates/user_edit.html:82
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:120
+#: cps/templates/user_edit.html:123
 msgid "Delete this user"
 msgstr ""
 
-#: cps/templates/user_edit.html:135
+#: cps/templates/user_edit.html:138
 msgid "Recent Downloads"
 msgstr ""