diff --git a/cps.py b/cps.py
index 32e9b43a..50ab0076 100755
--- a/cps.py
+++ b/cps.py
@@ -41,6 +41,7 @@ from cps.shelf import shelf
 from cps.admin import admi
 from cps.gdrive import gdrive
 from cps.editbooks import editbook
+from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
 
 try:
@@ -68,6 +69,7 @@ def main():
     app.register_blueprint(about)
     app.register_blueprint(shelf)
     app.register_blueprint(admi)
+    app.register_blueprint(remotelogin)
     # if config.config_use_google_drive:
     app.register_blueprint(gdrive)
     app.register_blueprint(editbook)
diff --git a/cps/remotelogin.py b/cps/remotelogin.py
index 39a1d8e6..a448e5fc 100644
--- a/cps/remotelogin.py
+++ b/cps/remotelogin.py
@@ -26,6 +26,7 @@ from datetime import datetime
 from flask import Blueprint, request, make_response, abort, url_for, flash, redirect
 from flask_login import login_required, current_user, login_user
 from flask_babel import gettext as _
+from sqlalchemy.sql.expression import true
 
 from . import config, logger, ub
 from .render_template import render_title_template
@@ -60,7 +61,7 @@ def remote_login():
     ub.session.add(auth_token)
     ub.session.commit()
 
-    verify_url = url_for('web.verify_token', token=auth_token.auth_token, _external=true)
+    verify_url = url_for('remotelogin.verify_token', token=auth_token.auth_token, _external=true)
     log.debug(u"Remot Login request with token: %s", auth_token.auth_token)
     return render_title_template('remote_login.html', title=_(u"login"), token=auth_token.auth_token,
                                  verify_url=verify_url, page="remotelogin")
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index 383f7e37..de7a694c 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -240,7 +240,7 @@ body.blur .row-fluid .col-sm-10 {
 
 .col-sm-10 .book-meta > div.btn-toolbar:after {
     content: '';
-    direction: block;
+    direction: ltr;
     position: fixed;
     top: 120px;
     right: 0;
@@ -398,20 +398,17 @@ body.blur .row-fluid .col-sm-10 {
 
 .shelforder #sortTrue > div:hover {
     background-color: hsla(0, 0%, 100%, .06) !important;
-    cursor: move;
     cursor: grab;
-    cursor: -webkit-grab;
     color: #eee
 }
 
 .shelforder #sortTrue > div:active {
     cursor: grabbing;
-    cursor: -webkit-grabbing
 }
 
 .shelforder #sortTrue > div:before {
     content: "\EA53";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     margin-right: 30px;
     margin-left: 15px;
     vertical-align: bottom;
@@ -446,7 +443,7 @@ body.blur .row-fluid .col-sm-10 {
 
 body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     content: "\e155";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -494,7 +491,7 @@ body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
 }
 
 #have_read_cb + label:before, #have_read_cb:checked + label:before {
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-size: 16px;
     height: 40px;
     width: 60px;
@@ -550,13 +547,12 @@ body.shelforder > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     height: 60px;
     width: 50px;
     cursor: pointer;
-    margin: 0;
     display: inline-block;
-    margin-top: -4px;
+    margin: -4px 0 0;
 }
 
 #archived_cb + label:before, #archived_cb:checked + label:before {
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-size: 16px;
     height: 40px;
     width: 60px;
@@ -618,7 +614,7 @@ div[aria-label="Edit/Delete book"] > .btn > span {
 
 div[aria-label="Edit/Delete book"] > .btn > span:before {
     content: "\EA5d";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     font-size: 20px;
     padding: 16px 15px;
     display: inline-block;
@@ -641,7 +637,7 @@ div[aria-label="Edit/Delete book"] > .btn > span:hover {
     width: 225px;
     max-width: 225px;
     position: relative !important;
-    left: auto !important; 
+    left: auto !important;
     top: auto !important;
     -webkit-transform: none !important;
     -ms-transform: none !important;
@@ -760,7 +756,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-header > a
 
 .home-btn {
     color: hsla(0, 0%, 100%, .7);
-    line-height: 34.29px;
+    line-height: 34px;
     margin: 0;
     padding: 0;
     position: absolute;
@@ -770,7 +766,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-header > a
 
 .home-btn > a {
     color: rgba(255, 255, 255, .7);
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     line-height: 60px;
     position: relative;
     text-align: center;
@@ -800,7 +796,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.home-btn > a:hove
 
 .glyphicon-search:before {
     content: "\EA4F";
-    font-family: plex-icons
+    font-family: plex-icons, serif
 }
 
 #nav_about:after, .profileDrop > span:after, .profileDrop > span:before {
@@ -817,7 +813,6 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.home-btn > a:hove
 }
 
 body:not(.read-frame) {
-    background-image: url(images/caliblur/blur-noise.png), url(images/caliblur/blur-light.png) !important;
     background-repeat: repeat, no-repeat !important;
     background-attachment: fixed, fixed !important;
     background-position: center center, center center !important;
@@ -826,14 +821,13 @@ body:not(.read-frame) {
     -moz-background-size: auto, cover !important;
     -o-background-size: auto, cover !important;
     line-height: 1.71428571;
-    background: url(images/caliblur/blur-noise.png), var(--color-background);
     color: hsla(0, 0%, 100%, .45);
     font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
     font-weight: 400;
     overflow: hidden;
     margin: 0;
     /* scroll bar fix for firefox  */
-    scrollbar-color: hsla(0, 0%, 100%, .2) transparent; 
+    scrollbar-color: hsla(0, 0%, 100%, .2) transparent;
     scrollbar-width: thin;
 }
 
@@ -966,7 +960,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
 
 #form-upload .form-group .btn:before {
     content: "\e043";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -991,7 +985,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
 #form-upload .form-group .btn:after {
     content: "\EA13";
     position: absolute;
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 8px;
     background: #3c444a;
     color: hsla(0, 0%, 100%, .7);
@@ -1019,7 +1013,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
     text-transform: none;
     font-weight: 400;
     font-style: normal;
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
     line-height: 1;
@@ -1075,7 +1069,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > d
 
 body > div.navbar.navbar-default.navbar-static-top > div > form > div > span > button:before {
     content: "\EA32";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     color: #eee;
     background: #555;
     font-size: 10px;
@@ -1097,7 +1091,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form > div > span > b
 body > div.navbar.navbar-default.navbar-static-top > div > form:before {
     content: "\EA4F";
     display: block;
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     position: absolute;
     color: #eee;
     font-weight: 400;
@@ -1120,7 +1114,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > form:before {
 body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > div > span.input-group-btn:before {
     content: "\EA4F";
     display: block;
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     position: absolute;
     left: -298px;
     top: 8px;
@@ -1193,7 +1187,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-collapse.c
 
 body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-collapse.collapse > ul > li > #top_admin > .glyphicon-dashboard::before {
     content: "\EA31";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 20px
 }
 
@@ -1272,7 +1266,7 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
     user-select: none
 }
 
-.navigation li, .navigation li:not(ul>li) {
+.navigation li, .navigation li:not(ul > li) {
     border-radius: 0 4px 4px 0
 }
 
@@ -1352,32 +1346,32 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
 
 #nav_hot .glyphicon-fire::before {
     content: "\1F525";
-    font-family: glyphicons regular
+    font-family: glyphicons regular, serif
 }
 
 .glyphicon-star:before {
     content: "\EA10";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #nav_rand .glyphicon-random::before {
     content: "\EA44";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 .glyphicon-list::before {
     content: "\EA4D";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #nav_about .glyphicon-info-sign::before {
     content: "\EA26";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #nav_cat .glyphicon-inbox::before, .glyphicon-tags::before {
     content: "\E067";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     margin-left: 2px
 }
 
@@ -1423,7 +1417,7 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
 
 .navigation .create-shelf a:before {
     content: "\EA13";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 100%;
     padding-right: 10px;
     vertical-align: middle
@@ -1473,7 +1467,7 @@ body > div.container-fluid > div > div.col-sm-10 > div > form > a:hover {
 
 #books > .cover > a:before, #books_rand > .cover > a:before, .book.isotope-item > .cover > a:before, body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form > div.col-sm-12 > div.col-sm-12 > div.col-sm-2 > a:before {
     content: "\e352";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     background: var(--color-secondary);
     border-radius: 50%;
     font-weight: 400;
@@ -1521,8 +1515,8 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form
     top: 0;
     left: 0;
     opacity: 0;
-    background: -webkit-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
-    background: -o-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -webkit-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -o-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     background: radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     z-index: -9
 }
@@ -1562,8 +1556,8 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form
     top: 0;
     left: 0;
     opacity: 0;
-    background: -webkit-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
-    background: -o-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -webkit-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -o-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     background: radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%)
 }
 
@@ -1739,7 +1733,7 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 {
 
 body.me > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     content: '';
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     font-size: 6vw;
@@ -1947,7 +1941,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.pagination .page-next > a
 body > div.container-fluid > div > div.col-sm-10 > div.pagination .page-previous > a
 {
     top: 0;
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 100;
     -webkit-font-smoothing: antialiased;
     line-height: 60px;
@@ -2026,7 +2020,7 @@ body.authorlist > div.container-fluid > div > div.col-sm-10 > div.container > di
 
 body.serieslist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e044";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -2131,7 +2125,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > div.container
 
 body.catlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
     content: "\E067";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -2151,7 +2145,7 @@ body.catlist > div.container-fluid > div.row-fluid > div.col-sm-10:before {
 
 
 body.authorlist > div.container-fluid > div.row-fluid > div.col-sm-10:before, body.langlist > div.container-fluid > div > div.col-sm-10:before {
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -2250,7 +2244,7 @@ body.langlist > div.container-fluid > div > div.col-sm-10 > div.container:before
 
 body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
     padding: 15px 10px 15px 40px;
-} 
+}
 
 @media screen and (max-width: 992px) {
     body.advsearch > div.container-fluid > div > div.col-sm-10 > div.col-md-10.col-lg-6 {
@@ -2492,7 +2486,6 @@ body > div.container-fluid > div > div.col-sm-10 > div.col-sm-8 > form > .btn.bt
 }
 
 textarea {
-    resize: none;
     resize: vertical
 }
 
@@ -2838,7 +2831,7 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-8 > form
 
 body.advanced_search > div.container-fluid > div > div.col-sm-10 > div.col-sm-8:before {
     content: "\EA4F";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -3195,7 +3188,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div.
 
 #add-to-shelf > span.glyphicon.glyphicon-list:before {
     content: "\EA59";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     font-size: 18px
 }
 
@@ -3207,7 +3200,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div.
 
 #read-in-browser > span.glyphicon-eye-open:before, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.glyphicon-eye-open:before {
     content: "\e352";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-size: 18px;
     padding-right: 5px
 }
@@ -3219,7 +3212,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div.
 #btnGroupDrop1 > span.glyphicon-download:before {
     font-size: 20px;
     content: "\ea66";
-    font-family: plex-icons
+    font-family: plex-icons, serif
 }
 
 .col-sm-10 .book-meta > div.btn-toolbar {
@@ -3323,7 +3316,6 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd
     -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .35);
     box-shadow: 0 4px 10px rgba(0, 0, 0, .35);
     -o-transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
-    transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
     transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4), -webkit-transform .15s cubic-bezier(.6, .4, .2, 1.4);
     -webkit-transform-origin: center top;
     -ms-transform-origin: center top;
@@ -3441,7 +3433,7 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > .btn-primary:l
 
 .book-meta > div.more-stuff > .btn-toolbar > .btn-group[aria-label="Remove from shelves"] > a > .glyphicon-remove:before {
     content: "\ea64";
-    font-family: plex-icons
+    font-family: plex-icons, serif
 }
 
 body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form > .col-sm-6 {
@@ -3555,7 +3547,7 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-b
 
 body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-btn-group > [data-target="#DeleteShelfDialog"]:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .7);
     font-size: 20px;
@@ -3585,7 +3577,7 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-b
 
 body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-btn-group > [href*=edit]:before {
     content: "\EA5d";
-    font-family: plex-icons;
+    font-family: plex-icons, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .7);
     font-size: 20px;
@@ -3615,7 +3607,7 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-b
 
 body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > .shelf-btn-group > [href*=order]:before {
     content: "\E409";
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .7);
     font-size: 20px;
@@ -3752,7 +3744,7 @@ body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-header > a
 
 .plexBack > a {
     color: rgba(255, 255, 255, .7);
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     -webkit-font-variant-ligatures: normal;
     font-variant-ligatures: normal;
     line-height: 60px;
@@ -3864,11 +3856,9 @@ body.login > div.container-fluid > div.row-fluid > div.col-sm-10::before, body.l
     -webkit-transform: translateY(-50%);
     -ms-transform: translateY(-50%);
     transform: translateY(-50%);
-    border-style: solid;
     vertical-align: middle;
     -webkit-transition: border .2s, -webkit-transform .4s;
     -o-transition: border .2s, transform .4s;
-    transition: border .2s, transform .4s;
     transition: border .2s, transform .4s, -webkit-transform .4s;
     margin: 9px 6px
 }
@@ -3887,11 +3877,9 @@ body.login > div.container-fluid > div.row-fluid > div.col-sm-10::before, body.l
     -webkit-transform: translateY(-50%);
     -ms-transform: translateY(-50%);
     transform: translateY(-50%);
-    border-style: solid;
     vertical-align: middle;
     -webkit-transition: border .2s, -webkit-transform .4s;
     -o-transition: border .2s, transform .4s;
-    transition: border .2s, transform .4s;
     transition: border .2s, transform .4s, -webkit-transform .4s;
     margin: 12px 6px
 }
@@ -3971,7 +3959,7 @@ body.author img.bg-blur[src=undefined] {
 
 body.author:not(.authorlist) .undefined-img:before {
     content: "\e008";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -4120,7 +4108,7 @@ body.shelf.modal-open > .container-fluid {
     font-size: 18px;
     color: #999;
     display: inline-block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400
 }
@@ -4221,7 +4209,7 @@ body.shelf.modal-open > .container-fluid {
 
 #remove-from-shelves > .btn > span:before {
     content: "\EA52";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     color: transparent;
     padding-left: 5px
 }
@@ -4233,7 +4221,7 @@ body.shelf.modal-open > .container-fluid {
 
 #remove-from-shelves > a:first-of-type:before {
     content: "\EA4D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     position: absolute;
     color: hsla(0, 0%, 100%, .45);
     font-style: normal;
@@ -4273,7 +4261,7 @@ body.shelf.modal-open > .container-fluid {
     content: "\E208";
     padding-right: 10px;
     display: block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     position: absolute;
@@ -4284,7 +4272,6 @@ body.shelf.modal-open > .container-fluid {
     opacity: .5;
     -webkit-transition: -webkit-transform .3s ease-out;
     -o-transition: transform .3s ease-out;
-    transition: transform .3s ease-out;
     transition: transform .3s ease-out, -webkit-transform .3s ease-out;
     -webkit-transform: translate(0, -60px);
     -ms-transform: translate(0, -60px);
@@ -4344,7 +4331,7 @@ body.advanced_search > div.container-fluid > div > div.col-sm-10 > div.col-sm-8
 
 .glyphicon-remove:before {
     content: "\EA52";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400
 }
 
@@ -4430,7 +4417,7 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div
 
     body:not(.blur) #nav_new:before {
         content: "\EA4F";
-        font-family: plex-icons;
+        font-family: plex-icons, serif;
         font-style: normal;
         font-weight: 400;
         line-height: 1;
@@ -4456,7 +4443,7 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div
         color: hsla(0, 0%, 100%, .7);
         cursor: pointer;
         display: block;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         font-size: 20px;
         font-stretch: 100%;
         font-style: normal;
@@ -4552,12 +4539,12 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
 }
 
 body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > div.row > div.col .table > tbody > tr > td, body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > div.row > div.col .table > tbody > tr > th, body.admin > div.container-fluid > div > div.col-sm-10 > div.discover > .table > tbody > tr > td, body.admin > div.container-fluid > div > div.col-sm-10 > div.discover > .table > tbody > tr > th {
-    border: collapse
+    border: collapse;
 }
 
 body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10::before, body.newuser.admin > div.container-fluid > div.row-fluid > div.col-sm-10::before {
     content: '';
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     font-size: 6vw;
@@ -4661,7 +4648,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     content: "\e352";
     display: inline-block;
     position: absolute;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     background: var(--color-secondary);
     color: #fff;
     border-radius: 50%;
@@ -4699,8 +4686,8 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     top: 0;
     left: 0;
     opacity: 0;
-    background: -webkit-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
-    background: -o-radial-gradient(50% 50%, farthest-corner, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -webkit-radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
+    background: -o-radial-gradient(farthest-corner 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%);
     background: radial-gradient(farthest-corner at 50% 50%, rgba(50, 50, 50, .5) 50%, #323232 100%)
 }
 
@@ -4752,7 +4739,7 @@ body.admin td > a:hover {
 
 .glyphicon-ok::before {
     content: "\EA55";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400
 }
 
@@ -4821,7 +4808,7 @@ body:not(.blur):not(.login):not(.me):not(.author):not(.editbook):not(.upload):no
     background-position: center center, center center, center center !important;
     background-size: auto, auto, cover !important;
     -webkit-background-size: auto, auto, cover !important;
-    -moz-background-size: autom, auto, cover !important;
+    -moz-background-size: auto, auto, cover !important;
     -o-background-size: auto, auto, cover !important;
     width: 100%;
     height: 60px;
@@ -4887,7 +4874,6 @@ body.read:not(.blur) a[href*=readbooks] {
 .tooltip.in {
     opacity: 1;
     -o-transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
-    transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4);
     transition: opacity .15s ease-out, transform .15s cubic-bezier(.6, .4, .2, 1.4), -webkit-transform .15s cubic-bezier(.6, .4, .2, 1.4);
     -webkit-transform: translate(0) scale(1);
     -ms-transform: translate(0) scale(1);
@@ -4987,7 +4973,7 @@ body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div
 
 body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-3 > div.text-center > #delete:before, body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > form > div.col-sm-3 > div.text-center > #delete:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 18px;
     color: hsla(0, 0%, 100%, .7)
 }
@@ -5072,7 +5058,7 @@ body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.boot
 
 body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.bootstrap-table > div.fixed-table-container > div.fixed-table-body > #table > thead > tr > th > .th-inner.asc:after {
     content: "\EA58";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400;
     right: 20px;
     position: absolute
@@ -5080,7 +5066,7 @@ body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.boot
 
 body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.bootstrap-table > div.fixed-table-container > div.fixed-table-body > #table > thead > tr > th > .th-inner.desc:after {
     content: "\EA57";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400;
     right: 20px;
     position: absolute
@@ -5143,7 +5129,7 @@ body.tasks > div.container-fluid > div > div.col-sm-10 > div.discover > div.boot
 
 .epub-back:before {
     content: "\EA1C";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-weight: 400;
     color: #4f4f4f;
     position: absolute;
@@ -5306,7 +5292,7 @@ body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm
 
 body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3 > div.text-center > #delete:before, body.upload > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm-3 > div.text-center > #delete:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 18px;
     color: hsla(0, 0%, 100%, .7);
     vertical-align: super
@@ -5466,7 +5452,7 @@ body.editbook > div.container-fluid > div.row-fluid > div.col-sm-10 > div.col-sm
 
 #main-nav + #scnd-nav .create-shelf a:before {
     content: "\EA13";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     font-size: 100%;
     padding-right: 10px;
     vertical-align: middle
@@ -5511,7 +5497,7 @@ body.admin.modal-open .navbar {
     content: "\E208";
     padding-right: 10px;
     display: block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     position: absolute;
@@ -5522,7 +5508,6 @@ body.admin.modal-open .navbar {
     opacity: .5;
     -webkit-transition: -webkit-transform .3s ease-out;
     -o-transition: transform .3s ease-out;
-    transition: transform .3s ease-out;
     transition: transform .3s ease-out, -webkit-transform .3s ease-out;
     -webkit-transform: translate(0, -60px);
     -ms-transform: translate(0, -60px);
@@ -5576,22 +5561,22 @@ body.admin.modal-open .navbar {
 
 #RestartDialog > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA4F";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before {
     content: "\E064";
-    font-family: glyphicons regular
+    font-family: glyphicons regular, serif
 }
 
 #StatusDialog > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA15";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #RestartDialog > .modal-dialog > .modal-content > .modal-header:after {
@@ -6073,7 +6058,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     body > div.navbar.navbar-default.navbar-static-top > div > form.search-focus > div > span.input-group-btn:before {
         content: "\EA33";
         display: block;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         position: fixed;
         left: 0;
         top: 0;
@@ -6225,7 +6210,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     #form-upload .form-group .btn:before {
         content: "\e043";
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         line-height: 1;
         -webkit-font-smoothing: antialiased;
         color: #fff;
@@ -6243,7 +6228,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     #form-upload .form-group .btn:after {
         content: "\EA13";
         position: absolute;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         font-size: 8px;
         background: #3c444a;
         color: #fff;
@@ -6305,7 +6290,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
     #top_admin > .glyphicon, #top_tasks > .glyphicon-tasks {
         position: relative;
         top: 0;
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         line-height: 1;
         border-radius: 0;
         background: 0 0;
@@ -6324,7 +6309,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     #top_tasks > .glyphicon-tasks::before, body > div.navbar.navbar-default.navbar-static-top > div > div.navbar-collapse.collapse > ul > li > #top_admin > .glyphicon-dashboard::before {
         text-transform: none;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         text-rendering: optimizeLegibility;
@@ -6649,7 +6634,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
     .author > .container-fluid > .row-fluid > .col-sm-10 > h2:after {
         content: "\e008";
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         font-style: normal;
         font-weight: 400;
         line-height: 1;
@@ -6854,7 +6839,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         color: hsla(0, 0%, 100%, .7);
         cursor: pointer;
         display: block;
-        font-family: plex-icons-new;
+        font-family: plex-icons-new, serif;
         font-size: 20px;
         font-stretch: 100%;
         font-style: normal;
@@ -7025,11 +7010,9 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         -webkit-transform: translateY(-50%);
         -ms-transform: translateY(-50%);
         transform: translateY(-50%);
-        border-style: solid;
         vertical-align: middle;
         -webkit-transition: border .2s, -webkit-transform .4s;
         -o-transition: border .2s, transform .4s;
-        transition: border .2s, transform .4s;
         transition: border .2s, transform .4s, -webkit-transform .4s;
         margin: 12px 6px
     }
@@ -7048,18 +7031,16 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         -webkit-transform: translateY(-50%);
         -ms-transform: translateY(-50%);
         transform: translateY(-50%);
-        border-style: solid;
         vertical-align: middle;
         -webkit-transition: border .2s, -webkit-transform .4s;
         -o-transition: border .2s, transform .4s;
-        transition: border .2s, transform .4s;
         transition: border .2s, transform .4s, -webkit-transform .4s;
         margin: 9px 6px
     }
 
     body.author:not(.authorlist) .blur-wrapper:before, body.author > .container-fluid > .row-fluid > .col-sm-10 > h2:after {
         content: "\e008";
-        font-family: 'Glyphicons Halflings';
+        font-family: 'Glyphicons Halflings', serif;
         font-weight: 400;
         z-index: 9;
         line-height: 1;
@@ -7390,7 +7371,6 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         transform: translate3d(0, 0, 0);
         -webkit-transition: -webkit-transform .5s;
         -o-transition: transform .5s;
-        transition: transform .5s;
         transition: transform .5s, -webkit-transform .5s;
         z-index: 99
     }
@@ -7405,7 +7385,6 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         transform: translate3d(-240px, 0, 0);
         -webkit-transition: -webkit-transform .5s;
         -o-transition: transform .5s;
-        transition: transform .5s;
         transition: transform .5s, -webkit-transform .5s;
         top: 0;
         margin: 0;
@@ -7444,7 +7423,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         text-align: center;
         min-width: 40px;
         pointer-events: none;
-        color: #
+        // color: #
     }
 
     .col-xs-12 > .row > .col-xs-10 {
@@ -7555,7 +7534,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
 
 body.publisherlist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e241";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -7575,7 +7554,7 @@ body.publisherlist > div.container-fluid > div > div.col-sm-10:before {
 
 body.ratingslist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e007";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -7601,7 +7580,7 @@ body.ratingslist > div.container-fluid > div > div.col-sm-10:before {
 
 body.formatslist > div.container-fluid > div > div.col-sm-10:before {
     content: "\e022";
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Glyphicons Halflings', serif;
     font-style: normal;
     font-weight: 400;
     line-height: 1;
@@ -7776,7 +7755,7 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .editabl
 
 body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphicon-trash:before {
     content: "\EA6D";
-    font-family: plex-icons-new
+    font-family: plex-icons-new, serif
 }
 
 #DeleteDomain {
@@ -7799,7 +7778,7 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic
     content: "\E208";
     padding-right: 10px;
     display: block;
-    font-family: Glyphicons Regular;
+    font-family: Glyphicons Regular, serif;
     font-style: normal;
     font-weight: 400;
     position: absolute;
@@ -7810,7 +7789,6 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic
     opacity: .5;
     -webkit-transition: -webkit-transform .3s ease-out;
     -o-transition: transform .3s ease-out;
-    transition: transform .3s ease-out;
     transition: transform .3s ease-out, -webkit-transform .3s ease-out;
     -webkit-transform: translate(0, -60px);
     -ms-transform: translate(0, -60px);
@@ -7849,7 +7827,7 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic
 
 #DeleteDomain > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
-    font-family: plex-icons-new;
+    font-family: plex-icons-new, serif;
     padding-right: 10px;
     font-size: 18px;
     color: #999;
diff --git a/cps/static/css/main.css b/cps/static/css/main.css
index 08506bc2..2831a0fd 100644
--- a/cps/static/css/main.css
+++ b/cps/static/css/main.css
@@ -25,10 +25,9 @@ body {
   overflow: hidden;
   -webkit-transition: -webkit-transform 0.4s, width 0.2s;
   -moz-transition: -webkit-transform 0.4s, width 0.2s;
-  -ms-transition: -webkit-transform 0.4s, width 0.2s;
+  transition: -webkit-transform 0.4s, width 0.2s;
   -moz-box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
   -webkit-box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
-  -ms-box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
   box-shadow: inset 0 0 50px rgba(0, 0, 0, 0.1);
 }
 
@@ -45,7 +44,7 @@ body {
   text-align: center;
   -webkit-transition: opacity 0.5s;
   -moz-transition: opacity 0.5s;
-  -ms-transition: opacity 0.5s;
+  transition: opacity 0.5s;
   z-index: 10;
 }
 
@@ -79,7 +78,6 @@ body {
   color: rgba(0, 0, 0, 0.6);
   -moz-box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
   -webkit-box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
-  -ms-box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
   box-shadow: inset 0 0 6px rgba(155, 155, 155, 0.8);
 }
 
@@ -121,7 +119,6 @@ body {
   font-weight: bold;
   cursor: pointer;
   -webkit-user-select: none;
-  -khtml-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
@@ -147,7 +144,7 @@ body {
   height: 100%;
   -webkit-transition: -webkit-transform 0.5s;
   -moz-transition: -moz-transform 0.5s;
-  -ms-transition: -moz-transform 0.5s;
+  transition: -moz-transform 0.5s;
   overflow: hidden;
 }
 
@@ -183,7 +180,6 @@ body {
   height: 14px;
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
-  -ms-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6);
 }
 
@@ -232,7 +228,6 @@ body {
 
 input::-webkit-input-placeholder { color: #454545; }
 input:-moz-placeholder { color: #454545; }
-input:-ms-placeholder { color: #454545; }
 
 #divider {
   position: absolute;
@@ -268,18 +263,18 @@ input:-ms-placeholder { color: #454545; }
   width: 25%;
   height: 100%;
   visibility: hidden;
-  -webkit-transition: visibility 0 ease 0.5s;
-  -moz-transition: visibility 0 ease 0.5s;
-  -ms-transition: visibility 0 ease 0.5s;
+  -webkit-transition: visibility 0s ease 0.5s;
+  -moz-transition: visibility 0s ease 0.5s;
+  transition: visibility 0s ease 0.5s;
 }
 
 #sidebar.open #tocView,
 #sidebar.open #bookmarksView {
   overflow-y: auto;
   visibility: visible;
-  -webkit-transition: visibility 0 ease 0;
-  -moz-transition: visibility 0 ease 0;
-  -ms-transition: visibility 0 ease 0;
+  -webkit-transition: visibility 0s ease 0s;
+  -moz-transition: visibility 0s ease 0s;
+  transition: visibility 0s ease 0s;
 }
 
 #sidebar.open #tocView {
@@ -495,9 +490,8 @@ input:-ms-placeholder { color: #454545; }
   position: fixed;
   top: 50%;
   left: 50%;
-  width: 50%;
+  // width: 50%;
   width: 630px;
-
   height: auto;
   z-index: 2000;
   visibility: hidden;
@@ -518,7 +512,6 @@ input:-ms-placeholder { color: #454545; }
   background: rgba(255, 255, 255, 0.8);
   -webkit-transition: all 0.3s;
   -moz-transition: all 0.3s;
-  -ms-transition: all 0.3s;
   transition: all 0.3s;
 }
 
@@ -588,7 +581,6 @@ input:-ms-placeholder { color: #454545; }
   opacity: 0;
   -webkit-transition: all 0.3s;
   -moz-transition: all 0.3s;
-  -ms-transition: all 0.3s;
   transition: all 0.3s;
 }
 
@@ -601,7 +593,7 @@ input:-ms-placeholder { color: #454545; }
 }
 
 .md-content > .closer {
-  font-size: 18px;
+  //font-size: 18px;
   position: absolute;
   right: 0;
   top: 0;
@@ -663,7 +655,7 @@ input:-ms-placeholder { color: #454545; }
     -ms-transform: translate(0, 0);
     -webkit-transition: -webkit-transform .3s;
     -moz-transition: -moz-transform .3s;
-    -ms-transition: -moz-transform .3s;
+    transition: -moz-transform .3s;
   }
 
   #main.closed {
@@ -778,7 +770,7 @@ and (orientation : landscape)
 }
 
 [class^="icon-"]:before, [class*=" icon-"]:before {
-    font-family: "fontello";
+    font-family: "fontello", serif;
     font-style: normal;
     font-weight: normal;
     speak: none;
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 47b0c4cb..99031aaa 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -241,7 +241,7 @@ span.glyphicon.glyphicon-tags {
 .button-link {color: #fff; }
 .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; }
+.btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left: 0; }
 .panel-body {background-color: #f5f5f5; }
 .spinner {margin: 0 41%; }
 .spinner2 {margin: 0 41%; }
@@ -311,11 +311,11 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
 .editable-input { display:inline-block; }
 
 .editable-cancel {
-  margin-bottom: 0px !important;
+  margin-bottom: 0 !important;
   margin-left: 7px !important;
 }
 
-.editable-submit { margin-bottom: 0px !important; }
+.editable-submit { margin-bottom: 0 !important; }
 .filterheader { margin-bottom: 20px; }
 .errorlink { margin-top: 20px; }
 .emailconfig { margin-top: 10px; }
@@ -326,7 +326,7 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
 }
 
 div.log {
-  font-family: Courier New;
+  font-family: Courier New, serif;
   font-size: 12px;
   box-sizing: border-box;
   height: 700px;
diff --git a/cps/static/js/filter_list.js b/cps/static/js/filter_list.js
index 676ff47b..679c5359 100644
--- a/cps/static/js/filter_list.js
+++ b/cps/static/js/filter_list.js
@@ -19,16 +19,9 @@ var direction = 0;  // Descending order
 var sort = 0;       // Show sorted entries
 
 $("#sort_name").click(function() {
-    var class_name = $("h1").attr('Class') + "_sort_name";
+    var className = $("h1").attr("Class") + "_sort_name";
     var obj = {};
-    obj[class_name] = sort;
-    /*$.ajax({
-        method:"post",
-        contentType: "application/json; charset=utf-8",
-        dataType: "json",
-        url: window.location.pathname + "/../../ajax/view",
-        data: JSON.stringify({obj}),
-    });*/
+    obj[className] = sort;
 
     var count = 0;
     var index = 0;
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 62f7e220..eb349c2b 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -45,14 +45,13 @@ $(function() {
             if (selections.length < 1) {
                 $("#delete_selection").addClass("disabled");
                 $("#delete_selection").attr("aria-disabled", true);
-            }
-            else{
+            } else {
                 $("#delete_selection").removeClass("disabled");
                 $("#delete_selection").attr("aria-disabled", false);
             }
         });
     $("#delete_selection").click(function() {
-        $("#books-table").bootstrapTable('uncheckAll');
+        $("#books-table").bootstrapTable("uncheckAll");
     });
 
     $("#merge_confirm").click(function() {
@@ -63,8 +62,8 @@ $(function() {
             url: window.location.pathname + "/../../ajax/mergebooks",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success() {
-                $('#books-table').bootstrapTable('refresh');
-                $("#books-table").bootstrapTable('uncheckAll');
+                $("#books-table").bootstrapTable("refresh");
+                $("#books-table").bootstrapTable("uncheckAll");
             }
         });
     });
@@ -76,11 +75,11 @@ $(function() {
             dataType: "json",
             url: window.location.pathname + "/../../ajax/simulatemerge",
             data: JSON.stringify({"Merge_books":selections}),
-            success: function success(book_titles) {
-                $.each(book_titles.from, function(i, item) {
+            success: function success(booTitles) {
+                $.each(booTitles.from, function(i, item) {
                     $("<span>- " + item + "</span>").appendTo("#merge_from");
                 });
-                $('#merge_to').text("- " + book_titles.to);
+                $("#merge_to").text("- " + booTitles.to);
 
             }
         });
@@ -126,34 +125,35 @@ $(function() {
         formatNoMatches: function () {
             return "";
         },
+        // eslint-disable-next-line no-unused-vars
         onEditableSave: function (field, row, oldvalue, $el) {
-        if (field === 'title' || field === 'authors') {
-            $.ajax({
-                method:"get",
-                dataType: "json",
-                url: window.location.pathname + "/../../ajax/sort_value/" + field + '/' + row.id,
-                success: function success(data) {
-                    var key = Object.keys(data)[0]
-                    $("#books-table").bootstrapTable('updateCellByUniqueId', {
-                        id: row.id,
-                        field: key,
-                        value: data[key]
-                    });
-                    console.log(data);
-                }
-            });
-         }
+            if (field === "title" || field === "authors") {
+                $.ajax({
+                    method:"get",
+                    dataType: "json",
+                    url: window.location.pathname + "/../../ajax/sort_value/" + field + "/" + row.id,
+                    success: function success(data) {
+                        var key = Object.keys(data)[0];
+                        $("#books-table").bootstrapTable("updateCellByUniqueId", {
+                            id: row.id,
+                            field: key,
+                            value: data[key]
+                        });
+                        // console.log(data);
+                    }
+                });
+            }
         },
+        // eslint-disable-next-line no-unused-vars
         onColumnSwitch: function (field, checked) {
-            var visible = $("#books-table").bootstrapTable('getVisibleColumns');
-            var hidden  = $("#books-table").bootstrapTable('getHiddenColumns');
-            var visibility =[]
-             var st = ""
+            var visible = $("#books-table").bootstrapTable("getVisibleColumns");
+            var hidden  = $("#books-table").bootstrapTable("getHiddenColumns");
+            var st = "";
             visible.forEach(function(item) {
-                st += "\""+ item.field + "\":\"" +"true"+ "\","
+                st += "\"" + item.field + "\":\"" + "true" + "\",";
             });
             hidden.forEach(function(item) {
-                st += "\""+ item.field + "\":\"" +"false"+ "\","
+                st += "\"" + item.field + "\":\"" + "false" + "\",";
             });
             st = st.slice(0, -1);
             $.ajax({
diff --git a/cps/templates/login.html b/cps/templates/login.html
index a031d949..7ae56d1b 100644
--- a/cps/templates/login.html
+++ b/cps/templates/login.html
@@ -22,7 +22,7 @@
     <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('remotelogin.remote_login')}}" id="remote_login" class="pull-right">{{_('Log in with Magic Link')}}</a>
     {% endif %}
     {% if config.config_login_type == 2 %}
       {% if 1 in oauth_check %}
diff --git a/cps/templates/remote_login.html b/cps/templates/remote_login.html
index ce755afd..bfa1b115 100644
--- a/cps/templates/remote_login.html
+++ b/cps/templates/remote_login.html
@@ -4,7 +4,7 @@
   <h2 style="margin-top: 0">{{_('Magic Link - Authorise New Device')}}</h2>
   <p>
     {{_('On another device, login and visit:')}}
-  <h4><a href="{{verify_url}}">{{verify_url}}</a></b>
+  <h4><a id="verify_url" href="{{verify_url}}">{{verify_url}}</a></b>
   </h4>
   <p>
     {{_('Once verified, you will automatically be logged in on this device.')}}
@@ -20,7 +20,7 @@
   (function () {
     // Poll the server to check if the user has authenticated
     var t = setInterval(function () {
-      $.post('{{url_for("web.token_verified")}}', { token: '{{token}}' })
+      $.post('{{url_for("remotelogin.token_verified")}}', { token: '{{token}}' })
         .done(function(response) {
           if (response.status === 'success') {
             // Wait a tick so cookies are updated