diff --git a/web/src/app/app-routing.module.ts b/web/src/app/app-routing.module.ts
index cd3f3a54..1746cae3 100644
--- a/web/src/app/app-routing.module.ts
+++ b/web/src/app/app-routing.module.ts
@@ -1,5 +1,5 @@
-import { HomeComponent } from './components/home/home.component';
-import { AboutComponent } from './components/about/about.component';
+import { HomeComponent } from './pages/home/home.component';
+import { AboutComponent } from './pages/about/about.component';
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
diff --git a/web/src/app/app.component.html b/web/src/app/app.component.html
index 984ed506..6659729a 100644
--- a/web/src/app/app.component.html
+++ b/web/src/app/app.component.html
@@ -1,20 +1,2 @@
-<!-- TODO: figure out if the <nav> should go inside of a <header> element. -->
-<nav class="docs-navbar">
-  <md-toolbar color="primary">
-  <a md-button class="docs-button" routerLink="/" aria-label="Angular Material">
-    <span>Logo</span>
-  </a>
-  <a md-button class="docs-button" routerLink="about">Dashboard</a>
-  <a md-button class="docs-button" routerLink="about">Wallet Summary</a>
-  <a md-button class="docs-button" routerLink="about">Settings</a>
-  <a md-button class="docs-button" routerLink="about">Help</a>
-  <div class="flex-spacer"></div>
-  <a md-button class="docs-button" href="https://github.com/angular/material2" aria-label="GitHub Repository">
-    GitHub
-  </a>
-  </md-toolbar>
-</nav>
-
-
-
+<app-navbar></app-navbar>
 <router-outlet></router-outlet>
diff --git a/web/src/app/app.component.ts b/web/src/app/app.component.ts
index 3039aa11..e0da5672 100644
--- a/web/src/app/app.component.ts
+++ b/web/src/app/app.component.ts
@@ -4,7 +4,7 @@ import { ElectronService } from './providers/electron.service';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+  styleUrls: ['./app.component.scss'],
 })
 export class AppComponent {
   constructor(public electronService: ElectronService) {
diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts
index 136f0c67..a369bb3d 100644
--- a/web/src/app/app.module.ts
+++ b/web/src/app/app.module.ts
@@ -10,18 +10,20 @@ import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
-import { HomeComponent } from './components/home/home.component';
-import { AboutComponent } from './components/about/about.component';
+import { HomeComponent } from './pages/home/home.component';
+import { AboutComponent } from './pages/about/about.component';
 
 import { AppRoutingModule } from './app-routing.module';
 
 import { ElectronService } from './providers/electron.service';
+import { NavbarComponent } from './shared/navbar/navbar.component';
 
 @NgModule({
   declarations: [
     AppComponent,
     HomeComponent,
-    AboutComponent
+    AboutComponent,
+    NavbarComponent
   ],
   imports: [
     BrowserModule,
diff --git a/web/src/app/components/about/about.component.html b/web/src/app/pages/about/about.component.html
similarity index 100%
rename from web/src/app/components/about/about.component.html
rename to web/src/app/pages/about/about.component.html
diff --git a/web/src/app/components/about/about.component.scss b/web/src/app/pages/about/about.component.scss
similarity index 100%
rename from web/src/app/components/about/about.component.scss
rename to web/src/app/pages/about/about.component.scss
diff --git a/web/src/app/components/about/about.component.spec.ts b/web/src/app/pages/about/about.component.spec.ts
similarity index 100%
rename from web/src/app/components/about/about.component.spec.ts
rename to web/src/app/pages/about/about.component.spec.ts
diff --git a/web/src/app/components/about/about.component.ts b/web/src/app/pages/about/about.component.ts
similarity index 100%
rename from web/src/app/components/about/about.component.ts
rename to web/src/app/pages/about/about.component.ts
diff --git a/web/src/app/components/home/home.component.html b/web/src/app/pages/home/home.component.html
similarity index 99%
rename from web/src/app/components/home/home.component.html
rename to web/src/app/pages/home/home.component.html
index c5631912..946b2403 100644
--- a/web/src/app/components/home/home.component.html
+++ b/web/src/app/pages/home/home.component.html
@@ -4,3 +4,4 @@
   </h1>
   <a routerLink="/about" routerLinkActive="active" >hello</a>
 </div>
+
diff --git a/web/src/app/components/home/home.component.scss b/web/src/app/pages/home/home.component.scss
similarity index 100%
rename from web/src/app/components/home/home.component.scss
rename to web/src/app/pages/home/home.component.scss
diff --git a/web/src/app/components/home/home.component.spec.ts b/web/src/app/pages/home/home.component.spec.ts
similarity index 100%
rename from web/src/app/components/home/home.component.spec.ts
rename to web/src/app/pages/home/home.component.spec.ts
diff --git a/web/src/app/components/home/home.component.ts b/web/src/app/pages/home/home.component.ts
similarity index 85%
rename from web/src/app/components/home/home.component.ts
rename to web/src/app/pages/home/home.component.ts
index edf1531c..4b4e0dab 100644
--- a/web/src/app/components/home/home.component.ts
+++ b/web/src/app/pages/home/home.component.ts
@@ -3,7 +3,8 @@ import { Component, OnInit } from '@angular/core';
 @Component({
   selector: 'app-home',
   templateUrl: './home.component.html',
-  styleUrls: ['./home.component.scss']
+  styleUrls: ['./home.component.scss'],
+
 })
 export class HomeComponent implements OnInit {
   title = `App works !`;
diff --git a/web/src/app/shared/navbar/navbar.component.html b/web/src/app/shared/navbar/navbar.component.html
new file mode 100644
index 00000000..45227148
--- /dev/null
+++ b/web/src/app/shared/navbar/navbar.component.html
@@ -0,0 +1,16 @@
+<!-- TODO: figure out if the <nav> should go inside of a <header> element. -->
+<nav class="docs-navbar">
+  <md-toolbar color="primary">
+  <a md-button class="docs-button" routerLink="/" aria-label="Angular Material">
+    <span>Logo</span>
+  </a>
+  <a md-button class="docs-button" routerLink="about">Dashboard</a>
+  <a md-button class="docs-button" routerLink="about">Wallet Summary</a>
+  <a md-button class="docs-button" routerLink="about">Settings</a>
+  <a md-button class="docs-button" routerLink="about">Help</a>
+  <div class="flex-spacer"></div>
+  <a md-button class="docs-button" href="https://github.com/thrasher-/gocryptotrader/issues" aria-label="GitHub Repository">
+    Report issue
+  </a>
+  </md-toolbar>
+</nav>
\ No newline at end of file
diff --git a/web/src/app/shared/navbar/navbar.component.scss b/web/src/app/shared/navbar/navbar.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/web/src/app/shared/navbar/navbar.component.spec.ts b/web/src/app/shared/navbar/navbar.component.spec.ts
new file mode 100644
index 00000000..4e5f590e
--- /dev/null
+++ b/web/src/app/shared/navbar/navbar.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NavbarComponent } from './navbar.component';
+
+describe('NavbarComponent', () => {
+  let component: NavbarComponent;
+  let fixture: ComponentFixture<NavbarComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NavbarComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NavbarComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should be created', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/web/src/app/shared/navbar/navbar.component.ts b/web/src/app/shared/navbar/navbar.component.ts
new file mode 100644
index 00000000..a1b4d251
--- /dev/null
+++ b/web/src/app/shared/navbar/navbar.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-navbar',
+  templateUrl: './navbar.component.html',
+  styleUrls: ['./navbar.component.scss']
+})
+export class NavbarComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}