diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 216f9d9d2..76ecd538b 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { AdminGuard } from '../_guards/admin.guard';
 import { DashboardComponent } from './dashboard/dashboard.component';
-import { UsersComponent } from './users/users.component';
+import { ManageUsersComponent } from './manage-users/manage-users.component';
 
 const routes: Routes = [
   {path: '**', component: DashboardComponent, pathMatch: 'full'},
@@ -11,7 +11,7 @@ const routes: Routes = [
     canActivate: [AdminGuard],
     children: [
       {path: '/dashboard', component: DashboardComponent},
-      {path: '/users', component: UsersComponent}
+      {path: '/users', component: ManageUsersComponent}
     ]
   }
 ];
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
index 6e2c2dcf4..49e49c6b0 100644
--- a/src/app/admin/admin.module.ts
+++ b/src/app/admin/admin.module.ts
@@ -1,15 +1,15 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { AdminRoutingModule } from './admin-routing.module';
-import { UsersComponent } from './users/users.component';
-import { ToastrModule } from 'ngx-toastr';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import { ManageLibraryComponent } from './manage-library/manage-library.component';
+import { ManageUsersComponent } from './manage-users/manage-users.component';
 
 
 
 @NgModule({
-  declarations: [UsersComponent, DashboardComponent],
+  declarations: [ManageUsersComponent, DashboardComponent, ManageLibraryComponent],
   imports: [
     CommonModule,
     AdminRoutingModule,
diff --git a/src/app/admin/dashboard/dashboard.component.html b/src/app/admin/dashboard/dashboard.component.html
index 1a3b96daf..a8f3e5e42 100644
--- a/src/app/admin/dashboard/dashboard.component.html
+++ b/src/app/admin/dashboard/dashboard.component.html
@@ -6,10 +6,10 @@
       <ng-template ngbNavContent>
 
         <ng-container *ngIf="tab === 'users'">
-            <app-users></app-users>
+            <app-manage-users></app-manage-users>
         </ng-container>
         <ng-container *ngIf="tab === 'libraries'">
-            Library management here
+            <app-manage-library></app-manage-library>
         </ng-container>
       </ng-template>
     </li>
diff --git a/src/app/admin/dashboard/dashboard.component.ts b/src/app/admin/dashboard/dashboard.component.ts
index 7bb6aebf3..ec83c8286 100644
--- a/src/app/admin/dashboard/dashboard.component.ts
+++ b/src/app/admin/dashboard/dashboard.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-dashboard',
@@ -11,7 +12,11 @@ export class DashboardComponent implements OnInit {
   counter = this.tabs.length + 1;
   active = this.tabs[0];
 
-  constructor() { }
+  constructor(private router: Router) {
+    // TODO: Depending on active route, set the tab else default to first tab.
+    console.log('current route: ', this.router.url);
+    //this.router.url === '/login'
+  }
 
   ngOnInit(): void {
   }
diff --git a/src/app/admin/manage-library/manage-library.component.html b/src/app/admin/manage-library/manage-library.component.html
new file mode 100644
index 000000000..49e489a41
--- /dev/null
+++ b/src/app/admin/manage-library/manage-library.component.html
@@ -0,0 +1,3 @@
+<h2>Libraries</h2>
+
+<button class="btn btn-primary" (click)="addFolder('')">Add Folder</button>
\ No newline at end of file
diff --git a/src/app/admin/users/users.component.scss b/src/app/admin/manage-library/manage-library.component.scss
similarity index 100%
rename from src/app/admin/users/users.component.scss
rename to src/app/admin/manage-library/manage-library.component.scss
diff --git a/src/app/admin/manage-library/manage-library.component.ts b/src/app/admin/manage-library/manage-library.component.ts
new file mode 100644
index 000000000..dc1d5947b
--- /dev/null
+++ b/src/app/admin/manage-library/manage-library.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit } from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { DirectoryPickerComponent, DirectoryPickerResult } from 'src/app/directory-picker/directory-picker.component';
+
+@Component({
+  selector: 'app-manage-library',
+  templateUrl: './manage-library.component.html',
+  styleUrls: ['./manage-library.component.scss']
+})
+export class ManageLibraryComponent implements OnInit {
+
+  constructor(private modalService: NgbModal) { }
+
+  ngOnInit(): void {
+  }
+
+  addFolder(library: string) {
+
+    const modalRef = this.modalService.open(DirectoryPickerComponent);
+    //modalRef.componentInstance.name = 'World';
+    modalRef.closed.subscribe((closeResult: DirectoryPickerResult) => {
+      console.log('Closed Result', closeResult);
+      if (closeResult.success) {
+        console.log('Add folder path to Library');
+      }
+    });
+
+  }
+
+}
diff --git a/src/app/admin/users/users.component.html b/src/app/admin/manage-users/manage-users.component.html
similarity index 54%
rename from src/app/admin/users/users.component.html
rename to src/app/admin/manage-users/manage-users.component.html
index 605a778bc..24ee3fba8 100644
--- a/src/app/admin/users/users.component.html
+++ b/src/app/admin/manage-users/manage-users.component.html
@@ -1,10 +1,4 @@
 
-<button class="btn btn-primary" (click)="addFolder('')">Add Folder</button>
-
-
-<div class="container">
-    <h2></h2>
-</div>
 
 <h2>Members:</h2>
 <div class="container">
diff --git a/src/app/admin/manage-users/manage-users.component.scss b/src/app/admin/manage-users/manage-users.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/admin/manage-users/manage-users.component.ts b/src/app/admin/manage-users/manage-users.component.ts
new file mode 100644
index 000000000..fc53075ec
--- /dev/null
+++ b/src/app/admin/manage-users/manage-users.component.ts
@@ -0,0 +1,28 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { DirectoryPickerComponent, DirectoryPickerResult } from 'src/app/directory-picker/directory-picker.component';
+import { MemberService } from 'src/app/member.service';
+import { Member } from 'src/app/_models/member';
+
+@Component({
+  selector: 'app-manage-users',
+  templateUrl: './manage-users.component.html',
+  styleUrls: ['./manage-users.component.scss']
+})
+export class ManageUsersComponent implements OnInit {
+
+  members: Member[] = [];
+  closeResult = ''; // Debug code
+  @ViewChild('content') content: any;
+
+  constructor(private memberService: MemberService) { }
+
+  ngOnInit(): void {
+    console.log('User Component');
+    this.memberService.getMembers().subscribe(members => {
+      this.members = members;
+    });
+  }
+
+  
+}
diff --git a/src/app/admin/users/users.component.ts b/src/app/admin/users/users.component.ts
deleted file mode 100644
index 9539eb879..000000000
--- a/src/app/admin/users/users.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { ModalDismissReasons, NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { DirectoryPickerComponent, DirectoryPickerResult } from 'src/app/directory-picker/directory-picker.component';
-import { MemberService } from 'src/app/member.service';
-import { Member } from 'src/app/_models/member';
-
-@Component({
-  selector: 'app-users',
-  templateUrl: './users.component.html',
-  styleUrls: ['./users.component.scss']
-})
-export class UsersComponent implements OnInit {
-
-  members: Member[] = [];
-  closeResult = ''; // Debug code
-  @ViewChild('content') content: any;
-
-  constructor(private memberService: MemberService, private modalService: NgbModal) { }
-
-  ngOnInit(): void {
-    console.log('User Component');
-    this.memberService.getMembers().subscribe(members => {
-      this.members = members;
-    });
-  }
-
-  addFolder(library: string) {
-
-    const modalRef = this.modalService.open(DirectoryPickerComponent);
-    //modalRef.componentInstance.name = 'World';
-    modalRef.closed.subscribe((closeResult: DirectoryPickerResult) => {
-      console.log('Closed Result', closeResult);
-      if (closeResult.success) {
-        console.log('Add folder path to Library');
-      }
-    });
-
-  }
-}
diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 734a0f0cb..2c1572356 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -30,9 +30,6 @@
     <ng-container *ngIf="!firstTimeFlow && (this.accountService.currentUser$ | async) == null">
         <app-user-login></app-user-login>
     </ng-container>
-
-    <app-directory-picker></app-directory-picker>
-
 </div>