diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..c791f535f
Binary files /dev/null and b/.DS_Store differ
diff --git a/cps/.DS_Store b/cps/.DS_Store
new file mode 100644
index 000000000..f2b265cf5
Binary files /dev/null and b/cps/.DS_Store differ
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index a7770c598..5b2ad78c2 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -6,16 +6,16 @@
 <div class="container-fluid">
   <div class="row">
     <div class="col">
-      <h2>{{_('User list')}}</h2>
+      <h2>{{_('Users')}}</h2>
       <table class="table table-striped" id="table_user">
         <tr>
-            <th>{{_('Nickname')}}</th>
-            <th>{{_('E-mail')}}</th>
-            <th>{{_('Kindle')}}</th>
-            <th>{{_('DLS')}}</th>
+            <th>{{_('Username')}}</th>
+            <th>{{_('E-mail Address')}}</th>
+            <th>{{_('Send to Kindle E-mail Address')}}</th>
+            <th>{{_('Downloads')}}</th>
             <th class="hidden-xs">{{_('Admin')}}</th>
             <th class="hidden-xs">{{_('Download')}}</th>
-            <th class="hidden-xs">{{_('View Ebooks')}}</th>
+            <th class="hidden-xs">{{_('View eBooks')}}</th>
             <th class="hidden-xs">{{_('Upload')}}</th>
             <th class="hidden-xs">{{_('Edit')}}</th>
         </tr>
@@ -35,20 +35,20 @@
           {% endif %}
         {% endfor %}
       </table>
-      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add new user')}}</a></div>
+      <div class="btn btn-default" id="admin_new_user"><a href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a></div>
     </div>
   </div>
 
   <div class="row">
     <div class="col">
-      <h2>{{_('SMTP e-mail server settings')}}</h2>
+      <h2>{{_('E-mail Server Settings')}}</h2>
       <table class="table table-striped" id="table_email">
         <tr>
-          <th>{{_('SMTP hostname')}}</th>
-          <th>{{_('SMTP port')}}</th>
-          <th>{{_('SSL')}}</th>
-          <th>{{_('SMTP login')}}</th>
-          <th class="hidden-xs">{{_('From mail')}}</th>
+          <th>{{_('SMTP Hostname')}}</th>
+          <th>{{_('SMTP Port')}}</th>
+          <th>{{_('Encryption')}}</th>
+          <th>{{_('SMTP Login')}}</th>
+          <th class="hidden-xs">{{_('From E-mail')}}</th>
         </tr>
         <tr>
           <td>{{email.mail_server}}</td>
@@ -67,11 +67,11 @@
       <h2>{{_('Configuration')}}</h2>
       <div class="col-xs-12 col-sm-6">
         <div class="row">
-            <div class="col-xs-6 col-sm-6">{{_('Calibre DB dir')}}</div>
+            <div class="col-xs-6 col-sm-6">{{_('Calibre Database Directory')}}</div>
             <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-6">{{_('Log level')}}</div>
+            <div class="col-xs-6 col-sm-6">{{_('Log Level')}}</div>
             <div class="col-xs-6 col-sm-6">{{config.get_log_level()}}</div>
         </div>
         <div class="row">
@@ -81,27 +81,27 @@
       </div>
       <div class="col-xs-12 col-sm-6">
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Books per page')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Books per Page')}}</div>
             <div class="col-xs-6 col-sm-5">{{config.config_books_per_page}}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Uploads')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_uploading) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Anonymous Browsing')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_anonbrowse) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Public Registration')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_public_reg) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Magic Link Remote Login')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_remote_login) }}</div>
         </div>
         <div class="row">
-            <div class="col-xs-6 col-sm-7">{{_('Reverse proxy login')}}</div>
+            <div class="col-xs-6 col-sm-7">{{_('Reverse Proxy Login')}}</div>
             <div class="col-xs-6 col-sm-5">{{ display_bool_setting(config.config_allow_reverse_proxy_header_login) }}</div>
         </div>
         {% if config.config_allow_reverse_proxy_header_login %}
@@ -111,18 +111,18 @@
         </div>
         {% endif %}
       </div>
-      <div class="btn btn-default"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Basic Configuration')}}</a></div>
-      <div class="btn btn-default"><a id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('UI Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="basic_config" href="{{url_for('admin.configuration')}}">{{_('Edit Basic Configuration')}}</a></div>
+      <div class="btn btn-default"><a id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('Edit UI Configuration')}}</a></div>
     </div>
   </div>
 
   <div class="row">
     <div class="col">
       <h2>{{_('Administration')}}</h2>
-      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logfiles')}}</a></div>
-      <div class="btn btn-default" id="restart_database">{{_('Reconnect to Calibre DB')}}</div>
-      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart Calibre-Web')}}</div>
-      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Stop Calibre-Web')}}</div>
+      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
+      <div class="btn btn-default" id="restart_database">{{_('Reconnect Calibre Database')}}</div>
+      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
+      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
     </div>
   </div>
 
@@ -145,7 +145,7 @@
       </table>
 
       <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
-      <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
+      <div class="btn btn-default" id="check_for_update">{{_('Check for Update')}}</div>
       <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
     </div>
   </div>
@@ -158,13 +158,13 @@
     <div class="modal-content">
       <div class="modal-header bg-info"></div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to restart Calibre-Web?')}}</p>
+        <p>{{_('Are you sure you want to restart?')}}</p>
           <div id="spinner" class="spinner"  style="display:none;">
                 <img id="img-spinner" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
           </div>
           <p></p>
-        <button type="button" class="btn btn-default" id="restart" >{{_('Ok')}}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <button type="button" class="btn btn-default" id="restart" >{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -176,9 +176,9 @@
       <div class="modal-header bg-info">
       </div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to stop Calibre-Web?')}}</p>
-        <button type="button" class="btn btn-default" id="shutdown" data-dismiss="modal">{{_('Ok')}}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <p>{{_('Are you sure you want to shutdown?')}}</p>
+        <button type="button" class="btn btn-default" id="shutdown" data-dismiss="modal">{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -188,7 +188,7 @@
     <!-- Modal content-->
     <div class="modal-content">
       <div class="modal-header bg-info text-center">
-      <span>{{_('Updating, please do not reload page')}}</span>
+      <span>{{_('Updating, please do not reload this page')}}</span>
       </div>
       <div class="modal-body text-center">
           <div id="spinner2" class="spinner2"  style="display:none;">
@@ -197,7 +197,7 @@
           <p></p>
          <div id="Updatecontent"></div>
           <p></p>
-        <button type="button" class="btn btn-default hidden" id="updateFinished" data-dismiss="modal">{{_('Ok')}}</button>
+        <button type="button" class="btn btn-default hidden" id="updateFinished" data-dismiss="modal">{{_('OK')}}</button>
       </div>
     </div>
   </div>
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index e734698aa..b577ca072 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -72,7 +72,7 @@
       <input type="text" class="form-control typeahead" name="series" id="series" value="{% if book.series %}{{book.series[0].name}}{% endif %}">
     </div>
     <div class="form-group">
-      <label for="series_index">{{_('Series id')}}</label>
+      <label for="series_index">{{_('Series ID')}}</label>
       <input type="number" step="0.01" min="0" class="form-control" name="series_index" id="series_index" value="{{book.series_index}}">
     </div>
     <div class="form-group">
@@ -80,16 +80,16 @@
       <input type="number"  name="rating" id="rating" class="rating input-lg" data-clearable="" value="{% if book.ratings %}{{(book.ratings[0].rating / 2)|int}}{% endif %}">
     </div>
     <div class="form-group">
-      <label for="cover_url">{{_('Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)')}}</label>
+      <label for="cover_url">{{_('Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)')}}</label>
       <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
     </div>
     <div class="form-group" aria-label="Upload cover from local drive">
-        <label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from local drive') }}</label>
+        <label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from Local Disk') }}</label>
         <div class="upload-cover-input-text" id="upload-cover"></div>
         <input id="btn-upload-cover" name="btn-upload-cover" type="file" accept=".jpg, .jpeg, .png, .webp">
     </div>
     <div class="form-group">
-      <label for="pubdate">{{_('Publishing date')}}</label>
+      <label for="pubdate">{{_('Published Date')}}</label>
       <div style="position: relative">
         <input type="date" class="form-control" name="pubdate" id="pubdate" value="{% if book.pubdate %}{{book.pubdate|formatdateinput}}{% endif %}">
         <input type="text" class="form-control fake-input hidden" id="fake_pubdate" value="{% if book.pubdate %}{{book.pubdate|formatdate}}{% endif %}">
@@ -157,7 +157,7 @@
       {% if g.user.role_upload() or g.user.role_admin()%}
         {% if g.allow_upload %}
           <div role="group" aria-label="Upload new book format">
-            <label class="btn btn-primary btn-file" for="btn-upload-format">{{ _('Upload format') }}</label>
+            <label class="btn btn-primary btn-file" for="btn-upload-format">{{ _('Upload Format') }}</label>
             <div class="upload-format-input-text" id="upload-format"></div>
             <input id="btn-upload-format" name="btn-upload-format" type="file">
           </div>
@@ -166,12 +166,12 @@
 
     <div class="checkbox">
       <label>
-        <input name="detail_view" type="checkbox" checked> {{_('view book after edit')}}
+        <input name="detail_view" type="checkbox" checked> {{_('View Book on Save')}}
       </label>
     </div>
-    <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Get metadata')}}</a>
-    <button type="submit" id="submit" class="btn btn-default">{{_('Submit')}}</button>
-    <a href="{{ url_for('web.show_book', book_id=book.id) }}" class="btn btn-default">{{_('Back')}}</a>
+    <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Fetch Metadata')}}</a>
+    <button type="submit" id="submit" class="btn btn-default">{{_('Save')}}</button>
+    <a href="{{ url_for('web.show_book', book_id=book.id) }}" class="btn btn-default">{{_('Cancel')}}</a>
   </div>
 </form>
 
@@ -187,13 +187,13 @@
           <span>{{_('Are you really sure?')}}</span>
       </div>
         <div class="modal-body text-center">
-          <span>{{_('Book will be deleted from Calibre database')}}</span>
-          <span>{{_('and from hard disk')}}</span>
+          <span>{{_('This book will be permanently erased from database')}}</span>
+          <span>{{_('and hard disk')}}</span>
         </div>
 
       <div class="modal-footer">
         <a href="{{ url_for('editbook.delete_book', book_id=book.id) }}" class="btn btn-danger">{{_('Delete')}}</a>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -205,13 +205,13 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="metaModalLabel">{{_('Get metadata')}}</h4>
+        <h4 class="modal-title" id="metaModalLabel">{{_('Fetch Metadata')}}</h4>
         <form class="padded-bottom" id="meta-search">
           <div class="input-group">
             <label class="sr-only" for="keyword">{{_('Keyword')}}</label>
             <input type="text" class="form-control" id="keyword" name="keyword" placeholder="{{_(" Search keyword ")}}">
             <span class="input-group-btn">
-              <button type="submit" class="btn btn-primary" id="do-search">{{_("Go!")}}</button>
+              <button type="submit" class="btn btn-primary" id="do-search">{{_("Search")}}</button>
             </span>
           </div>
         </form>
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index 0d28b8eaa..91597372b 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -16,7 +16,7 @@
     <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>
+      <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 config.config_calibre_dir != None %}{{ config.config_calibre_dir }}{% endif %}" autocomplete="off">
     </div>
     {% if feature_support['gdrive']  %}
@@ -96,7 +96,7 @@
           <input type="text" class="form-control" name="config_keyfile" id="config_keyfile" value="{% if config.config_keyfile != None %}{{ config.config_keyfile }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_updatechannel">{{_('Update channel')}}</label>
+          <label for="config_updatechannel">{{_('Update Channel')}}</label>
             <select name="config_updatechannel" id="config_updatechannel" class="form-control">
                     <option value="0" {% if config.config_updatechannel == 0 %}selected{% endif %}>{{_('Stable')}}</option>
                     <!--option value="1" {% if config.config_updatechannel == 1 %}selected{% endif %}>{{_('Stable (Automatic)')}}</option-->
@@ -155,25 +155,25 @@
       <div class="panel-body">
     <div class="form-group">
         <input type="checkbox" id="config_uploading" name="config_uploading" {% if config.config_uploading %}checked{% endif %}>
-        <label for="config_uploading">{{_('Enable uploading')}}</label>
+        <label for="config_uploading">{{_('Enable Uploads')}}</label>
     </div>
     <div class="form-group">
         <input type="checkbox" id="config_anonbrowse" name="config_anonbrowse" {% if config.config_anonbrowse %}checked{% endif %}>
-        <label for="config_anonbrowse">{{_('Enable anonymous browsing')}}</label>
+        <label for="config_anonbrowse">{{_('Enable Anonymous Browsing')}}</label>
     </div>
     <div class="form-group">
         <input type="checkbox" id="config_public_reg" name="config_public_reg" {% if config.config_public_reg %}checked{% endif %}>
-        <label for="config_public_reg">{{_('Enable public registration')}}</label>
+        <label for="config_public_reg">{{_('Enable Public Registration')}}</label>
     </div>
     <div class="form-group">
       <input type="checkbox" id="config_remote_login" name="config_remote_login" {% if config.config_remote_login %}checked{% endif %}>
-      <label for="config_remote_login">{{_('Enable remote login ("magic link")')}}</label>
+      <label for="config_remote_login">{{_('Enable Magic Link Remote Login')}}</label>
     </div>
     {% if feature_support['goodreads'] %}
     <div class="form-group">
       <input type="checkbox" id="config_use_goodreads" name="config_use_goodreads" data-control="goodreads-settings" {% if config.config_use_goodreads %}checked{% endif %}>
       <label for="config_use_goodreads">{{_('Use Goodreads')}}</label>
-      <a href="https://www.goodreads.com/api/keys" target="_blank" style="margin-left: 5px">{{_('Obtain an API Key')}}</a>
+      <a href="https://www.goodreads.com/api/keys" target="_blank" style="margin-left: 5px">{{_('Create an API Key')}}</a>
     </div>
     <div data-related="goodreads-settings">
       <div class="form-group">
@@ -190,7 +190,7 @@
       <div class="form-group">
         <label for="config_login_type">{{_('Login type')}}</label>
         <select name="config_login_type" id="config_login_type" class="form-control" data-control="login-settings">
-           <option value="0" {% if config.config_login_type == 0 %}selected{% endif %}>{{_('Use standard Authentication')}}</option>
+           <option value="0" {% if config.config_login_type == 0 %}selected{% endif %}>{{_('Use Standard Authentication')}}</option>
            {% if feature_support['ldap'] %}
            <option value="1" {% if config.config_login_type == 1 %}selected{% endif %}>{{_('Use LDAP Authentication')}}</option>
            {% endif %}
@@ -210,24 +210,24 @@
           <input type="text" class="form-control" id="config_ldap_port" name="config_ldap_port" value="{% if config.config_ldap_port != None %}{{ config.config_ldap_port }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_schema">{{_('LDAP schema (ldap or ldaps)')}}</label>
+          <label for="config_ldap_schema">{{_('LDAP Schema (LDAP or LPAPS)')}}</label>
           <input type="text" class="form-control" id="config_ldap_schema" name="config_ldap_schema" value="{% if config.config_ldap_schema != None %}{{ config.config_ldap_schema }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_serv_username">{{_('LDAP Admin username')}}</label>
+          <label for="config_ldap_serv_username">{{_('LDAP Administrator Username')}}</label>
           <input type="text" class="form-control" id="config_ldap_serv_username" name="config_ldap_serv_username" value="{% if config.config_ldap_serv_username != None %}{{ config.config_ldap_serv_username }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_serv_password">{{_('LDAP Admin password')}}</label>
+          <label for="config_ldap_serv_password">{{_('LDAP Administrator Password')}}</label>
           <input type="password" class="form-control" id="config_ldap_serv_password" name="config_ldap_serv_password" value="{% if config.config_ldap_serv_password != None %}{{ config.config_ldap_serv_password }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
           <input type="checkbox" id="config_ldap_use_ssl" name="config_ldap_use_ssl" {% if config.config_ldap_use_ssl %}checked{% endif %}>
-          <label for="config_ldap_use_ssl">{{_('LDAP Server use SSL')}}</label>
+          <label for="config_ldap_use_ssl">{{_('LDAP Server Enable SSL')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" id="config_ldap_use_tls" name="config_ldap_use_tls" {% if config.config_ldap_use_tls %}checked{% endif %}>
-          <label for="config_ldap_use_tls">{{_('LDAP Server use TLS')}}</label>
+          <label for="config_ldap_use_tls">{{_('LDAP Server Enable TLS')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" id="config_ldap_require_cert" name="config_ldap_require_cert" data-control="ldap-cert-settings" {% if config.config_ldap_require_cert %}checked{% endif %}>
@@ -244,7 +244,7 @@
           <input type="text" class="form-control" id="config_ldap_dn" name="config_ldap_dn" value="{% if config.config_ldap_dn != None %}{{ config.config_ldap_dn }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_ldap_user_object">{{_('LDAP User object filter')}}</label>
+          <label for="config_ldap_user_object">{{_('LDAP User Object Filter')}}</label>
           <input type="text" class="form-control" id="config_ldap_user_object" name="config_ldap_user_object" value="{% if config.config_ldap_user_object != None %}{{ config.config_ldap_user_object }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
@@ -297,7 +297,7 @@
       <div class="panel-body">
           <div class="form-group">
               <div><input type="radio" name="config_ebookconverter" id="converter0" value="0" {% if config.config_ebookconverter == 0 %}checked{% endif %}>
-              <label for="converter0">{{_('No converter')}}</label></div>
+              <label for="converter0">{{_('No Converter')}}</label></div>
               <div><input type="radio" name="config_ebookconverter" id="converter1" value="1" {% if config.config_ebookconverter == 1 %}checked{% endif %}>
               <label for="converter1">{{_('Use Kindlegen')}}</label></div>
               <div><input type="radio" name="config_ebookconverter" id="converter2" value="2" {% if config.config_ebookconverter == 2 %}checked{% endif %}>
@@ -326,9 +326,9 @@
 
 
     <div class="col-sm-12">
-    <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" name="submit" class="btn btn-default">{{_('Save')}}</button>
     {% if show_back_button %}
-      <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Back')}}</a>
+      <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Cancel')}}</a>
     {% endif %}
     {% if show_login_button %}
       <a href="{{ url_for('web.login') }}" name="login" class="btn btn-default">{{_('Login')}}</a>
diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html
index bc6defa40..d37826b55 100644
--- a/cps/templates/config_view_edit.html
+++ b/cps/templates/config_view_edit.html
@@ -20,15 +20,15 @@
           <input type="text" class="form-control" name="config_calibre_web_title" id="config_calibre_web_title" value="{% if conf.config_calibre_web_title != None %}{{ conf.config_calibre_web_title }}{% endif %}" autocomplete="off" required>
         </div>
         <div class="form-group">
-          <label for="config_books_per_page">{{_('Books per page')}}</label>
+          <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 conf.config_books_per_page != None %}{{ conf.config_books_per_page }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_random_books">{{_('No. of random books to show')}}</label>
+          <label for="config_random_books">{{_('No. of Random Books to Display')}}</label>
           <input type="number" min="1" max="30" class="form-control" name="config_random_books" id="config_random_books" value="{% if conf.config_random_books != None %}{{ conf.config_random_books }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
-          <label for="config_authors_max">{{_('No. of authors to show before hiding (0=disable hiding)')}}</label>
+          <label for="config_authors_max">{{_('No. of Authors to Display Before Hiding (0=Disable Hiding)')}}</label>
           <input type="number" min="0" max="999" class="form-control" name="config_authors_max" id="config_authors_max" value="{% if conf.config_authors_max != None %}{{ conf.config_authors_max }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
@@ -39,11 +39,11 @@
             </select>
         </div>
         <div class="form-group">
-          <label for="config_columns_to_ignore">{{_('Regular expression for ignoring columns')}}</label>
+          <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 conf.config_columns_to_ignore != None %}{{ conf.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>
+          <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 conf.config_read_column == 0 %}selected{% endif %}></option>
                 {%  for readColumn in readColumns %}
@@ -52,7 +52,7 @@
               </select>
         </div>
         <div class="form-group">
-          <label for="config_title_regex">{{_('Regular expression for title sorting')}}</label>
+          <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 conf.config_title_regex != None %}{{ conf.config_title_regex }}{% endif %}" autocomplete="off">
         </div>
         <div class="form-group">
@@ -70,7 +70,7 @@
       <h4 class="panel-title">
         <a class="accordion-toggle" data-toggle="collapse" href="#collapsesix">
           <span class="glyphicon glyphicon-plus"></span>
-          {{_('Default settings for new users')}}
+          {{_('Default Settings for New Users')}}
         </a>
       </h4>
     </div>
@@ -78,7 +78,7 @@
       <div class="panel-body">
         <div class="form-group">
           <input type="checkbox" name="admin_role" id="admin_role" {% if conf.role_admin() %}checked{% endif %}>
-          <label for="admin_role">{{_('Admin user')}}</label>
+          <label for="admin_role">{{_('Admin User')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" name="download_role" id="download_role" {% if conf.role_download() %}checked{% endif %}>
@@ -86,7 +86,7 @@
         </div>
         <div class="form-group">
           <input type="checkbox" name="viewer_role" id="viewer_role" {% if conf.role_viewer() %}checked{% endif %}>
-          <label for="viewer_role">{{_('Allow book viewer')}}</label>
+          <label for="viewer_role">{{_('Allow eBook Viewer')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" name="upload_role" id="upload_role" {% if conf.role_upload() %}checked{% endif %}>
@@ -98,7 +98,7 @@
         </div>
         <div class="form-group">
           <input type="checkbox" name="delete_role" id="delete_role" {% if conf.role_delete_books() %}checked{% endif %}>
-          <label for="delete_role">{{_('Allow Delete books')}}</label>
+          <label for="delete_role">{{_('Allow Delete Books')}}</label>
         </div>
         <div class="form-group">
           <input type="checkbox" name="passwd_role" id="passwd_role" {% if conf.role_passwd() %}checked{% endif %}>
@@ -116,7 +116,7 @@
       <h4 class="panel-title">
         <a class="accordion-toggle" data-toggle="collapse" href="#collapseseven">
           <span class="glyphicon glyphicon-plus"></span>
-          {{_('Default visibilities for new users')}}
+          {{_('Default Visibilities for New Users')}}
         </a>
       </h4>
     </div>
@@ -132,19 +132,19 @@
         {% endfor %}
         <div class="form-group">
             <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if conf.show_detail_random() %}checked{% endif %}>
-            <label for="Show_detail_random">{{_('Show random books in detail view')}}</label>
+            <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 conf.show_mature_content() %}checked{% endif %}>
-            <label for="Show_mature_content">{{_('Show mature content')}}</label>
+            <label for="Show_mature_content">{{_('Show Mature Content')}}</label>
         </div>
       </div>
     </div>
   </div>
 </div>
     <div class="col-sm-12">
-    <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
-    <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Back')}}</a>
+    <button type="submit" name="submit" class="btn btn-default">{{_('Save')}}</button>
+    <a href="{{ url_for('admin.admin') }}" class="btn btn-default">{{_('Cancel')}}</a>
     </div>
   </form>
 </div>
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b76a8afac..d84dbe618 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -56,7 +56,7 @@
           {% if reader_list and g.user.role_viewer() %}
               <div class="btn-group" role="group">
                 <button id="read-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <span class="glyphicon glyphicon-eye-open"></span> {{_('Read in browser')}}
+                  <span class="glyphicon glyphicon-eye-open"></span> {{_('Read in Browser')}}
                   <span class="caret"></span>
                 </button>
                     <ul class="dropdown-menu" aria-labelledby="read-in-browser">
@@ -69,7 +69,7 @@
             {% if audioentries|length > 0 %}
               <div class="btn-group" role="group">
                 <button id="listen-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <span class="glyphicon glyphicon-music"></span> {{_('Listen in browser')}}
+                  <span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}}
                   <span class="caret"></span>
                 </button>
                     <ul class="dropdown-menu" aria-labelledby="read-in-browser">
@@ -120,7 +120,7 @@
       {% if entry.languages.__len__() > 0 %}
        <div class="languages">
        <p>
-      <span class="label label-default">{{_('language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %}</span>
+      <span class="label label-default">{{_('Language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %}</span>
       </p>
       </div>
       {% endif %}
@@ -162,7 +162,7 @@
 
       {% if entry.pubdate[:10] != '0101-01-01' %}
       <div class="publishing-date">
-        <p>{{_('Publishing date')}}: {{entry.pubdate|formatdate}} </p>
+        <p>{{_('Published')}}: {{entry.pubdate|formatdate}} </p>
       </div>
       {% endif %}
       {% if cc|length > 0 %}
@@ -283,7 +283,7 @@
       {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
-          <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit metadata')}}</a>
+          <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-warning" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
         </div>
       </div>
       {% endif %}
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 5ac1dad88..f51809218 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -8,11 +8,11 @@
   <h1>{{title}}</h1>
   <form role="form" method="POST">
     <div class="form-group">
-      <label for="mail_server">{{_('SMTP hostname')}}</label>
+      <label for="mail_server">{{_('SMTP Hostname')}}</label>
       <input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}">
     </div>
     <div class="form-group">
-      <label for="mail_port">{{_('SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)')}}</label>
+      <label for="mail_port">{{_('SMTP Port')}}</label>
       <input type="text" class="form-control" name="mail_port" id="mail_port" value="{{content.mail_port}}">
     </div>
     <div class="form-group">
@@ -24,23 +24,23 @@
         </select>
     </div>
     <div class="form-group">
-      <label for="mail_login">{{_('SMTP login')}}</label>
+      <label for="mail_login">{{_('SMTP Login')}}</label>
       <input type="text" class="form-control" name="mail_login" id="mail_login" value="{{content.mail_login}}">
     </div>
     <div class="form-group">
-      <label for="mail_password">{{_('SMTP password')}}</label>
+      <label for="mail_password">{{_('SMTP Password')}}</label>
       <input type="password" class="form-control" name="mail_password" id="mail_password" value="{{content.mail_password}}">
     </div>
     <div class="form-group">
-      <label for="mail_from">{{_('From e-mail')}}</label>
+      <label for="mail_from">{{_('From E-mail')}}</label>
       <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}">
     </div>
-    <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save settings')}}</button>
-    <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save settings and send Test E-Mail')}}</button>
-    <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Back')}}</a>
+    <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
+    <button type="submit" name="test" value="test" class="btn btn-default">{{_('Save and Send Test E-mail')}}</button>
+    <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Cancel')}}</a>
   </form>
     {% if g.allow_registration %}
-    <h2>{{_('Allowed domains for registering')}}</h2>
+    <h2>{{_('Allowed Domains (Whitelist)')}}</h2>
     <form id="domain_add_allow" action="{{ url_for('admin.add_domain',allow=1)}}" method="POST">
     <div class="form-group required">
       <label for="domainname_allow">{{_('Add Domain')}}</label>
@@ -57,7 +57,7 @@
     </tr>
     </thead>
   </table>
-  <h2>{{_('Denied domains for registering')}}</h2>
+  <h2>{{_('Denied Domains (Blacklist))')}}</h2>
     <table class="table table-no-bordered" id="domain-deny-table" data-url="{{url_for('admin.list_domain', allow=0)}}" data-id-field="id" data-show-header="false" data-editable-mode="inline">
       <thead>
         <tr>
@@ -87,9 +87,9 @@
       <div class="modal-header bg-danger">
       </div>
       <div class="modal-body text-center">
-        <p>{{_('Do you really want to delete this domain rule?')}}</p>
+        <p>{{_('Are you sure you want to delete this domain?')}}</p>
         <button type="button" class="btn btn-danger" id="btndeletedomain" >{{_('Delete')}}</button>
-        <button type="button" class="btn btn-default" id="btncancel" data-dismiss="modal">{{_('Back')}}</button>
+        <button type="button" class="btn btn-default" id="btncancel" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
@@ -104,4 +104,3 @@
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
 {% endif %}
 {% endblock %}
-
diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 1f09a79df..e1e103883 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -20,6 +20,7 @@
   <div class="container-fluid">
   <div class="row">
     <div class="col">
+        <h1  class="text-center">{{instance}}</h1>
         <h1  class="text-center">{{ error_code }}</h1>
         <h3>{{ error_name }}</h3>
     </div>
@@ -34,14 +35,14 @@
   {% if issue %}
     <div class="row">
     <div class="col errorlink">Please report this issue with all related information:
-        <a href="https://github.com/janeczku/calibre-web/issues/new">{{_('Create issue')}}</a>
+        <a href="https://github.com/janeczku/calibre-web/issues/new">{{_('Create Issue')}}</a>
     </div>
       </div>
     {% endif %}
 
   <div class="row">
     <div class="col errorlink">
-        <a href="{{url_for('web.index')}}" title="{{ _('Back to home') }}">{{_('Back to home')}}</a>
+        <a href="{{url_for('web.index')}}" title="{{ _('Return to Home') }}">{{_('Return to Home')}}</a>
     </div>
   </div>
 
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 9ffb04f85..552e4e39b 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -31,7 +31,7 @@
       <div class="container-fluid">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">{{_('Toggle navigation')}}</span>
+            <span class="sr-only">{{_('Toggle Navigation')}}</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -42,9 +42,9 @@
           <form class="navbar-form navbar-left" role="search" action="{{url_for('web.search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
-              <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search')}}">
+              <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search Library')}}">
               <span class="input-group-btn">
-                <button type="submit" class="btn btn-default">{{_('Go!')}}</button>
+                <button type="submit" class="btn btn-default">{{_('Search')}}</button>
               </span>
             </div>
           </form>
@@ -52,7 +52,7 @@
         <div class="navbar-collapse collapse">
           {% if g.user.is_authenticated or g.allow_anonymous %}
           <ul class="nav navbar-nav ">
-            <li><a href="{{url_for('web.advanced_search')}}"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm">{{_('Advanced Search')}}</span></a></li>
+            <li><a href="{{url_for('web.advanced_search')}}"><span class="glyphicon glyphicon-search"></span> <span class="hidden-sm">{{_(' Advanced Search')}}</span></a></li>
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
@@ -70,14 +70,14 @@
                 {% endif %}
               {% endif %}
               {% if not g.user.is_anonymous %}
-                <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span><span class="hidden-sm">{{_('Tasks')}}</span></a></li>
+                <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
-                <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span><span class="hidden-sm">{{_('Admin')}}</span></a></li>
+                <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span> <span class="hidden-sm">{{_('Admin')}}</span></a></li>
               {% endif %}
-              <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span><span class="hidden-sm">{{g.user.nickname}}</span></a></li>
+              <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{g.user.nickname}}</span></a></li>
               {% if not g.user.is_anonymous %}
-              <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span><span class="hidden-sm">{{_('Logout')}}</span></a></li>
+              <li><a id="logout" href="{{url_for('web.logout')}}"><span class="glyphicon glyphicon-log-out"></span> <span class="hidden-sm">{{_('Logout')}}</span></a></li>
               {% endif %}
             {% endif %}
             {% if g.allow_registration and not g.user.is_authenticated %}
@@ -114,7 +114,7 @@
       <div id="loader" hidden="true">
         <center>
           <h3>{{_('Uploading...')}}</h3>
-          <span>{{_("please don't refresh the page")}}</span>.
+          <span>{{_("please do not refresh the page")}}</span>.
         </center>
       </div>
     {%endif%}
@@ -132,19 +132,18 @@
                     <li id="nav_{{element['id']}}" {% if page == element['page'] %}class="active"{% endif %}><a href="{{url_for(element['link'], data=element['page'], sort='new')}}"><span class="glyphicon {{element['glyph']}}"></span>{{_(element['text'])}}</a></li>
                 {% endif %}
               {% endfor %}
-
               {% if g.user.is_authenticated or g.allow_anonymous %}
                 <li class="nav-head hidden-xs public-shelves">{{_('Public Shelves')}}</li>
                 {% for shelf in g.public_shelfes %}
-                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
+                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list public_shelf"></span> {{shelf.name|shortentitle(40)}}</a></li>
                 {% endfor %}
                 <li class="nav-head hidden-xs your-shelves">{{_('Your Shelves')}}</li>
                 {% for shelf in g.user.shelf %}
-                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span>{{shelf.name|shortentitle(40)}}</a></li>
+                  <li><a href="{{url_for('shelf.show_shelf', shelf_id=shelf.id)}}"><span class="glyphicon glyphicon-list private_shelf"></span> {{shelf.name|shortentitle(40)}}</a></li>
                 {% endfor %}
               {% if not g.user.is_anonymous %}
                 <li id="nav_createshelf" class="create-shelf"><a href="{{url_for('shelf.create_shelf')}}">{{_('Create a Shelf')}}</a></li>
-                <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('about.stats')}}"><span class="glyphicon glyphicon-info-sign"></span>{{_('About')}}</a></li>
+                <li id="nav_about" {% if page == 'stat' %}class="active"{% endif %}><a href="{{url_for('about.stats')}}"><span class="glyphicon glyphicon-info-sign"></span> {{_('About')}}</a></li>
               {% endif %}
               {% endif %}
 
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 8113c7597..279ec28ff 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -35,7 +35,7 @@
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#play" class="sm2-inline-button sm2-icon-play-pause">Play / pause</a>
+    <a href="#play" class="sm2-inline-button sm2-icon-play-pause">Play / Pause</a>
    </div>
   </div>
 
@@ -43,7 +43,7 @@
 
    <div class="sm2-playlist">
     <div class="sm2-playlist-target">
-     <noscript><p>JavaScript is required.</p></noscript>
+     <noscript><p>JavaScript Required.</p></noscript>
     </div>
    </div>
 
@@ -65,31 +65,31 @@
   <div class="sm2-inline-element sm2-button-element sm2-volume">
    <div class="sm2-button-bd">
     <span class="sm2-inline-button sm2-volume-control volume-shade"></span>
-    <a href="#volume" class="sm2-inline-button sm2-volume-control">volume</a>
+    <a href="#volume" class="sm2-inline-button sm2-volume-control">Volume</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#prev" title="Previous" class="sm2-inline-button sm2-icon-previous">&lt; previous</a>
+    <a href="#prev" title="Previous" class="sm2-inline-button sm2-icon-previous">&lt; Previous</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#next" title="Next" class="sm2-inline-button sm2-icon-next">&gt; next</a>
+    <a href="#next" title="Next" class="sm2-inline-button sm2-icon-next">&gt; Next</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element">
    <div class="sm2-button-bd">
-    <a href="#repeat" title="Repeat playlist" class="sm2-inline-button sm2-icon-repeat">&infin; repeat</a>
+    <a href="#repeat" title="Repeat playlist" class="sm2-inline-button sm2-icon-repeat">&infin; Repeat</a>
    </div>
   </div>
 
   <div class="sm2-inline-element sm2-button-element sm2-menu">
    <div class="sm2-button-bd">
-    <a href="#menu" class="sm2-inline-button sm2-icon-menu">menu</a>
+    <a href="#menu" class="sm2-inline-button sm2-icon-menu">Menu</a>
    </div>
   </div>
 
diff --git a/cps/templates/login.html b/cps/templates/login.html
index 4a259287a..23d59f2e2 100644
--- a/cps/templates/login.html
+++ b/cps/templates/login.html
@@ -14,15 +14,15 @@
     </div>
     <div class="checkbox">
       <label>
-        <input type="checkbox" name="remember_me" checked> {{_('Remember me')}}
+        <input type="checkbox" name="remember_me" checked> {{_('Remember Me')}}
       </label>
     </div>
-    <button type="submit" name="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" name="submit" class="btn btn-default">{{_('Login')}}</button>
     {% if config.config_login_type == 0 and mail%}
-    <button type="submit" name="forgot" value="forgot" class="btn btn-default">{{_('Forgot password')}}</button>
+    <button type="submit" name="forgot" value="forgot" class="btn btn-default">{{_('Forgot Password?')}}</button>
     {% endif %}
     {% if config.config_remote_login %}
-    <a href="{{url_for('web.remote_login')}}" class="pull-right">{{_('Log in with magic link')}}</a>
+    <a href="{{url_for('web.remote_login')}}" class="pull-right">{{_('Log in with Magic Link')}}</a>
     {% endif %}
     {% if config.config_login_type == 2 %}
     <a href="{{url_for('oauth.github_login')}}" class="pull-right">
diff --git a/cps/templates/logviewer.html b/cps/templates/logviewer.html
index be14fa8c8..e74ec27eb 100644
--- a/cps/templates/logviewer.html
+++ b/cps/templates/logviewer.html
@@ -3,13 +3,13 @@
    <div id="log_group" class="inputs">
      {% if log_enable %}
       <div><input type="radio" name="log_radio" id="log1" value="0" checked>
-      <label for="log1">{{_('Show Calibre-Web log: ')}}</label>{{logfiles[0]}}</div>
+      <label for="log1">{{_('Show Calibre-Web Log: ')}}</label>{{logfiles[0]}}</div>
      {% else %}
-     <div><label for="log1">{{_('Calibre-Web log: ')}}</label> {{_("Stream output, can't be displayed")}}</div>
+     <div><label for="log1">{{_('Calibre-Web Log: ')}}</label> {{_("Stream output, can't be displayed")}}</div>
      {% endif %}
      {% if accesslog_enable %}
       <div><input type="radio" name="log_radio" id="log0" value="1" {% if not log_enable %}checked{% endif %}>
-      <label for="log0">{{_('Show access log: ')}}</label>{{logfiles[1]}}</div>
+      <label for="log0">{{_('Show Access Log: ')}}</label>{{logfiles[1]}}</div>
      {% endif %}
    </div>
    <div id="renderer" class="log"></div>
diff --git a/cps/templates/osd.xml b/cps/templates/osd.xml
index 5c35b7649..b1077890b 100644
--- a/cps/templates/osd.xml
+++ b/cps/templates/osd.xml
@@ -2,7 +2,7 @@
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
    <LongName>{{instance}}</LongName>
    <ShortName>{{instance}}</ShortName>
-   <Description>{{_('Calibre-Web ebook catalog')}}</Description>
+   <Description>{{_('Calibre-Web eBook Catalog')}}</Description>
    <Developer>Janeczku</Developer>
    <Contact>https://github.com/janeczku/calibre-web</Contact>
    <Url type="text/html"
diff --git a/cps/templates/read.html b/cps/templates/read.html
index b3caec492..a4361fa03 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>ePubJS Reader</title>
+        <title>ePub Reader</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/cps/templates/register.html b/cps/templates/register.html
index 90ba8f8ef..0e218ec2c 100644
--- a/cps/templates/register.html
+++ b/cps/templates/register.html
@@ -1,14 +1,14 @@
 {% extends "layout.html" %}
 {% block body %}
 <div class="well col-sm-6 col-sm-offset-2">
-  <h2 style="margin-top: 0">{{_('Register a new account')}}</h2>
+  <h2 style="margin-top: 0">{{_('Register New Account')}}</h2>
   <form method="POST" role="form">
     <div class="form-group required">
       <label for="nickname">{{_('Username')}}</label>
       <input type="text" class="form-control" id="nickname" name="nickname" placeholder="{{_('Choose a username')}}" required>
     </div>
     <div class="form-group required">
-      <label for="email">{{_('E-mail address')}}</label>
+      <label for="email">{{_('E-mail Address')}}</label>
       <input type="email" class="form-control" id="email" name="email" placeholder="{{_('Your email address')}}" required>
     </div>
     <button type="submit" id="submit" class="btn btn-primary">{{_('Register')}}</button>
diff --git a/cps/templates/remote_login.html b/cps/templates/remote_login.html
index a688ce624..ce755afdf 100644
--- a/cps/templates/remote_login.html
+++ b/cps/templates/remote_login.html
@@ -1,15 +1,16 @@
 {% extends "layout.html" %}
 {% block body %}
 <div class="well">
-  <h2 style="margin-top: 0">{{_('Remote login')}}</h2>
+  <h2 style="margin-top: 0">{{_('Magic Link - Authorise New Device')}}</h2>
   <p>
-    {{_('Use your other device, login and visit ')}} <a href="{{verify_url}}">{{verify_url}}</a>.
+    {{_('On another device, login and visit:')}}
+  <h4><a href="{{verify_url}}">{{verify_url}}</a></b>
+  </h4>
+  <p>
+    {{_('Once verified, you will automatically be logged in on this device.')}}
   </p>
   <p>
-    {{_('Once you do so, you will automatically get logged in on this device.')}}
-  </p>
-  <p>
-    {{_('The link will expire after 10 minutes.')}}
+    {{_('This verification link will expire in 10 minutes.')}}
   </p>
 </div>
 {% endblock %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index dfa427990..c4c3d0e45 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -2,8 +2,8 @@
 {% block body %}
 <div class="discover">
     {% if entries|length < 1 %}
-      <h2>{{_('No Results for:')}} {{searchterm}}</h2>
-      <p>{{_('Please try a different search')}}</p>
+      <h2>{{_('No Results Found')}} {{searchterm}}</h2>
+      <p>{{_('Search Term::')}} {{searchterm}}</p>
     {% else %}
       <h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2>
       {% if g.user.is_authenticated %}
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index 6a64085d4..252ce448d 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -16,14 +16,14 @@
     </div>
     <div class="row">
         <div class="form-group col-sm-6">
-          <label for="Publishstart">{{_('Publishing date from')}}</label>
+          <label for="Publishstart">{{_('Published Date From')}}</label>
           <div style="position: relative">
             <input type="date" class="form-control" name="Publishstart" id="Publishstart" value="">
             <input type="text" class="form-control fake-input hidden" id="fake_Publishstart" value="">
           </div>
         </div>
         <div class="form-group col-sm-6">
-          <label for="Publishend">{{_('Publishing date to')}}</label>
+          <label for="Publishend">{{_('Published Date To')}}</label>
           <div style="position: relative">
             <input type="date" class="form-control" name="Publishend" id="Publishend" value="">
             <input type="text" class="form-control fake-input hidden" id="fake_Publishend" value="">
@@ -114,11 +114,11 @@
     </div>
     <div class="row">
         <div class="form-group col-sm-6">
-          <label for="ratinghigh">{{_('Rating bigger than')}}</label>
+          <label for="ratinghigh">{{_('Rating Above')}}</label>
           <input type="number"  name="ratinghigh" id="ratinghigh" class="rating input-lg" data-clearable="" >
         </div>
         <div class="form-group col-sm-6">
-          <label for="ratinglow">{{_('Rating less than')}}</label>
+          <label for="ratinglow">{{_('Rating Below')}}</label>
           <input type="number"  name="ratinglow" id="ratinglow" class="rating input-lg" data-clearable="" >
         </div>
     </div>
@@ -167,7 +167,7 @@
       {% endfor %}
     {% endif %}
 
-    <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" class="btn btn-default">{{_('Search')}}</button>
   </form>
 </div>
 {% endblock %}
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 7f3c03cfa..0bde5278f 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -64,13 +64,13 @@
   <div class="modal-dialog modal-sm">
     <div class="modal-content">
       <div class="modal-header bg-danger text-center">
-      <span>{{_('Do you really want to delete the shelf?')}}</span>
+      <span>{{_('Are you sure you  want to delete this shelf?')}}</span>
       </div>
       <div class="modal-body text-center">
-        <span>{{_('Shelf will be lost for everybody and forever!')}}</span>
+        <span>{{_('Shelf will be deleted for all users')}}</span>
           <p></p>
-        <a id="confirm" href="{{ url_for('shelf.delete_shelf', shelf_id=shelf.id) }}" class="btn btn-danger">{{_('Ok')}}</a>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Back')}}</button>
+        <a id="confirm" href="{{ url_for('shelf.delete_shelf', shelf_id=shelf.id) }}" class="btn btn-danger">{{_('OK')}}</a>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>
diff --git a/cps/templates/shelf_edit.html b/cps/templates/shelf_edit.html
index d7f32dc4a..934efe2b3 100644
--- a/cps/templates/shelf_edit.html
+++ b/cps/templates/shelf_edit.html
@@ -10,13 +10,13 @@
     {% if g.user.role_edit_shelfs() %}
       <div class="checkbox">
         <label>
-          <input type="checkbox" name="is_public" {% if shelf.is_public == 1 %}checked{% endif %}> {{_('should the shelf be public?')}}
+          <input type="checkbox" name="is_public" {% if shelf.is_public == 1 %}checked{% endif %}> {{_('Share with Everyone')}}
         </label>
       </div>
     {% endif %}
-    <button type="submit" class="btn btn-default" id="submit">{{_('Submit')}}</button>
+    <button type="submit" class="btn btn-default" id="submit">{{_('Save')}}</button>
     {% if shelf.id != None %}
-      <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" class="btn btn-default">{{_('Back')}}</a>
+      <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" class="btn btn-default">{{_('Cancel')}}</a>
     {% endif %}
   </form>
 </div>
diff --git a/cps/templates/shelf_order.html b/cps/templates/shelf_order.html
index 26fa2e356..c8a92da55 100644
--- a/cps/templates/shelf_order.html
+++ b/cps/templates/shelf_order.html
@@ -2,7 +2,7 @@
 {% block body %}
   <div class="col-sm-8 col-lg-8 col-xs-12">
     <h2>{{title}}</h2>
-    <div>{{_('Drag \'n drop to rearrange order')}}</div>
+    <div>{{_('Drag to Rearrange Order')}}</div>
       <div id="sortTrue" class="list-group">
         {% for entry in entries %}
           <div id="{{entry.id}}" class="list-group-item">
@@ -28,8 +28,8 @@
           </div>
         {% endfor %}
       </div>
-        <button onclick="sendData('{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}')" class="btn btn-default" id="ChangeOrder">{{_('Change order')}}</button>
-        <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" class="btn btn-default">{{_('Back')}}</a>
+        <button onclick="sendData('{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}')" class="btn btn-default" id="ChangeOrder">{{_('Change Order')}}</button>
+        <a href="{{ url_for('shelf.show_shelf', shelf_id=shelf.id) }}" class="btn btn-default">{{_('Cancel')}}</a>
   </div>
 {% endblock %}
 
@@ -37,6 +37,3 @@
 <script src="{{ url_for('static', filename='js/libs/Sortable.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/shelforder.js') }}"></script>
 {% endblock %}
-
-
-
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index 1c4692e4e..0457e4b9d 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -1,10 +1,10 @@
 {% extends "layout.html" %}
 {% block body %}
-  <h3>{{_('About')}}</h3>
+  <h3>{{_('About')}} {{instance}}</h3>
 <p>{{instance}} powered by
 <a href="https://github.com/janeczku/calibre-web" title="Calibre-Web">Calibre-Web</a>.
 </p>
-  <h3>{{_('Calibre library statistics')}}</h3>
+  <h3>{{_('Library Statistics')}}</h3>
 <table id="stats" class="table">
   <tbody>
     <tr>
@@ -25,11 +25,11 @@
     </tr>
   </tbody>
 </table>
-  <h3>{{_('Linked libraries')}}</h3>
+  <h3>{{_('Linked Libraries')}}</h3>
 <table id="libs" class="table">
   <thead>
     <tr>
-      <th>{{_('Program library')}}</th>
+      <th>{{_('Program Library')}}</th>
       <th>{{_('Installed Version')}}</th>
     </tr>
   </thead>
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 2f2c37c5e..4a755c826 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block body %}
 <div class="discover">
-    <h2>{{_('Tasks list')}}</h2>
+    <h2>{{_('Tasks')}}</h2>
     <table class="table table-no-bordered" id="table" data-url="{{  url_for('web.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc">
       <thead>
         <tr>
@@ -14,8 +14,8 @@
             <th data-halign="right" data-align="right" data-field="taskMessage" data-sortable="true">{{_('Task')}}</th>
             <th data-halign="right" data-align="right" data-field="status" data-sortable="true">{{_('Status')}}</th>
             <th data-halign="right" data-align="right" data-field="progress" data-sortable="true" data-sorter="elementSorter">{{_('Progress')}}</th>
-            <th data-halign="right" data-align="right" data-field="runtime" data-sortable="true" data-sort-name="rt">{{_('Runtime')}}</th>
-            <th data-halign="right" data-align="right" data-field="starttime" data-sortable="true" data-sort-name="id">{{_('Starttime')}}</th>
+            <th data-halign="right" data-align="right" data-field="runtime" data-sortable="true" data-sort-name="rt">{{_('Run Time')}}</th>
+            <th data-halign="right" data-align="right" data-field="starttime" data-sortable="true" data-sort-name="id">{{_('Start Time')}}</th>
             <th data-field="id" data-visible="false"></th>
             <th data-field="rt" data-visible="false"></th>
         </tr>
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 54adb537e..1a68501a9 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -10,7 +10,7 @@
     </div>
     {% endif %}
     <div class="form-group">
-      <label for="email">{{_('E-mail address')}}</label>
+      <label for="email">{{_('E-mail Address')}}</label>
       <input type="email" class="form-control" name="email" id="email" value="{{ content.email if content.email != None }}" autocomplete="off">
     </div>
     {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
@@ -23,7 +23,7 @@
         </div>
     {% endif %}
     <div class="form-group">
-      <label for="kindle_mail">{{_('Kindle E-Mail')}}</label>
+      <label for="kindle_mail">{{_('Send to Kindle E-mail Address')}}</label>
       <input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
     </div>
     {% if not content.role_anonymous() %}
@@ -38,9 +38,9 @@
     {% endif %}
 
     <div class="form-group">
-      <label for="default_language">{{_('Show books with language')}}</label>
+      <label for="default_language">{{_('Language of Books')}}</label>
         <select name="default_language" id="default_language" class="form-control">
-            <option value="all" {% if new_user == 1 %}selected{% endif %}>{{ _('Show all') }}</option>
+            <option value="all" {% if new_user == 1 %}selected{% endif %}>{{ _('Show All') }}</option>
             {%  for language in languages %}
             <option value="{{ language.lang_code }}" {% if content.default_language == language.lang_code %}selected{% endif %}>{{ language.name }}</option>
             {% endfor %}
@@ -73,7 +73,7 @@
 
       <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>
+          <label for="Show_detail_random">{{_('Show Random Books')}}</label>
       </div>
     </div>
       <div class="col-sm-6">
@@ -81,12 +81,12 @@
     {% if not content.role_anonymous() %}
     <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>
+      <label for="admin_role">{{_('Admin User')}}</label>
     </div>
     {% endif %}
     <div class="form-group">
         <input type="checkbox" name="Show_mature_content" id="Show_mature_content" {% if content.mature_content %}checked{% endif %}>
-        <label for="Show_mature_content">{{_('Show mature content')}}</label>
+        <label for="Show_mature_content">{{_('Show Mature Content')}}</label>
     </div>
     <div class="form-group">
       <input type="checkbox" name="download_role" id="download_role" {% if content.role_download() %}checked{% endif %}>
@@ -94,7 +94,7 @@
     </div>
     <div class="form-group">
       <input type="checkbox" name="viewer_role" id="viewer_role" {% if content.role_viewer() %}checked{% endif %}>
-      <label for="viewer_role">{{_('Allow book viewer')}}</label>
+      <label for="viewer_role">{{_('Allow eBook Viewer')}}</label>
     </div>
     <div class="form-group">
       <input type="checkbox" name="upload_role" id="upload_role" {% if content.role_upload() %}checked{% endif %}>
@@ -106,7 +106,7 @@
     </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>
+      <label for="delete_role">{{_('Allow Delete Books')}}</label>
     </div>
       {% if not content.role_anonymous() %}
         <div class="form-group">
@@ -122,15 +122,15 @@
     {% if g.user and g.user.role_admin() and not profile and not new_user and not content.role_anonymous() %}
       <div class="checkbox">
         <label>
-          <input type="checkbox" id="delete" name="delete"> {{_('Delete this user')}}
+          <input type="checkbox" id="delete" name="delete"> {{_('Delete User')}}
         </label>
       </div>
     {% endif %}
     </div>
       <div class="col-sm-12">
-    <button type="submit" id="submit" class="btn btn-default">{{_('Submit')}}</button>
+    <button type="submit" id="submit" class="btn btn-default">{{_('Save')}}</button>
     {% if not profile %}
-      <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Back')}}</a>
+      <a href="{{ url_for('admin.admin') }}" id="back" class="btn btn-default">{{_('Cancel')}}</a>
     {% endif %}
     </div>
   </form>
diff --git a/cps/ub.py b/cps/ub.py
index 85ed11272..95a322eac 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -61,7 +61,7 @@ def get_sidebar_config(kwargs=None):
                     "visibility": constants.SIDEBAR_HOT, 'public': True, "page": "hot", "show_text": _('Show hot books'),
                     "config_show":True})
     sidebar.append(
-        {"glyph": "glyphicon-star", "text": _('Best rated Books'), "link": 'web.books_list', "id": "rated",
+        {"glyph": "glyphicon-star", "text": _('Top Rated Books'), "link": 'web.books_list', "id": "rated",
          "visibility": constants.SIDEBAR_BEST_RATED, 'public': True, "page": "rated",
          "show_text": _('Show best rated books'), "config_show":True})
     sidebar.append({"glyph": "glyphicon-eye-open", "text": _('Read Books'), "link": 'web.books_list', "id": "read",
diff --git a/cps/web.py b/cps/web.py
index 000c23fd4..a59d73509 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -511,7 +511,7 @@ def books_list(data, sort, book_id, page):
             entries, random, pagination = fill_indexpage(page, db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
                                                          order)
             return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                         id=book_id, title=_(u"Best rated books"), page="rated")
+                                         id=book_id, title=_(u"Top Rated Books"), page="rated")
         else:
             abort(404)
     elif data == "discover":
@@ -519,7 +519,7 @@ def books_list(data, sort, book_id, page):
             entries, __, pagination = fill_indexpage(page, db.Books, True, [func.randomblob(2)])
             pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
             return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
-                                         title=_(u"Random Books"), page="discover")
+                                         title=_(u"Discover (Random Books)"), page="discover")
         else:
             abort(404)
     elif data == "unread":
@@ -572,7 +572,7 @@ def render_hot_books(page):
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (most downloaded)"), page="hot")
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
     else:
         abort(404)
 
@@ -583,7 +583,7 @@ def render_author_books(page, author_id, order):
                                              [order[0], db.Series.name, db.Books.series_index],
                                              db.books_series_link, db.Series)
     if entries is None or not len(entries):
-        flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
         return redirect(url_for("web.index"))
 
     author = db.session.query(db.Authors).get(author_id)
@@ -686,7 +686,7 @@ def author_list():
         for entry in entries:
             entry.Authors.name = entry.Authors.name.replace('|', ',')
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=u"Author list", page="authorlist", data='author')
+                                     title=u"Authors", page="authorlist", data='author')
     else:
         abort(404)
 
@@ -702,7 +702,7 @@ def publisher_list():
             .join(db.books_publishers_link).join(db.Books).filter(common_filters()) \
             .group_by(func.upper(func.substr(db.Publishers.name,1,1))).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=_(u"Publisher list"), page="publisherlist", data="publisher")
+                                     title=_(u"Publishers"), page="publisherlist", data="publisher")
     else:
         abort(404)
 
@@ -718,7 +718,7 @@ def series_list():
             .join(db.books_series_link).join(db.Books).filter(common_filters()) \
             .group_by(func.upper(func.substr(db.Series.sort,1,1))).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=_(u"Series list"), page="serieslist", data="series")
+                                     title=_(u"Series"), page="serieslist", data="series")
     else:
         abort(404)
 
@@ -773,7 +773,7 @@ def language_overview():
                                         func.count('books_languages_link.book').label('bookcount')).group_by(
             text('books_languages_link.lang_code')).all()
         return render_title_template('languages.html', languages=languages, lang_counter=lang_counter,
-                                     charlist=charlist, title=_(u"Available languages"), page="langlist",
+                                     charlist=charlist, title=_(u"Languages"), page="langlist",
                                      data="language")
     else:
         abort(404)
@@ -790,7 +790,7 @@ def category_list():
             .join(db.books_tags_link).join(db.Books).filter(common_filters()) \
             .group_by(func.upper(func.substr(db.Tags.name,1,1))).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                     title=_(u"Category list"), page="catlist", data="category")
+                                     title=_(u"Categories"), page="catlist", data="category")
     else:
         abort(404)