diff --git a/src/app/App.tsx b/src/app/App.tsx
index d1ba195e..be113bec 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1,24 +1,38 @@
-import { ApolloProvider } from "@apollo/client/react/context";
-import { ErrorBoundary } from "@components/ErrorBoundary";
-import { RootAppRouter } from "@routers/RootAppRouter";
-import { DateTimeLocalizationProvider } from "./DateTimeLocalizationProvider";
+import CssBaseline from "@mui/material/CssBaseline";
+import { ToastContainer } from "@/components/Alerts";
+import { ErrorBoundary } from "@/components/ErrorBoundary";
+import { RootAppRouter } from "@/routes/RootAppRouter";
+import { ApolloProvider } from "./ApolloProvider";
+import { FetchStateContextProvider } from "./FetchStateContext";
 import { GlobalStyles } from "./GlobalStyles";
 import { PageLayoutContextProvider } from "./PageLayoutContext";
 import { ThemeProvider } from "./ThemeProvider";
-import { ToastContainer } from "./ToastContainer";
-import { apolloClient } from "./apolloClient";
+import { DateTimeLocalizationProvider } from "./localization";
 
+/**
+ * ```
+ *  ███████╗ ██╗ ██╗  ██╗ ██╗ ████████╗
+ *  ██╔════╝ ██║ ╚██╗██╔╝ ██║ ╚══██╔══╝
+ *  █████╗   ██║  ╚███╔╝  ██║    ██║
+ *  ██╔══╝   ██║  ██╔██╗  ██║    ██║
+ *  ██║      ██║ ██╔╝ ██╗ ██║    ██║
+ *  ╚═╝      ╚═╝ ╚═╝  ╚═╝ ╚═╝    ╚═╝
+ * ```
+ */
 export const App = () => (
-  <ApolloProvider client={apolloClient}>
+  <ApolloProvider>
     <ErrorBoundary>
       <PageLayoutContextProvider>
-        <ThemeProvider>
-          <DateTimeLocalizationProvider>
+        <DateTimeLocalizationProvider>
+          <ThemeProvider>
+            <CssBaseline />
             <GlobalStyles />
-            <RootAppRouter />
             <ToastContainer />
-          </DateTimeLocalizationProvider>
-        </ThemeProvider>
+            <FetchStateContextProvider>
+              <RootAppRouter />
+            </FetchStateContextProvider>
+          </ThemeProvider>
+        </DateTimeLocalizationProvider>
       </PageLayoutContextProvider>
     </ErrorBoundary>
   </ApolloProvider>