diff --git a/source/js/Ox.App.js b/source/js/Ox.App.js
index e45fbfb1..077b9987 100644
--- a/source/js/Ox.App.js
+++ b/source/js/Ox.App.js
@@ -79,8 +79,8 @@ Ox.App = (function() {
                 };
             });
             that.api.init(getUserData(), function(result) {
-                var $div = Ox.UI.$body.find('div');
-                Ox.UI.$body.find('img').remove();
+                var $div = $('div');
+                $('img').remove();
                 $div.animate({
                     opacity: 0
                 }, 1000, function() {
diff --git a/source/js/OxUI.js b/source/js/OxUI.js
index 3a2b002a..2678b84d 100644
--- a/source/js/OxUI.js
+++ b/source/js/OxUI.js
@@ -363,7 +363,7 @@ Provides function Ox.UI([options], callback) that fires when
         $.getJSON(path + 'json/OxUI.json', function(data) {
 
             var $head = $('head'),
-                promises = documentReady ? [] : [waitForDocument()];
+                promises = Ox.UI.$window ? [] : [waitForDocument()];
 
             log('OxUI.json loaded.')