diff --git a/src/components/modals/Main.jsx b/src/components/modals/Main.jsx
index d341723b..3237ed3a 100644
--- a/src/components/modals/Main.jsx
+++ b/src/components/modals/Main.jsx
@@ -27,7 +27,8 @@ export default class MainModal extends React.PureComponent {
     document.getElementById('center').classList.toggle('backgroundEffects');
 
     this.setState({ 
-      tab: this.tabs.settings, currentTab: 'settings' 
+      tab: this.tabs.settings, 
+      currentTab: 'settings' 
     });
   }
 
diff --git a/src/components/modals/settings/Checkbox.jsx b/src/components/modals/settings/Checkbox.jsx
index e98cd0c7..b91ffa23 100644
--- a/src/components/modals/settings/Checkbox.jsx
+++ b/src/components/modals/settings/Checkbox.jsx
@@ -15,6 +15,7 @@ export default class Checkbox extends React.PureComponent {
 
   handleChange(name) {
     SettingsFunctions.setItem(name);
+    
     this.setState({ 
       checked: (this.state.checked === true) ? false : true 
     });
diff --git a/src/components/modals/settings/Section.jsx b/src/components/modals/settings/Section.jsx
index 1abf5955..574f949c 100644
--- a/src/components/modals/settings/Section.jsx
+++ b/src/components/modals/settings/Section.jsx
@@ -27,7 +27,7 @@ export default class Section extends React.PureComponent {
   }
 
   render() {
-    let extraHTML, expandMore, slider, noDropdown;
+    let extraHTML, expandMore;
 
     if (this.props.children) {
         extraHTML = (
@@ -44,19 +44,11 @@ export default class Section extends React.PureComponent {
         );
     }
 
-    if (this.props.slider !== false) {
-      slider = <Slider name={this.props.name} />;
-    }
-    
-    if (this.props.dropdown === false) {
-      noDropdown = 'nodropdown';
-    }
-
     return (
         <div className='section'>
-            <h4 className={noDropdown} onClick={() => this.toggleSection()}>{this.props.title}</h4>
+            <h4 className={(this.props.dropdown === false) ? 'nodropdown' : null} onClick={() => this.toggleSection()}>{this.props.title}</h4>
             {expandMore}
-            {slider}
+            {(this.props.slider !== false) ? <Slider name={this.props.name} /> : null}
             {extraHTML}
         </div>
     );
diff --git a/src/components/modals/settings/Slider.jsx b/src/components/modals/settings/Slider.jsx
index c0640b4e..3f7f3c94 100644
--- a/src/components/modals/settings/Slider.jsx
+++ b/src/components/modals/settings/Slider.jsx
@@ -10,8 +10,10 @@ export default class Slider extends React.PureComponent {
     };
   }
 
-  handleChange(name) {
-    SettingsFunctions.setItem(name);
+  handleChange() {
+    let setText = (this.props.override) ? this.props.override : this.props.name;
+
+    SettingsFunctions.setItem(setText);
 
     this.setState({ 
       checked: (this.state.checked === true) ? false : true 
@@ -19,11 +21,9 @@ export default class Slider extends React.PureComponent {
   }
 
   render() {
-    let setText = (this.props.override) ? this.props.override : this.props.name;
-
     return (
         <label className='switch'>
-          <input type='checkbox' checked={this.state.checked} onChange={() => this.handleChange(setText)} />
+          <input type='checkbox' checked={this.state.checked} onChange={() => this.handleChange()} />
           <span className='slider'></span>
         </label>
     );
diff --git a/src/components/modals/settings/sections/GreetingSettings.jsx b/src/components/modals/settings/sections/GreetingSettings.jsx
index 2bd449c2..d0cf451d 100644
--- a/src/components/modals/settings/sections/GreetingSettings.jsx
+++ b/src/components/modals/settings/sections/GreetingSettings.jsx
@@ -20,6 +20,7 @@ export default class GreetingSettings extends React.PureComponent {
     this.setState({ 
       greetingName: '' 
     });
+
     toast(this.props.toastLanguage.reset);
   }
 
@@ -29,6 +30,7 @@ export default class GreetingSettings extends React.PureComponent {
       }
 
       localStorage.setItem('birthday', data);
+      
       this.setState({ 
         birthday: data 
       });
diff --git a/src/components/modals/settings/sections/SearchSettings.jsx b/src/components/modals/settings/sections/SearchSettings.jsx
index febf93d5..5a35b497 100644
--- a/src/components/modals/settings/sections/SearchSettings.jsx
+++ b/src/components/modals/settings/sections/SearchSettings.jsx
@@ -14,6 +14,7 @@ export default class SearchSettings extends React.PureComponent {
   resetSearch() {
     localStorage.removeItem('customSearchEngine');
     document.getElementById('customSearchEngine').value = '';
+    
     toast(this.props.toastLanguage.reset);
   }
 
diff --git a/src/components/modals/tabs/Marketplace.jsx b/src/components/modals/tabs/Marketplace.jsx
index bf43a6f7..4e508134 100644
--- a/src/components/modals/tabs/Marketplace.jsx
+++ b/src/components/modals/tabs/Marketplace.jsx
@@ -56,13 +56,22 @@ export default class Marketplace extends React.PureComponent {
             break;
 
         case 'item':
-            let info;
+            let info; // get item info
             try { 
               info = await (await fetch(`${Constants.MARKETPLACE_URL}/item/${type2}/${data}`)).json(); 
             } catch (e) { 
               return toast(this.props.toastLanguage.error);
             }
 
+            // check if already installed
+            let button = this.buttons.install; 
+
+            const installed = JSON.parse(localStorage.getItem('installed'));
+
+            if (installed.some(item => item.name === data)) {
+              button = this.buttons.uninstall;
+            }
+
             this.setState({
                 current_data: { type: type2, name: data, content: info },
                 item_data: {
@@ -72,19 +81,8 @@ export default class Marketplace extends React.PureComponent {
                     updated: info.updated,
                     version: info.data.version,
                     icon: info.data.screenshot_url
-                }
-            });
-
-            let button = this.buttons.install;
-
-            const installed = JSON.parse(localStorage.getItem('installed'));
-
-            if (installed.some(item => item.name === data)) {
-              button = this.buttons.uninstall;
-            }
-
-            this.setState({
-               button: button 
+                },
+                button: button
             });
 
             document.getElementById('marketplace').style.display = 'none';
@@ -101,7 +99,7 @@ export default class Marketplace extends React.PureComponent {
    }
 
   async getItems() {
-    const { data }= await (await fetch(Constants.MARKETPLACE_URL + '/all')).json();
+    const { data } = await (await fetch(Constants.MARKETPLACE_URL + '/all')).json();
     const featured = await (await fetch(Constants.MARKETPLACE_URL + '/featured')).json();
 
     this.setState({
diff --git a/src/components/widgets/greeting/Greeting.jsx b/src/components/widgets/greeting/Greeting.jsx
index 4c2768e9..7d607058 100644
--- a/src/components/widgets/greeting/Greeting.jsx
+++ b/src/components/widgets/greeting/Greeting.jsx
@@ -54,7 +54,9 @@ export default class Greeting extends React.PureComponent {
     const data = localStorage.getItem('greetingName');
 
     if (typeof data === 'string') {
-      if (data.replace(/\s/g, '').length > 0) name = `, ${data.trim()}`;
+      if (data.replace(/\s/g, '').length > 0) {
+        name = `, ${data.trim()}`;
+      }
     }
 
     if (custom === 'false') {
diff --git a/src/components/widgets/quote/Quote.jsx b/src/components/widgets/quote/Quote.jsx
index f3da7d54..e30e34a8 100644
--- a/src/components/widgets/quote/Quote.jsx
+++ b/src/components/widgets/quote/Quote.jsx
@@ -121,30 +121,12 @@ export default class Quote extends React.PureComponent {
   }
 
   componentDidMount() {
-    if (localStorage.getItem('favouriteQuote')) {
-      this.setState({ 
-        favourited: <StarIcon className='copyButton' onClick={() => this.favourite()} /> 
-      });
-    }
+    this.setState({ 
+      favourited: localStorage.getItem('favouriteQuote') ? <StarIcon className='copyButton' onClick={() => this.favourite()} /> : null, // todo: fix (localStorage.getItem('favouriteQuoteEnabled') === 'false')
+      copy: (localStorage.getItem('copyButton') === 'false') ? null : this.state.copy,
+      tweet: (localStorage.getItem('tweetButton') === 'false') ? null: this.state.tweet
+    });
 
-    if (localStorage.getItem('favouriteQuoteEnabled') === 'false') {
-      this.setState({ 
-        favourited: null 
-      });
-    }
-
-    if (localStorage.getItem('copyButton') === 'false') {
-      this.setState({ 
-        copy: null 
-      });
-    }
-
-    if (localStorage.getItem('tweetButton') === 'false') {
-      this.setState({ 
-        tweet: null 
-      });
-    }
-  
     this.getQuote();
   }