diff --git a/manifest/chrome.json b/manifest/chrome.json
index 9fba42bd..d4d3c8af 100644
--- a/manifest/chrome.json
+++ b/manifest/chrome.json
@@ -3,7 +3,7 @@
     "offline_enabled": true,
     "name": "Mue",
     "description": "Fast, open and free-to-use new tab page for most modern browsers.",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "browser_action": {
         "default_icon": "./icons/extension-icon.png"
     },
@@ -14,8 +14,5 @@
 		"16": "./icons/16x16-circle.png",
 		"48": "./icons/48x48-circle.png",
 		"128": "./icons/128x128-circle.png"
-    },
-    "background": {
-        "scripts": ["background-chrome.js"]
     }
 }
\ No newline at end of file
diff --git a/manifest/firefox.json b/manifest/firefox.json
index 29679cf2..639bec19 100644
--- a/manifest/firefox.json
+++ b/manifest/firefox.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "Mue",
     "description": "Fast, open and free-to-use new tab page for most modern browsers.",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "browser_action": {
         "default_icon": "./icons/extension-icon.png"
     },
diff --git a/manifest/opera.json b/manifest/opera.json
index 2a72a290..42875751 100644
--- a/manifest/opera.json
+++ b/manifest/opera.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "Mue",
     "description": "Fast, open and free-to-use new tab page for most modern browsers.",
-    "version": "4.0.0",
+    "version": "4.0.2",
     "browser_action": {
         "default_icon": "./icons/extension-icon.png"
     },
diff --git a/package.json b/package.json
index c7757279..cfb0273e 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "homepage": "https://muetab.xyz",
   "bugs": "https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D",
   "license": "BSD-3-Clause",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "dependencies": {
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
diff --git a/src/components/modals/Settings.jsx b/src/components/modals/Settings.jsx
index 5a910522..7800e5f3 100644
--- a/src/components/modals/Settings.jsx
+++ b/src/components/modals/Settings.jsx
@@ -168,7 +168,7 @@ export default class Settings extends React.PureComponent {
         <div className='section'>
           <h4 onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[3], document.getElementsByClassName('expandIcons')[3])}>{this.props.language.background.title}</h4>
           <ExpandMore style={{ 'transition': 'all 0.5s ease 0s' }} className='expandIcons' onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName('extraSettings')[3], document.getElementsByClassName('expandIcons')[3])} />
-          <Slider name='background' override='customBackground' />
+          <Slider name='background' />
           <li className='extraSettings'>
           <ul>
             <label htmlFor='8'>{this.props.language.background.API} </label>
diff --git a/src/components/widgets/Background.jsx b/src/components/widgets/Background.jsx
index 3f87df64..77902fa5 100644
--- a/src/components/widgets/Background.jsx
+++ b/src/components/widgets/Background.jsx
@@ -50,10 +50,9 @@ export default class Background extends React.PureComponent {
       try { // First we try and get an image from the API...
         let requestURL;
         const enabled = localStorage.getItem('webp');
-        const backgroundAPI = localStorage.getItem('backgroundAPI');
         let data;
 
-        switch (backgroundAPI) {
+        switch (localStorage.getItem('backgroundAPI')) {
           case 'mue':
             if (await supportsWebP && enabled === 'true') requestURL = Constants.API_URL + '/getImage?webp=true';
             else requestURL = Constants.API_URL + '/getImage?category=Outdoors';
@@ -73,7 +72,8 @@ export default class Background extends React.PureComponent {
         document.getElementById('backgroundImage').setAttribute('style', `-webkit-filter:blur(${localStorage.getItem('blur')}px); background-image: url(${data.file})`); // Set background and blur etc
         let credit = document.getElementById('photographer');
         credit.innerText = `${credit.innerText} ${data.photographer}`; // Set the credit
-        document.getElementById('location').innerText = `${data.location}`; // Set the location tooltip
+        if (data.location.replace(/[null]+/g, '') === ' ') return document.getElementById('backgroundCredits').style.display = 'none';
+        document.getElementById('location').innerText = `${data.location.replace('null', '')}`; // Set the location tooltip
       } catch (e) { // ..and if that fails we load one locally
         this.doOffline();
       }
@@ -81,7 +81,10 @@ export default class Background extends React.PureComponent {
   }
 
   componentDidMount() {
-    if (localStorage.getItem('background') === 'false') return document.getElementById('backgroundCredits').style.display = 'none';
+    if (localStorage.getItem('background') === 'false') {
+      document.getElementById('photographer').style.display = 'none';
+      return document.getElementById('backgroundCredits').style.display = 'none';
+    }
     if (localStorage.getItem('animations') === 'true') document.getElementById('backgroundImage').classList.add('fade-in');
     this.setBackground();
   }
diff --git a/src/scss/modules/_modal.scss b/src/scss/modules/_modal.scss
index 8c226a4a..fb6da412 100644
--- a/src/scss/modules/_modal.scss
+++ b/src/scss/modules/_modal.scss
@@ -13,6 +13,8 @@
   -moz-user-select: none;
   -webkit-user-select: none;
   user-select: none;
+  scrollbar-width: thin;
+  scrollbar-color: #34495e  #bdc3c7;
 
   &:focus {
     outline: 0;
@@ -183,4 +185,14 @@
     width: 100%;
     height: auto;
   }
+}
+
+::-webkit-scrollbar {
+  width: 5px;
+  background: #bdc3c7;
+  height: auto;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #34495e;
 }
\ No newline at end of file
diff --git a/src/scss/modules/_settings.scss b/src/scss/modules/_settings.scss
index 989171a4..3f5f2928 100644
--- a/src/scss/modules/_settings.scss
+++ b/src/scss/modules/_settings.scss
@@ -69,16 +69,6 @@ input {
   }
 }
 
-::-webkit-scrollbar {
-  width: 5px;
-  background: #bdc3c7;
-  height: auto;
-}
-
-::-webkit-scrollbar-thumb {
-  background: #34495e;
-}
-
 h4,
 .switch,
 .expandIcons {