diff --git a/LesionTracker/client/components/app/app.styl b/LesionTracker/client/components/app/app.styl
index 30edb631f..a366062ca 100644
--- a/LesionTracker/client/components/app/app.styl
+++ b/LesionTracker/client/components/app/app.styl
@@ -1,4 +1,4 @@
-@import "{ohif:design}/app"
+@require "{ohif:design}/app"
 
 body>.header
 
diff --git a/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js b/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
index edbf00d5a..5ecfbd952 100644
--- a/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
+++ b/Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
@@ -7,7 +7,7 @@ Meteor.startup(function() {
     OHIF.studylist.callbacks.middleClickOnStudy = dblClickOnStudy;
 
     OHIF.studylist.timepointApi = new OHIF.measurements.TimepointApi();
-    OHIF.studylist.timepointApi.retrieveTimepoints();
+    OHIF.studylist.timepointApi.retrieveTimepoints({});
 });
 
 /**
diff --git a/Packages/ohif-measurements/both/configuration/timepoints.js b/Packages/ohif-measurements/both/configuration/timepoints.js
index f15479135..b96bbadc6 100644
--- a/Packages/ohif-measurements/both/configuration/timepoints.js
+++ b/Packages/ohif-measurements/both/configuration/timepoints.js
@@ -65,7 +65,7 @@ class TimepointApi {
             OHIF.log.info('Disassociation completed');
 
             this.timepoints.remove({});
-            this.retrieveTimepoints();
+            this.retrieveTimepoints({});
         });
     }
 
diff --git a/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js b/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js
index 3b36da0b1..9c08bf0b8 100644
--- a/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js
+++ b/Packages/ohif-measurements/client/components/caseProgress/caseProgress.js
@@ -1,6 +1,7 @@
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
+import { Tracker } from 'meteor/tracker';
 import { OHIF } from 'meteor/ohif:core';
 
 Template.caseProgress.onCreated(() => {
@@ -10,11 +11,13 @@ Template.caseProgress.onCreated(() => {
     instance.progressText = new ReactiveVar();
     instance.isLocked = new ReactiveVar();
     instance.path = 'viewer.studyViewer.measurements';
+    instance.saveObserver = new Tracker.Dependency();
 
     instance.saveData = () => {
         // Clear signaled unsaved changes...
         const successHandler = () => {
             OHIF.ui.unsavedChanges.clear(`${instance.path}.*`);
+            instance.saveObserver.changed();
         };
 
         // Display the error messages
@@ -165,7 +168,10 @@ Template.caseProgress.helpers({
     },
 
     isFinishDisabled() {
-        // Run this computation every time any measurement / timepoint suffer changes
+        const instance = Template.instance();
+
+        // Run this computation on save or every time any measurement / timepoint suffer changes
+        instance.saveObserver.depend();
         Session.get('LayoutManagerUpdated');
 
         return OHIF.ui.unsavedChanges.probe('viewer.*') === 0;