diff --git a/Packages/ohif-design/package.js b/Packages/ohif-design/package.js
index 86c5356e7..5707a227a 100644
--- a/Packages/ohif-design/package.js
+++ b/Packages/ohif-design/package.js
@@ -40,6 +40,7 @@ Package.onUse(function(api) {
     // Component styles
     api.addFiles([
         'styles/components/dialog.styl',
+        'styles/components/popover.styl',
         'styles/components/radio.styl',
         'styles/components/select2.styl',
         'styles/components/states.styl'
diff --git a/Packages/ohif-design/styles/components/popover.styl b/Packages/ohif-design/styles/components/popover.styl
new file mode 100644
index 000000000..65600cbc7
--- /dev/null
+++ b/Packages/ohif-design/styles/components/popover.styl
@@ -0,0 +1,21 @@
+@require '{ohif:design}/app'
+
+div.popover
+  theme('background-color', '$uiGray')
+  theme('color', '$textPrimaryColor')
+
+  .popover-title
+    theme('background-color', '$uiGrayDark')
+    theme('border-bottom-color', '$uiGrayDarkest')
+
+  &.top .arrow:after
+    theme('border-top-color', '$uiGray')
+
+  &.right .arrow:after
+    theme('border-right-color', '$uiGray')
+
+  &.bottom .arrow:after
+    theme('border-bottom-color', '$uiGray')
+
+  &.left .arrow:after
+    theme('border-left-color', '$uiGray')
diff --git a/Packages/ohif-measurements/client/components/measureFlow/measureFlow.html b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.html
index f9b1a8f4e..91b35a05a 100644
--- a/Packages/ohif-measurements/client/components/measureFlow/measureFlow.html
+++ b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.html
@@ -23,7 +23,7 @@
                     {{/if}}
                 {{/if}}
                 <div class="actions clearfix">
-                    <button class="pull-left btn-rename">Rename</button>
+                    <button class="pull-left btn-rename">Relabel</button>
                     <button class="pull-right btn-description">{{valueIf instance.description.get 'Edit' 'Add'}} description</button>
                 </div>
             </div>
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html
index ab31e6cb0..71ed7d0b6 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html
@@ -7,13 +7,11 @@
                 </div>
             {{/if}}
             <div class="measurementTableTimepointHeaderRow">
-                {{#if hasWarnings}}
-                    <div class="warning-status">
-                        <svg>
-                            <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-warning"}}></use>
-                        </svg>
-                    </div>
-                {{/if}}
+                <div class="warning-status {{#unless hasWarnings}}hidden{{/unless}}">
+                    <svg>
+                        <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-warning"}}></use>
+                    </svg>
+                </div>
                 {{#each timepoint in this.timepoints.get}}
                     {{>measurementTableTimepointHeader (clone this timepoint)}}
                 {{/each}}
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html
index cad965c47..c33f71c95 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html
@@ -38,7 +38,7 @@
                     <svg class="edit-icon">
                         <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-measurements-additional"}}></use>
                     </svg>
-                    Rename
+                    Relabel
                 </div>
                 <div class="rowAction js-delete pull-left" tabindex="1">
                     <svg class="close-icon">
diff --git a/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js b/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
index 53b9ec556..12d72dbb8 100644
--- a/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
+++ b/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
@@ -1,6 +1,5 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
-import { Session } from 'meteor/session';
 import { _ } from 'meteor/underscore';
 import { OHIF } from 'meteor/ohif:core';
 import 'meteor/ohif:viewerbase';
@@ -17,11 +16,7 @@ class ConformanceCriteria {
         this.maxTargets = new ReactiveVar(null);
         this.maxNewTargets = new ReactiveVar(null);
 
-        const validate = _.debounce(trialCriteriaType => {
-            if (!Session.get('MeasurementsReady')) return;
-            this.validate(trialCriteriaType);
-        }, 300);
-
+        const validate = _.debounce(trialCriteriaType => this.validate(trialCriteriaType), 300);
         Tracker.autorun(() => {
             const selectedType = OHIF.lesiontracker.TrialCriteriaTypes.findOne({ selected: true });
             this.measurementApi.changeObserver.depend();
@@ -161,7 +156,7 @@ class ConformanceCriteria {
                         return;
                     }
 
-                    const promise = OHIF.studies.retrieveStudyMetadata(studyInstanceUid);
+                    const promise = OHIF.studies.loadStudy(studyInstanceUid);
                     promise.then(study => {
                         const studyMetadata = OHIF.viewerbase.getStudyMetadata(study);
 
diff --git a/Packages/ohif-measurements/client/lib/clearCornerstoneToolState.js b/Packages/ohif-measurements/client/lib/clearCornerstoneToolState.js
new file mode 100644
index 000000000..3ba308818
--- /dev/null
+++ b/Packages/ohif-measurements/client/lib/clearCornerstoneToolState.js
@@ -0,0 +1,6 @@
+import { OHIF } from 'meteor/ohif:core';
+import { cornerstoneTools } from 'meteor/ohif:cornerstone';
+
+OHIF.measurements.clearCornerstoneToolState = () => {
+    cornerstoneTools.globalImageIdSpecificToolStateManager.restoreToolState({});
+};
diff --git a/Packages/ohif-measurements/client/lib/index.js b/Packages/ohif-measurements/client/lib/index.js
index 02a072131..7794058f5 100644
--- a/Packages/ohif-measurements/client/lib/index.js
+++ b/Packages/ohif-measurements/client/lib/index.js
@@ -1,5 +1,6 @@
 import './jumpToRowItem';
 import './activateMeasurements';
+import './clearCornerstoneToolState';
 import './deactivateAllToolData';
 import './exportPdf';
 import './findAndRenderDisplaySet';
diff --git a/Packages/ohif-studies/imports/client/lib/loadStudy.js b/Packages/ohif-studies/imports/client/lib/loadStudy.js
index c20c99cdf..750bd6794 100644
--- a/Packages/ohif-studies/imports/client/lib/loadStudy.js
+++ b/Packages/ohif-studies/imports/client/lib/loadStudy.js
@@ -27,6 +27,7 @@ OHIF.studies.loadStudy = studyInstanceUid => new Promise((resolve, reject) => {
         const loaded = OHIF.viewer.Studies.findBy({ studyInstanceUid: study.studyInstanceUid });
         if (!loaded) {
             OHIF.viewer.Studies.insert(study);
+            OHIF.viewer.StudyMetadataList.insert(study);
         }
 
         // Add the studyInstanceUid to the loaded state dictionary