diff --git a/src/components/modals/Addons.jsx b/src/components/modals/Addons.jsx
index 0c7a155f..853efb9f 100644
--- a/src/components/modals/Addons.jsx
+++ b/src/components/modals/Addons.jsx
@@ -145,16 +145,24 @@ export default class Addons extends React.PureComponent {
   }
 
   render() {
+     let content = <div id='marketplace'>
+     <input id='file-input' type='file' name='name' className='hidden' />
+     <button className='addToMue sideload' onClick={() => document.getElementById('file-input').click()}>Sideload</button>
+     <h1>{this.props.language.added}</h1>
+       <div className='items'>
+           {this.state.installed.map((item) =>
+                <div className='item' onClick={() => this.toggle('item', item.type, item.name)}>
+                <img alt='icon' src={item.content.data.icon_url} />
+                <div className='details'>
+                    <h4>{item.content.data.name}</h4>
+                    <p>{item.content.data.author}</p>
+                </div>
+            </div>)}
+       </div>
+     </div>;
+
      if (this.state.installed.length === 0) {
-         return <div className='content'>
-         <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
-         <h1>{this.props.modalLanguage.title}</h1>
-             <div className='tab'>
-               <button className='tablinks' onClick={this.props.openMarketplace}>{this.props.modalLanguage.marketplace}</button>
-               <button className='tablinks' id='active'>{this.props.modalLanguage.addons}</button>
-               <button className='tablinks' onClick={this.props.openSettings}>{this.props.modalLanguage.settings}</button>
-            </div>
-         <div id='marketplace'>
+         content = <div id='marketplace'>
          <input id='file-input' type='file' name='name' className='hidden' />
          <button className='addToMue sideload' onClick={() => document.getElementById('file-input').click()}>Sideload</button>
            <h1>{this.props.language.added}</h1>
@@ -166,33 +174,18 @@ export default class Addons extends React.PureComponent {
                     <button className='goToMarket' onClick={this.props.openMarketplace}>{this.props.language.empty.button}</button>
               </div>
            </div>
-         </div>
-        </div>;
+         </div>;
      }
 
     return <div className='content'>
         <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
         <h1>{this.props.modalLanguage.title}</h1>
-             <div className='tab'>
-               <button className='tablinks' onClick={this.props.openMarketplace}>{this.props.modalLanguage.marketplace}</button>
-               <button className='tablinks' id='active'>{this.props.modalLanguage.addons}</button>
-               <button className='tablinks' onClick={this.props.openSettings}>{this.props.modalLanguage.settings}</button>
-            </div>
-        <div id='marketplace'>
-        <input id='file-input' type='file' name='name' className='hidden' />
-        <button className='addToMue sideload' onClick={() => document.getElementById('file-input').click()}>Sideload</button>
-        <h1>{this.props.language.added}</h1>
-          <div className='items'>
-              {this.state.installed.map((item) =>
-                   <div className='item' onClick={() => this.toggle('item', item.type, item.name)}>
-                   <img alt='icon' src={item.content.data.icon_url} />
-                   <div className='details'>
-                       <h4>{item.content.data.name}</h4>
-                       <p>{item.content.data.author}</p>
-                   </div>
-               </div>)}
-          </div>
+        <div className='tab'>
+            <button className='tablinks' onClick={this.props.openMarketplace}>{this.props.modalLanguage.marketplace}</button>
+            <button className='tablinks' id='active'>{this.props.modalLanguage.addons}</button>
+            <button className='tablinks' onClick={this.props.openSettings}>{this.props.modalLanguage.settings}</button>
         </div>
+        {content}
         <Item button={this.state.button} data={this.state.item_data} function={() => this.toggle()} language={this.props.marketplaceLanguage.product} />
     </div>;
     }
diff --git a/src/components/modals/Marketplace.jsx b/src/components/modals/Marketplace.jsx
index f254c70f..b51812fe 100644
--- a/src/components/modals/Marketplace.jsx
+++ b/src/components/modals/Marketplace.jsx
@@ -232,7 +232,12 @@ export default class Marketplace extends React.PureComponent {
                    toggleFunction={(input) => this.toggle('item', 'theme', input)}
                    seeMoreFunction={() => this.toggle('seemore', 'themes')} />
              </div>
-             <Item button={this.state.button} data={this.state.item_data} function={() => this.toggle()} language={this.props.language.product} />
+             <Item
+               button={this.state.button}
+               data={this.state.item_data}
+               content={this.state.current_data}
+               function={() => this.toggle()} language={this.props.language.product}
+             />
              <div id='seemore'>
                 <ArrowBackIcon className='backArrow' onClick={() => this.toggle()} />
                 <Items
diff --git a/src/components/modals/marketplace/Item.jsx b/src/components/modals/marketplace/Item.jsx
index 9b6fccac..352e2d7c 100644
--- a/src/components/modals/marketplace/Item.jsx
+++ b/src/components/modals/marketplace/Item.jsx
@@ -5,14 +5,17 @@ export default class Item extends React.PureComponent {
   render() {
     //if (!this.props.data.icon) return null;
     let warningHTML;
-    if (this.props.data.quote_api) {
-      warningHTML = <div className='productInformation'>
-          <ul>
-              <li className='header'>{this.props.language.quoteWarning.title}</li>
-              <li id='updated'>{this.props.language.quoteWarning.description}</li>
-          </ul>
-      </div>
-    }
+    try { // For some reason it breaks sometimes so we use try/catch
+      if (this.props.content.content.data.quote_api) {
+        warningHTML = <div className='productInformation'>
+            <ul>
+                <li className='header'>{this.props.language.quoteWarning.title}</li>
+                <li id='updated'>{this.props.language.quoteWarning.description}</li>
+            </ul>
+        </div>
+      }
+    } catch (e) {}
+
     return (
       <div id='item'>
       <br/>
diff --git a/src/modules/marketplaceFunctions.js b/src/modules/marketplaceFunctions.js
index 272797e4..649d4e59 100644
--- a/src/modules/marketplaceFunctions.js
+++ b/src/modules/marketplaceFunctions.js
@@ -29,6 +29,7 @@ export default class MarketplaceFunctions {
             case 'quote_pack':
                 localStorage.removeItem('quote_packs');
                 localStorage.removeItem('quote_api');
+                uninstallStuff();
                 break;
             default:
               try {