diff --git a/Client/src/app/app.component.html b/Client/src/app/app.component.html
index 065fe37..1e9a244 100644
--- a/Client/src/app/app.component.html
+++ b/Client/src/app/app.component.html
@@ -1,5 +1,2 @@
 <nav-menu></nav-menu>
 <app-home></app-home>
-
-
-
diff --git a/Client/src/app/app.component.ts b/Client/src/app/app.component.ts
index 81f8620..363c824 100644
--- a/Client/src/app/app.component.ts
+++ b/Client/src/app/app.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { AuthService } from './services/auth.service';
 import { JwtHelperService } from '@auth0/angular-jwt';
+import { Title } from '@angular/platform-browser';
 
 @Component({
   selector: 'app-root',
@@ -12,9 +13,11 @@ export class AppComponent implements OnInit {
   private title = 'Friendster';
   private jwtHelper = new JwtHelperService();
 
-  constructor(private authService: AuthService) { }
+  constructor(private authService: AuthService, private titleService: Title) { }
 
   ngOnInit(): void {
+    this.titleService.setTitle(this.title);
+
     const token = localStorage.getItem('token');
     if (token) {
       this.authService.decodedToken = this.jwtHelper.decodeToken(token);
diff --git a/Client/src/app/app.module.ts b/Client/src/app/app.module.ts
index 25d0584..e5aa6a1 100644
--- a/Client/src/app/app.module.ts
+++ b/Client/src/app/app.module.ts
@@ -11,19 +11,27 @@ import { RegisterComponent } from './components/register/register.component';
 import { ErrorInterceptorProvider } from './services/error.interceptor';
 import { AlertifyService } from './services/alertify.service';
 import { BsDropdownModule } from 'ngx-bootstrap';
+import { MemberListComponent } from './components/member-list/member-list.component';
+import { ListsComponent } from './components/lists/lists.component';
+import { MessagesComponent } from './components/messages/messages.component';
+import { RouterModule } from '@angular/router';
 
 @NgModule({
   declarations: [
     AppComponent,
     NavMenuComponent,
     HomeComponent,
-    RegisterComponent
+    RegisterComponent,
+    MemberListComponent,
+    ListsComponent,
+    MessagesComponent
   ],
   imports: [
     BrowserModule,
     HttpClientModule,
     FormsModule,
-    BsDropdownModule.forRoot()
+    BsDropdownModule.forRoot(),
+    RouterModule
   ],
   providers: [
     AuthService,
diff --git a/Client/src/app/components/home/home.component.html b/Client/src/app/components/home/home.component.html
index 75e9792..4eebd51 100644
--- a/Client/src/app/components/home/home.component.html
+++ b/Client/src/app/components/home/home.component.html
@@ -4,7 +4,7 @@ <h1>Find your friend</h1>
     <p class="lead">Come on in to view your friends... All you need to do is sign up!</p>
     <div class="text-center">
       <button class="btn btn-primary btn-lg mr-2" (click)="startRegisterMode()">Register</button>
-      <button class="btn btn-info btn-lg">Learn more</button>
+      <button class="btn btn-default btn-lg">Learn more</button>
     </div>
   </div>
   <div class="container" *ngIf="registerMode">
diff --git a/Client/src/app/components/lists/lists.component.css b/Client/src/app/components/lists/lists.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/Client/src/app/components/lists/lists.component.html b/Client/src/app/components/lists/lists.component.html
new file mode 100644
index 0000000..a33abe8
--- /dev/null
+++ b/Client/src/app/components/lists/lists.component.html
@@ -0,0 +1,3 @@
+<p>
+  lists works!
+</p>
diff --git a/Client/src/app/components/lists/lists.component.spec.ts b/Client/src/app/components/lists/lists.component.spec.ts
new file mode 100644
index 0000000..07b8747
--- /dev/null
+++ b/Client/src/app/components/lists/lists.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ListsComponent } from './lists.component';
+
+describe('ListsComponent', () => {
+  let component: ListsComponent;
+  let fixture: ComponentFixture<ListsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ListsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ListsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/Client/src/app/components/lists/lists.component.ts b/Client/src/app/components/lists/lists.component.ts
new file mode 100644
index 0000000..1cd794e
--- /dev/null
+++ b/Client/src/app/components/lists/lists.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-lists',
+  templateUrl: './lists.component.html',
+  styleUrls: ['./lists.component.css']
+})
+export class ListsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/Client/src/app/components/member-list/member-list.component.css b/Client/src/app/components/member-list/member-list.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/Client/src/app/components/member-list/member-list.component.html b/Client/src/app/components/member-list/member-list.component.html
new file mode 100644
index 0000000..7459953
--- /dev/null
+++ b/Client/src/app/components/member-list/member-list.component.html
@@ -0,0 +1,3 @@
+<p>
+  member-list works!
+</p>
diff --git a/Client/src/app/components/member-list/member-list.component.spec.ts b/Client/src/app/components/member-list/member-list.component.spec.ts
new file mode 100644
index 0000000..d25fa02
--- /dev/null
+++ b/Client/src/app/components/member-list/member-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MemberListComponent } from './member-list.component';
+
+describe('MemberListComponent', () => {
+  let component: MemberListComponent;
+  let fixture: ComponentFixture<MemberListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ MemberListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MemberListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/Client/src/app/components/member-list/member-list.component.ts b/Client/src/app/components/member-list/member-list.component.ts
new file mode 100644
index 0000000..f486465
--- /dev/null
+++ b/Client/src/app/components/member-list/member-list.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-member-list',
+  templateUrl: './member-list.component.html',
+  styleUrls: ['./member-list.component.css']
+})
+export class MemberListComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/Client/src/app/components/messages/messages.component.css b/Client/src/app/components/messages/messages.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/Client/src/app/components/messages/messages.component.html b/Client/src/app/components/messages/messages.component.html
new file mode 100644
index 0000000..6ae1113
--- /dev/null
+++ b/Client/src/app/components/messages/messages.component.html
@@ -0,0 +1,3 @@
+<p>
+  messages works!
+</p>
diff --git a/Client/src/app/components/messages/messages.component.spec.ts b/Client/src/app/components/messages/messages.component.spec.ts
new file mode 100644
index 0000000..66109cc
--- /dev/null
+++ b/Client/src/app/components/messages/messages.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MessagesComponent } from './messages.component';
+
+describe('MessagesComponent', () => {
+  let component: MessagesComponent;
+  let fixture: ComponentFixture<MessagesComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ MessagesComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MessagesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/Client/src/app/components/messages/messages.component.ts b/Client/src/app/components/messages/messages.component.ts
new file mode 100644
index 0000000..1ff6603
--- /dev/null
+++ b/Client/src/app/components/messages/messages.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-messages',
+  templateUrl: './messages.component.html',
+  styleUrls: ['./messages.component.css']
+})
+export class MessagesComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/Client/src/app/components/nav-menu/nav-menu.component.html b/Client/src/app/components/nav-menu/nav-menu.component.html
index 1ffe949..7621248 100644
--- a/Client/src/app/components/nav-menu/nav-menu.component.html
+++ b/Client/src/app/components/nav-menu/nav-menu.component.html
@@ -1,6 +1,5 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
   <div class="container">
-
     <a class="navbar-brand" href="#">Friendster</a>
 
     <ul class="navbar-nav mr-auto" *ngIf="isAuthenticated()">
@@ -30,9 +29,7 @@
     <form #loginForm="ngForm" class="form-inline my-2 my-lg-0" (ngSubmit)="login()" *ngIf="!isAuthenticated()">
       <input class="form-control mr-sm-2" type="text" name="username" placeholder="Username" required [(ngModel)]="model.username">
       <input class="form-control mr-sm-2" type="password" name="password" placeholder="Password" required [(ngModel)]="model.password">
-      <button [disabled]="!loginForm.valid" class="btn btn-primary my-2 my-sm-0" type="submit">Login</button>
+      <button [disabled]="!loginForm.valid" class="btn btn-secondary my-2 my-sm-0" type="submit">Login</button>
     </form>
   </div>
-
-
 </nav>
diff --git a/Client/src/app/routes.ts b/Client/src/app/routes.ts
new file mode 100644
index 0000000..a04a072
--- /dev/null
+++ b/Client/src/app/routes.ts
@@ -0,0 +1,13 @@
+import { Routes } from '@angular/router';
+import { HomeComponent } from './components/home/home.component';
+import { MemberListComponent } from './components/member-list/member-list.component';
+import { MessagesComponent } from './components/messages/messages.component';
+import { ListsComponent } from './components/lists/lists.component';
+
+export const appRoutes: Routes = [
+  { path: 'home', component: HomeComponent },
+  { path: 'members', component: MemberListComponent },
+  { path: 'messages', component: MessagesComponent },
+  { path: 'lists', component: ListsComponent },
+  { path: '**', redirectTo: 'home', pathMatch: 'full' }
+]