diff --git a/static/src/Header/Header.js b/static/src/Header/Header.js
deleted file mode 100644
index 5c0a2e2..0000000
--- a/static/src/Header/Header.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
-
-export default class HeaderComponent extends Component {
-    render() {
-        return (
-            <ul>
-                <li><Link to="/">Home</Link></li>
-                <li><Link to="/about">About</Link></li>
-            </ul>
-        )
-    }
-};
diff --git a/static/src/Home/Home.css b/static/src/Home/Home.css
index 0fbc026..30ae385 100644
--- a/static/src/Home/Home.css
+++ b/static/src/Home/Home.css
@@ -1,4 +1,4 @@
-@media only screen and (min-width: 768px) {
+/* @media only screen and (min-width: 768px) {
     #rootContainer {
         margin-top: 150px
     }
@@ -8,4 +8,4 @@
     #rootContainer {
         margin-top: 50px
     }
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/static/src/Home/Home.js b/static/src/Home/Home.js
index 9f78ba9..bfd414d 100644
--- a/static/src/Home/Home.js
+++ b/static/src/Home/Home.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { Container, Input, Segment, Form, Modal, Button } from 'semantic-ui-react'
+import { Input, Segment, Form, Modal, Button } from 'semantic-ui-react'
 
 import './Home.css';
 
@@ -75,16 +75,14 @@ export default class HomeComponent extends Component {
     const { open, authorized } = this.state
     if (authorized) {
       return (
-        <Container id='rootContainer' >
-          <Segment raised>
-            <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa strong. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede link mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi.</p>
-            <Form onSubmit={this.handleURLSubmit}>
-              <Form.Field>
-                <Input size='big' action={{ icon: 'arrow right', labelPosition: 'right', content: 'Shorten' }} type='url' onChange={this.handleURLChange} name='url' placeholder='Paste a link to shorten it' />
-              </Form.Field>
-            </Form>
-          </Segment>
-        </Container>
+        <Segment raised>
+          <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa strong. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede link mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi.</p>
+          <Form onSubmit={this.handleURLSubmit}>
+            <Form.Field>
+              <Input size='big' action={{ icon: 'arrow right', labelPosition: 'right', content: 'Shorten' }} type='url' onChange={this.handleURLChange} name='url' placeholder='Paste a link to shorten it' />
+            </Form.Field>
+          </Form>
+        </Segment>
       )
     } else {
       return (
diff --git a/static/src/index.js b/static/src/index.js
index 66a8e6e..072c483 100644
--- a/static/src/index.js
+++ b/static/src/index.js
@@ -1,25 +1,59 @@
 import registerServiceWorker from './registerServiceWorker';
-import React from 'react'
+import React, { Component } from 'react'
 import ReactDOM from 'react-dom';
 import {
     HashRouter,
-    Route
+    Route,
+    Link
 } from 'react-router-dom'
+import { Menu, Container } from 'semantic-ui-react'
 
-import Header from './Header/Header'
 import About from './About/About'
 import Home from './Home/Home'
 
 import 'semantic-ui-css/semantic.min.css';
 
+export default class BaseComponent extends Component {
+    state = {}
+
+    handleItemClick = (e, { name }) => this.setState({ activeItem: name })
+
+    render() {
+        const { activeItem } = this.state
+
+        return (
+            <HashRouter>
+                <Container style={{ "margin-top": "15px" }}>
+                    <Menu stackable>
+                        <Menu.Item to="/">
+                            <img src='https://react.semantic-ui.com/logo.png' alt='user profile picture' />
+                        </Menu.Item>
+
+                        <Menu.Item name='features' active={activeItem === 'features'} onClick={this.handleItemClick} as={Link} to="/">
+                            Shorten
+                        </Menu.Item>
+
+                        <Menu.Item name='testimonials' active={activeItem === 'testimonials'} onClick={this.handleItemClick} as={Link} to="/about">
+                            About
+                        </Menu.Item>
+
+                        <Menu.Item name='sign-in' active={activeItem === 'sign-in'} onClick={this.handleItemClick}>
+                            Sign-in
+                        </Menu.Item>
+                        <Menu.Menu position='right'>
+                            <Menu.Item name='logout' active={activeItem === 'logout'} onClick={this.handleItemClick} />
+                        </Menu.Menu>
+                    </Menu>
+                    <Route exact path="/" component={Home} />
+                    <Route path="/about" component={About} />
+                </Container>
+            </HashRouter>
+        )
+    }
+}
+
 ReactDOM.render((
-    <HashRouter>
-        <div>
-            <Header />
-            <Route exact path="/" component={Home} />
-            <Route path="/about" component={About} />
-        </div>
-    </HashRouter>
+    <BaseComponent />
 ), document.getElementById('root'))
 
 registerServiceWorker();
\ No newline at end of file