diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 2bdcbee..df79bf5 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -19,10 +19,14 @@ import {AdminRewardByBrokerComponent} from './admin-reward-by-broker/admin-rewar
 import {RewardOverviewComponent} from './reward-overview/reward-overview.component';
 import {RewardPaidComponent} from './reward-paid/reward-paid.component';
 import {RewardUnpaidComponent} from './reward-unpaid/reward-unpaid.component';
+import {PayInComponent} from './pay-in/pay-in.component';
+import {PeopleAddComponent} from './people-add/people-add.component';
+import {SettingsComponent} from './settings/settings.component';
 
 
 const routes: Routes = [
   {path : '', component: DashboardComponent, canActivate: [AuthGuard]},
+  {path : 'settings', component: SettingsComponent, canActivate: [AuthGuard]},
   {path : 'dashboard', component: DashboardComponent, canActivate: [AuthGuard] },
   {path : 'login', component: AuthComponent},
   {path : 'transaction', component: TransactionComponent, canActivate: [AuthGuard]},
@@ -42,6 +46,10 @@ const routes: Routes = [
   {path : 'reward-overview', component: RewardOverviewComponent, canActivate: [AuthGuard] },
   {path : 'reward-paid', component: RewardPaidComponent, canActivate: [AuthGuard] },
   {path : 'reward-unpaid', component: RewardUnpaidComponent, canActivate: [AuthGuard] },
+  {path : 'pay-in', component: PayInComponent, canActivate: [AuthGuard] },
+  {path : 'lender-uploads', component: LenderUploadsComponent, canActivate: [AuthGuard] },
+  {path : 'list-all-people', component: LenderUploadsComponent, canActivate: [AuthGuard] },
+  {path : 'people-add', component: PeopleAddComponent, canActivate: [AuthGuard] },
   {path : 'e403', component: E403Component, },
 ];
 
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 8dff6ed..df7e9db 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -76,6 +76,10 @@ import { AdminRewardByBrokerComponent } from './admin-reward-by-broker/admin-rew
 import { RewardOverviewComponent } from './reward-overview/reward-overview.component';
 import { RewardUnpaidComponent } from './reward-unpaid/reward-unpaid.component';
 import { RewardPaidComponent } from './reward-paid/reward-paid.component';
+import { PayInComponent } from './pay-in/pay-in.component';
+import { PeopleAddComponent } from './people-add/people-add.component';
+import { ListAllPeopleComponent } from './list-all-people/list-all-people.component';
+import { SettingsComponent } from './settings/settings.component';
 
 
 
@@ -122,7 +126,11 @@ import { RewardPaidComponent } from './reward-paid/reward-paid.component';
     AdminRewardByBrokerComponent,
     RewardOverviewComponent,
     RewardUnpaidComponent,
-    RewardPaidComponent
+    RewardPaidComponent,
+    PayInComponent,
+    PeopleAddComponent,
+    ListAllPeopleComponent,
+    SettingsComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/list-all-people/list-all-people.component.html b/src/app/list-all-people/list-all-people.component.html
new file mode 100644
index 0000000..3647e3b
--- /dev/null
+++ b/src/app/list-all-people/list-all-people.component.html
@@ -0,0 +1 @@
+<p>list-all-people works!</p>
diff --git a/src/app/list-all-people/list-all-people.component.scss b/src/app/list-all-people/list-all-people.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/list-all-people/list-all-people.component.spec.ts b/src/app/list-all-people/list-all-people.component.spec.ts
new file mode 100644
index 0000000..a349b8e
--- /dev/null
+++ b/src/app/list-all-people/list-all-people.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ListAllPeopleComponent } from './list-all-people.component';
+
+describe('ListAllPeopleComponent', () => {
+  let component: ListAllPeopleComponent;
+  let fixture: ComponentFixture<ListAllPeopleComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ListAllPeopleComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ListAllPeopleComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/list-all-people/list-all-people.component.ts b/src/app/list-all-people/list-all-people.component.ts
new file mode 100644
index 0000000..0c58b62
--- /dev/null
+++ b/src/app/list-all-people/list-all-people.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-list-all-people',
+  templateUrl: './list-all-people.component.html',
+  styleUrls: ['./list-all-people.component.scss']
+})
+export class ListAllPeopleComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/main-menu-items.ts b/src/app/main-menu-items.ts
index 9f0a7c1..b352e87 100644
--- a/src/app/main-menu-items.ts
+++ b/src/app/main-menu-items.ts
@@ -8,7 +8,10 @@ export const mainMenuItems: any[] = [
         items: [
             { text: 'Summary', fa: faChartArea, url: './#dashboard'},
             { text: '--', separator: 'true'  },
-            { text: 'Logout', icon: 'logout', url: './#login'}]
+            { text: 'Settings', icon: 'logout', url: './#settings'},
+            { text: '--', separator: 'true'  },
+            { text: 'Logout', icon: 'logout'},
+        ]
     },
     {
         text: 'Loans',
@@ -17,9 +20,9 @@ export const mainMenuItems: any[] = [
             { text: 'Start New Loan', icon: 'plus', url: './#edit-loan/' },
             { text: 'List All', icon: 'table' , url: './#list-all-loans' },
             { text: '--', separator: 'true'  },
-            { text: 'Income',  icon: 'dollar', url: './#income' },
+            { text: 'Income',  icon: 'dollar', url: './#pay-in' },
             { text: '--', separator: 'true'  },
-            { text: 'Uploads',  icon: 'dollar', url: './#loan-uploads' },
+            { text: 'Uploads',  icon: 'dollar', url: './#lender-uploads' },
         ]
     },
     {
@@ -40,11 +43,9 @@ export const mainMenuItems: any[] = [
         icon: 'user',
         items: [
             { text: 'Add ', icon: 'plus', url: './#add-people' },
-            { text: 'List All', fa: faIdCard , url: './#list-all-client'},
-            { text: '--', separator: 'true' },
-            { text: 'Broadcast', icon: 'email', url: './#send-to-all-client'},
+            { text: 'List All', fa: faIdCard , url: './#list-all-people'},
             { text: '--', separator: 'true' },
-            { text: 'Broadcast', icon: 'email', url: './#send-to-all-client'},
+            { text: 'Admin', icon: 'email', url: './#send-to-all-people'},
         ]
     },
 ];
diff --git a/src/app/pay-in/pay-in.component.html b/src/app/pay-in/pay-in.component.html
new file mode 100644
index 0000000..b25a474
--- /dev/null
+++ b/src/app/pay-in/pay-in.component.html
@@ -0,0 +1 @@
+<p>pay-in works!</p>
diff --git a/src/app/pay-in/pay-in.component.scss b/src/app/pay-in/pay-in.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pay-in/pay-in.component.spec.ts b/src/app/pay-in/pay-in.component.spec.ts
new file mode 100644
index 0000000..7491bee
--- /dev/null
+++ b/src/app/pay-in/pay-in.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PayInComponent } from './pay-in.component';
+
+describe('PayInComponent', () => {
+  let component: PayInComponent;
+  let fixture: ComponentFixture<PayInComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PayInComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PayInComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/pay-in/pay-in.component.ts b/src/app/pay-in/pay-in.component.ts
new file mode 100644
index 0000000..bf22de7
--- /dev/null
+++ b/src/app/pay-in/pay-in.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-pay-in',
+  templateUrl: './pay-in.component.html',
+  styleUrls: ['./pay-in.component.scss']
+})
+export class PayInComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/people-add/people-add.component.html b/src/app/people-add/people-add.component.html
new file mode 100644
index 0000000..02f3335
--- /dev/null
+++ b/src/app/people-add/people-add.component.html
@@ -0,0 +1 @@
+<p>people-add works!</p>
diff --git a/src/app/people-add/people-add.component.scss b/src/app/people-add/people-add.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/people-add/people-add.component.spec.ts b/src/app/people-add/people-add.component.spec.ts
new file mode 100644
index 0000000..49a3f27
--- /dev/null
+++ b/src/app/people-add/people-add.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PeopleAddComponent } from './people-add.component';
+
+describe('PeopleAddComponent', () => {
+  let component: PeopleAddComponent;
+  let fixture: ComponentFixture<PeopleAddComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PeopleAddComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PeopleAddComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/people-add/people-add.component.ts b/src/app/people-add/people-add.component.ts
new file mode 100644
index 0000000..e6a11b1
--- /dev/null
+++ b/src/app/people-add/people-add.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-people-add',
+  templateUrl: './people-add.component.html',
+  styleUrls: ['./people-add.component.scss']
+})
+export class PeopleAddComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
new file mode 100644
index 0000000..4ab2a41
--- /dev/null
+++ b/src/app/settings/settings.component.html
@@ -0,0 +1 @@
+<p>settings works!</p>
diff --git a/src/app/settings/settings.component.scss b/src/app/settings/settings.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/settings/settings.component.spec.ts b/src/app/settings/settings.component.spec.ts
new file mode 100644
index 0000000..a3a508b
--- /dev/null
+++ b/src/app/settings/settings.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SettingsComponent } from './settings.component';
+
+describe('SettingsComponent', () => {
+  let component: SettingsComponent;
+  let fixture: ComponentFixture<SettingsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ SettingsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
new file mode 100644
index 0000000..232b5dd
--- /dev/null
+++ b/src/app/settings/settings.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-settings',
+  templateUrl: './settings.component.html',
+  styleUrls: ['./settings.component.scss']
+})
+export class SettingsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/top-bar/top-bar.component.ts b/src/app/top-bar/top-bar.component.ts
index 1726b28..8d90dad 100644
--- a/src/app/top-bar/top-bar.component.ts
+++ b/src/app/top-bar/top-bar.component.ts
@@ -80,10 +80,8 @@ export class TopBarComponent implements OnInit , OnDestroy {
       this.menuService.itemClicked.emit(item);
 
       // handle logout
-      if (item.text === 'Logout'){
-        this.authService.logout();
-        this.login = false;
-        // this.authService.loginSuccess.emit("loggedout");
+      if (item.text.toLowerCase() === 'logout'){
+        this.logout();
       }
     }
   }