diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js
index 2e2c654b..c82b25b9 100644
--- a/frontend/src/components/App.js
+++ b/frontend/src/components/App.js
@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { Component , Suspense } from "react";
 import ReactDOM from 'react-dom/client';
 import HomePage from "./HomePage";
 import { CssBaseline, IconButton , Link} from "@mui/material";
@@ -36,6 +36,7 @@ export default class App extends Component {
 
   render() {
     return (
+      <Suspense fallback="loading language">
       <I18nextProvider i18n={i18n}>
         <ThemeProvider theme={this.state.dark ? this.darkTheme : this.lightTheme}>
           <CssBaseline/>
@@ -48,6 +49,7 @@ export default class App extends Component {
           <HomePage/>
         </ThemeProvider>
       </I18nextProvider>
+      </Suspense>
     );
   }
 }
diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js
index de7df16c..2876ccb6 100644
--- a/frontend/src/components/BottomBar.js
+++ b/frontend/src/components/BottomBar.js
@@ -294,15 +294,17 @@ bottomBarDesktop =()=>{
     }
 
     LangSelect = () => {
-        const { i18n} = this.props;
+        const { i18n } = this.props;
+        const lang = i18n.resolvedLanguage == null ? 'en' : i18n.resolvedLanguage.substring(0,2);
         const flagProps = {
             width: 20,
             height: 20,
           };
+
         return(
             <Select
                 size = 'small'
-                value = {i18n.resolvedLanguage.substring(0,2)}
+                value = {lang}
                 inputProps={{
                     style: {textAlign:"center"}
                 }}
diff --git a/frontend/src/components/i18n.js b/frontend/src/components/i18n.js
index 9fbb9ad5..dcd808d2 100644
--- a/frontend/src/components/i18n.js
+++ b/frontend/src/components/i18n.js
@@ -3,37 +3,119 @@ import LanguageDetector from "i18next-browser-languagedetector";
 import { initReactI18next } from "react-i18next";
 import HttpApi from 'i18next-http-backend';
 
-import translationEN from "../locales/en.json";
-import translationES from "../locales/es.json";
-import translationDE from "../locales/de.json";
-import translationRU from "../locales/ru.json";
-// import translationZH from "../locales/zh.json";
-import translationPL from "../locales/pl.json";
-import translationFR from "../locales/fr.json";
-import translationCA from "../locales/ca.json";
-import translationIT from "../locales/it.json";
-import translationPT from "../locales/pt.json";
-import translationEU from "../locales/eu.json";
+// import translationEN from "../../static/locales/en.json";
+// import translationES from "../../static/locales/es.json";
+// import translationDE from "../../static/locales/de.json";
+// import translationRU from "../../static/locales/ru.json";
+// // import translationZH from "../../static/locales/zh.json";
+// import translationPL from "../../static/locales/pl.json";
+// import translationFR from "../../static/locales/fr.json";
+// import translationCA from "../../static/locales/ca.json";
+// import translationIT from "../../static/locales/it.json";
+// import translationPT from "../../static/locales/pt.json";
+// import translationEU from "../../static/locales/eu.json";
 
 i18n
   .use(HttpApi)
   .use(LanguageDetector)
   .use(initReactI18next)
   .init({
-  resources: {
-    en: {translations: translationEN},
-    es: {translations: translationES},
-    ru: {translations: translationRU},
-    de: {translations: translationDE},
-    // zh: {translations: translationZH},
-    pl: {translations: translationPL},
-    fr: {translations: translationFR},
-    ca: {translations: translationCA},
-    it: {translations: translationIT},
-    pt: {translations: translationPT},
-    eu: {translations: translationEU},
-  },
+  // resources: {
+  //   en: {translations: translationEN},
+  //   es: {translations: translationES},
+  //   ru: {translations: translationRU},
+  //   de: {translations: translationDE},
+  //   // zh: {translations: translationZH},
+  //   pl: {translations: translationPL},
+  //   fr: {translations: translationFR},
+  //   ca: {translations: translationCA},
+  //   it: {translations: translationIT},
+  //   pt: {translations: translationPT},
+  //   eu: {translations: translationEU},
+  // },
   
+  backend:{
+    // path where resources get loaded from, or a function
+    // returning a path:
+    // function(lngs, namespaces) { return customPath; }
+    // the returned path will interpolate lng, ns if provided like giving a static path
+    // the function might return a promise
+    // returning falsy will abort the download
+    //
+    // If allowMultiLoading is false, lngs and namespaces will have only one element each,
+    // If allowMultiLoading is true, lngs and namespaces can have multiple elements
+    loadPath: '/static/locales/{{lng}}.json',
+  
+    // path to post missing resources, or a function
+    // function(lng, namespace) { return customPath; }
+    // the returned path will interpolate lng, ns if provided like giving a static path
+    addPath: '/static/locales/add/{{lng}}/{{ns}}',
+  
+    // your backend server supports multiloading
+    // /locales/resources.json?lng=de+en&ns=ns1+ns2
+    // Adapter is needed to enable MultiLoading https://github.com/i18next/i18next-multiload-backend-adapter
+    // Returned JSON structure in this case is
+    // {
+    //  lang : {
+    //   namespaceA: {},
+    //   namespaceB: {},
+    //   ...etc
+    //  }
+    // }
+    allowMultiLoading: false, // set loadPath: '/locales/resources.json?lng={{lng}}&ns={{ns}}' to adapt to multiLoading
+  
+    // parse data after it has been fetched
+    // in example use https://www.npmjs.com/package/json5
+    // here it removes the letter a from the json (bad idea)
+    //parse: function(data) { return data.replace(/a/g, ''); },
+  
+    //parse data before it has been sent by addPath
+    //parsePayload: function(namespace, key, fallbackValue) { return { key } },
+  
+    // allow cross domain requests
+    crossDomain: false,
+  
+    // allow credentials on cross domain requests
+    withCredentials: false,
+  
+    // overrideMimeType sets request.overrideMimeType("application/json")
+    overrideMimeType: false,
+  
+    // custom request headers sets request.setRequestHeader(key, value)
+    // customHeaders: {
+    //   authorization: 'foo',
+    //   // ...
+    // },
+    // can also be a function, that returns the headers
+    // customHeaders: () => ({
+    //   authorization: 'foo',
+    //   // ...
+    // }),
+  
+    // requestOptions: { // used for fetch, can also be a function (payload) => ({ method: 'GET' })
+    //   mode: 'cors',
+    //   credentials: 'same-origin',
+    //   cache: 'default'
+    // },
+  
+    // define a custom request function
+    // can be used to support XDomainRequest in IE 8 and 9
+    //
+    // 'options' will be this entire options object
+    // 'url' will be passed the value of 'loadPath'
+    // 'payload' will be a key:value object used when saving missing translations
+    // 'callback' is a function that takes two parameters, 'err' and 'res'.
+    //            'err' should be an error
+    //            'res' should be an object with a 'status' property and a 'data' property containing a stringified object instance beeing the key:value translation pairs for the
+    //            requested language and namespace, or null in case of an error.
+    //request: function (options, url, payload, callback) {},
+  
+    // adds parameters to resource URL. 'example.com' -> 'example.com?v=1.3.5'
+    // queryStringParams: { v: '1.3.5' },
+  
+    reloadInterval: false // can be used to reload resources in a specific interval (useful in server environments)
+  },
+
   fallbackLng: "en",
   debug: false,
 
diff --git a/frontend/src/locales/CONTRIBUTING.MD b/frontend/static/locales/CONTRIBUTING.MD
similarity index 100%
rename from frontend/src/locales/CONTRIBUTING.MD
rename to frontend/static/locales/CONTRIBUTING.MD
diff --git a/frontend/src/locales/ca.json b/frontend/static/locales/ca.json
similarity index 100%
rename from frontend/src/locales/ca.json
rename to frontend/static/locales/ca.json
diff --git a/frontend/src/locales/de.json b/frontend/static/locales/de.json
similarity index 100%
rename from frontend/src/locales/de.json
rename to frontend/static/locales/de.json
diff --git a/frontend/src/locales/en.json b/frontend/static/locales/en.json
similarity index 100%
rename from frontend/src/locales/en.json
rename to frontend/static/locales/en.json
diff --git a/frontend/src/locales/es.json b/frontend/static/locales/es.json
similarity index 100%
rename from frontend/src/locales/es.json
rename to frontend/static/locales/es.json
diff --git a/frontend/src/locales/eu.json b/frontend/static/locales/eu.json
similarity index 100%
rename from frontend/src/locales/eu.json
rename to frontend/static/locales/eu.json
diff --git a/frontend/src/locales/fr.json b/frontend/static/locales/fr.json
similarity index 100%
rename from frontend/src/locales/fr.json
rename to frontend/static/locales/fr.json
diff --git a/frontend/src/locales/it.json b/frontend/static/locales/it.json
similarity index 100%
rename from frontend/src/locales/it.json
rename to frontend/static/locales/it.json
diff --git a/frontend/src/locales/pl.json b/frontend/static/locales/pl.json
similarity index 100%
rename from frontend/src/locales/pl.json
rename to frontend/static/locales/pl.json
diff --git a/frontend/src/locales/pt.json b/frontend/static/locales/pt.json
similarity index 100%
rename from frontend/src/locales/pt.json
rename to frontend/static/locales/pt.json
diff --git a/frontend/src/locales/ru.json b/frontend/static/locales/ru.json
similarity index 100%
rename from frontend/src/locales/ru.json
rename to frontend/static/locales/ru.json
diff --git a/frontend/src/locales/zh.json b/frontend/static/locales/zh.json
similarity index 100%
rename from frontend/src/locales/zh.json
rename to frontend/static/locales/zh.json