diff --git a/frontend/components/Layout.js b/frontend/pages/_app.js
similarity index 54%
rename from frontend/components/Layout.js
rename to frontend/pages/_app.js
index d78d2b2..342b06a 100644
--- a/frontend/components/Layout.js
+++ b/frontend/pages/_app.js
@@ -2,8 +2,8 @@
 import { Fragment } from 'react';
 
 /* Components Imports */
-import Header from './Header/Header';
-import Footer from './Footer/Footer';
+import Header from '../components/Header/Header';
+import Footer from '../components/Footer/Footer';
 
 /* CSS Imports */
 import '../public/fonts/Montserrat/Montserrat.css';
@@ -11,12 +11,14 @@ import '../public/css/normalize.css';
 import '../public/css/grid.css';
 import '../public/css/general.css';
 
-const Layout = (props) => (
+const App = ({ Component, pageProps }) => (
     <Fragment>
         <Header />
-            <div className="content container-fluid">{props.children}</div>
+            <div className="content container-fluid">
+                <Component {...pageProps} />
+            </div>
         <Footer />
     </Fragment>
 );
-  
-export default Layout;
\ No newline at end of file
+
+export default App;
\ No newline at end of file
diff --git a/frontend/pages/index.js b/frontend/pages/index.js
index d76944b..afe58a6 100644
--- a/frontend/pages/index.js
+++ b/frontend/pages/index.js
@@ -1,15 +1,15 @@
-import Layout from '../components/Layout';
+import { Fragment } from 'react';
 import HeadTag from '../components/HeadTag';
 
 const Home = () => (
-    <Layout>
+    <Fragment>
         <HeadTag 
             title="FunctionProject" 
             description="FunctionProject est un projet créé par Divlo qui a pour but de rassembler plein de mini-programme permettant de faire plusieurs choses comme savoir la météo, générer un nombre aléatoire, etc." 
             image="/images/FunctionProject_icon_small.png" 
         />
         <div>Home</div>
-    </Layout>
+    </Fragment>
 );
 
 export default Home;
\ No newline at end of file