diff --git a/BOILERPLATE.md b/BOILERPLATE.md
index 72f75fb7..8c9bd74d 100644
--- a/BOILERPLATE.md
+++ b/BOILERPLATE.md
@@ -29,14 +29,6 @@ To match a URL to a specific page (i.e. you want to add a contacts page), you mu
 
 React Router Docs : https://reacttraining.com/react-router/web/guides/quick-start
 
-
-
-```js
-export default withRouter(connect(mapStateToProps, mapActionsToProps)(TopButtonBar));
-```
-
-> From `/src/components/HomePage/TopButtonBar.js`
-
 ## Material UI
 
 The Visual components used in this project come from `material-ui` framework, which provides many web elements and utilities to allow an easier and more responsive development of an UI/UX with Material Design styles.
diff --git a/package-lock.json b/package-lock.json
index b0d3f1a5..b114cdba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6929,9 +6929,9 @@
       "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="
     },
     "handlebars": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
-      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
+      "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
       "requires": {
         "neo-async": "^2.6.0",
         "optimist": "^0.6.1",
diff --git a/src/AppRouter.js b/src/AppRouter.js
index deb8a486..38eb53d3 100644
--- a/src/AppRouter.js
+++ b/src/AppRouter.js
@@ -1,19 +1,27 @@
-import React from "react";
+/* istanbul ignore file */
+// ReactDOMServer does not support Suspense for now, so ignoring coverage
+
+import React, { Suspense } from "react";
 import { BrowserRouter, Switch, Route } from "react-router-dom";
-import HomePage from "./pages/HomePage";
-import NotFound from "./pages/NotFound";
+import { LinearProgress } from "@material-ui/core";
+
+const HomePage = React.lazy(() => import("./pages/HomePage"));
+const NotFound = React.lazy(() => import("./pages/NotFound"));
 
 const AppRouter = () => (
     <BrowserRouter basename={`${process.env.REACT_APP_BASE_ROUTE || "/"}`}>
-        <Switch>
-            <Route
-                exact
-                path="/"
-                component={HomePage}
-            />
-            <Route component={NotFound} />
-        </Switch>
+        <Suspense fallback={<LinearProgress color="secondary"/>}>
+            <Switch>
+                <Route exact path="/">
+                    <HomePage />
+                </Route>
+                <Route>
+                    <NotFound />
+                </Route>
+            </Switch>
+        </Suspense>
     </BrowserRouter>
 );
 
+
 export default AppRouter;
diff --git a/src/AppRouter.spec.js b/src/AppRouter.spec.js
index aec2256b..a371f8fe 100644
--- a/src/AppRouter.spec.js
+++ b/src/AppRouter.spec.js
@@ -1,13 +1,12 @@
 import React from "react";
 import AppRouter from "./AppRouter";
 import { Route } from "react-router-dom";
-import HomePage from "./pages/HomePage";
 
 describe("AppRouter", () => {
     it("should have a landing route", () => {
         const firstRoute = shallow(<AppRouter />).find(Route).first();
         expect(firstRoute.prop("path")).toEqual("/");
         expect(firstRoute.prop("exact")).toBe(true);
-        expect(firstRoute.prop("component")).toEqual(HomePage);
+        // expect(firstRoute.find(HomePage).exists()).toBe(true);
     });
 });