diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 776cdb61..1d722e0c 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -133,7 +133,7 @@ def getDrive(drive=None, gauth=None):
             try:
                 gauth.Refresh()
             except:
-                web.app.logger.error("GDrive gdrive_credentials file not present, reauthenticate in config section")
+                web.app.logger.error("Google Drive gdrive_credentials file not present, reauthenticate in config section")
         else:
             # Initialize the saved creds
             gauth.Authorize()
diff --git a/cps/helper.py b/cps/helper.py
index 51bf227c..95dca99f 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -371,7 +371,7 @@ def update_dir_structure_gdrive(book_id):
             book.path = book.path.split('/')[0] + '/' + new_titledir
             gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
         else:
-            error = _(u'File %s not found on gdrive' % book.path) # file not found
+            error = _(u'File %s not found on Google Drive' % book.path) # file not found
 
     if authordir != new_authordir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
@@ -380,7 +380,7 @@ def update_dir_structure_gdrive(book_id):
             book.path = new_authordir + '/' + book.path.split('/')[1]
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
-            error = _(u'File %s not found on gdrive' % authordir) # file not found
+            error = _(u'File %s not found on Google Drive' % authordir) # file not found
     return error
 
 
@@ -391,7 +391,7 @@ def delete_book_gdrive(book):
         gd.deleteDatabaseEntry(gFile['id'])
         gFile.Trash()
     else:
-        error =_(u'delete_bookPath %s not found on gdrive' % book.path)  # file not found
+        error =_(u'Book path %s not found on Google Drive' % book.path)  # file not found
     return error
 
 ################################## External interface
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index a89291e5..6d6f7414 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -48,7 +48,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
 .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
 .btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; }
 .btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left:0px; }
-
+.panel-body {background-color: #f5f5f5;}
 .spinner {margin:0 41%;}
 .spinner2 {margin:0 41%;}
 
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 96d2ceb8..62460fa5 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -76,7 +76,8 @@
         <td>{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
         <td>{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td>
   </table>
-  <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Configuration')}}</a></div>
+  <div class="btn btn-default"><a href="{{url_for('configuration')}}">{{_('Basic Configuration')}}</a></div>
+  <div class="btn btn-default"><a href="{{url_for('view_configuration')}}">{{_('UI Configuration')}}</a></div>
   <h2>{{_('Administration')}}</h2>
       {% if not development %}
         <div>{{_('Current commit timestamp')}}: <span>{{commit}} </span></div>
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index 0928ed4d..02238ebc 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -3,19 +3,31 @@
 <div class="discover">
   <h2>{{title}}</h2>
   <form role="form" method="POST" autocomplete="off">
+<div class="panel-group">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <div class="accordion-toggle" data-toggle="collapse" href="#collapseOne">
+          <span class="glyphicon glyphicon-minus"></span>
+          {{_('Library Configuration')}}
+        </div>
+      </h4>
+    </div>
+    <div id="collapseOne" class="panel-collapse collapse in">
+      <div class="panel-body">
     <div class="form-group required">
       <label for="config_calibre_dir">{{_('Location of Calibre database')}}</label>
       <input type="text" class="form-control" name="config_calibre_dir" id="config_calibre_dir" value="{% if content.config_calibre_dir != None %}{{ content.config_calibre_dir }}{% endif %}" autocomplete="off">
     </div>
     <div class="form-group required">
       <input type="checkbox" id="config_use_google_drive" name="config_use_google_drive" data-control="gdrive_settings" {% if content.config_use_google_drive %}checked{% endif %} >
-      <label for="config_use_google_drive">{{_('Use google drive?')}}</label>
+      <label for="config_use_google_drive">{{_('Use Google Drive?')}}</label>
     </div>
     <div data-related="gdrive_settings">
       {% if gdriveError %}
         <div class="form-group">
           <label>
-            {{_('Google drive config problem')}}: {{ gdriveError }}
+            {{_('Google Drive config problem')}}: {{ gdriveError }}
           </label>
         </div>
       {% else %}
@@ -25,7 +37,7 @@
           </div>
         {% else %}
           <div class="form-group required">
-            <label for="config_google_drive_folder">{{_('Google drive Calibre folder')}}</label>
+            <label for="config_google_drive_folder">{{_('Google Drive Calibre folder')}}</label>
               <select name="config_google_drive_folder" id="config_google_drive_folder" class="form-control">
                 {%  for gdrivefolder in gdrivefolders %}
                 <option value="{{ gdrivefolder.title }}" {% if gdrivefolder.title == content.config_google_drive_folder %}selected{% endif %}>{{ gdrivefolder.title }}</option>
@@ -44,59 +56,73 @@
         {% endif %}
       {% endif %}
     </div>
-    <div class="form-group">
-      <label for="config_port">{{_('Server Port')}}</label>
-      <input type="number" min="1" max="65535" class="form-control" name="config_port" id="config_port" value="{% if content.config_port != None %}{{ content.config_port }}{% endif %}" autocomplete="off" required>
-    </div>
-    <div class="form-group">
-      <label for="config_certfile">{{_('SSL certfile location (leave it empty for non-SSL Servers)')}}</label>
-      <input type="text" class="form-control" name="config_certfile" id="config_certfile" value="{% if content.config_certfile != None %}{{ content.config_certfile }}{% endif %}" autocomplete="off">
-    </div>
-    <div class="form-group">
-      <label for="config_keyfile">{{_('SSL Keyfile location (leave it empty for non-SSL Servers)')}}</label>
-      <input type="text" class="form-control" name="config_keyfile" id="config_keyfile" value="{% if content.config_keyfile != None %}{{ content.config_keyfile }}{% endif %}" autocomplete="off">
-    </div>
-    <div class="form-group">
-      <label for="config_calibre_web_title">{{_('Title')}}</label>
-      <input type="text" class="form-control" name="config_calibre_web_title" id="config_calibre_web_title" value="{% if content.config_calibre_web_title != None %}{{ content.config_calibre_web_title }}{% endif %}" autocomplete="off" required>
-    </div>    
-    <div class="form-group">
-      <label for="config_books_per_page">{{_('Books per page')}}</label>
-      <input type="number" min="1" max="200" class="form-control" name="config_books_per_page" id="config_books_per_page" value="{% if content.config_books_per_page != None %}{{ content.config_books_per_page }}{% endif %}" autocomplete="off">
-    </div>
-    <div class="form-group">
-      <label for="config_random_books">{{_('No. of random books to show')}}</label>
-      <input type="number" min="1" max="30" class="form-control" name="config_random_books" id="config_random_books" value="{% if content.config_random_books != None %}{{ content.config_random_books }}{% endif %}" autocomplete="off">
+      </div>
     </div>
-    <div class="form-group">
-      <label for="config_columns_to_ignore">{{_('Regular expression for ignoring columns')}}</label>
-      <input type="text" class="form-control" name="config_columns_to_ignore" id="config_columns_to_ignore" value="{% if content.config_columns_to_ignore != None %}{{ content.config_columns_to_ignore }}{% endif %}" autocomplete="off">
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <div class="accordion-toggle" data-toggle="collapse" href="#collapsetwo">
+          <span class="glyphicon glyphicon-plus"></span>
+          {{_('Server Configuration')}}
+        </div>
+      </h4>
     </div>
-    <div class="form-group">
-      <label for="config_title_regex">{{_('Regular expression for title sorting')}}</label>
-      <input type="text" class="form-control" name="config_title_regex" id="config_title_regex" value="{% if content.config_title_regex != None %}{{ content.config_title_regex }}{% endif %}" autocomplete="off">
+    <div id="collapsetwo" class="panel-collapse collapse">
+      <div class="panel-body">
+                <div class="form-group">
+          <label for="config_port">{{_('Server Port')}}</label>
+          <input type="number" min="1" max="65535" class="form-control" name="config_port" id="config_port" value="{% if content.config_port != None %}{{ content.config_port }}{% endif %}" autocomplete="off" required>
+        </div>
+        <div class="form-group">
+          <label for="config_certfile">{{_('SSL certfile location (leave it empty for non-SSL Servers)')}}</label>
+          <input type="text" class="form-control" name="config_certfile" id="config_certfile" value="{% if content.config_certfile != None %}{{ content.config_certfile }}{% endif %}" autocomplete="off">
+        </div>
+        <div class="form-group">
+          <label for="config_keyfile">{{_('SSL Keyfile location (leave it empty for non-SSL Servers)')}}</label>
+          <input type="text" class="form-control" name="config_keyfile" id="config_keyfile" value="{% if content.config_keyfile != None %}{{ content.config_keyfile }}{% endif %}" autocomplete="off">
+        </div>
+      </div>
     </div>
-    <div class="form-group">
-      <label for="config_mature_content_tags">{{_('Tags for Mature Content')}}</label>
-      <input type="text" class="form-control" name="config_mature_content_tags" id="config_mature_content_tags"
-             value="{% if content.config_mature_content_tags != None%}{{ content.config_mature_content_tags }}{% endif %}"
-             autocomplete="off"
-      >
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <div class="accordion-toggle" data-toggle="collapse" href="#collapsethree">
+          <span class="glyphicon glyphicon-plus"></span>
+          {{_('Logfile Configuration')}}
+        </div>
+      </h4>
     </div>
-    <div class="form-group">
-    <label for="config_log_level">{{_('Log Level')}}</label>
-        <select name="config_log_level" id="config_log_level" class="form-control">
-                <option value="10" {% if content.config_log_level == 10 %}selected{% endif %}>DEBUG</option>
-                <option value="20" {% if content.config_log_level == 20 or content.config_log_level == None %}selected{% endif %}>INFO</option>
-                <option value="30" {% if content.config_log_level == 30 %}selected{% endif %}>WARNING</option>
-                <option value="40" {% if content.config_log_level == 40 %}selected{% endif %}>ERROR</option>
-        </select>
+    <div id="collapsethree" class="panel-collapse collapse">
+      <div class="panel-body">
+        <div class="form-group">
+        <label for="config_log_level">{{_('Log Level')}}</label>
+            <select name="config_log_level" id="config_log_level" class="form-control">
+                    <option value="10" {% if content.config_log_level == 10 %}selected{% endif %}>DEBUG</option>
+                    <option value="20" {% if content.config_log_level == 20 or content.config_log_level == None %}selected{% endif %}>INFO</option>
+                    <option value="30" {% if content.config_log_level == 30 %}selected{% endif %}>WARNING</option>
+                    <option value="40" {% if content.config_log_level == 40 %}selected{% endif %}>ERROR</option>
+            </select>
+        </div>
+        <div class="form-group">
+          <label for="config_logfile">{{_('Location and name of logfile (calibre-web.log for no entry)')}}</label>
+          <input type="text" class="form-control" name="config_logfile" id="config_logfile" value="{% if content.config_logfile != None %}{{ content.config_logfile }}{% endif %}" autocomplete="off">
+        </div>
+      </div>
     </div>
-    <div class="form-group">
-      <label for="config_logfile">{{_('Location and name of logfile (calibre-web.log for no entry)')}}</label>
-      <input type="text" class="form-control" name="config_logfile" id="config_logfile" value="{% if content.config_logfile != None %}{{ content.config_logfile }}{% endif %}" autocomplete="off">
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <div class="accordion-toggle" data-toggle="collapse" href="#collapsefive">
+          <span class="glyphicon glyphicon-plus"></span>
+          {{_('Feature Configuration')}}
+        </div>
+      </h4>
     </div>
-    <div class="col-sm-6">
+    <div id="collapsefive" class="panel-collapse collapse">
+      <div class="panel-body">
     <div class="form-group">
         <input type="checkbox" id="config_uploading" name="config_uploading" {% if content.config_uploading %}checked{% endif %}>
         <label for="config_uploading">{{_('Enable uploading')}}</label>
@@ -130,89 +156,12 @@
       </div>
     </div>
     {% endif %}
-    <h2>{{_('Default Settings for new users')}}</h2>
-    <div class="form-group">
-      <input type="checkbox" name="admin_role" id="admin_role" {% if content.role_admin() %}checked{% endif %}>
-      <label for="admin_role">{{_('Admin user')}}</label>
-    </div>
-    <div class="form-group">
-      <input type="checkbox" name="download_role" id="download_role" {% if content.role_download() %}checked{% endif %}>
-      <label for="download_role">{{_('Allow Downloads')}}</label>
-    </div>
-    <div class="form-group">
-      <input type="checkbox" name="upload_role" id="upload_role" {% if content.role_upload() %}checked{% endif %}>
-      <label for="upload_role">{{_('Allow Uploads')}}</label>
-    </div>
-    <div class="form-group">
-      <input type="checkbox" name="edit_role" id="edit_role" {% if content.role_edit() %}checked{% endif %}>
-      <label for="edit_role">{{_('Allow Edit')}}</label>
-    </div>
-    <div class="form-group">
-      <input type="checkbox" name="delete_role" id="delete_role" {% if content.role_delete_books() %}checked{% endif %}>
-      <label for="delete_role">{{_('Allow Delete books')}}</label>
-    </div>
-    <div class="form-group">
-      <input type="checkbox" name="passwd_role" id="passwd_role" {% if content.role_passwd() %}checked{% endif %}>
-      <label for="passwd_role">{{_('Allow Changing Password')}}</label>
-    </div>
-    <div class="form-group">
-      <input type="checkbox" name="edit_shelf_role" id="edit_shelf_role" {% if content.role_edit_shelfs() %}checked{% endif %}>
-      <label for="edit_shelf_role">{{_('Allow Editing Public Shelfs')}}</label>
-    </div>
-    </div>
-    <div class="col-sm-6">
-    <h3>{{_('Default visiblities for new users')}}</h3>
-    <div class="col-sm-6">
-      <div class="form-group">
-          <input type="checkbox" name="show_random" id="show_random" {% if content.show_random_books() %}checked{% endif %}>
-          <label for="show_random">{{_('Show random books')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_recent" id="show_recent" {% if content.show_recent() %}checked{% endif %}>
-          <label for="show_recent">{{_('Show recent books')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_sorted" id="show_sorted" {% if content.show_sorted() %}checked{% endif %}>
-          <label for="show_sorted">{{_('Show sorted books')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_hot" id="show_hot" {% if content.show_hot_books() %}checked{% endif %}>
-          <label for="show_hot">{{_('Show hot books')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_best_rated" id="show_best_rated" {% if content.show_best_rated_books() %}checked{% endif %}>
-          <label for="show_best_rated">{{_('Show best rated books')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_language" id="show_language" {% if content.show_language() %}checked{% endif %}>
-          <label for="show_language">{{_('Show language selection')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_series" id="show_series" {% if content.show_series() %}checked{% endif %}>
-          <label for="show_series">{{_('Show series selection')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_category" id="show_category" {% if content.show_category() %}checked{% endif %}>
-          <label for="show_category">{{_('Show category selection')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_author" id="show_author" {% if content.show_author() %}checked{% endif %}>
-          <label for="show_author">{{_('Show author selection')}}</label>
       </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_read_and_unread" id="show_read_and_unread" {% if content.show_read_and_unread() %}checked{% endif %}>
-          <label for="show_read_and_unread">{{_('Show read and unread')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_detail_random" id="show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
-          <label for="show_detail_random">{{_('Show random books in detail view')}}</label>
-      </div>
-      <div class="form-group">
-          <input type="checkbox" name="show_mature_content" id="show_mature_content" {% if content.show_mature_content() %}checked{% endif %}>
-          <label for="show_mature_content">{{_('Show mature content')}}</label>
-      </div>
-    </div>
     </div>
+  </div>
+</div>
+
+
     <div class="col-sm-12">
     <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
     {% if not origin %}
@@ -230,5 +179,10 @@
     $(document).on('change', '#config_use_google_drive', function() {
         $('#config_google_drive_folder').prop('required', $(this).prop('checked'));
     });
+    $('.collapse').on('shown.bs.collapse', function(){
+        $(this).parent().find(".glyphicon-plus").removeClass("glyphicon-plus").addClass("glyphicon-minus");
+    }).on('hidden.bs.collapse', function(){
+    $(this).parent().find(".glyphicon-minus").removeClass("glyphicon-minus").addClass("glyphicon-plus");
+    });
 </script>
 {% endblock %}
diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html
new file mode 100644
index 00000000..317ac9e2
--- /dev/null
+++ b/cps/templates/config_view_edit.html
@@ -0,0 +1,177 @@
+{% extends "layout.html" %}
+{% block body %}
+<div class="discover">
+  <h2>{{title}}</h2>
+  <form role="form" method="POST" autocomplete="off">
+<div class="panel-group">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <div class="accordion-toggle" data-toggle="collapse" href="#collapsefour">
+          <span class="glyphicon glyphicon-plus"></span>
+          {{_('View Configuration')}}
+        </div>
+      </h4>
+    </div>
+    <div id="collapsefour" class="panel-collapse collapse">
+      <div class="panel-body">
+                <div class="form-group">
+          <label for="config_calibre_web_title">{{_('Title')}}</label>
+          <input type="text" class="form-control" name="config_calibre_web_title" id="config_calibre_web_title" value="{% if content.config_calibre_web_title != None %}{{ content.config_calibre_web_title }}{% endif %}" autocomplete="off" required>
+        </div>
+        <div class="form-group">
+          <label for="config_books_per_page">{{_('Books per page')}}</label>
+          <input type="number" min="1" max="200" class="form-control" name="config_books_per_page" id="config_books_per_page" value="{% if content.config_books_per_page != None %}{{ content.config_books_per_page }}{% endif %}" autocomplete="off">
+        </div>
+        <div class="form-group">
+          <label for="config_random_books">{{_('No. of random books to show')}}</label>
+          <input type="number" min="1" max="30" class="form-control" name="config_random_books" id="config_random_books" value="{% if content.config_random_books != None %}{{ content.config_random_books }}{% endif %}" autocomplete="off">
+        </div>
+        <div class="form-group">
+          <label for="config_columns_to_ignore">{{_('Regular expression for ignoring columns')}}</label>
+          <input type="text" class="form-control" name="config_columns_to_ignore" id="config_columns_to_ignore" value="{% if content.config_columns_to_ignore != None %}{{ content.config_columns_to_ignore }}{% endif %}" autocomplete="off">
+        </div>
+        <div class="form-group">
+          <label for="config_read_column">{{_('Link read/unread status to Calibre column')}}</label>
+              <select name="config_read_column" id="config_read_column" class="form-control">
+                <option value="0" {% if content.config_read_column == 0 %}selected{% endif %}></option>
+                {%  for readColumn in readColumns %}
+                <option value="{{ readColumn.id }}" {% if readColumn.id == content.config_read_column %}selected{% endif %}>{{ readColumn.name }}</option>
+                {% endfor %}
+              </select>
+        </div>
+        <div class="form-group">
+          <label for="config_title_regex">{{_('Regular expression for title sorting')}}</label>
+          <input type="text" class="form-control" name="config_title_regex" id="config_title_regex" value="{% if content.config_title_regex != None %}{{ content.config_title_regex }}{% endif %}" autocomplete="off">
+        </div>
+        <div class="form-group">
+          <label for="config_mature_content_tags">{{_('Tags for Mature Content')}}</label>
+          <input type="text" class="form-control" name="config_mature_content_tags" id="config_mature_content_tags"
+                 value="{% if content.config_mature_content_tags != None%}{{ content.config_mature_content_tags }}{% endif %}"
+                 autocomplete="off"
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <div class="accordion-toggle" data-toggle="collapse" href="#collapsesix">
+          <span class="glyphicon glyphicon-plus"></span>
+          {{_('Default settings for new users')}}
+        </div>
+      </h4>
+    </div>
+    <div id="collapsesix" class="panel-collapse collapse">
+      <div class="panel-body">
+        <div class="form-group">
+          <input type="checkbox" name="admin_role" id="admin_role" {% if content.role_admin() %}checked{% endif %}>
+          <label for="admin_role">{{_('Admin user')}}</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" name="download_role" id="download_role" {% if content.role_download() %}checked{% endif %}>
+          <label for="download_role">{{_('Allow Downloads')}}</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" name="upload_role" id="upload_role" {% if content.role_upload() %}checked{% endif %}>
+          <label for="upload_role">{{_('Allow Uploads')}}</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" name="edit_role" id="edit_role" {% if content.role_edit() %}checked{% endif %}>
+          <label for="edit_role">{{_('Allow Edit')}}</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" name="delete_role" id="delete_role" {% if content.role_delete_books() %}checked{% endif %}>
+          <label for="delete_role">{{_('Allow Delete books')}}</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" name="passwd_role" id="passwd_role" {% if content.role_passwd() %}checked{% endif %}>
+          <label for="passwd_role">{{_('Allow Changing Password')}}</label>
+        </div>
+        <div class="form-group">
+          <input type="checkbox" name="edit_shelf_role" id="edit_shelf_role" {% if content.role_edit_shelfs() %}checked{% endif %}>
+          <label for="edit_shelf_role">{{_('Allow Editing Public Shelfs')}}</label>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4 class="panel-title">
+        <div class="accordion-toggle" data-toggle="collapse" href="#collapseseven">
+          <span class="glyphicon glyphicon-plus"></span>
+          {{_('Default visibilities for new users')}}
+        </div>
+      </h4>
+    </div>
+    <div id="collapseseven" class="panel-collapse collapse">
+      <div class="panel-body">
+          <div class="form-group">
+              <input type="checkbox" name="show_random" id="show_random" {% if content.show_random_books() %}checked{% endif %}>
+              <label for="show_random">{{_('Show random books')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_recent" id="show_recent" {% if content.show_recent() %}checked{% endif %}>
+              <label for="show_recent">{{_('Show recent books')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_sorted" id="show_sorted" {% if content.show_sorted() %}checked{% endif %}>
+              <label for="show_sorted">{{_('Show sorted books')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_hot" id="show_hot" {% if content.show_hot_books() %}checked{% endif %}>
+              <label for="show_hot">{{_('Show hot books')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_best_rated" id="show_best_rated" {% if content.show_best_rated_books() %}checked{% endif %}>
+              <label for="show_best_rated">{{_('Show best rated books')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_language" id="show_language" {% if content.show_language() %}checked{% endif %}>
+              <label for="show_language">{{_('Show language selection')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_series" id="show_series" {% if content.show_series() %}checked{% endif %}>
+              <label for="show_series">{{_('Show series selection')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_category" id="show_category" {% if content.show_category() %}checked{% endif %}>
+              <label for="show_category">{{_('Show category selection')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_author" id="show_author" {% if content.show_author() %}checked{% endif %}>
+              <label for="show_author">{{_('Show author selection')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_read_and_unread" id="show_read_and_unread" {% if content.show_read_and_unread() %}checked{% endif %}>
+              <label for="show_read_and_unread">{{_('Show read and unread')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_detail_random" id="show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
+              <label for="show_detail_random">{{_('Show random books in detail view')}}</label>
+          </div>
+          <div class="form-group">
+              <input type="checkbox" name="show_mature_content" id="show_mature_content" {% if content.show_mature_content() %}checked{% endif %}>
+              <label for="show_mature_content">{{_('Show mature content')}}</label>
+          </div>
+      </div>
+    </div>
+  </div>
+</div>
+    <div class="col-sm-12">
+    <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <a href="{{ url_for('admin') }}" class="btn btn-default">{{_('Back')}}</a>
+    </div>
+  </form>
+</div>
+{% endblock %}
+{% block js %}
+<script type="text/javascript">
+        $('.collapse').on('shown.bs.collapse', function(){
+            $(this).parent().find(".glyphicon-plus").removeClass("glyphicon-plus").addClass("glyphicon-minus");
+        }).on('hidden.bs.collapse', function(){
+        $(this).parent().find(".glyphicon-minus").removeClass("glyphicon-minus").addClass("glyphicon-plus");
+        });
+</script>
+{% endblock %}
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index a6b60558..37e1523f 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 83375441..c3318268 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: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+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.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "Nicht installiert"
 
@@ -78,25 +78,25 @@ msgstr ""
 "Konnte keine Formate finden welche für das versenden per E-Mail geeignet "
 "sind"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "Umbenennen des Titelpfades \"%s\" nach \"%s\" schlug fehl: %s"
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "Umbenennen des Authorpfades \"%s\" nach \"%s\" schlug fehl: %s"
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
-msgstr "Datei %s nicht auf Gdrive gefunden"
+msgid "File %s not found on Google Drive"
+msgstr "Datei %s wirde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
-msgstr "Pfad %s nicht auf GDrive gefunden"
+msgid "Book path %s not found on Google Drive"
+msgstr "Buchpfad %s wurde nicht auf Google Drive gefunden"
 
 #: cps/web.py:954
 msgid "Requesting update package"
@@ -162,7 +162,7 @@ msgstr "Zufällige Bücher"
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
@@ -195,15 +195,15 @@ msgstr "Kategorieliste"
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr "Ausführungsberechtigung nicht vorhanden"
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
@@ -211,326 +211,330 @@ msgstr ""
 "Callback Domain ist nicht verifiziert, bitte Domain in der Google "
 "Developer Console verifizieren"
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "Update durchgeführt"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr "Herausgegeben nach dem %s"
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr "Herausgegeben vor dem %s"
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "Suche"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 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:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Buch erfolgreich versandt an %(kindlemail)s"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, 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:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, 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:2192
+#: cps/web.py:2232
 #, 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:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Keine Erlaubnis das Buch aus dem Bücherregal %(sname)s zu entfernen"
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, 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:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 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:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "Es existiert ein Benutzerkonto für diese E-Mailadresse"
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
-msgstr "Optionale Abhängigkeiten für GDrive fehlen"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Calibre-web Konfiguration wurde aktualisiert"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
+msgstr "Konfiguration Benutzeroberfläche"
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr "Optionale Abhängigkeiten für Google Drive fehlen"
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json nicht vorhanden, oder nicht lesbar"
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json nicht als Webapplication konfiguriert"
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "SSL-Keydatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "SSL-Certdatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Speicherort Logdatei ist ungültig, bitte Pfad korrigieren"
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web Konfiguration wurde aktualisiert"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 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:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 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:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "E-Mail Einstellungen aktualisiert"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, 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:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "E-Mail Einstellungen wurden aktualisiert"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "E-Mail Einstellungen editieren"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 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:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, 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:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr "Fehler beim speichern der Datei %s."
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr "Cover ist keine JPG Datei, konnte nicht gespeichert werden"
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim editieren des Buchs, Details im Logfile"
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "Datei müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
@@ -608,7 +612,7 @@ msgstr "Absenderadresse"
 msgid "Change SMTP settings"
 msgstr "SMTP Einstellungen ändern"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -616,7 +620,7 @@ msgstr "Konfiguration"
 msgid "Calibre DB dir"
 msgstr "Calibre DB Pfad"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "Log Level"
 
@@ -624,7 +628,7 @@ msgstr "Log Level"
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Bücher pro Seite"
 
@@ -644,60 +648,61 @@ msgstr "Anonymer Zugriff"
 msgid "Remote Login"
 msgstr "Remote Login"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr "Aktuelles Commit Datum"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr "Neuestes Commit Datum"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Calibre-DB neu verbinden"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Calibre-web Neustarten"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Stoppe Calibre-web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "Suche nach Update"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Calibre-web wirklich neustarten?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "Zurück"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Calibre-web wirklich stoppen"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "Updatevorgang, bitte Seite nicht neu laden"
 
@@ -784,9 +789,10 @@ msgstr "Buch nach Bearbeitung ansehen"
 msgid "Get metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Abschicken"
 
@@ -847,192 +853,216 @@ msgstr "Fehler bei Suche!"
 msgid "No Result! Please try anonther keyword."
 msgstr "Kein Ergebniss! Bitte anderen Begriff versuchen"
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr "Bibliothekskonfiguration"
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Speicherort der Calibre Datenbank"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
 msgstr "Google Drive benutzen"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr "Google Drive Konfigurationsproblem"
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr "Google Drive authentifizieren"
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
 msgstr "Google Drive Calibre Ordner"
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr "Matadata Überwachungs-ID"
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr "Widerrufen"
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr "Server Konfiguration"
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "Server Port"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL Certdatei Speicherort (leerlassen für nicht SSL Server)"
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr "SSL Keydatei Speicherort (leerlassen für nicht SSL Server)"
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
+msgstr "Konfiguration Logdatei"
 
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "Anzahl Anzeige zufällige Bücher"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "Regulärer Ausdruck um Spalten zu ignorien"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "Regulärer Ausdruck für Titelsortierung"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
-msgstr "Kategorien für Erwachsenencontent"
-
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "Pfad und Name der Logdatei (calibre-web.log bei keinem Eintrag)"
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr "Feature Konfiguration"
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "Hochladen aktivieren"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "Anonymes Browsen aktivieren"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "Öffentliche Registrierung aktivieren"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr "Remote login aktivieren (\"Magischer Link\")"
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr "Benutze"
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr "Einen API Schlüssel erhalten"
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr "Öffentlicher Goodreads API Schlüssel"
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr "eheimer Goodreads API Schlüssel"
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Login"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr "Ansichtskonfiguration"
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "Anzahl Anzeige zufällige Bücher"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "Regulärer Ausdruck um Spalten zu ignorien"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr "Verknüpfe Gelesen Status mit Calibre Spalte"
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "Regulärer Ausdruck für Titelsortierung"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr "Kategorien für Erwachsenencontent"
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "Default Einstellungen für neue Benutzer"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "Admin Benutzer"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "Downloads erlauben"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "Uploads erlauben"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr "Bücher löschen erlauben"
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "Passwort ändern erlauben"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr "Öffentliche Bücherregale editieren erlauben"
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr "Default Sichtbarkeiten für neue Benutzer"
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "Zeige Zufällige Bücher"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr "Zeige kürzlich hinzugefügte Bücher"
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr "Zeige Bücher sortiert"
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "Zeige Auswahl Beliebte Bücher"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "Zeige am besten bewertete Bücher"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "Zeige Sprachauswahl"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "Zeige Serienauswahl"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "Zeige Kategorienauswahl"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "Zeige Gelesen/Ungelesen Auswahl"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr "Erwachsenencontent anzeigen"
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "Login"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "Im Browser lesen"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 8ecc14fd..c4d4bc81 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 0190ac64..5e9733d7 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n"
 "Language: es\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "No instalado"
 
@@ -69,24 +69,24 @@ msgstr "Enviar a Kindle"
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Formato no compatible para enviar por correo electronico"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -153,7 +153,7 @@ msgstr "Libros al azar"
 msgid "Author list"
 msgstr "Lista de autores"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Error en la apertura del eBook. El archivo no existe o no es accesible:"
 
@@ -184,338 +184,342 @@ msgstr "Lista de categorias"
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "Servidor en proceso de apagado. Por favor, cierre la ventana."
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "Actualización realizada"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "búsqueda"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "Libros leídos"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "¡Por favor completar todos los campos!"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "Error desconocido. Por favor, inténtelo de nuevo mas tarde."
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr "Usuario o dirección de correo en uso."
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "Iniciar sesión"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Envio de Libro a %(kindlemail)s correctamente"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, 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:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Configurar primero la dirección de correo Kindle por favor..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, 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:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "crear un estante"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "Existe una cuenta vinculada a esta dirección de correo."
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Configuración de Calibre-web actualizada"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr ""
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Configuración de Calibre-web actualizada"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr "Localicación de la BD inválida. Por favor, introduzca la ruta correcta."
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "Se ha encontrado una cuenta vinculada a esta dirección de correo o nombre"
 " de usuario."
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "Parámetros de correo actualizados"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Exito al realizar envio de prueba a %(kindlemail)s"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, 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:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "Ajustes de correo electrónico actualizados"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "Editar parametros de correo"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "Error inesperado."
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "editar metainformación"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión \"%s\" a este servidor"
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
@@ -593,7 +597,7 @@ msgstr "Desde el correo"
 msgid "Change SMTP settings"
 msgstr "Cambiar parametros smtp"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -601,7 +605,7 @@ msgstr "Configuración"
 msgid "Calibre DB dir"
 msgstr "Dir DB Calibre"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "Nivel de registro"
 
@@ -609,7 +613,7 @@ msgstr "Nivel de registro"
 msgid "Port"
 msgstr "Puerto"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Libros por página"
 
@@ -629,60 +633,61 @@ msgstr "Navegación anónima"
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "Administración"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr "Marca temporal del commit actual"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr "Marca temporal del commit más reciente"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Reconectar la BD Calibre"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Reinicial Calibre-web"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Detener Calibre-web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "Buscar actualizaciones"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "Actualizar"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "¿Seguro que quiere reiniciar Calibre-web?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "Regresar"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "¿Seguro que quiere detener Calibre-web?"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "Actualizando. Por favor, no recargue la página."
 
@@ -767,9 +772,10 @@ msgstr "Ver libro tras la edicion"
 msgid "Get metadata"
 msgstr "Obtener metainformación"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Enviar"
 
@@ -830,192 +836,216 @@ msgstr "¡Error en la búsqueda!"
 msgid "No Result! Please try anonther keyword."
 msgstr "¡Sin resultados! Por favor, pruebe otra palabra clave."
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Ubicación de la base de datos Calibre"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
-msgstr "¿Utiliza google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
+msgstr "¿Utiliza Google Drive?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
-msgstr "Carpeta Calibre de Google drive"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
+msgstr ""
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "Puerto del servidor"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titulo"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "Número de libros aletorios a mostrar"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "Expresión regular para ignorar columnas"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "Expresión regular para ordenar títulos"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "Permitir subida"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "Permitir navegación anónima"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "Permitir registro público"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr ""
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr ""
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Inicio de Sesion"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titulo"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "Número de libros aletorios a mostrar"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "Expresión regular para ignorar columnas"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "Expresión regular para ordenar títulos"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "Ajustes por defecto para nuevos usuarios"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "Usuario Administrador"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "Permitir descargas"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "Permitir editar"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr ""
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la clave"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr ""
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "Mostrar libros al azar"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "Mostrar libros populares"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "Mostrar libros mejor valorados"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "Mostrar lenguaje seleccionado"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "Mostrar series seleccionadas"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "Mostrar categorias elegidas"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "Mostrar libro aleatorios con vista detallada"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "Inicio de Sesion"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "Ver en el navegador"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index c88ee417..39eac778 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 e7e54e34..a8d37e3b 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2017-10-26 22:42+0200\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "non installé"
 
@@ -75,24 +75,24 @@ msgstr "Envoyer vers Kindle"
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossible de trouver un format adapté à envoyer par courriel"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -159,7 +159,7 @@ msgstr "Livres au hasard"
 msgid "Author list"
 msgstr "Liste des auteurs"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 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 "
@@ -192,338 +192,342 @@ msgstr "Liste des catégories"
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "Mise à jour effectuée"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "recherche"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "Livres lus"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "Une erreur a eu lieu. Merci de réessayez plus tard."
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 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:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "connexion"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veillez configurer les paramètres smtp d'abord..."
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Livres envoyés à %(kindlemail)s avec succès"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, 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:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Veuillez configurer votre adresse kindle d'abord..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, 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:2192
+#: cps/web.py:2232
 #, 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:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, 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:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "créer une étagère"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "l’étagère %(name)s a été supprimé avec succès"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "Un compte avec cette adresse de courriel existe déjà."
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "Page administrateur"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Configuration de Calibre-web mise à jour"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
+msgstr ""
+
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "Configuration basique"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Configuration de Calibre-web mise à jour"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 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:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "Paramètres de courriel mis à jour"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "Préférences e-mail mises à jour"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "Éditer les paramètres de courriel"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 "Erreur à l’ouverture du livre. Le fichier n’existe pas ou n’est pas "
 "accessible"
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr "inconnu"
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être téléverser le fichier doit avoir une extension"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
@@ -601,7 +605,7 @@ msgstr "Expéditeur des courriels"
 msgid "Change SMTP settings"
 msgstr "Changer les paramètre smtp"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -609,7 +613,7 @@ msgstr "Configuration"
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr ""
 
@@ -617,7 +621,7 @@ msgstr ""
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Livres par page"
 
@@ -637,60 +641,61 @@ msgstr "Navigation anonyme"
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Se reconnecter à Calibre-web"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Redémarrer Calibre-web"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Arrêter Calibre-web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "Rechercher les mise à jour"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-web?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "D’accord"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "Retour"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Voulez-Vous vraiment arrêter Calibre-web?"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -775,9 +780,10 @@ msgstr "voir le livre après l'édition"
 msgid "Get metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -838,192 +844,216 @@ msgstr "Rechercher les erreur!"
 msgid "No Result! Please try anonther keyword."
 msgstr "Aucun résultat, Merci d’essayer un autre mot-clé."
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Localisation de la base de donnée Calibre"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
-msgstr "Utiliser Google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
+msgstr "Utiliser Google Drive?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
 msgstr "Dossier Calibre de Google Drive"
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr ""
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titre"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr ""
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
+#: cps/templates/config_edit.html:109
+msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
-msgstr "Mots clés pour contenue pour adulte"
-
-#: cps/templates/config_edit.html:96
-msgid "Location and name of logfile (calibre-web.log for no entry)"
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "Autoriser le téléversement"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "Autoriser la navigation anonyme"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "Autoriser l’inscription publique"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr ""
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr "Utiliser"
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr "Obtenir la clé API"
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Connexion"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titre"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr "Mots clés pour contenue pour adulte"
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "Réglages par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "Utilisateur admin"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "Permettre les téléchargements"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "Permettre les téléversements"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "Permettre l'édition"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr "Autoriser la suppression des livres"
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr "Autoriser la modification d’étagères publiques"
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "Montrer les livres populaires"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "Montrer les livres les mieux notés"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "Montrer la sélection par langue"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "Montrer la sélection par séries"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "Montrer la sélection par catégories"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "Montrer lu et non-lu"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "Montrer aléatoirement des livres dans la vue détaillée"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr "Montrer le contenu pour adulte"
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "Connexion"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "Lire dans le navigateur"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 15564de2..1c350134 100644
Binary files a/cps/translations/it/LC_MESSAGES/messages.mo and b/cps/translations/it/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 6a9dd338..3e7b94b6 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Marco Picone <marcovendere@gmail.com>\n"
 "Language: it\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "non installato"
 
@@ -69,24 +69,24 @@ msgstr "Invia a Kindle"
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossibile trovare i formati adatti per l'invio tramite email"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -153,7 +153,7 @@ msgstr "Libri casuali"
 msgid "Author list"
 msgstr "Elenco degli autori"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Errore durante l'apertura di eBook. Il file non esiste o il file non è "
@@ -186,342 +186,346 @@ msgstr "Elenco categorie"
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr "Mancano autorizzazioni di esecuzione"
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "Statistica"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, ricarica pagina"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguire l'arresto del server, chiudi la finestra."
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "Aggiornamento fatto"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "ricerca"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "Leggere libri"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "Libri non letti"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "Leggere un libro"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "Compila tutti i campi"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "Registrare"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "Si è verificato un errore sconosciuto. Per favore riprova più tardi."
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr "Questo nome utente o indirizzo email è già in uso."
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come : '%(nickname)s'"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errata"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "Accesso"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr "Successo! Torna al tuo dispositivo"
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurare prima le impostazioni della posta SMTP..."
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Libro inviare con successo %(kindlemail)s correttamente"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Si prega di configurare innanzitutto il tuo indirizzo email..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Il libro è stato aggiunto alla mensola: %(sname)s"
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Il libro è stato rimosso dalla mensola: %(sname)s"
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Uno scaffale con il nome '%(title)s' esiste già."
 
-#: cps/web.py:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Mensola %(title)s creato"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "c'era un errore"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "creare uno scaffale"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Mensola %(title)s cambiato"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "Modifica un ripiano"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "cancellato con successo il ripiano %(name)s"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Mensola: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 "Errore durante l'apertura dello scaffale. La mensola non esiste o non è "
 "accessibile"
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modificare l'ordine della mensola: '%(name)s'"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "Trovato un account esistente per questo indirizzo email."
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Aggiornamento della configurazione del calibro-web"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr ""
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Aggiornamento della configurazione del calibro-web"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr "Posizione DB non valida. Inserisci il percorso corretto."
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "utente '%(user)s' creato"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "È stato trovato un account collegato a questo indirizzo e-mail o nome "
 "utente."
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "Parametri di posta aggiornati"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Successo quando invii il test a %(kindlemail)s"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Impossibile inviare il test a E-Mail: %(res)s"
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "Impostazioni email aggiornate"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "Modificare i parametri della posta"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "utente '%(nick)s' cancellati"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "utente '%(nick)s'  aggiornato"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "Errore imprevisto."
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica utente %(nick)s"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 "Errore durante l'apertura di eBook. Il file non esiste o il file non è "
 "accessibile"
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "modificare la metainformazione"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Non è consentito caricare i file con l'estensione \"%s\" a questo server"
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr "Sconosciuto"
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossibile creare il percorso %s (autorizzazione negata)"
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossibile archiviare il file %s (autorizzazione negata)"
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossibile eliminare il file %s (autorizzazione negata)"
@@ -599,7 +603,7 @@ msgstr "From mail"
 msgid "Change SMTP settings"
 msgstr "Modificare SMTP impostazioni"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -607,7 +611,7 @@ msgstr "Configurazione"
 msgid "Calibre DB dir"
 msgstr "Calibre DB dir"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "Livello del registro"
 
@@ -615,7 +619,7 @@ msgstr "Livello del registro"
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Libri per pagina"
 
@@ -635,60 +639,61 @@ msgstr "Navigazione anonima"
 msgid "Remote Login"
 msgstr "Login remoto"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr "Timestamp di commit corrente"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr "Più recente commit timestamp"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Ricollegare al DB Calibre"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Ricomincia Calibre-web"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Stop Calibre-web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "Esegui aggiornamento"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Vuoi veramente riavviare Caliber-web?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "Indietro"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Vuoi veramente fermare Caliber-web?"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -773,9 +778,10 @@ msgstr "visualizzare il libro dopo la modifica"
 msgid "Get metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Sottoscrivi"
 
@@ -836,192 +842,216 @@ msgstr "Errore di ricerca!"
 msgid "No Result! Please try anonther keyword."
 msgstr "Nessun risultato! Prova un'altra parola chiave."
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Posizione del database Calibre"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
 msgstr "Usa Google Drive?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
-msgstr "La cartella Calibre di Google drive"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
+msgstr ""
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr "ID canale Watch Metadata"
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "Porta del server"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titolo"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "Numero di libri casuali da mostrare"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "Espressione regolare per ignorare le colonne"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "Espressione regolare per la selezione del titolo"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
-msgstr "Tags per Contenuti maturi"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
+msgstr ""
 
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "Abilita il caricamento"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "Abilita la navigazione anonima"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "Abilita la registrazione pubblica"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr "Attiva login remoto (\"magic link\")"
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr "Uso"
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr "Ottenere una chiave API"
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr "API di Goodreads"
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Accesso"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titolo"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "Numero di libri casuali da mostrare"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "Espressione regolare per ignorare le colonne"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "Espressione regolare per la selezione del titolo"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr "Tags per Contenuti maturi"
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "Impostazioni predefinite per i nuovi utenti"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "Utente amministratore"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "Consenti download"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "Consenti caricamenti"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "Consenti Modifica"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr "Consenti l'eliminazione di libri"
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "Consenti la modifica della password"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr "Consenti la modifica dei ripiani pubblici"
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "Mostra libro a caso"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "Mostra libri popolari"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "Mostra sezione più votati"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "Mostra sezione lingua"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "Mostra sezione serie"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "Mostra sezione categorie"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "Mostra sezione autore"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "Mostra letto e non letto"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "Un libro a caso"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr "Mostra sezione adulti"
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "Accesso"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "Leggere nel browser"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 90fdbd04..5ef4683c 100644
Binary files a/cps/translations/ja/LC_MESSAGES/messages.mo and b/cps/translations/ja/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 44a8c556..8d1a5701 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "インストールされません"
 
@@ -64,24 +64,24 @@ msgstr "Kindleに送信する"
 msgid "Could not find any formats suitable for sending by email"
 msgstr "メールを送るための適切な拡張子は見つかりません"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "タイトルを\"%s\"から\"%s\"の改名は失敗しました。エーラ: %s"
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "著者を\"%s\"から\"%s\"の改名は失敗しました。エーラ：%s"
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -148,7 +148,7 @@ msgstr "任意の本"
 msgid "Author list"
 msgstr "著者リスト"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
@@ -179,336 +179,340 @@ msgstr "カテゴリーリスト"
 msgid "Category: %(name)s"
 msgstr "カテゴリー: %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr "実行許可はありません"
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました、ページを再読み込みしてください"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンします、ページを閉じてください"
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "更新完了"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "検索"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "既読の本"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "未読の本"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "未知のエーラが発生しました、再度試してください"
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr "ユーザ名またはメールアドレスは使われました"
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログインします"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードは間違いました"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "ログイン"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr "トークンは見つかりません"
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr "トークンは失効されました"
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr "成功しまた！端末に戻ってください"
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "SMTPメールをまず設定してください"
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "本を %(kindlemail)s に送信しました"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信する際にエーラが発生しました"
 
-#: cps/web.py:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Kindleのメールアドレスをまず設定してください"
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "本 %(sname)s を書架に追加されました"
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "本 %(sname)s を書架から除去されました"
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "名前を使った書架 '%(title)s'　は既に存在しました"
 
-#: cps/web.py:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架%(title)s は作成されました"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "エーラが発生しました"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "書架を作成する"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 変わりました"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "書架を編集する"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "%(name)s の書架を削除されました"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "書架を開けません。書架は存在しないまたはアクセスできません"
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' の書架の順番を入れ替える"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "このメールアドレスを使ったアカウント名は既に存在します"
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sのプロファイル"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "プロファイルが更新されました"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Calibre-web 設定を更新されました"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr ""
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ログファイルの場所は不適切です。正しい場所を入力してください"
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web 設定を更新されました"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr "データベースの場所は不適切です。正しい場所を入力してください"
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ　'%(user)s' が作成されました"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr "同じメールアドレスまたは通所は既に存在しました"
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "メール設定が更新されました"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "テストメールから%(kindlemail)sまでの送信は完了しました"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "テストメールに送信するエラーが発生しました: %(res)s"
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "メール設定更新されました"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "メール編集設定"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' 削除されました"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' 更新されました"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "不明のエーラが発生しました"
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "ユーザ編集 %(nick)s"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "メタデータを編集します"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 \"%s\" をこのサーバにアップロードする許可はありません"
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr "フアイル %s の保存を失敗しました"
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr "不明"
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "ファイルをアップロードするために拡張子が必要です"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "場所 %s の作成を失敗しました (許可拒否)"
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "ファイル %s の保存を失敗しました (許可拒否)"
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "ファイル %s の削除を失敗しました (許可拒否)"
@@ -586,7 +590,7 @@ msgstr "メールから"
 msgid "Change SMTP settings"
 msgstr "SMTP設定を変更する"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "設定"
 
@@ -594,7 +598,7 @@ msgstr "設定"
 msgid "Calibre DB dir"
 msgstr "Calibre データベースの場所"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "ログレベル"
 
@@ -602,7 +606,7 @@ msgstr "ログレベル"
 msgid "Port"
 msgstr "ポート"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "本数毎ページ"
 
@@ -622,60 +626,61 @@ msgstr "匿名ブラウジング"
 msgid "Remote Login"
 msgstr "遠距離ログイン"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr "現在コミットのタイムスタンプ"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr "最新コミットのタイムスタンプ"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Calibreデータベースに再接続します"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Calibre-webを再起動します"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Calibre-webを停止します"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "更新を確認します"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "更新を実行します"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Calibre-webを再起動します。宜しいですか?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "はい"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "戻る"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Calibre-webを停止します。宜しいですか?"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "更新中、ページ再読み込みしないでください"
 
@@ -760,9 +765,10 @@ msgstr "編集してから本を表示します"
 msgid "Get metadata"
 msgstr "メタデータを取得します"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "提出"
 
@@ -823,192 +829,216 @@ msgstr "検索エーラ!"
 msgid "No Result! Please try anonther keyword."
 msgstr "結果なし! 他のキーワードで検索してください。"
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Calibreデータベースの場所"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
 msgstr "Googleドライブを利用します?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
-msgstr "GoogleドライブCalibreフォルダ"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
+msgstr ""
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr ""
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "サーバポート"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "タイトル"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "任意本を表示するの数"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "列を無視するの正規表現"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "タイトルを並び替えの正規表現"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
-msgstr "成人向けのタグ"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
+msgstr ""
 
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr "ログファイルの場所と名前 (エントリーなしでcalibre-web.log)"
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "アップロードを 有効する"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "匿名ブラウジングを有効する"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "公的登録を有効する"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr "遠距離ログインを有効する (\"マジックリンク\")"
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr "使う"
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr "APIキーを取得する"
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr "GoodreadsのAPIキー"
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr "GoodreadsのAPI秘密"
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "ログイン"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "タイトル"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "任意本を表示するの数"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "列を無視するの正規表現"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "タイトルを並び替えの正規表現"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr "成人向けのタグ"
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "新規ユーザにデフォルト設定を設定する"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "管理ユーザ"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "ダウンロードを有効する"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "アップロードを有効する"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "編集を有効する"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr "本削除を有効する"
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "パスワード変更を有効する"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr "公的叢書の編集を有効する"
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr "新規ユーザにデフォルト可視性を設定する"
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "任意本を表示する"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr "最近の本を表示する"
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr "整列された本を表示する"
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "有名な本を表示する"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "最高評価の本を表示する"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "言語選択を表示する"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "奏者選択を表示する"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "カテゴリー選択を表示する"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "著者選択を表示する"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "既読と未読の本を表示する"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "任意の本を詳細閲覧で表示する"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr "成人向けコンテンツを表示"
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "ログイン"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "ブラウザで読む"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 1ed82b44..c7001bd6 100644
Binary files a/cps/translations/nl/LC_MESSAGES/messages.mo and b/cps/translations/nl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 6ff00b0b..4f4b4cef 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-web dutch translation by Ed Driesen (GPL V3)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2017-06-21 20:15+0200\n"
 "Last-Translator: \n"
 "Language: nl\n"
@@ -33,7 +33,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
@@ -77,24 +77,24 @@ msgstr "Stuur naar Kindle:"
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Kon geen geschikte formaten vinden om te verzenden per email"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -161,7 +161,7 @@ msgstr "Willekeurige boeken"
 msgid "Author list"
 msgstr "Auteur lijst"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Fout bij openen van het boek. Bestand bestaat niet of is niet "
@@ -194,338 +194,342 @@ msgstr "Categorie lijst"
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr "Rechten om uit te voeren ontbreken"
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "Server herstart, gelieve de pagina herladen"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met het stoppen van de server, gelieve venster te sluiten"
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "Update voltooid"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "zoek"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "Gelezen Boeken"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "Ongelezen Boeken"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "Gelieve alle velden in te vullen!"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "registreer"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "Een onbekende fout deed zich voor. Gelieve later nog eens te proberen."
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr "Deze gebruikersnaam of dit emailadres is reeds in gebruik."
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent nu ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of Wachtwoord"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "login"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr "Token niet gevonden"
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr "Token is verlopen"
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Gelieve de SMTP mail instellingen eerst te configureren..."
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Boek met succes verstuurd naar %(kindlemail)s"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Er trad een fout op bij het versturen van dit boek: %(res)s"
 
-#: cps/web.py:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Gelieve eerst je kindle email adres te configureren..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Boek werd toegevoegd aan boekenplank: %(sname)s"
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Boek werd verwijderd van boekenplank: %(sname)s"
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Een boekenplank met de naam '%(title)s' bestaat reeds."
 
-#: cps/web.py:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank %(title)s aangemaakt"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "Er deed zich een fout voor"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "maak een boekenplank"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank %(title)s gewijzigd"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "Bewerk een boekenplank"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Boekenplank %(name)s succesvol gewist"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 "Fout bij openen boekenplank. Boekenplank bestaat niet of is niet "
 "toegankelijk"
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Verander volgorde van Boekenplank: '%(name)s'"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "Een bestaand gebruiker gevonden voor dit email adres."
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "Profiel aangepast"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "Administratie pagina"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Calibre-web configuratie aangepast"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr ""
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web configuratie aangepast"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB locatie is niet geldig, gelieve het correcte pad in te geven"
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "Voeg nieuwe gebruiker toe"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr "Een bestaande gebruiker gevonden voor dit emailadres of gebruikersnaam."
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "Mail instellingen aangepast"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test email met succes verstuurd naar %(kindlemail)s"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Er trad een fout op met het versturen van de test email: %(res)s"
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "Email instellingen aangepast"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "Bewerk mail instellingen"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' aangepast"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "Een onbekende fout deed zich voor."
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Bewerk gebruiker '%(nick)s'"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Fout bij openen eBook. Het bestand bestaat niet of is niet toegankelijk"
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "Bewerk metadata"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Het uploaden van bestandsextensie \"%s\" is niet toegestaan op deze server"
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr "Bestand opslaan niet gelukt voor %s."
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr "onbekend"
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "Up te loaden bestanden dienen een extensie te hebben"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Het pad %s aanmaken mislukt (Geen toestemming)."
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Bestand %s opslaan mislukt (Geen toestemming)."
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Bestand %s wissen mislukt (Geen toestemming)."
@@ -603,7 +607,7 @@ msgstr "Van mail"
 msgid "Change SMTP settings"
 msgstr "Bewerk SMTP instellingen"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "Configuratie"
 
@@ -611,7 +615,7 @@ msgstr "Configuratie"
 msgid "Calibre DB dir"
 msgstr "Calibre DB map"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "Log niveau"
 
@@ -619,7 +623,7 @@ msgstr "Log niveau"
 msgid "Port"
 msgstr "Poort"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Boeken per pagina"
 
@@ -639,60 +643,61 @@ msgstr "Anoniem verkennen"
 msgid "Remote Login"
 msgstr "Login op afstand"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "Administratie"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr "Huidige commit tijdsstempel"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr "Nieuwste commit tijdsstempel"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Herverbinden met calibre DB"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Herstart Calibre-web"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Stop Calibre-web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "Controleer voor update"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "Voer update uit"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Wil je Calibre-web echt herstarten?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "Terug"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Wil je Calibre-web echt stoppen?"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "Aan het updaten, gelieve de pagina niet te herladen"
 
@@ -777,9 +782,10 @@ msgstr "bekijk boek na bewerking"
 msgid "Get metadata"
 msgstr "Verkrijg metadata"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Opslaan"
 
@@ -840,192 +846,216 @@ msgstr "Zoek fout!"
 msgid "No Result! Please try anonther keyword."
 msgstr "Geen resultaat! Gelieve een ander zoekwoord proberen"
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Locatie van de Calibre database"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
-msgstr "Google drive gebruiken?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
+msgstr "Google Drive gebruiken?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
-msgstr "Google drive calibre folder"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
+msgstr ""
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "Server poort"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "Aantal boeken te tonen"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "Reguliere expressie om kolommen te negeren"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "Rguliere expressie op titels te sorteren"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
-msgstr "Tags voor Volwassen Inhoud"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
+msgstr ""
 
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "Uploaden aanzetten"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "Anoniem verkennen aanzetten"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "Publieke registratie aanzetten"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr "Maak op afstand ionloggen mogelijk (\"magic link\")"
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr "Gebruik"
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr "Verkrijg een API sleutel"
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr "Goodreads API sleutel"
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr "Goodreads API geheim"
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Login"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "Aantal boeken te tonen"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "Reguliere expressie om kolommen te negeren"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "Rguliere expressie op titels te sorteren"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr "Tags voor Volwassen Inhoud"
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "Standaard instellingen voor nieuwe gebruikers"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "Administratie gebruiker"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "Downloads toestaan"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "Uploads toestaan"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "Bewerken toestaan"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr "Het wissen van boeken toestaan"
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "Wachtwoord wijzigen toestaan"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr "Publieke boekenplanken bewerken toestaan"
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "Toon willekeurige boeken"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "Toon populaire boeken"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "Toon best beoordeelde boeken"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "Toon taal selectie"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "Toon serie selectie"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "Toon categorie selectie"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "Toon auteur selectie"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "Toon gelezen en ongelezen"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "Toon willekeurige boeken in gedetailleerd zicht"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr "Toon Volwassen Inhoud"
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "Login"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "Lees in browser"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index d3638a58..1d5d0071 100644
Binary files a/cps/translations/pl/LC_MESSAGES/messages.mo and b/cps/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index ac78af36..5221d71f 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2017-04-11 22:51)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2017-04-11 22:51+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "nie zainstalowane"
 
@@ -70,24 +70,24 @@ msgstr ""
 "Nie można znaleźć żadnych formatów przystosowane do wysyłania pocztą "
 "e-mail"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -154,7 +154,7 @@ msgstr "Losowe książki"
 msgid "Author list"
 msgstr "Lista autorów"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:"
 
@@ -185,336 +185,340 @@ msgstr "Lista kategorii"
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "Aktualizacja zakończona"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "szukaj"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "Przeczytane książki"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "Nieprzeczytane książki"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr "Nazwa użytkownika lub adres e-mail jest już w użyciu."
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Książka została pomyślnie wysłana do %(kindlemail)s"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
 
-#: cps/web.py:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Proszę najpierw skonfigurować adres e-mail swojego kindla..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Książka została dodana do półki: %(sname)s"
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Książka została usunięta z półki: %(sname)s"
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Półka o nazwie '%(title)s' już istnieje."
 
-#: cps/web.py:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "utwórz półkę"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "pomyślnie usunięto półkę %(name)s"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "Portal administracyjny"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Konfiguracja Calibre-web została zaktualizowana"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr ""
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Konfiguracja Calibre-web została zaktualizowana"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wpisz poprawną ścieżkę"
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy użytkownika."
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "Zaktualizowano ustawienia poczty e-mail"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Testowy e-mail został pomyślnie wysłany do %(kindlemail)s"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania testowej wiadomości e-mail: %(res)s"
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "Zaktualizowano ustawienia e-mail"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "Edytuj ustawienia poczty e-mail"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku \"%s\" nie jest dozwolone do przesłania na ten serwer"
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do przesłania musi mieć rozszerzenie"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)."
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)."
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)."
@@ -592,7 +596,7 @@ msgstr "Wyślij z adresu e-mail"
 msgid "Change SMTP settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -600,7 +604,7 @@ msgstr "Konfiguracja"
 msgid "Calibre DB dir"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "Poziom logów"
 
@@ -608,7 +612,7 @@ msgstr "Poziom logów"
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Ilość książek na stronie"
 
@@ -628,60 +632,61 @@ msgstr "Anonimowe przeglądanie"
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr "Znacznik czasowy zainstalowanej wersji"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr "Znacznik czasowy nowej wersji"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Połącz ponownie z bazą danych Calibre"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Uruchom ponownie Calibre Web"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Zatrzymaj Calibre Web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "OK"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "Wróć"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -766,9 +771,10 @@ msgstr "wyświetl książkę po edycji"
 msgid "Get metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Wyślij"
 
@@ -829,193 +835,217 @@ msgstr "Błąd wyszukiwania!"
 msgid "No Result! Please try anonther keyword."
 msgstr "Brak wyników! Spróbuj innego słowa kluczowego."
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Lokalizacja bazy danych Calibre"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
 msgstr "Użyć dysku Google?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
-msgstr "Folder biblioteki Calibre na Dysku Google"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
+msgstr ""
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 #, fuzzy
 msgid "Metadata Watch Channel ID"
 msgstr "Metadane Watch Channel ID"
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "Port serwera"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Tytuł"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "Liczba losowych książek do pokazania"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "Wyrażenie regularne dla ignorowanych kolumn"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "Wyrażenie regularne dla tytułu sortującego"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "Włącz wysyłanie"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "Włącz anonimowe przeglądanie"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "Włącz publiczną rejestrację"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr ""
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr ""
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Zaloguj się"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Tytuł"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "Liczba losowych książek do pokazania"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "Wyrażenie regularne dla ignorowanych kolumn"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "Wyrażenie regularne dla tytułu sortującego"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "Domyślne ustawienia dla nowych użytkowników"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "Użytkownik z uprawnieniami administratora"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "Zezwalaj na pobieranie"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "Zezwalaj na wysyłanie"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "Zezwalaj na edycję"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr ""
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "Zezwalaj na zmianę hasła"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr ""
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "Pokaż losowe książki"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "Pokaż najpopularniejsze książki"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "Pokaż najlepiej ocenione książki"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "Pokaż wybór języka"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "Pokaż wybór serii"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "Pokaż wybór kategorii"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "Pokaż wybór autora"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "Pokaż przeczytane i nieprzeczytane"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "Pokaz losowe książki w widoku szczegółowym"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "Zaloguj się"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "Czytaj w przeglądarce"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index e7bed0c5..1c912c34 100644
Binary files a/cps/translations/ru/LC_MESSAGES/messages.mo and b/cps/translations/ru/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 2a2ee809..314f4e5d 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: Pavel Korovin <p@tristero.se>\n"
 "Language: ru\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "Отсутствует"
 
@@ -70,24 +70,24 @@ msgstr "Отправить на Kindle"
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Невозоможно найти формат, подходящий для отправки по email"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -154,7 +154,7 @@ msgstr "Случайный выбор"
 msgid "Author list"
 msgstr "Авторы"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
 
@@ -185,336 +185,340 @@ msgstr "Категории"
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, перезагрузите страницу"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "Обновление закончено"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "поиск"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "Прочитанные"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "Непрочитанные"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "Читать книгу"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "зарегистрироваться"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "Неизвестная ошибка. Пожалуйста, попробуйте позже."
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr "Имя пользователя или адрес эл. почты уже используется"
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как пользователь '%(nickname)s'"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "войти"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Книга успешно отправлена на %(kindlemail)s"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ошибка при отправке книги: %(res)s"
 
-#: cps/web.py:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "Пожалуйста, сначала укажите ваш kindle email..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Книга добавлена на книжную полку: %(sname)s"
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга удалена с книжной полки: %(sname)s"
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Книжкная полка с названием '%(title)s' уже существует."
 
-#: cps/web.py:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана книжная полка %(title)s"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "создать книжную полку"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжная полка %(title)s изменена"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "Изменить книжную полку"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Книжная полка %(name)s удалена"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжная полка: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение книжной полки '%(name)s'"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "Найдена учётная запись для для данного адреса email."
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Конфигурация Calibre-web обновлена"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr ""
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Конфигурация Calibre-web обновлена"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr "Неверный путь к фалу БД, пожалуйста, укажите правильное расположение БД"
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr "Для указанного адреса или имени найдена существующая учётная запись."
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "Настройки почты изменены"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Тестовое сообщение успешно отправлено на адрес %(kindlemail)s"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Ошибка отправки тестового сообщения: %(res)s"
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "Обновлены настройки e-mail"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "Изменить почтовые настройки"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением \"%s\""
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr "неизвестно"
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Ошибка при создании пути %s (доступ запрещён)"
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Ошибка записи файоа %s (доступ запрещён)"
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Ошибка удаления файла %s (доступ запрещён)"
@@ -592,7 +596,7 @@ msgstr "Отправитель"
 msgid "Change SMTP settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "Настройки сервера"
 
@@ -600,7 +604,7 @@ msgstr "Настройки сервера"
 msgid "Calibre DB dir"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "Уровень логирования"
 
@@ -608,7 +612,7 @@ msgstr "Уровень логирования"
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Количество книг на странице"
 
@@ -628,60 +632,61 @@ msgstr "Анонимный просмотр"
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "Управление"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "Переподключиться к БД Calibre"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "Перезагрузить Calibre-web"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "Остановить Calibre-web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Вы действительно хотите перезагрузить Calibre-web?"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "Назад"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Вы действительно хотите остановить Calibre-web?"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу."
 
@@ -766,9 +771,10 @@ msgstr "смотреть книгу после редактирования"
 msgid "Get metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "Отправить"
 
@@ -829,192 +835,216 @@ msgstr "Ошибка поиска!"
 msgid "No Result! Please try anonther keyword."
 msgstr "Нет результатов. Пожалуйста, попробуйте другое ключевое слово"
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Расположение БД Calibre"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
 msgstr "Использовать Google Drive?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
-msgstr "Папка Calibre на Google drive"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
+msgstr ""
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr "Metadata Watch Channel ID"
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "Порт сервера"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Заголовок"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "Количество отображаемых случайных книг"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "Regexp для игнорирования столбцов"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "Regexp для сортировки по названию"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "Разрешить загрузку на сервер"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "Разрешить анонимный просмотр"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "Разрешить публичную регистрацию"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr ""
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr ""
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Имя пользователя"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Заголовок"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "Количество отображаемых случайных книг"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "Regexp для игнорирования столбцов"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "Regexp для сортировки по названию"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "Настройки по умолчанию для новых пользователей"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "Управление сервером"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "Разрешить скачивание с сервера"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "Разрешить загрузку на сервер"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "Разрешить редактирование книг"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr "Разрешить удаление книг"
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "Разрешить смену пароля"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr "Разрешить редактирование публичных книжных полок"
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "Показывать случайные книги"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "Показывать популярные книги"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "Показывать выбор языка"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "Показывать выбор серии"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "Показывать выбор категории"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "Показывать случайные книги при просмотре деталей"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "Имя пользователя"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "Открыть в браузере"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 4da4b37d..783fbfb2 100644
Binary files a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 25beb8ff..7c293c06 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+0200\n"
 "PO-Revision-Date: 2017-01-06 17:00+0000\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr "未安装"
 
@@ -70,24 +70,24 @@ msgstr "发送到Kindle"
 msgid "Could not find any formats suitable for sending by email"
 msgstr "无法找到适合邮件发送的格式"
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -154,7 +154,7 @@ msgstr "随机书籍"
 msgid "Author list"
 msgstr "作者列表"
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
@@ -185,336 +185,340 @@ msgstr "分类列表"
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr "可执行权限缺失"
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr "更新完成"
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr "搜索"
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr "已读书籍"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr "发生一个未知错误。请稍后再试。"
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr "此用户名或邮箱已被使用。"
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "此书已被成功发给 %(kindlemail)s"
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr "请先配置您的kindle电子邮箱地址..."
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书已被添加到书架: %(sname)s"
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "已存在书架 '%(title)s'。"
 
-#: cps/web.py:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已被创建"
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr "创建书架"
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已被修改"
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "成功删除书架 %(name)s"
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr "找到已使用此邮箱的账号。"
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr "Calibre-web配置已更新"
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
+msgstr ""
+
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr "Calibre-web配置已更新"
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB位置无效，请输入正确路径"
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr "已存在使用此邮箱或昵称的账号。"
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr "邮箱设置已更新"
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已成功发送到 %(kindlemail)s"
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "发送测试邮件时发生错误: %(res)s"
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr "E-Mail 设置已更新"
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr "编辑邮箱设置"
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "不能上传后缀为　\"%s\"　的文件到此服务器"
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr "未知"
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须有一个后缀"
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "创建路径 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "存储文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "删除文件 %s 失败(权限拒绝)。"
@@ -592,7 +596,7 @@ msgstr "来自邮箱"
 msgid "Change SMTP settings"
 msgstr "修改SMTP设置"
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr "配置"
 
@@ -600,7 +604,7 @@ msgstr "配置"
 msgid "Calibre DB dir"
 msgstr "Calibre DB目录"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr "日志级别"
 
@@ -608,7 +612,7 @@ msgstr "日志级别"
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "每页书籍数"
 
@@ -628,60 +632,61 @@ msgstr "匿名浏览"
 msgid "Remote Login"
 msgstr "远程登录"
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr "当前提交时间戳"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr "最新提交时间戳"
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr "重启 Calibre-web"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr "停止 Calibre-web"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr "您确定要重启 Calibre-web 吗？"
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr "确定"
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr "后退"
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr "您确定要关闭 Calibre-web 吗？"
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -766,9 +771,10 @@ msgstr "编辑后查看书籍"
 msgid "Get metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr "提交"
 
@@ -829,192 +835,216 @@ msgstr "搜索错误"
 msgid "No Result! Please try anonther keyword."
 msgstr "没有结果!请尝试别的关键字."
 
-#: cps/templates/config_edit.html:7
+#: cps/templates/config_edit.html:12
+msgid "Library Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:19
 msgid "Location of Calibre database"
 msgstr "Calibre 数据库位置"
 
-#: cps/templates/config_edit.html:12
-msgid "Use google drive?"
-msgstr "是否使用google drive?"
+#: cps/templates/config_edit.html:24
+msgid "Use Google Drive?"
+msgstr "是否使用Google Drive?"
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
-#: cps/templates/config_edit.html:24
+#: cps/templates/config_edit.html:36
 msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
 msgstr ""
 
-#: cps/templates/config_edit.html:36
+#: cps/templates/config_edit.html:48
 msgid "Metadata Watch Channel ID"
 msgstr ""
 
-#: cps/templates/config_edit.html:39
+#: cps/templates/config_edit.html:51
 msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:48
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:74
 msgid "Server Port"
 msgstr "服务器端口"
 
-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:78
 msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
+#: cps/templates/config_edit.html:82
 msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "标题"
-
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
-msgstr "随机书籍显示数量"
-
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
-msgstr "忽略列的正则表达式"
-
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
-msgstr "标题排序的正则表达式"
-
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:96
+#: cps/templates/config_edit.html:109
 msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
+msgstr ""
+
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr "启用上传"
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr "启用匿名浏览"
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr "启用注册"
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr "启用远程登录 (\"魔法链接\")"
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr ""
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "登录"
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "标题"
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr "随机书籍显示数量"
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr "忽略列的正则表达式"
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr "标题排序的正则表达式"
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
 msgstr "新用户默认设置"
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr "管理用户"
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr "允许下载"
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr "允许上传"
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr "允许编辑"
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr "允许删除书籍"
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr "允许修改密码"
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr "允许编辑公共书架"
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr "显示随机书籍"
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr "显示热门书籍"
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr "显示最高评分书籍"
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr "显示语言选择"
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr "显示丛书选择"
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr "显示分类选择"
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr "显示作者选择"
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr "显示已读和未读"
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr "在详情页显示随机书籍"
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr "登录"
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr "在浏览器中阅读"
diff --git a/cps/ub.py b/cps/ub.py
index fdcd8ee7..1a64fed9 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -282,6 +282,7 @@ class Settings(Base):
     config_calibre_web_title = Column(String, default=u'Calibre-web')
     config_books_per_page = Column(Integer, default=60)
     config_random_books = Column(Integer, default=4)
+    config_read_column = Column(Integer, default=0)
     config_title_regex = Column(String, default=u'^(A|The|An|Der|Die|Das|Den|Ein|Eine|Einen|Dem|Des|Einem|Eines)\s+')
     config_log_level = Column(SmallInteger, default=logging.INFO)
     config_uploading = Column(SmallInteger, default=0)
@@ -344,6 +345,7 @@ class Config:
         self.config_books_per_page = data.config_books_per_page
         self.config_random_books = data.config_random_books
         self.config_title_regex = data.config_title_regex
+        self.config_read_column = data.config_read_column
         self.config_log_level = data.config_log_level
         self.config_uploading = data.config_uploading
         self.config_anonbrowse = data.config_anonbrowse
@@ -352,9 +354,6 @@ class Config:
         self.config_default_show = data.config_default_show
         self.config_columns_to_ignore = data.config_columns_to_ignore
         self.config_use_google_drive = data.config_use_google_drive
-        # self.config_google_drive_client_id = data.config_google_drive_client_id
-        # self.config_google_drive_client_secret = data.config_google_drive_client_secret
-        # self.config_google_drive_calibre_url_base = data.config_google_drive_calibre_url_base
         self.config_google_drive_folder = data.config_google_drive_folder
         if data.config_google_drive_watch_changes_response:
             self.config_google_drive_watch_changes_response = json.loads(data.config_google_drive_watch_changes_response)
@@ -544,7 +543,6 @@ def migrate_Database():
         conn.execute("ALTER TABLE Settings ADD column `config_anonbrowse` SmallInteger DEFAULT 0")
         conn.execute("ALTER TABLE Settings ADD column `config_public_reg` SmallInteger DEFAULT 0")
         session.commit()
-
     try:
         session.query(exists().where(Settings.config_use_google_drive)).scalar()
     except exc.OperationalError:
@@ -649,6 +647,13 @@ def migrate_Database():
         conn.execute("ALTER TABLE Settings ADD column `config_certfile` String DEFAULT ''")
         conn.execute("ALTER TABLE Settings ADD column `config_keyfile` String DEFAULT ''")
         session.commit()
+    try:
+        session.query(exists().where(Settings.config_read_column)).scalar()
+        session.commit()
+    except exc.OperationalError:  # Database is not compatible, some rows are missing
+        conn = engine.connect()
+        conn.execute("ALTER TABLE Settings ADD column `config_read_column` INTEGER DEFAULT 0")
+        session.commit()
     # Remove login capability of user Guest
     conn = engine.connect()
     conn.execute("UPDATE user SET password='' where nickname = 'Guest' and password !=''")
diff --git a/cps/web.py b/cps/web.py
index 63148b51..fc690058 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1295,20 +1295,38 @@ def category(book_id, page):
 @app.route("/ajax/toggleread/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_read(book_id):
-    book = ub.session.query(ub.ReadBook).filter(ub.and_(ub.ReadBook.user_id == int(current_user.id),
+    if not config.config_read_column:
+        book = ub.session.query(ub.ReadBook).filter(ub.and_(ub.ReadBook.user_id == int(current_user.id),
                                                                    ub.ReadBook.book_id == book_id)).first()
-    if book:
-        book.is_read = not book.is_read
+        if book:
+            book.is_read = not book.is_read
+        else:
+            readBook = ub.ReadBook()
+            readBook.user_id = int(current_user.id)
+            readBook.book_id = book_id
+            readBook.is_read = True
+            book = readBook
+        ub.session.merge(book)
+        ub.session.commit()
     else:
-        readBook = ub.ReadBook()
-        readBook.user_id = int(current_user.id)
-        readBook.book_id = book_id
-        readBook.is_read = True
-        book = readBook
-    ub.session.merge(book)
-    ub.session.commit()
-    return ""
+        try:
+            db.session.connection().connection.connection.create_function("title_sort", 1, db.title_sort)
+            book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first()
+            read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
+            if len(read_status):
+                #setattr(getattr(book,'custom_column_' + str(cc_id), 'value', (not read_status))
+                read_status[0].value = not read_status[0].value
+                db.session.commit()
+            else:
+                cc_class = db.cc_classes[cc_id]
+                new_cc = cc_class(value=1, book=book_id)
+                db.session.add(new_cc)
+                db.session.commit()
+        except KeyError:
+            app.logger.error(
+                    u"Custom Column No.%d is not exisiting in calibre database" % config.config_read_column)
 
+    return ""
 
 @app.route("/book/<int:book_id>")
 @login_required_if_no_ano
@@ -1338,9 +1356,20 @@ def show_book(book_id):
             book_in_shelfs.append(entry.shelf)
 
         if not current_user.is_anonymous:
-            matching_have_read_book = ub.session.query(ub.ReadBook).filter(ub.and_(ub.ReadBook.user_id == int(current_user.id),
-                                                                   ub.ReadBook.book_id == book_id)).all()
-            have_read = len(matching_have_read_book) > 0 and matching_have_read_book[0].is_read
+            if not config.config_read_column:
+                matching_have_read_book = ub.session.query(ub.ReadBook)\
+                    .filter(ub.and_(ub.ReadBook.user_id == int(current_user.id),
+                    ub.ReadBook.book_id == book_id)).all()
+                have_read = len(matching_have_read_book) > 0 and matching_have_read_book[0].is_read
+            else:
+                try:
+                    matching_have_read_book = getattr(entries,'custom_column_'+str(config.config_read_column))
+                    have_read = len(matching_have_read_book) > 0 and matching_have_read_book[0].value
+                except KeyError:
+                    app.logger.error(
+                        u"Custom Column No.%d is not exisiting in calibre database" % config.config_read_column)
+                    have_read = None
+
         else:
             have_read = None
 
@@ -1761,7 +1790,7 @@ def get_cover(cover_path):
             if path:
                 return redirect(path)
             else:
-                app.logger.error(cover_path + '/cover.jpg not found on GDrive')
+                app.logger.error(cover_path + '/cover.jpg not found on Google Drive')
                 return send_from_directory(os.path.join(os.path.dirname(__file__), "static"), "generic_cover.jpg")
         except Exception as e:
             app.logger.error("Message "+e.message)
@@ -1804,8 +1833,19 @@ def feed_get_cover(book_id):
 
 
 def render_read_books(page, are_read, as_xml=False):
-    readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id)).filter(ub.ReadBook.is_read == True).all()
-    readBookIds = [x.book_id for x in readBooks]
+    if not config.config_read_column:
+        readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id))\
+            .filter(ub.ReadBook.is_read == True).all()
+        readBookIds = [x.book_id for x in readBooks]
+    else:
+        try:
+            readBooks = db.session.query(db.cc_classes[config.config_read_column])\
+                .filter(db.cc_classes[config.config_read_column].value==True).all()
+            readBookIds = [x.book for x in readBooks]
+        except KeyError:
+            app.logger.error(u"Custom Column No.%d is not exisiting in calibre database" % config.config_read_column)
+            readBookIds=[]
+
     if are_read:
         db_filter = db.Books.id.in_(readBookIds)
     else:
@@ -2439,6 +2479,93 @@ def configuration():
     return configuration_helper(0)
 
 
+@app.route("/admin/viewconfig", methods=["GET", "POST"])
+@login_required
+@admin_required
+def view_configuration():
+    if request.method == "POST":
+        to_save = request.form.to_dict()
+        content = ub.session.query(ub.Settings).first()
+        if "config_calibre_web_title" in to_save:
+            content.config_calibre_web_title = to_save["config_calibre_web_title"]
+        if "config_columns_to_ignore" in to_save:
+            content.config_columns_to_ignore = to_save["config_columns_to_ignore"]
+        if "config_read_column" in to_save:
+            content.config_read_column = int(to_save["config_read_column"])
+        if "config_title_regex" in to_save:
+            if content.config_title_regex != to_save["config_title_regex"]:
+                content.config_title_regex = to_save["config_title_regex"]
+                reboot_required = True
+        if "config_log_level" in to_save:
+            content.config_log_level = int(to_save["config_log_level"])
+        if "config_random_books" in to_save:
+            content.config_random_books = int(to_save["config_random_books"])
+        if "config_books_per_page" in to_save:
+            content.config_books_per_page = int(to_save["config_books_per_page"])
+        content.config_uploading = 0
+        content.config_anonbrowse = 0
+        content.config_public_reg = 0
+        if "config_uploading" in to_save and to_save["config_uploading"] == "on":
+            content.config_uploading = 1
+        if "config_anonbrowse" in to_save and to_save["config_anonbrowse"] == "on":
+            content.config_anonbrowse = 1
+        if "config_public_reg" in to_save and to_save["config_public_reg"] == "on":
+            content.config_public_reg = 1
+        # Mature Content configuration
+        if "config_mature_content_tags" in to_save:
+            content.config_mature_content_tags = to_save["config_mature_content_tags"].strip()
+
+        # Default user configuration
+        content.config_default_role = 0
+        if "admin_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_ADMIN
+        if "download_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_DOWNLOAD
+        if "upload_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_UPLOAD
+        if "edit_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_EDIT
+        if "delete_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_DELETE_BOOKS
+        if "passwd_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_PASSWD
+        if "passwd_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_EDIT_SHELFS
+        content.config_default_show = 0
+        if "show_detail_random" in to_save:
+            content.config_default_show = content.config_default_show + ub.DETAIL_RANDOM
+        if "show_language" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_LANGUAGE
+        if "show_series" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_SERIES
+        if "show_category" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_CATEGORY
+        if "show_hot" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_HOT
+        if "show_random" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_RANDOM
+        if "show_author" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_AUTHOR
+        if "show_best_rated" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_BEST_RATED
+        if "show_read_and_unread" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_READ_AND_UNREAD
+        if "show_recent" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_RECENT
+        if "show_sorted" in to_save:
+            content.config_default_show = content.config_default_show + ub.SIDEBAR_SORTED
+        if "show_mature_content" in to_save:
+            content.config_default_show = content.config_default_show + ub.MATURE_CONTENT
+        ub.session.commit()
+        flash(_(u"Calibre-web configuration updated"), category="success")
+        config.loadSettings()
+    readColumn = db.session.query(db.Custom_Columns)\
+            .filter(db.and_(db.Custom_Columns.datatype == 'bool',db.Custom_Columns.mark_for_delete == 0)).all()
+    return render_title_template("config_view_edit.html", content=config, readColumns=readColumn,
+                                 title=_(u"UI Configuration"))
+
+
+
 @app.route("/config", methods=["GET", "POST"])
 @unconfigured
 def basic_configuration():
@@ -2451,7 +2578,7 @@ def configuration_helper(origin):
     db_change = False
     success = False
     if gdrive_support == False:
-        gdriveError = _('Import of optional GDrive requirements missing')
+        gdriveError = _('Import of optional Google Drive requirements missing')
     else:
         if not os.path.isfile(os.path.join(config.get_main_dir,'client_secrets.json')):
             gdriveError = _('client_secrets.json is missing or not readable')
@@ -2527,29 +2654,6 @@ def configuration_helper(origin):
                     return render_title_template("config_edit.html", content=config, origin=origin,
                                                  gdrive=gdrive_support, gdriveError=gdriveError,
                                                  goodreads=goodreads_support, title=_(u"Basic Configuration"))
-        if "config_calibre_web_title" in to_save:
-            content.config_calibre_web_title = to_save["config_calibre_web_title"]
-        if "config_columns_to_ignore" in to_save:
-            content.config_columns_to_ignore = to_save["config_columns_to_ignore"]
-        if "config_title_regex" in to_save:
-            if content.config_title_regex != to_save["config_title_regex"]:
-                content.config_title_regex = to_save["config_title_regex"]
-                reboot_required = True
-        if "config_log_level" in to_save:
-            content.config_log_level = int(to_save["config_log_level"])
-        if "config_random_books" in to_save:
-            content.config_random_books = int(to_save["config_random_books"])
-        if "config_books_per_page" in to_save:
-            content.config_books_per_page = int(to_save["config_books_per_page"])
-        content.config_uploading = 0
-        content.config_anonbrowse = 0
-        content.config_public_reg = 0
-        if "config_uploading" in to_save and to_save["config_uploading"] == "on":
-            content.config_uploading = 1
-        if "config_anonbrowse" in to_save and to_save["config_anonbrowse"] == "on":
-            content.config_anonbrowse = 1
-        if "config_public_reg" in to_save and to_save["config_public_reg"] == "on":
-            content.config_public_reg = 1
 
         # Remote login configuration
         content.config_remote_login = ("config_remote_login" in to_save and to_save["config_remote_login"] == "on")
@@ -2563,52 +2667,6 @@ def configuration_helper(origin):
         if "config_goodreads_api_secret" in to_save:
             content.config_goodreads_api_secret = to_save["config_goodreads_api_secret"]
 
-        # Mature Content configuration
-        if "config_mature_content_tags" in to_save:
-            content.config_mature_content_tags = to_save["config_mature_content_tags"].strip()
-
-        # Default user configuration
-        content.config_default_role = 0
-        if "admin_role" in to_save:
-            content.config_default_role = content.config_default_role + ub.ROLE_ADMIN
-        if "download_role" in to_save:
-            content.config_default_role = content.config_default_role + ub.ROLE_DOWNLOAD
-        if "upload_role" in to_save:
-            content.config_default_role = content.config_default_role + ub.ROLE_UPLOAD
-        if "edit_role" in to_save:
-            content.config_default_role = content.config_default_role + ub.ROLE_EDIT
-        if "delete_role" in to_save:
-            content.config_default_role = content.config_default_role + ub.ROLE_DELETE_BOOKS
-        if "passwd_role" in to_save:
-            content.config_default_role = content.config_default_role + ub.ROLE_PASSWD
-        if "passwd_role" in to_save:
-            content.config_default_role = content.config_default_role + ub.ROLE_EDIT_SHELFS
-        content.config_default_show = 0
-        if "show_detail_random" in to_save:
-            content.config_default_show = content.config_default_show + ub.DETAIL_RANDOM
-        if "show_language" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_LANGUAGE
-        if "show_series" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_SERIES
-        if "show_category" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_CATEGORY
-        if "show_hot" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_HOT
-        if "show_random" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_RANDOM
-        if "show_author" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_AUTHOR
-        if "show_best_rated" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_BEST_RATED
-        if "show_read_and_unread" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_READ_AND_UNREAD
-        if "show_recent" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_RECENT
-        if "show_sorted" in to_save:
-            content.config_default_show = content.config_default_show + ub.SIDEBAR_SORTED
-        if "show_mature_content" in to_save:
-            content.config_default_show = content.config_default_show + ub.MATURE_CONTENT
-
         if content.config_logfile != to_save["config_logfile"]:
             # check valid path, only path or file
             if os.path.dirname(to_save["config_logfile"]):
diff --git a/messages.pot b/messages.pot
index 9eebffab..1af23932 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: 2018-07-14 19:01+0200\n"
+"POT-Creation-Date: 2018-07-15 15:03+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.5.1\n"
 
-#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1393
+#: cps/book_formats.py:123 cps/book_formats.py:127 cps/web.py:1422
 msgid "not installed"
 msgstr ""
 
@@ -61,24 +61,24 @@ msgstr ""
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 
-#: cps/helper.py:332
+#: cps/helper.py:342
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:341
+#: cps/helper.py:351
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:364 cps/helper.py:373
+#: cps/helper.py:374 cps/helper.py:383
 #, python-format
-msgid "File %s not found on gdrive"
+msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:384
+#: cps/helper.py:394
 #, python-format
-msgid "Path %s not found on gdrive"
+msgid "Book path %s not found on Google Drive"
 msgstr ""
 
 #: cps/web.py:954
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Author list"
 msgstr ""
 
-#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1350 cps/web.py:1869
+#: cps/web.py:1158 cps/web.py:1220 cps/web.py:1379 cps/web.py:1909
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
@@ -176,334 +176,338 @@ msgstr ""
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:1404
+#: cps/web.py:1433
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/web.py:1419
+#: cps/web.py:1448
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:1515
+#: cps/web.py:1544
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1591
+#: cps/web.py:1620
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1594
+#: cps/web.py:1623
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1612
+#: cps/web.py:1641
 msgid "Update done"
 msgstr ""
 
-#: cps/web.py:1669
+#: cps/web.py:1698
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1674
+#: cps/web.py:1703
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1720 cps/web.py:1733
+#: cps/web.py:1749 cps/web.py:1762
 msgid "search"
 msgstr ""
 
 #: cps/templates/index.xml:39 cps/templates/index.xml:42
-#: cps/templates/layout.html:143 cps/web.py:1824
+#: cps/templates/layout.html:143 cps/web.py:1864
 msgid "Read Books"
 msgstr ""
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:49
-#: cps/templates/layout.html:145 cps/web.py:1827
+#: cps/templates/layout.html:145 cps/web.py:1867
 msgid "Unread Books"
 msgstr ""
 
-#: cps/web.py:1879 cps/web.py:1881 cps/web.py:1883 cps/web.py:1895
+#: cps/web.py:1919 cps/web.py:1921 cps/web.py:1923 cps/web.py:1935
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1951 cps/web.py:2686
+#: cps/web.py:1991 cps/web.py:2744
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:1952 cps/web.py:1969 cps/web.py:1974 cps/web.py:1976
+#: cps/web.py:1992 cps/web.py:2009 cps/web.py:2014 cps/web.py:2016
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1968
+#: cps/web.py:2008
 msgid "An unknown error occured. Please try again later."
 msgstr ""
 
-#: cps/web.py:1973
+#: cps/web.py:2013
 msgid "This username or email address is already in use."
 msgstr ""
 
-#: cps/web.py:1990 cps/web.py:2086
+#: cps/web.py:2030 cps/web.py:2126
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1995
+#: cps/web.py:2035
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:2001 cps/web.py:2022
+#: cps/web.py:2041 cps/web.py:2062
 msgid "login"
 msgstr ""
 
-#: cps/web.py:2034 cps/web.py:2065
+#: cps/web.py:2074 cps/web.py:2105
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2042 cps/web.py:2073
+#: cps/web.py:2082 cps/web.py:2113
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2050
+#: cps/web.py:2090
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2100
+#: cps/web.py:2140
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:2104
+#: cps/web.py:2144
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2108
+#: cps/web.py:2148
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:2110 cps/web.py:2774
+#: cps/web.py:2150 cps/web.py:2832
 msgid "Please configure your kindle email address first..."
 msgstr ""
 
-#: cps/web.py:2154
+#: cps/web.py:2194
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2192
+#: cps/web.py:2232
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2198
+#: cps/web.py:2238
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2218 cps/web.py:2242
+#: cps/web.py:2258 cps/web.py:2282
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:2223
+#: cps/web.py:2263
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:2225 cps/web.py:2253
+#: cps/web.py:2265 cps/web.py:2293
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:2226 cps/web.py:2228
+#: cps/web.py:2266 cps/web.py:2268
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:2251
+#: cps/web.py:2291
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2254 cps/web.py:2256
+#: cps/web.py:2294 cps/web.py:2296
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:2277
+#: cps/web.py:2317
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:2299
+#: cps/web.py:2339
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2302
+#: cps/web.py:2342
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2333
+#: cps/web.py:2373
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2404
+#: cps/web.py:2444
 msgid "Found an existing account for this email address."
 msgstr ""
 
-#: cps/web.py:2406 cps/web.py:2410
+#: cps/web.py:2446 cps/web.py:2450
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:2407
+#: cps/web.py:2447
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:2419
+#: cps/web.py:2459
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2432
+#: cps/web.py:2472
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:2454
-msgid "Import of optional GDrive requirements missing"
+#: cps/web.py:2560 cps/web.py:2692
+msgid "Calibre-web configuration updated"
+msgstr ""
+
+#: cps/templates/admin.html:80 cps/web.py:2565
+msgid "UI Configuration"
+msgstr ""
+
+#: cps/web.py:2581
+msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2457
+#: cps/web.py:2584
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2462 cps/web.py:2490
+#: cps/web.py:2589 cps/web.py:2617
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/web.py:2493 cps/web.py:2518 cps/web.py:2529 cps/web.py:2622
-#: cps/web.py:2642 cps/web.py:2649 cps/web.py:2667
+#: cps/templates/admin.html:79 cps/web.py:2620 cps/web.py:2645 cps/web.py:2656
+#: cps/web.py:2680 cps/web.py:2700 cps/web.py:2707 cps/web.py:2725
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:2515
+#: cps/web.py:2642
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2526
+#: cps/web.py:2653
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2619
+#: cps/web.py:2677
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2634
-msgid "Calibre-web configuration updated"
-msgstr ""
-
-#: cps/web.py:2646
+#: cps/web.py:2704
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:2688 cps/web.py:2744
+#: cps/templates/admin.html:34 cps/web.py:2746 cps/web.py:2802
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:2734
+#: cps/web.py:2792
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:2738
+#: cps/web.py:2796
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 
-#: cps/web.py:2762
+#: cps/web.py:2820
 msgid "Mail settings updated"
 msgstr ""
 
-#: cps/web.py:2769
+#: cps/web.py:2827
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2772
+#: cps/web.py:2830
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:2776
+#: cps/web.py:2834
 msgid "E-Mail settings updated"
 msgstr ""
 
-#: cps/web.py:2777
+#: cps/web.py:2835
 msgid "Edit mail settings"
 msgstr ""
 
-#: cps/web.py:2807
+#: cps/web.py:2865
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:2916
+#: cps/web.py:2974
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:2919
+#: cps/web.py:2977
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:2922
+#: cps/web.py:2980
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:2938
+#: cps/web.py:2996
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:2953 cps/web.py:3164 cps/web.py:3169 cps/web.py:3337
+#: cps/web.py:3011 cps/web.py:3222 cps/web.py:3227 cps/web.py:3395
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2963 cps/web.py:3214
+#: cps/web.py:3021 cps/web.py:3272
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:2974
+#: cps/web.py:3032
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:2998 cps/web.py:3002
+#: cps/web.py:3056 cps/web.py:3060
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3023
+#: cps/web.py:3081
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3173
+#: cps/web.py:3231
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3278
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3297
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3244
+#: cps/web.py:3302
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3249
+#: cps/web.py:3307
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
@@ -581,7 +585,7 @@ msgstr ""
 msgid "Change SMTP settings"
 msgstr ""
 
-#: cps/templates/admin.html:57 cps/templates/admin.html:79
+#: cps/templates/admin.html:57
 msgid "Configuration"
 msgstr ""
 
@@ -589,7 +593,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:87
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:100
 msgid "Log Level"
 msgstr ""
 
@@ -597,7 +601,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:64
+#: cps/templates/admin.html:63 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr ""
 
@@ -617,60 +621,61 @@ msgstr ""
 msgid "Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:80
+#: cps/templates/admin.html:81
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:82
+#: cps/templates/admin.html:83
 msgid "Current commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:84
 msgid "Newest commit timestamp"
 msgstr ""
 
-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Reconnect to Calibre DB"
 msgstr ""
 
-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Restart Calibre-web"
 msgstr ""
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:88
 msgid "Stop Calibre-web"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:89
 msgid "Check for update"
 msgstr ""
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:90
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:99
+#: cps/templates/admin.html:100
 msgid "Do you really want to restart Calibre-web?"
 msgstr ""
 
-#: cps/templates/admin.html:104 cps/templates/admin.html:118
-#: cps/templates/admin.html:139 cps/templates/shelf.html:59
+#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:140 cps/templates/shelf.html:59
 msgid "Ok"
 msgstr ""
 
-#: cps/templates/admin.html:105 cps/templates/admin.html:119
+#: cps/templates/admin.html:106 cps/templates/admin.html:120
 #: cps/templates/book_edit.html:135 cps/templates/book_edit.html:157
-#: cps/templates/config_edit.html:219 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:147
+#: cps/templates/config_edit.html:168 cps/templates/config_view_edit.html:164
+#: 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:147
 msgid "Back"
 msgstr ""
 
-#: cps/templates/admin.html:117
+#: cps/templates/admin.html:118
 msgid "Do you really want to stop Calibre-web?"
 msgstr ""
 
-#: cps/templates/admin.html:130
+#: cps/templates/admin.html:131
 msgid "Updating, please do not reload page"
 msgstr ""
 
@@ -753,9 +758,10 @@ msgstr ""
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:217
-#: cps/templates/login.html:20 cps/templates/search_form.html:96
-#: cps/templates/shelf_edit.html:17 cps/templates/user_edit.html:145
+#: cps/templates/book_edit.html:134 cps/templates/config_edit.html:166
+#: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
+#: cps/templates/search_form.html:96 cps/templates/shelf_edit.html:17
+#: cps/templates/user_edit.html:145
 msgid "Submit"
 msgstr ""
 
@@ -816,192 +822,216 @@ msgstr ""
 msgid "No Result! Please try anonther keyword."
 msgstr ""
 
-#: cps/templates/config_edit.html:7
-msgid "Location of Calibre database"
-msgstr ""
-
 #: cps/templates/config_edit.html:12
-msgid "Use google drive?"
+msgid "Library Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:18
-msgid "Google drive config problem"
+#: cps/templates/config_edit.html:19
+msgid "Location of Calibre database"
 msgstr ""
 
 #: cps/templates/config_edit.html:24
-msgid "Authenticate Google Drive"
+msgid "Use Google Drive?"
 msgstr ""
 
-#: cps/templates/config_edit.html:28
-msgid "Google drive Calibre folder"
+#: cps/templates/config_edit.html:30
+msgid "Google Drive config problem"
 msgstr ""
 
 #: cps/templates/config_edit.html:36
-msgid "Metadata Watch Channel ID"
+msgid "Authenticate Google Drive"
 msgstr ""
 
-#: cps/templates/config_edit.html:39
-msgid "Revoke"
+#: cps/templates/config_edit.html:40
+msgid "Google Drive Calibre folder"
 msgstr ""
 
 #: cps/templates/config_edit.html:48
-msgid "Server Port"
+msgid "Metadata Watch Channel ID"
 msgstr ""
 
-#: cps/templates/config_edit.html:52
-msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+#: cps/templates/config_edit.html:51
+msgid "Revoke"
 msgstr ""
 
-#: cps/templates/config_edit.html:56
-msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+#: cps/templates/config_edit.html:67
+msgid "Server Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:60 cps/templates/layout.html:130
-#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
-msgid "Title"
+#: cps/templates/config_edit.html:74
+msgid "Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:68
-msgid "No. of random books to show"
+#: cps/templates/config_edit.html:78
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:72
-msgid "Regular expression for ignoring columns"
+#: cps/templates/config_edit.html:82
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
 msgstr ""
 
-#: cps/templates/config_edit.html:76
-msgid "Regular expression for title sorting"
+#: cps/templates/config_edit.html:93
+msgid "Logfile Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:80
-msgid "Tags for Mature Content"
+#: cps/templates/config_edit.html:109
+msgid "Location and name of logfile (calibre-web.log for no entry)"
 msgstr ""
 
-#: cps/templates/config_edit.html:96
-msgid "Location and name of logfile (calibre-web.log for no entry)"
+#: cps/templates/config_edit.html:120
+msgid "Feature Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:102
+#: cps/templates/config_edit.html:128
 msgid "Enable uploading"
 msgstr ""
 
-#: cps/templates/config_edit.html:106
+#: cps/templates/config_edit.html:132
 msgid "Enable anonymous browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:110
+#: cps/templates/config_edit.html:136
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:114
+#: cps/templates/config_edit.html:140
 msgid "Enable remote login (\"magic link\")"
 msgstr ""
 
-#: cps/templates/config_edit.html:119
+#: cps/templates/config_edit.html:145
 msgid "Use"
 msgstr ""
 
-#: cps/templates/config_edit.html:120
+#: cps/templates/config_edit.html:146
 msgid "Obtain an API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:124
+#: cps/templates/config_edit.html:150
 msgid "Goodreads API Key"
 msgstr ""
 
-#: cps/templates/config_edit.html:128
+#: cps/templates/config_edit.html:154
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:133
-msgid "Default Settings for new users"
+#: cps/templates/config_edit.html:171 cps/templates/layout.html:79
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:12
+msgid "View Configuration"
 msgstr ""
 
-#: cps/templates/config_edit.html:136 cps/templates/user_edit.html:102
+#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:130
+#: cps/templates/layout.html:131 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:27
+msgid "No. of random books to show"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:31
+msgid "Regular expression for ignoring columns"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:35
+msgid "Link read/unread status to Calibre column"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:44
+msgid "Regular expression for title sorting"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:48
+msgid "Tags for Mature Content"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:62
+msgid "Default settings for new users"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:70 cps/templates/user_edit.html:102
 msgid "Admin user"
 msgstr ""
 
-#: cps/templates/config_edit.html:140 cps/templates/user_edit.html:111
+#: cps/templates/config_view_edit.html:74 cps/templates/user_edit.html:111
 msgid "Allow Downloads"
 msgstr ""
 
-#: cps/templates/config_edit.html:144 cps/templates/user_edit.html:115
+#: cps/templates/config_view_edit.html:78 cps/templates/user_edit.html:115
 msgid "Allow Uploads"
 msgstr ""
 
-#: cps/templates/config_edit.html:148 cps/templates/user_edit.html:119
+#: cps/templates/config_view_edit.html:82 cps/templates/user_edit.html:119
 msgid "Allow Edit"
 msgstr ""
 
-#: cps/templates/config_edit.html:152 cps/templates/user_edit.html:123
+#: cps/templates/config_view_edit.html:86 cps/templates/user_edit.html:123
 msgid "Allow Delete books"
 msgstr ""
 
-#: cps/templates/config_edit.html:156 cps/templates/user_edit.html:128
+#: cps/templates/config_view_edit.html:90 cps/templates/user_edit.html:128
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:160 cps/templates/user_edit.html:132
+#: cps/templates/config_view_edit.html:94 cps/templates/user_edit.html:132
 msgid "Allow Editing Public Shelfs"
 msgstr ""
 
-#: cps/templates/config_edit.html:164
-msgid "Default visiblities for new users"
+#: cps/templates/config_view_edit.html:104
+msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:168 cps/templates/user_edit.html:54
+#: cps/templates/config_view_edit.html:112 cps/templates/user_edit.html:54
 msgid "Show random books"
 msgstr ""
 
-#: cps/templates/config_edit.html:172 cps/templates/user_edit.html:58
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:58
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/config_edit.html:176 cps/templates/user_edit.html:62
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:62
 msgid "Show sorted books"
 msgstr ""
 
-#: cps/templates/config_edit.html:180 cps/templates/user_edit.html:66
+#: cps/templates/config_view_edit.html:124 cps/templates/user_edit.html:66
 msgid "Show hot books"
 msgstr ""
 
-#: cps/templates/config_edit.html:184 cps/templates/user_edit.html:70
+#: cps/templates/config_view_edit.html:128 cps/templates/user_edit.html:70
 msgid "Show best rated books"
 msgstr ""
 
-#: cps/templates/config_edit.html:188 cps/templates/user_edit.html:74
+#: cps/templates/config_view_edit.html:132 cps/templates/user_edit.html:74
 msgid "Show language selection"
 msgstr ""
 
-#: cps/templates/config_edit.html:192 cps/templates/user_edit.html:78
+#: cps/templates/config_view_edit.html:136 cps/templates/user_edit.html:78
 msgid "Show series selection"
 msgstr ""
 
-#: cps/templates/config_edit.html:196 cps/templates/user_edit.html:82
+#: cps/templates/config_view_edit.html:140 cps/templates/user_edit.html:82
 msgid "Show category selection"
 msgstr ""
 
-#: cps/templates/config_edit.html:200 cps/templates/user_edit.html:86
+#: cps/templates/config_view_edit.html:144 cps/templates/user_edit.html:86
 msgid "Show author selection"
 msgstr ""
 
-#: cps/templates/config_edit.html:204 cps/templates/user_edit.html:90
+#: cps/templates/config_view_edit.html:148 cps/templates/user_edit.html:90
 msgid "Show read and unread"
 msgstr ""
 
-#: cps/templates/config_edit.html:208 cps/templates/user_edit.html:94
+#: cps/templates/config_view_edit.html:152 cps/templates/user_edit.html:94
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/config_edit.html:212 cps/templates/user_edit.html:107
+#: cps/templates/config_view_edit.html:156 cps/templates/user_edit.html:107
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/config_edit.html:222 cps/templates/layout.html:79
-#: cps/templates/login.html:4
-msgid "Login"
-msgstr ""
-
 #: cps/templates/detail.html:49
 msgid "Read in browser"
 msgstr ""