--- a/client/src/App.js	Wed May 31 17:28:12 2017 +0200
+++ b/client/src/App.js	Wed May 31 17:51:54 2017 +0200
@@ -1,44 +1,19 @@
 import React, { Component } from 'react';
-import logo from './logo.svg';
-import { Grid, Navbar, Jumbotron, Button, Row, Col} from 'react-bootstrap';
+
+// import logo from './logo.svg';
+import { Grid, Row, Col, Alert } from 'react-bootstrap';
 import './App.css';
-import NotesContainer from './components/NotesContainer';
+import Navbar from './components/Navbar';
 
 class App extends Component {
   render() {
     return (
       <div>
-        <Navbar inverse fixedTop>
-          <Grid>
-            <Navbar.Header>
-              <Navbar.Brand>
-                <a href="/">React App</a>
-              </Navbar.Brand>
-              <Navbar.Toggle />
-            </Navbar.Header>
-          </Grid>
-        </Navbar>
-        <Jumbotron>
-          <Grid>
-            <h1>Welcome to React <img src={logo} className="App-logo" alt="logo" /></h1>
-            <p>
-              <Button
-                bsStyle="success"
-                bsSize="large"
-                href="http://react-bootstrap.github.io/components.html"
-                target="_blank">
-                View React Bootstrap Docs
-              </Button>
-            </p>
-            <p className="App-intro">
-              To get started, edit <code>src/App.js</code> and save to reload.
-            </p>
-          </Grid>
-        </Jumbotron>
-        <Grid>
+        <Navbar history={this.props.history} />
+        <Grid fluid>
           <Row>
-            <Col xs={12} md={12}>
-              <NotesContainer />
+            <Col md={6} mdOffset={3} className="text-center">
+              <Alert bsStyle="info">Welcome to IRI Notes</Alert>
             </Col>
           </Row>
         </Grid>
@@ -47,4 +22,4 @@
   }
 }
 
-export default App;
\ No newline at end of file
+export default App;