diff --git a/functions/handlers/users.js b/functions/handlers/users.js
index c165ae0..6c5941f 100644
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
@@ -1,3 +1,4 @@
+/* eslint-disable promise/catch-or-return */
 const {db} = require('../util/admin');
 const {validateUpdateProfileInfo} = require('../util/validator');
 
diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js
index 1fea229..e6efa6c 100644
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -6,6 +6,7 @@ import './App.css';
 import { BrowserRouter as Router } from 'react-router-dom';
 import Route from 'react-router-dom/Route';
 
+import NavBar, { Navbar } from './components/layout/NavBar';
 
 import home from './Home.js';
 import register from './Register.js';
@@ -18,7 +19,9 @@ class App extends Component {
   render() {
     return (
       <Router>
-
+        <div className='container'>
+          <Navbar />
+        </div>
 
         <div className="app">
           <Route exact path="/" component={home}/>
diff --git a/twistter-frontend/src/components/layout/NavBar.js b/twistter-frontend/src/components/layout/NavBar.js
index 9a7d6eb..e4ee5c5 100644
--- a/twistter-frontend/src/components/layout/NavBar.js
+++ b/twistter-frontend/src/components/layout/NavBar.js
@@ -10,8 +10,8 @@ export class Navbar extends Component {
         return (
             <AppBar>
                 <ToolBar>
-                    <Button component={ Link } to='/user'>
-                        User
+                    <Button component={ Link } to='/'>
+                        Home
                     </Button>
                     <Button component={ Link } to='/login'>
                         Login
@@ -19,9 +19,7 @@ export class Navbar extends Component {
                     <Button component={ Link } to='/register'>
                         Register
                     </Button>
-                    <Button component={ Link } to='/'>
-                        Home
-                    </Button>
+                    
                 </ToolBar>
             </AppBar>
         )