diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html
index 3884c0b3c..ab31e6cb0 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTable.html
@@ -1,23 +1,27 @@
 <template name="measurementTable">
-    <div id="measurementTableContainer">
-        {{#if this.timepoints.get.length}}
-            <div class="measurementTableLayoutChanger viewerRoundedButtonGroup">
-                {{>roundedButtonGroup buttonGroupData}}
-            </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 id="measurementTableContainer" class="flex-v">
+        <div class="measurementTableHeader">
+            {{#if this.timepoints.get.length}}
+                <div class="measurementTableLayoutChanger viewerRoundedButtonGroup">
+                    {{>roundedButtonGroup buttonGroupData}}
                 </div>
             {{/if}}
-            {{#each timepoint in this.timepoints.get}}
-                {{>measurementTableTimepointHeader (clone this timepoint)}}
-            {{/each}}
-            <!-- TODO: Add header for cross-sectional / non-longitudinal data -->
+            <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}}
+                {{#each timepoint in this.timepoints.get}}
+                    {{>measurementTableTimepointHeader (clone this timepoint)}}
+                {{/each}}
+                <!-- TODO: Add header for cross-sectional / non-longitudinal data -->
+            </div>
         </div>
-        {{>measurementTableView (clone this)}}
+        {{#scrollArea class='measurementTableView flex-grow fit' scrollStep=63}}
+            {{>measurementTableView (clone this)}}
+        {{/scrollArea}}
     </div>
 </template>
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
index 0be649306..fb2a9e7f3 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
@@ -1,16 +1,20 @@
 <template name="measurementTableHUD">
     <div id="measurementTableHUD" class="{{hudHidden}}">
-        <div class="header">
-            <span>Measurements</span>
-            <svg class="buttonClose">
-                <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-close"}}></use>
-            </svg>
-        </div>
-        {{>measurementTableView (clone this)}}
-        <div class="footer">
-            {{#each toolbarButton in toolbarButtons}}
-                {{>toolbarSectionButton toolbarButton}}
-            {{/each}}
+        <div class="flex-v full-height">
+            <div class="header">
+                <span>Measurements</span>
+                <svg class="buttonClose">
+                    <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-close"}}></use>
+                </svg>
+            </div>
+            {{#scrollArea class='measurementTableView flex-grow fit' scrollStep=63}}
+                {{>measurementTableView (clone this isHud=true)}}
+            {{/scrollArea}}
+            <div class="footer">
+                {{#each toolbarButton in toolbarButtons}}
+                    {{>toolbarSectionButton toolbarButton}}
+                {{/each}}
+            </div>
         </div>
     </div>
 </template>
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl
index 40167442b..50f8872ef 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.styl
@@ -16,7 +16,7 @@ $borderColor = rgba(77, 99, 110, 0.81)
   width: 318px
   z-index: 10000
 
-  .measurementTableView.scrollArea
+  .measurementTableView .scrollable
     margin-left: 0
     padding-left: 0
 
@@ -42,17 +42,14 @@ $borderColor = rgba(77, 99, 110, 0.81)
       top: 20px
       width: 14px
 
-  .measurementTableView.scrollArea
+  .measurementTableView
     height: calc(100% - 55px - 70px)
     padding-bottom: 20px
 
   .footer
     theme('background', '$uiGrayDarkest')
     border-top: $uiBorderThickness solid $borderColor
-    width: 100%
     height: 70px
-    position: absolute
-    bottom: 0
     padding: 10px
 
     .toolbarSectionButton
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.js
index 8844c5266..e6883ad46 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.js
@@ -65,6 +65,7 @@ Template.measurementTableRow.events({
 
     'click .js-delete'(event, instance) {
         const dialogSettings = {
+            class: 'themed',
             title: 'Delete measurements',
             message: 'Are you sure you want to delete the measurement across all timepoints?',
             position: {
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.js
index aa8d8a961..03d44481c 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.js
@@ -93,9 +93,15 @@ Template.measurementTableTimepointCell.events({
         if (keyCode === keys.DELETE || keyCode === keys.BACKSPACE || (keyCode === keys.D && event.ctrlKey === true)) {
             const timepointId = instance.data.timepointId;
 
+            const offset = $(event.currentTarget).offset();
             const dialogSettings = {
+                class: 'themed',
                 title: 'Delete measurements',
-                message: 'Are you sure you want to delete this measurement?'
+                message: 'Are you sure you want to delete this measurement?',
+                position: {
+                    x: offset.left,
+                    y: offset.top
+                }
             };
 
             OHIF.ui.showDialog('dialogConfirm', dialogSettings).then(() => {
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html
index f14eb2cae..7757212fb 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html
@@ -1,39 +1,39 @@
 <template name="measurementTableView">
-    <div class="measurementTableView scrollArea">
-        {{#let config=measurementConfiguration groups=measurementGroups.get}}
-            {{#each measurementGroup in groups}}
-                {{! #if hasMeasurements measurementGroup.toolGroup.id}}
-                    {{>measurementTableHeaderRow (clone this
-                        toolGroup=measurementGroup.toolGroup
-                        measurementRows=measurementGroup.measurementRows)}}
-                {{! /if}}
-                {{#each rowItem in measurementGroup.measurementRows}}
-                    {{>measurementTableRow (clone this rowItem=rowItem)}}
-                {{/each}}
+    {{#let config=measurementConfiguration groups=measurementGroups.get}}
+        {{#each measurementGroup in groups}}
+            {{! #if hasMeasurements measurementGroup.toolGroup.id}}
+                {{>measurementTableHeaderRow (clone this
+                    toolGroup=measurementGroup.toolGroup
+                    measurementRows=measurementGroup.measurementRows)}}
+            {{! /if}}
+            {{#each rowItem in measurementGroup.measurementRows}}
+                {{>measurementTableRow (clone this rowItem=rowItem)}}
             {{/each}}
+        {{/each}}
 
-            {{#each newLesionGroup in config.newLesions}}
-                {{#let toolGroup=(getNewLesionsToolGroup newLesionGroup)}}
-                {{#let newMeasurements=(newLesionsMeasurements toolGroup)}}
-                    {{#if newMeasurements.length}}
-                        {{#let collection=newMeasurements}}
-                            {{>measurementTableHeaderRow (clone this
-                                toolGroup=toolGroup
-                                measurementRows=collection)}}
+        {{#each newLesionGroup in config.newLesions}}
+            {{#let toolGroup=(getNewLesionsToolGroup newLesionGroup)}}
+            {{#let newMeasurements=(newLesionsMeasurements toolGroup)}}
+                {{#if newMeasurements.length}}
+                    {{#let collection=newMeasurements}}
+                        {{>measurementTableHeaderRow (clone this
+                            toolGroup=toolGroup
+                            measurementRows=collection)}}
 
-                            {{#each entry in collection}}
-                                {{>measurementTableRow (clone this rowItem=entry)}}
-                            {{/each}}
-                        {{/let}}
-                    {{/if}}
-                {{/let}}
-                {{/let}}
-            {{/each}}
-        {{/let}}
+                        {{#each entry in collection}}
+                            {{>measurementTableRow (clone this rowItem=entry)}}
+                        {{/each}}
+                    {{/let}}
+                {{/if}}
+            {{/let}}
+            {{/let}}
+        {{/each}}
+    {{/let}}
+    {{#unless this.isHud}}
         {{#if or (hasMeasurements 'targets') (hasMeasurements 'nonTargets')}}
             <div class="report-area">
                 <div class="btn btn-sm js-pdf">Generate Report</div>
             </div>
         {{/if}}
-    </div>
+    {{/unless}}
 </template>
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl
index 66017f57f..67c1417a2 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.styl
@@ -1,17 +1,6 @@
 @import "{ohif:design}/app"
 
-.measurementTableView.scrollArea
-  // height: calc(100% - 105px)
-  height: calc(100% - 50px)
-  overflow-x: hidden
-  overflow-y: auto
-  margin-right: -36px
-  padding-right: 36px
-  -webkit-overflow-scrolling: touch
-  -ms-overflow-style: none
-
-  &::-webkit-scrollbar
-    display: none
+.measurementTableView
 
   .report-area
     theme('background-color', '$uiGrayDarker')
diff --git a/Packages/ohif-measurements/client/lib/syncMeasurementAndToolData.js b/Packages/ohif-measurements/client/lib/syncMeasurementAndToolData.js
index b7681bfb5..08b670710 100644
--- a/Packages/ohif-measurements/client/lib/syncMeasurementAndToolData.js
+++ b/Packages/ohif-measurements/client/lib/syncMeasurementAndToolData.js
@@ -5,6 +5,12 @@ OHIF.measurements.syncMeasurementAndToolData = measurement => {
     OHIF.log.info('syncMeasurementAndToolData');
 
     const toolState = cornerstoneTools.globalImageIdSpecificToolStateManager.saveToolState();
+
+    // Stop here if the metadata for the measurement's study is not loaded yet
+    const { studyInstanceUid } = measurement;
+    const metadata = OHIF.viewer.StudyMetadataList.findBy({ studyInstanceUid });
+    if (!metadata) return;
+
     const imageId = OHIF.viewerbase.getImageIdForImagePath(measurement.imagePath);
     const toolType = measurement.toolType;