diff --git a/src/App.jsx b/src/App.jsx
index 7e144853..d5340b93 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -57,7 +57,7 @@ export default class App extends React.PureComponent {
     return (
       <React.Fragment>
         <Background/>
-        <ToastContainer className='toast' position='bottom-right' autoClose={2500} hideProgressBar={false} newestOnTop={true} closeOnClick rtl={false} pauseOnFocusLoss />
+        <ToastContainer position='bottom-right' autoClose={2500} newestOnTop={true} closeOnClick rtl={false} pauseOnFocusLoss />
         <div id='center'>
           <Search language={language.search} />
           <Navbar settingsModalOpen={() => this.setState({ mainModal: true })} updateModalOpen={() => this.setState({ updateModal: true })} />
@@ -78,9 +78,7 @@ export default class App extends React.PureComponent {
             <Modal id={'modal'} onRequestClose={() => this.setState({ mainModal: false })} isOpen={this.state.mainModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
               <MainModal
                 language={language}
-                modalLanguage={language.modals}
-                modalClose={() => this.setState({ mainsModal: false })}
-                toastLanguage={language.toasts} />
+                modalClose={() => this.setState({ mainsModal: false })} />
             </Modal>
             <Modal onRequestClose={() => this.setState({ updateModal: false })} isOpen={this.state.updateModal} className={modalClassList} overlayClassName={overlayClassList} ariaHideApp={false}>
               <Update
diff --git a/src/components/modals/MainModal.jsx b/src/components/modals/MainModal.jsx
index 94307fee..095ac294 100644
--- a/src/components/modals/MainModal.jsx
+++ b/src/components/modals/MainModal.jsx
@@ -29,7 +29,7 @@ export default class MainModal extends React.PureComponent {
       switch (input) {
           case 'addons':
               this.setState({
-                  tab: <Addons language={this.props.language.addons} marketplaceLanguage={this.props.language.marketplace} toastLanguage={this.props.toastLanguage} openMarketplace={() => this.changeEnabled('marketplace')}/>,
+                  tab: <Addons language={this.props.language.addons} marketplaceLanguage={this.props.language.marketplace} toastLanguage={this.props.language.toasts} openMarketplace={() => this.changeEnabled('marketplace')}/>,
                   addonsActive: 'active',
                   settingsActive: '',
                   marketplaceActive: ''
@@ -37,7 +37,7 @@ export default class MainModal extends React.PureComponent {
               break;
           case 'settings':
               this.setState({
-                  tab: <Settings language={this.props.language.settings} toastLanguage={this.props.toastLanguage}/>,
+                  tab: <Settings language={this.props.language.settings} toastLanguage={this.props.language.toasts}/>,
                   settingsActive: 'active',
                   addonsActive: '',
                   marketplaceActive: ''
@@ -45,7 +45,7 @@ export default class MainModal extends React.PureComponent {
               break;
           case 'marketplace':
               this.setState({
-                  tab: <Marketplace language={this.props.language.marketplace} toastLanguage={this.props.toastLanguage}/>,
+                  tab: <Marketplace language={this.props.language.marketplace} toastLanguage={this.props.language.toasts} updateLanguage={this.props.language.update}/>,
                   marketplaceActive: 'active',
                   addonsActive: '',
                   settingsActive: ''
@@ -60,11 +60,11 @@ export default class MainModal extends React.PureComponent {
     return (
       <div className='content'>
         <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
-        <h1>{this.props.modalLanguage.title}</h1>
+        <h1>{this.props.language.modals.title}</h1>
         <div className='tab'>
-          <button className='tablinks' id={this.state.marketplaceActive} onClick={() => this.changeEnabled('marketplace')}>{this.props.modalLanguage.marketplace}</button>
-          <button className='tablinks' id={this.state.addonsActive} onClick={() => this.changeEnabled('addons')}>{this.props.modalLanguage.addons}</button>
-          <button className='tablinks' id={this.state.settingsActive} onClick={() => this.changeEnabled('settings')}>{this.props.modalLanguage.settings}</button>
+          <button className='tablinks' id={this.state.marketplaceActive} onClick={() => this.changeEnabled('marketplace')}>{this.props.language.modals.marketplace}</button>
+          <button className='tablinks' id={this.state.addonsActive} onClick={() => this.changeEnabled('addons')}>{this.props.language.modals.addons}</button>
+          <button className='tablinks' id={this.state.settingsActive} onClick={() => this.changeEnabled('settings')}>{this.props.language.modals.settings}</button>
         </div>
         <br/>
         {this.state.tab}
diff --git a/src/components/modals/tabs/Marketplace.jsx b/src/components/modals/tabs/Marketplace.jsx
index 5b571338..055e658d 100644
--- a/src/components/modals/tabs/Marketplace.jsx
+++ b/src/components/modals/tabs/Marketplace.jsx
@@ -161,7 +161,7 @@ export default class Marketplace extends React.PureComponent {
         return (
             <div id='marketplace'>
             <div className='emptyMessage' style={{'marginTop': '20px', 'transform': 'translateY(80%)'}}>
-                <h1>Loading...</h1>
+                <h1>{this.props.updateLanguage.loading}</h1>
             </div>
           </div>
         )