diff --git a/package.json b/package.json
index 3b6a648..b628b54 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "@angular/material": "^2.0.0-beta.1"
   },
   "dependencies": {
-    "angular2-infinite-scroll": "^0.3.4",
     "angular2-moment": "^1.1.0",
     "chart.js": "^2.5.0",
     "d3": "^4.7.4",
@@ -73,6 +72,7 @@
     "material-design-lite": "^1.3.0",
     "materialize-css": "^0.98.0",
     "ng2-charts": "^1.5.0",
-    "ng2-google-charts": "^1.0.1"
+    "ng2-google-charts": "^1.0.1",
+    "ngx-infinite-scroll": "^0.4.1"
   }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 8cb9b10..c72aa87 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { HttpModule } from '@angular/http';
 import { RouterModule } from '@angular/router';
 import { MomentModule } from 'angular2-moment/moment.module';
-import { InfiniteScrollModule } from 'angular2-infinite-scroll';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { ChartsModule } from 'ng2-charts';
 import { Ng2GoogleChartsModule } from 'ng2-google-charts';
 import { AppComponent } from './app.component';
diff --git a/src/views/metrics/metrics.component.spec.ts b/src/views/metrics/metrics.component.spec.ts
index 1f54533..2f974b1 100644
--- a/src/views/metrics/metrics.component.spec.ts
+++ b/src/views/metrics/metrics.component.spec.ts
@@ -2,8 +2,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-import {HaystackComponent} from "./haystack.component";
-
+import { MetricsComponent } from './metrics.component';
 
 describe('MetricsComponent', () => {
   let component: MetricsComponent;
diff --git a/src/views/timeline/timeline.component.ts b/src/views/timeline/timeline.component.ts
index 5b6fcc0..8febc08 100644
--- a/src/views/timeline/timeline.component.ts
+++ b/src/views/timeline/timeline.component.ts
@@ -1,14 +1,14 @@
 import {Component, OnInit, OnChanges, ViewChild, ElementRef, Input, ViewEncapsulation} from '@angular/core';
 import * as d3 from 'd3';
 
-import * as Kinetic from 'Kinetic';
+import * as Kinetic from 'kinetic';
 import {Timeline} from "../../models/taskDetail/timeline";
 import {isNullOrUndefined} from "util";
 
 @Component({
   selector: 'app-timeline',
   templateUrl: './timeline.component.html',
-  styleUrls: ['./timeline.component.css'],
+  styleUrls: ['./timeline.component.scss'],
   encapsulation: ViewEncapsulation.None
 })
 export class TimelineComponent implements OnInit, OnChanges {