diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css
index 2020fef..13882ab 100644
--- a/app/assets/css/launcher.css
+++ b/app/assets/css/launcher.css
@@ -2122,7 +2122,7 @@ p {
 /* Stationary image for the spinner. */
 #loadCenterImage {
     position: absolute;
-    width: 200px;
+    width: 277px;
     height: auto;
 }
 
@@ -2130,6 +2130,7 @@ p {
 #loadSpinnerImage {
     width: 280px;
     height: auto;
+    z-index: 400;
 }
 
 /* Rotating animation for the spinner. */
diff --git a/app/assets/js/assetguard.js b/app/assets/js/assetguard.js
index 4238c4c..9fc73ab 100644
--- a/app/assets/js/assetguard.js
+++ b/app/assets/js/assetguard.js
@@ -854,15 +854,14 @@ class AssetGuard extends EventEmitter {
             // 'SOFTWARE\\JavaSoft\\JDK'
             // Forge does not yet support Java 9, therefore we do not.
 
-            let cbTracker = 0
-            let cbAcc = 0
-
             // Keys for Java 1.8 and prior:
             const regKeys = [
                 '\\SOFTWARE\\JavaSoft\\Java Runtime Environment',
                 '\\SOFTWARE\\JavaSoft\\Java Development Kit'
             ]
 
+            let keysDone = 0
+
             const candidates = new Set()
 
             for(let i=0; i<regKeys.length; i++){
@@ -875,15 +874,26 @@ class AssetGuard extends EventEmitter {
                     if(exists) {
                         key.keys((err, javaVers) => {
                             if(err){
+                                keysDone++
                                 console.error(err)
-                                if(i === regKeys.length-1 && cbAcc === cbTracker){
+
+                                // REG KEY DONE
+                                // DUE TO ERROR
+                                if(keysDone === regKeys.length){
                                     resolve(candidates)
                                 }
                             } else {
-                                cbTracker += javaVers.length
-                                if(i === regKeys.length-1 && cbTracker === cbAcc){
-                                    resolve(candidates)
+                                if(javaVers.length === 0){
+                                    // REG KEY DONE
+                                    // NO SUBKEYS
+                                    keysDone++
+                                    if(keysDone === regKeys.length){
+                                        resolve(candidates)
+                                    }
                                 } else {
+
+                                    let numDone = 0
+
                                     for(let j=0; j<javaVers.length; j++){
                                         const javaVer = javaVers[j]
                                         const vKey = javaVer.key.substring(javaVer.key.lastIndexOf('\\')+1)
@@ -893,17 +903,29 @@ class AssetGuard extends EventEmitter {
                                                 const jHome = res.value
                                                 if(jHome.indexOf('(x86)') === -1){
                                                     candidates.add(jHome)
-                                                    
                                                 }
-                                                cbAcc++
-                                                if(i === regKeys.length-1 && cbAcc === cbTracker){
-                                                    resolve(candidates)
+
+                                                // SUBKEY DONE
+
+                                                numDone++
+                                                if(numDone === javaVers.length){
+                                                    keysDone++
+                                                    if(keysDone === regKeys.length){
+                                                        resolve(candidates)
+                                                    }
                                                 }
                                             })
                                         } else {
-                                            cbAcc++
-                                            if(i === regKeys.length-1 && cbAcc === cbTracker){
-                                                resolve(candidates)
+
+                                            // SUBKEY DONE
+                                            // NOT JAVA 8
+
+                                            numDone++
+                                            if(numDone === javaVers.length){
+                                                keysDone++
+                                                if(keysDone === regKeys.length){
+                                                    resolve(candidates)
+                                                }
                                             }
                                         }
                                     }
@@ -911,7 +933,12 @@ class AssetGuard extends EventEmitter {
                             }
                         })
                     } else {
-                        if(i === regKeys.length-1 && cbAcc === cbTracker){
+
+                        // REG KEY DONE
+                        // DUE TO NON-EXISTANCE
+
+                        keysDone++
+                        if(keysDone === regKeys.length){
                             resolve(candidates)
                         }
                     }
diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js
index 7ecb690..def368c 100644
--- a/app/assets/js/scripts/uicore.js
+++ b/app/assets/js/scripts/uicore.js
@@ -130,6 +130,13 @@ document.addEventListener('readystatechange', function () {
             })
         })
 
+        // Remove focus from social media buttons once they're clicked.
+        Array.from(document.getElementsByClassName('mediaURL')).map(val => {
+            val.addEventListener('click', e => {
+                document.activeElement.blur()
+            })
+        })
+
     } else if(document.readyState === 'complete'){
 
         //266.01