diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 9142994..e8bd257 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -1,5 +1,6 @@
 import "@fontsource/roboto";
 
+import { Suspense } from "react";
 import { BrowserRouter, Route, Redirect, Switch } from "react-router-dom";
 
 import Theme from "./components/Theme";
@@ -10,19 +11,25 @@ import NotFound from "./routes/NotFound";
 import Network from "./routes/Network/Network";
 import Settings from "./routes/Settings";
 
+import Loading from "./components/Loading";
+
+import "./i18n";
+
 function App() {
   return (
     <Theme>
-      <BrowserRouter basename="/app">
-        <Bar />
-        <Switch>
-          <Route exact path="/" component={Home} />
-          <Route path="/network/:nwid" component={Network} />
-          <Route path="/settings" component={Settings} />
-          <Route path="/404" component={NotFound} />
-          <Redirect to="/404" />
-        </Switch>
-      </BrowserRouter>
+      <Suspense fallback={<Loading />}>
+        <BrowserRouter basename="/app">
+          <Bar />
+          <Switch>
+            <Route exact path="/" component={Home} />
+            <Route path="/network/:nwid" component={Network} />
+            <Route path="/settings" component={Settings} />
+            <Route path="/404" component={NotFound} />
+            <Redirect to="/404" />
+          </Switch>
+        </BrowserRouter>
+      </Suspense>
     </Theme>
   );
 }
diff --git a/frontend/src/components/Loading/Loading.jsx b/frontend/src/components/Loading/Loading.jsx
index a197665..7122fe7 100644
--- a/frontend/src/components/Loading/Loading.jsx
+++ b/frontend/src/components/Loading/Loading.jsx
@@ -7,7 +7,7 @@ function Loading() {
 
   return (
     <div className={classes.root}>
-      <CircularProgress color="secondary" />
+      <CircularProgress color="primary" />
       <Typography variant="h6" component="div" className={classes.loadingText}>
         Loading
         <span className="loadingDots"></span>
diff --git a/frontend/src/index.jsx b/frontend/src/index.jsx
index fcc4df5..3c94589 100644
--- a/frontend/src/index.jsx
+++ b/frontend/src/index.jsx
@@ -1,18 +1,13 @@
 import "./index.css";
 
-import React, { Suspense } from "react";
+import React from "react";
 import ReactDOM from "react-dom";
 
 import App from "./App";
 
-import "./i18n";
-import Loading from "components/Loading";
-
 ReactDOM.render(
   <React.StrictMode>
-    <Suspense fallback={<Loading />}>
-      <App />
-    </Suspense>
+    <App />
   </React.StrictMode>,
   document.getElementById("root")
 );