diff --git a/core/interceptor.js b/core/interceptor.js
index 6ca3506d689872e5dafa9ddbb9bf9651b1b4a0a9..c1d9c7a844f54974ef681310eaa20447281c6118 100644
--- a/core/interceptor.js
+++ b/core/interceptor.js
@@ -55,6 +55,7 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
         'blog.datawrapper.de': true,
         'bundleofholding.com': true,
         'cdnjs.com': true,
+        'code.world': true,
         'dropbox.com': true,
         'evoice.com': true,
         'freebusy.io': true,
diff --git a/core/mappings.js b/core/mappings.js
index 2f2a8b4e814249dfa5271ef2717147b5f3c2567f..dab3def4f1593e21a2c054a8830496baf493ef93 100644
--- a/core/mappings.js
+++ b/core/mappings.js
@@ -184,6 +184,29 @@ var mappings = {
         }
     },
     // Baidu CDN
+    'apps.bdimg.com': {
+        '/libs/': {
+            'angular.js/{version}/angular.': resources.angular,
+            'backbone.js/{version}/backbone.': resources.backbone,
+            'backbone.js/{version}/backbone-min.': resources.backbone,
+            'dojo/{version}/dojo.': resources.dojo,
+            'ember.js/{version}/ember.': resources.ember,
+            'ext-core/{version}/ext-core.': resources.extCore,
+            'jquery/{version}/jquery.': resources.jQuery,
+            'jqueryui/{version}/jquery-ui.js': resources.jQueryUI,
+            'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
+            'mootools/{version}/mootools-yui-compressed.': resources.mootools,
+            'prototype/{version}/prototype.': resources.prototypeJS,
+            'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
+            'swfobject/{version}/swfobject.': resources.swfobject,
+            'swfobject/{version}/swfobject_src.': resources.swfobject,
+            'underscore.js/{version}/underscore.': resources.underscore,
+            'underscore.js/{version}/underscore-min.': resources.underscore,
+            'webfont/{version}/webfont.': resources.webfont,
+            'webfont/{version}/webfont_debug.': resources.webfont
+        }
+    },
+    // Baidu CDN [Deprecated]
     'libs.baidu.com': {
         '/': {
             'backbone/{version}/backbone.': resources.backbone,
diff --git a/core/state-manager.js b/core/state-manager.js
index 0620c341fbf19ddb77f86d4662d8af0842c37b8b..85f7aa1ba062165398320fdcac745b4bd744e2af 100644
--- a/core/state-manager.js
+++ b/core/state-manager.js
@@ -125,7 +125,7 @@ stateManager._updateTab = function (details) {
 
     let tabDomain, domainIsWhitelisted, frameIdentifier, tabIdentifier;
 
-    tabDomain = helpers.extractDomainFromUrl(details.url);
+    tabDomain = helpers.extractDomainFromUrl(details.url, true);
     domainIsWhitelisted = stateManager._domainIsWhitelisted(tabDomain);
 
     frameIdentifier = details.frameId;
diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
index 9bacc050216085e3dba87c2cefa665f035504196..58ccdd2644719416fdba27fbb25bbf85d8f9842c 100644
--- a/modules/internal/helpers.js
+++ b/modules/internal/helpers.js
@@ -160,8 +160,10 @@ helpers.determineCdnName = function (domainName) {
         return 'Yandex CDN';
     case 'yandex.st':
         return 'Yandex CDN [Deprecated]';
-    case 'libs.baidu.com':
+    case 'apps.bdimg.com':
         return 'Baidu CDN';
+    case 'libs.baidu.com':
+        return 'Baidu CDN [Deprecated]';
     case 'lib.sinaapp.com':
         return 'Sina Public Resources';
     case 'upcdn.b0.upaiyun.com':
diff --git a/pages/options/options.css b/pages/options/options.css
index ba2532a48483183b1e1655deef4d0a8f7c61f18e..bec5f7f007b8d0a1460cd1b6d6a220c23bc8b0cb 100644
--- a/pages/options/options.css
+++ b/pages/options/options.css
@@ -12,6 +12,8 @@ body {
 }
 
 .option {
+    display: flex;
+    flex-direction: column;
     margin-top: 25px;
 }
 
@@ -81,6 +83,7 @@ body {
 
 .input-text {
     margin-left: 29px;
+    max-width: 320px;
 }
 
 /**
diff --git a/pages/popup/popup.js b/pages/popup/popup.js
index 7dc635e4aa5bdfd96821db617f29a120242452b9..9adccba621cc51a96fb97f1cd17da07786bb8f82 100644
--- a/pages/popup/popup.js
+++ b/pages/popup/popup.js
@@ -171,11 +171,7 @@ popup._determineTargetTab = function () {
         chrome.tabs.query({'active': true, 'currentWindow': true}, function (tabs) {
 
             popup._targetTab = tabs[0];
-            popup._domain = helpers.extractDomainFromUrl(tabs[0].url);
-
-            if (popup._domain !== null) {
-                popup._domain = helpers.normalizeDomain(popup._domain);
-            }
+            popup._domain = helpers.extractDomainFromUrl(tabs[0].url, true);
 
             resolve();
         });