diff --git a/www/index.html b/www/index.html
index 6fd84960..9f203872 100644
--- a/www/index.html
+++ b/www/index.html
@@ -657,13 +657,14 @@
                         <h2 style="margin-top:0;">Configuration</h2>
                         <div id="alertBoxPersistent"></div>
                         <p id="usage" style="margin: 1em auto 1em;">For <b>instructions</b> and <b>usage guide</b>, please see the <a href="#" class="aboutLink"><b>About tab</b> <span class="glyphicon glyphicon-info-sign"></span></a> (top right).</p>
+                        <p>App version: <b><span class="version"></span></b> <span id="updateCheck">[<a class="unhideLibrary" href="#btnRescanDeviceStorage">check for updates</a>]</span> </p>
                         <p class="packagedInfo" style="display: none; margin-top: 1em;">
                             Packaged ZIM archive: <b><span class="fileVersion"></span></b>
                             <button style="display:none;" id="reloadPackagedArchive" type="button" class="btn btn-primary btn-xs">Reload</button>
                         </p>
                         <p id="currentArchive" style="display: none;"></p>
                         <p id="downloadLinksText">
-                            <a id="otherLangs" href="#btnRescanDeviceStorage"><i>Download more archives from the <b>Archive Library</b>.</i></a>
+                            <a class="unhideLibrary" href="#btnRescanDeviceStorage"><i>Download more archives from the <b>Archive Library</b>.</i></a>
                         </p>
                         <p></p>
                     </div>
@@ -739,7 +740,7 @@
                                     <label class="checkbox">
                                         <input type="checkbox" name="allowInternetAccess" id="allowInternetAccessCheck">
                                         <span class="checkmark"></span>
-                                        <b>Allow Internet access?</b> <span id="updateStatus">(and check for updates)</span>
+                                        <b>Allow Internet access?</b> <span id="updateStatus">and <b>check for updates</b></span>
                                     </label>
                                 </div>
                                 <div id="downloadLinks" style="display: none;"></div>
diff --git a/www/js/app.js b/www/js/app.js
index 6a4a2563..2590e737 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -837,7 +837,7 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
                 }
             }
             // Check for upgrade of PWA
-            if (!params.upgradeNeeded && /PWA/.test(params.appType) && activeBtn === 'btnConfigure') {
+            if (!params.upgradeNeeded && /^(?!.*Electron).*PWA/.test(params.appType) && activeBtn === 'btnConfigure') {
                 caches.keys().then(function (keyList) {
                     var cachePrefix = cache.APPCACHE.replace(/^([^\d]+).+/, '$1');
                     document.getElementById('alertBoxPersistent').innerHTML = '';
@@ -867,6 +867,8 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
         }
 
         // Check for GitHub and Electron updates
+        var updateCheck = document.getElementById('updateCheck');
+        if (params.allowInternetAccess) updateCheck.style.display = 'none';
         function checkUpdateServer() {
             if (!params.allowInternetAccess) {
                 console.log("The update check was blocked because the user has not allowed Internet access.")
@@ -882,7 +884,10 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
             updater.getLatestUpdates(function (tag, url, releases) {
                 var updateSpan = document.getElementById('updateStatus');
                 if (!tag) {
-                    updateSpan.innerHTML = '[ <b><i>App is up to date</i></b> ]';
+                    var upToDate = '[&nbsp;<b><i>Latest&nbsp;version</i></b>&nbsp;]';
+                    updateCheck.style.display = 'inline';
+                    updateCheck.innerHTML = upToDate;
+                    updateSpan.innerHTML = upToDate;
                     console.log('No new update was found.');
                     return;
                 }
@@ -1233,6 +1238,8 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
                 checkUpdateServer();
             }
             settingsStore.setItem('allowInternetAccess', params.allowInternetAccess, Infinity);
+            library.style.borderColor = '';
+            library.style.borderStyle = '';
         });
         $('input:checkbox[name=cssCacheMode]').on('change', function (e) {
             params.cssCache = this.checked ? true : false;
@@ -1806,16 +1813,20 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'utf8', 'cache', 'images
             settingsStore.setItem('useMathJax', params.useMathJax, Infinity);
             params.themeChanged = true;
         });
-        document.getElementById('otherLangs').addEventListener('click', function () {
-            if (!params.showFileSelectors) document.getElementById('displayFileSelectorsCheck').click();
-            var library = document.getElementById('libraryArea');
-            library.style.borderColor = 'red';
-            library.style.borderStyle = 'solid';
-            document.getElementById('downloadTrigger').addEventListener('mousedown', function () {
-                library.style.borderColor = '';
-                library.style.borderStyle = '';
+        var library = document.getElementById('libraryArea');
+        var unhideArchiveLibraryAnchors = document.getElementsByClassName("unhideLibrary");
+        for (var i = 0; i < unhideArchiveLibraryAnchors.length; i++) {
+            unhideArchiveLibraryAnchors[i].addEventListener('click', function () {
+                if (!params.showFileSelectors) document.getElementById('displayFileSelectorsCheck').click();
+                library.style.borderColor = 'red';
+                library.style.borderStyle = 'solid';
             });
+        }
+        document.getElementById('downloadTrigger').addEventListener('mousedown', function () {
+            library.style.borderColor = '';
+            library.style.borderStyle = '';
         });
+        
         $('input:checkbox[name=displayFileSelectors]').on('change', function (e) {
             params.showFileSelectors = this.checked ? true : false;
             document.getElementById('rescanStorage').style.display = "block";