diff --git a/www/common/loading.js b/www/common/loading.js
index a1693d2c1..41c9365ff 100644
--- a/www/common/loading.js
+++ b/www/common/loading.js
@@ -1,5 +1,5 @@
 define([
-    'less!/customize/src/less/cryptpad.less'
+    'less!/customize/src/less/loading.less'
 ], function () {
     var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
     var elem = document.createElement('div');
diff --git a/www/common/sframe-boot.js b/www/common/sframe-boot.js
index f230373c6..6ed56cfea 100644
--- a/www/common/sframe-boot.js
+++ b/www/common/sframe-boot.js
@@ -9,11 +9,22 @@ if (req.pfx) {
     };
 }
 require.config(req.cfg);
-if (req.req) { require(req.req, function () { }); }
-window.addEventListener('message', function (msg) {
+var txid = Math.random().toString(16).replace('0.', '');
+var intr;
+var ready = function () {
+    intr = setInterval(function () {
+        if (typeof(txid) !== 'string') { return; }
+        window.parent.postMessage(JSON.stringify({ q: 'READY', txid: txid }), '*');
+    }, 1);
+};
+if (req.req) { require(req.req, ready); } else { ready(); }
+var onReply = function (msg) {
     var data = JSON.parse(msg.data);
-    if (data.q !== 'INIT') { return; }
-    msg.source.postMessage(JSON.stringify({ txid: data.txid, content: 'OK' }), '*');
+    if (data.txid !== txid) { return; }
+    clearInterval(intr);
+    txid = {};
+    window.removeEventListener('message', onReply);
     require(['/common/sframe-boot2.js'], function () { });
-});
+};
+window.addEventListener('message', onReply);
 }());
\ No newline at end of file
diff --git a/www/common/sframe-channel.js b/www/common/sframe-channel.js
index bce9cfdd3..6bfffb028 100644
--- a/www/common/sframe-channel.js
+++ b/www/common/sframe-channel.js
@@ -105,7 +105,6 @@ define([
             insideHandlers.push(content);
         }, true);
 
-        var intr;
         var txid;
         window.addEventListener('message', function (msg) {
             var data = JSON.parse(msg.data);
@@ -113,12 +112,8 @@ define([
                 console.log("DROP Message from unexpected source");
                 console.log(msg);
             } else if (!otherWindow) {
-                if (data.txid !== txid) {
-                    console.log("DROP Message with weird txid");
-                    return;
-                }
-                clearInterval(intr);
                 otherWindow = ow;
+                ow.postMessage(JSON.stringify({ txid: data.txid }), '*');
                 cb(chan);
             } else if (typeof(data.q) === 'string' && handlers[data.q]) {
                 handlers[data.q].forEach(function (f) {
@@ -139,17 +134,6 @@ define([
             // we're in the sandbox
             otherWindow = ow;
             cb(chan);
-        } else {
-            require(['/common/requireconfig.js'], function (RequireConfig) {
-                txid = mkTxid();
-                intr = setInterval(function () {
-                    ow.postMessage(JSON.stringify({
-                        txid: txid,
-                        content: { requireConf: RequireConfig() },
-                        q: 'INIT'
-                    }), '*');
-                }, 1);
-            });
         }
     };
 
diff --git a/www/pad2/inner.html b/www/pad2/inner.html
index 23aa8b764..0ebef67b2 100644
--- a/www/pad2/inner.html
+++ b/www/pad2/inner.html
@@ -2,7 +2,7 @@
 <html class="cp pad">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/pad2/main.js" data-main="/common/sframe-boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/pad2/main.js" data-main="/common/sframe-boot.js?ver=1.1" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
     html, body {
         margin: 0px;
diff --git a/www/pad2/outer.js b/www/pad2/outer.js
index 1e55c987d..7bbfb3b84 100644
--- a/www/pad2/outer.js
+++ b/www/pad2/outer.js
@@ -1,11 +1,25 @@
+// Load #1, load as little as possible because we are in a race to get the loading screen up.
 define([
+    '/bower_components/nthen/index.js',
     '/api/config',
     'jquery',
-    '/common/requireconfig.js',
-    '/common/cryptget.js'
-], function (ApiConfig, $, RequireConfig, Cryptget) {
+    '/common/requireconfig.js'
+], function (nThen, ApiConfig, $, RequireConfig) {
     var requireConfig = RequireConfig();
-    $(function () {
+
+    // Loaded in load #3
+    var CpNfOuter;
+    var Cryptpad;
+    var Crypto;
+    var Cryptget;
+
+    var sframeChan;
+    var secret;
+    var hashes;
+
+    nThen(function (waitFor) {
+        $(waitFor());
+    }).nThen(function (waitFor) {
         var req = {
             cfg: requireConfig,
             req: [ '/common/loading.js' ],
@@ -16,183 +30,195 @@ define([
         $('#sbox-iframe').attr('src',
             ApiConfig.httpSafeOrigin + '/pad2/inner.html?' + requireConfig.urlArgs +
                 '#' + encodeURIComponent(JSON.stringify(req)));
-    });
-    require([
-        '/common/sframe-channel.js',
-        '/common/sframe-chainpad-netflux-outer.js',
-        '/bower_components/nthen/index.js',
-        '/common/cryptpad-common.js',
-        '/bower_components/chainpad-crypto/crypto.js'
-    ], function (SFrameChannel, CpNfOuter, nThen, Cryptpad, Crypto) {
-        var sframeChan;
-        var hashes;
-        var secret;
-        nThen(function (waitFor) {
-            $(waitFor());
-        }).nThen(function (waitFor) {
+
+        // This is a cheap trick to avoid loading sframe-channel in parallel with the
+        // loading screen setup.
+        var done = waitFor();
+        var onMsg = function (msg) {
+            var data = JSON.parse(msg.data);
+            if (data.q !== 'READY') { return; }
+            window.removeEventListener('message', onMsg);
+            var _done = done;
+            done = function () { };
+            _done();
+        };
+        window.addEventListener('message', onMsg);
+
+    }).nThen(function (waitFor) {
+        // Load #3, the loading screen is up so grab whatever you need...
+        require([
+            '/common/sframe-chainpad-netflux-outer.js',
+            '/common/cryptpad-common.js',
+            '/bower_components/chainpad-crypto/crypto.js',
+            '/common/cryptget.js',
+            '/common/sframe-channel.js',
+        ], waitFor(function (_CpNfOuter, _Cryptpad, _Crypto, _Cryptget, SFrameChannel) {
+            CpNfOuter = _CpNfOuter;
+            Cryptpad = _Cryptpad;
+            Crypto = _Crypto;
+            Cryptget = _Cryptget;
             SFrameChannel.create($('#sbox-iframe')[0].contentWindow, waitFor(function (sfc) {
                 sframeChan = sfc;
-                console.log('sframe initialized');
             }));
             Cryptpad.ready(waitFor());
-        }).nThen(function (waitFor) {
-            secret = Cryptpad.getSecrets();
-            if (!secret.channel) {
-                // New pad: create a new random channel id
-                secret.channel = Cryptpad.createChannelId();
-            }
-            Cryptpad.getShareHashes(secret, waitFor(function (err, h) { hashes = h; }));
-        }).nThen(function (/*waitFor*/) {
-            var readOnly = secret.keys && !secret.keys.editKeyStr;
-            if (!secret.keys) { secret.keys = secret.key; }
-            var parsed = Cryptpad.parsePadUrl(window.location.href);
-            parsed.type = parsed.type.replace('pad2', 'pad');
-            if (!parsed.type) { throw new Error(); }
-            var defaultTitle = Cryptpad.getDefaultName(parsed);
-            var updateMeta = function () {
-                //console.log('EV_METADATA_UPDATE');
-                var name;
-                nThen(function (waitFor) {
-                    Cryptpad.getLastName(waitFor(function (err, n) {
-                        if (err) { console.log(err); }
-                        name = n;
-                    }));
-                }).nThen(function (/*waitFor*/) {
-                    sframeChan.event('EV_METADATA_UPDATE', {
-                        doc: {
-                            defaultTitle: defaultTitle,
-                            type: parsed.type
-                        },
-                        user: {
-                            name: name,
-                            uid: Cryptpad.getUid(),
-                            avatar: Cryptpad.getAvatarUrl(),
-                            profile: Cryptpad.getProfileUrl(),
-                            curvePublic: Cryptpad.getProxy().curvePublic,
-                            netfluxId: Cryptpad.getNetwork().webChannels[0].myID,
-                        },
-                        priv: {
-                            accountName: Cryptpad.getAccountName(),
-                            origin: window.location.origin,
-                            pathname: window.location.pathname,
-                            readOnly: readOnly,
-                            availableHashes: hashes,
-                            isTemplate: Cryptpad.isTemplate(window.location.href),
-                            feedbackAllowed: Cryptpad.isFeedbackAllowed()
-                        }
-                    });
-                });
-            };
-            Cryptpad.onDisplayNameChanged(updateMeta);
-            sframeChan.onReg('EV_METADATA_UPDATE', updateMeta);
-
-            Cryptpad.onError(function (info) {
-                console.log('error');
-                console.log(info);
-                if (info && info.type === "store") {
-                    //onConnectError();
-                }
-            });
-
-            sframeChan.on('Q_ANON_RPC_MESSAGE', function (data, cb) {
-                Cryptpad.anonRpcMsg(data.msg, data.content, function (err, response) {
-                    cb({error: err, response: response});
+        }));
+    }).nThen(function (waitFor) {
+        secret = Cryptpad.getSecrets();
+        if (!secret.channel) {
+            // New pad: create a new random channel id
+            secret.channel = Cryptpad.createChannelId();
+        }
+        Cryptpad.getShareHashes(secret, waitFor(function (err, h) { hashes = h; }));
+    }).nThen(function (/*waitFor*/) {
+        var readOnly = secret.keys && !secret.keys.editKeyStr;
+        if (!secret.keys) { secret.keys = secret.key; }
+        var parsed = Cryptpad.parsePadUrl(window.location.href);
+        parsed.type = parsed.type.replace('pad2', 'pad');
+        if (!parsed.type) { throw new Error(); }
+        var defaultTitle = Cryptpad.getDefaultName(parsed);
+        var updateMeta = function () {
+            //console.log('EV_METADATA_UPDATE');
+            var name;
+            nThen(function (waitFor) {
+                Cryptpad.getLastName(waitFor(function (err, n) {
+                    if (err) { console.log(err); }
+                    name = n;
+                }));
+            }).nThen(function (/*waitFor*/) {
+                sframeChan.event('EV_METADATA_UPDATE', {
+                    doc: {
+                        defaultTitle: defaultTitle,
+                        type: parsed.type
+                    },
+                    user: {
+                        name: name,
+                        uid: Cryptpad.getUid(),
+                        avatar: Cryptpad.getAvatarUrl(),
+                        profile: Cryptpad.getProfileUrl(),
+                        curvePublic: Cryptpad.getProxy().curvePublic,
+                        netfluxId: Cryptpad.getNetwork().webChannels[0].myID,
+                    },
+                    priv: {
+                        accountName: Cryptpad.getAccountName(),
+                        origin: window.location.origin,
+                        pathname: window.location.pathname,
+                        readOnly: readOnly,
+                        availableHashes: hashes,
+                        isTemplate: Cryptpad.isTemplate(window.location.href),
+                        feedbackAllowed: Cryptpad.isFeedbackAllowed()
+                    }
                 });
             });
+        };
+        Cryptpad.onDisplayNameChanged(updateMeta);
+        sframeChan.onReg('EV_METADATA_UPDATE', updateMeta);
 
-            sframeChan.on('Q_SET_PAD_TITLE_IN_DRIVE', function (newTitle, cb) {
-                Cryptpad.renamePad(newTitle, undefined, function (err) {
-                    if (err) { cb('ERROR'); } else { cb(); }
-                });
-            });
+        Cryptpad.onError(function (info) {
+            console.log('error');
+            console.log(info);
+            if (info && info.type === "store") {
+                //onConnectError();
+            }
+        });
 
-            sframeChan.on('Q_SETTINGS_SET_DISPLAY_NAME', function (newName, cb) {
-                Cryptpad.setAttribute('username', newName, function (err) {
-                    if (err) {
-                        console.log("Couldn't set username");
-                        console.error(err);
-                        cb('ERROR');
-                        return;
-                    }
-                    Cryptpad.changeDisplayName(newName, true);
-                    cb();
-                });
+        sframeChan.on('Q_ANON_RPC_MESSAGE', function (data, cb) {
+            Cryptpad.anonRpcMsg(data.msg, data.content, function (err, response) {
+                cb({error: err, response: response});
             });
+        });
 
-            sframeChan.on('Q_LOGOUT', function (data, cb) {
-                Cryptpad.logout(cb);
+        sframeChan.on('Q_SET_PAD_TITLE_IN_DRIVE', function (newTitle, cb) {
+            Cryptpad.renamePad(newTitle, undefined, function (err) {
+                if (err) { cb('ERROR'); } else { cb(); }
             });
+        });
 
-            sframeChan.on('Q_SET_LOGIN_REDIRECT', function (data, cb) {
-                sessionStorage.redirectTo = window.location.href;
+        sframeChan.on('Q_SETTINGS_SET_DISPLAY_NAME', function (newName, cb) {
+            Cryptpad.setAttribute('username', newName, function (err) {
+                if (err) {
+                    console.log("Couldn't set username");
+                    console.error(err);
+                    cb('ERROR');
+                    return;
+                }
+                Cryptpad.changeDisplayName(newName, true);
                 cb();
             });
+        });
 
-            sframeChan.on('Q_GET_PIN_LIMIT_STATUS', function (data, cb) {
-                Cryptpad.isOverPinLimit(function (e, overLimit, limits) {
-                    cb({
-                        error: e,
-                        overLimit: overLimit,
-                        limits: limits
-                    });
-                });
-            });
+        sframeChan.on('Q_LOGOUT', function (data, cb) {
+            Cryptpad.logout(cb);
+        });
 
-            sframeChan.on('Q_MOVE_TO_TRASH', function (data, cb) {
-                Cryptpad.moveToTrash(cb);
-            });
+        sframeChan.on('Q_SET_LOGIN_REDIRECT', function (data, cb) {
+            sessionStorage.redirectTo = window.location.href;
+            cb();
+        });
 
-            sframeChan.on('Q_SAVE_AS_TEMPLATE', function (data, cb) {
-                Cryptpad.saveAsTemplate(Cryptget.put, data, cb);
+        sframeChan.on('Q_GET_PIN_LIMIT_STATUS', function (data, cb) {
+            Cryptpad.isOverPinLimit(function (e, overLimit, limits) {
+                cb({
+                    error: e,
+                    overLimit: overLimit,
+                    limits: limits
+                });
             });
+        });
 
-            sframeChan.on('Q_GET_FULL_HISTORY', function (data, cb) {
-                var network = Cryptpad.getNetwork();
-                var hkn = network.historyKeeper;
-                var crypto = Crypto.createEncryptor(secret.keys);
-                // Get the history messages and send them to the iframe
-                var parse = function (msg) {
-                    try {
-                        return JSON.parse(msg);
-                    } catch (e) {
-                        return null;
-                    }
-                };
-                var onMsg = function (msg) {
-                    var parsed = parse(msg);
-                    if (parsed[0] === 'FULL_HISTORY_END') {
-                        console.log('END');
-                        cb();
-                        return;
-                    }
-                    if (parsed[0] !== 'FULL_HISTORY') { return; }
-                    if (parsed[1] && parsed[1].validateKey) { // First message
-                        secret.keys.validateKey = parsed[1].validateKey;
-                        return;
-                    }
-                    msg = parsed[1][4];
-                    if (msg) {
-                        msg = msg.replace(/^cp\|/, '');
-                        var decryptedMsg = crypto.decrypt(msg, secret.keys.validateKey);
-                        sframeChan.event('EV_RT_HIST_MESSAGE', decryptedMsg);
-                    }
-                };
-                network.on('message', onMsg);
-                network.sendto(hkn, JSON.stringify(['GET_FULL_HISTORY', secret.channel, secret.keys.validateKey]));
-            });
+        sframeChan.on('Q_MOVE_TO_TRASH', function (data, cb) {
+            Cryptpad.moveToTrash(cb);
+        });
 
-            CpNfOuter.start({
-                sframeChan: sframeChan,
-                channel: secret.channel,
-                network: Cryptpad.getNetwork(),
-                validateKey: secret.keys.validateKey || undefined,
-                readOnly: readOnly,
-                crypto: Crypto.createEncryptor(secret.keys),
-                onConnect: function (wc) {
-                    if (readOnly) { return; }
-                    Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
+        sframeChan.on('Q_SAVE_AS_TEMPLATE', function (data, cb) {
+            Cryptpad.saveAsTemplate(Cryptget.put, data, cb);
+        });
+
+        sframeChan.on('Q_GET_FULL_HISTORY', function (data, cb) {
+            var network = Cryptpad.getNetwork();
+            var hkn = network.historyKeeper;
+            var crypto = Crypto.createEncryptor(secret.keys);
+            // Get the history messages and send them to the iframe
+            var parse = function (msg) {
+                try {
+                    return JSON.parse(msg);
+                } catch (e) {
+                    return null;
                 }
-            });
+            };
+            var onMsg = function (msg) {
+                var parsed = parse(msg);
+                if (parsed[0] === 'FULL_HISTORY_END') {
+                    console.log('END');
+                    cb();
+                    return;
+                }
+                if (parsed[0] !== 'FULL_HISTORY') { return; }
+                if (parsed[1] && parsed[1].validateKey) { // First message
+                    secret.keys.validateKey = parsed[1].validateKey;
+                    return;
+                }
+                msg = parsed[1][4];
+                if (msg) {
+                    msg = msg.replace(/^cp\|/, '');
+                    var decryptedMsg = crypto.decrypt(msg, secret.keys.validateKey);
+                    sframeChan.event('EV_RT_HIST_MESSAGE', decryptedMsg);
+                }
+            };
+            network.on('message', onMsg);
+            network.sendto(hkn, JSON.stringify(['GET_FULL_HISTORY', secret.channel, secret.keys.validateKey]));
+        });
+
+        CpNfOuter.start({
+            sframeChan: sframeChan,
+            channel: secret.channel,
+            network: Cryptpad.getNetwork(),
+            validateKey: secret.keys.validateKey || undefined,
+            readOnly: readOnly,
+            crypto: Crypto.createEncryptor(secret.keys),
+            onConnect: function (wc) {
+                if (readOnly) { return; }
+                Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
+            }
         });
     });
 });
