diff --git a/frontend/src/app/components/components-sidebar/components-sidebar.component.html b/frontend/src/app/components/components-sidebar/components-sidebar.component.html
index d85a2ad6..54474ac0 100644
--- a/frontend/src/app/components/components-sidebar/components-sidebar.component.html
+++ b/frontend/src/app/components/components-sidebar/components-sidebar.component.html
@@ -2,24 +2,24 @@
   <div class="component-item">
     <label>Connected</label>
     <nav class="nav flex-column">
-      <a routerLink="/form/form-elements" routerLinkActive="active" class="nav-link">Active Sources</a>
-      <a routerLink="/form/form-elements" routerLinkActive="active" class="nav-link">Manual</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Active Sources</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Manual</a>
     </nav>
     <label>Categories</label>
     <nav class="nav flex-column">
-      <a routerLink="/form/form-elements" routerLinkActive="active" class="nav-link">Hospital Networks/Clinics</a>
-      <a routerLink="/form/form-elements" routerLinkActive="active" class="nav-link">Pharmacies</a>
-      <a routerLink="/form/form-elements" routerLinkActive="active" class="nav-link">Insurers</a>
-      <a routerLink="/form/form-elements" routerLinkActive="active" class="nav-link">Laboratoreies</a>
-      <a routerLink="/form/form-elements" routerLinkActive="active" class="nav-link">Wearables</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Hospital Networks/Clinics</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Pharmacies</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Insurers</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Laboratories</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Wearables</a>
     </nav>
 
     <label>Industry</label>
     <nav class="nav flex-column">
-      <a routerLink="/charts/chartjs" routerLinkActive="active" class="nav-link">Medical</a>
-      <a routerLink="/charts/chartjs" routerLinkActive="active" class="nav-link">Dental</a>
-      <a routerLink="/charts/chartjs" routerLinkActive="active" class="nav-link">Vision</a>
-      <a routerLink="/charts/chartjs" routerLinkActive="active" class="nav-link">Mental</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Medical</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Dental</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Vision</a>
+      <a ngbTooltip="not yet implemented" routerLinkActive="active" class="nav-link">Mental</a>
     </nav>
 
   </div><!-- component-item -->
diff --git a/frontend/src/app/components/header/header.component.html b/frontend/src/app/components/header/header.component.html
index e9149d4a..85f3445d 100644
--- a/frontend/src/app/components/header/header.component.html
+++ b/frontend/src/app/components/header/header.component.html
@@ -19,7 +19,7 @@
       </ul>
     </div><!-- az-header-menu -->
     <div class="az-header-right">
-      <a routerLink="/" class="az-header-search-link"><i class="fas fa-search"></i></a>
+      <a ngbTooltip="not yet implemented" class="az-header-search-link"><i class="fas fa-search"></i></a>
       <div class="az-header-message">
         <a routerLink="/"><i class="typcn typcn-messages"></i></a>
       </div><!-- az-header-message -->
@@ -48,7 +48,7 @@
             </div><!-- media -->
 
           </div><!-- az-notification-list -->
-          <div class="dropdown-footer"><a href="">View All Notifications</a></div>
+          <div class="dropdown-footer"><a ngbTooltip="not yet implemented">View All Notifications</a></div>
         </div><!-- dropdown-menu -->
       </div><!-- az-header-notification -->
       <div class="dropdown az-profile-menu" ngbDropdown>
@@ -65,7 +65,7 @@
             <span>Adminstrator</span>
           </div><!-- az-header-profile -->
 
-          <a routerLink="/general-pages/profile" class="dropdown-item"><i class="typcn typcn-time"></i> Activity Logs</a>
+          <a ngbTooltip="not yet implemented" class="dropdown-item"><i class="typcn typcn-time"></i> Activity Logs</a>
           <a (click)="signOut($event)" class="dropdown-item"><i class="typcn typcn-power-outline"></i> Sign Out</a>
         </div><!-- dropdown-menu -->
       </div>
diff --git a/frontend/src/app/components/shared.module.ts b/frontend/src/app/components/shared.module.ts
index d8a1d8f4..7ac58f3d 100644
--- a/frontend/src/app/components/shared.module.ts
+++ b/frontend/src/app/components/shared.module.ts
@@ -31,12 +31,14 @@ import {ListDeviceComponent} from './list-generic-resource/list-device.component
 import {ListDiagnosticReportComponent} from './list-generic-resource/list-diagnostic-report.component';
 import {ListGoalComponent} from './list-generic-resource/list-goal.component';
 import { ListFallbackResourceComponent } from './list-fallback-resource/list-fallback-resource.component';
+import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
   imports: [
     RouterModule,
     BrowserModule,
     NgxDatatableModule,
+    NgbModule,
   ],
   declarations: [
     ComponentsSidebarComponent,
diff --git a/frontend/src/app/pages/auth-signin/auth-signin.component.html b/frontend/src/app/pages/auth-signin/auth-signin.component.html
index 7d2f02de..3db5b09b 100644
--- a/frontend/src/app/pages/auth-signin/auth-signin.component.html
+++ b/frontend/src/app/pages/auth-signin/auth-signin.component.html
@@ -43,7 +43,7 @@
       </form>
     </div><!-- az-signin-header -->
     <div class="az-signin-footer">
-      <p><a href="">Forgot password?</a></p>
+      <p><a ngbTooltip="not yet implemented">Forgot password?</a></p>
       <p>Don't have an account? <a routerLink="/auth/signup">Create an Account</a></p>
     </div><!-- az-signin-footer -->
   </div><!-- az-card-signin -->
diff --git a/frontend/src/app/pages/dashboard/dashboard.component.html b/frontend/src/app/pages/dashboard/dashboard.component.html
index 2a3a58bf..b71f9f22 100644
--- a/frontend/src/app/pages/dashboard/dashboard.component.html
+++ b/frontend/src/app/pages/dashboard/dashboard.component.html
@@ -29,10 +29,10 @@
         </nav>
 
         <nav class="nav">
-          <a class="nav-link" routerLink="/"><i class="far fa-save"></i> Save Report</a>
-          <a class="nav-link" routerLink="/"><i class="far fa-file-pdf"></i> Export to PDF</a>
-          <a class="nav-link" routerLink="/"><i class="far fa-envelope"></i>Send to Email</a>
-          <a class="nav-link" routerLink="/"><i class="fas fa-ellipsis-h"></i></a>
+          <a class="nav-link" routerLink="/" ngbTooltip="not yet implemented"><i class="far fa-save"></i> Save Report</a>
+          <a class="nav-link" routerLink="/" ngbTooltip="not yet implemented"><i class="far fa-file-pdf"></i> Export to PDF</a>
+          <a class="nav-link" routerLink="/" ngbTooltip="not yet implemented"><i class="far fa-envelope"></i>Send to Email</a>
+          <a class="nav-link" routerLink="/" ngbTooltip="not yet implemented"><i class="fas fa-ellipsis-h"></i></a>
         </nav>
       </div>
 
@@ -107,8 +107,8 @@
               <div class="media">
                 <div ><fa-icon [icon]="['fas', 'calendar']"></fa-icon></div>
                 <div class="media-body"><label >Start Date</label>
-                  <div class="date"><span >Sept 01, 2018</span><a
-                    href="#"><fa-icon [icon]="['fas', 'caret-down']"></fa-icon></a>
+                  <div class="date"><span >Sept 01, 2018</span>
+                    <a ngbTooltip="not yet implemented"><fa-icon [icon]="['fas', 'caret-down']"></fa-icon></a>
                   </div>
                 </div>
               </div>
@@ -117,8 +117,7 @@
               <div class="media">
                 <div ><fa-icon [icon]="['fas', 'calendar']"></fa-icon></div>
                 <div class="media-body"><label >End Date</label>
-                  <div class="date"><span >Sept 30, 2018</span><a
-                    href="#"><fa-icon [icon]="['fas', 'caret-down']"></fa-icon></a>
+                  <div class="date"><span >Sept 30, 2018</span><a ngbTooltip="not yet implemented"><fa-icon [icon]="['fas', 'caret-down']"></fa-icon></a>
                   </div>
                 </div>
               </div>
@@ -127,8 +126,7 @@
               <div class="media">
                 <div ><fa-icon [icon]="['fas', 'hospital']"></fa-icon></div>
                 <div class="media-body"><label >Source Type</label>
-                  <div class="date"><span >All</span><a
-                    href="#"><fa-icon [icon]="['fas', 'caret-down']"></fa-icon></a>
+                  <div class="date"><span >All</span><a ngbTooltip="not yet implemented"><fa-icon [icon]="['fas', 'caret-down']"></fa-icon></a>
                   </div>
                 </div>
               </div>
diff --git a/frontend/src/assets/sources/careevolution.png b/frontend/src/assets/sources/careevolution.png
new file mode 100644
index 00000000..43b3989d
Binary files /dev/null and b/frontend/src/assets/sources/careevolution.png differ
diff --git a/frontend/src/assets/sources/healthit.png b/frontend/src/assets/sources/healthit.png
new file mode 100644
index 00000000..6e5c2e6f
Binary files /dev/null and b/frontend/src/assets/sources/healthit.png differ