diff --git a/wherehows-web/app/styles/components/dataset-compliance/_compliance-container.scss b/wherehows-web/app/styles/components/dataset-compliance/_compliance-container.scss
index 5401f9b8d2..bb0536b90c 100644
--- a/wherehows-web/app/styles/components/dataset-compliance/_compliance-container.scss
+++ b/wherehows-web/app/styles/components/dataset-compliance/_compliance-container.scss
@@ -22,6 +22,14 @@
     align-items: center;
     justify-content: flex-end;
   }
+
+  &__empty#{&}__empty#{&}__empty {
+    background-color: transparent;
+
+    td {
+      border: 0;
+    }
+  }
 }
 
 /// Default visual state for dataset-field-value selector
diff --git a/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss b/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss
index ce70b5c927..644a86b3a8 100644
--- a/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss
+++ b/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss
@@ -11,7 +11,7 @@
   }
 
   &__classification-column {
-    width: 17%;
+    width: 20%;
   }
 
   &__tall-cell#{&}__tall-cell {
diff --git a/wherehows-web/app/styles/components/nacho/_nacho-select.scss b/wherehows-web/app/styles/components/nacho/_nacho-select.scss
index d9302c6efc..a86665edd4 100644
--- a/wherehows-web/app/styles/components/nacho/_nacho-select.scss
+++ b/wherehows-web/app/styles/components/nacho/_nacho-select.scss
@@ -67,4 +67,17 @@ $default-border: (1px solid shade($color, 20%));
       visibility: hidden;
     }
   }
+
+  &--pre-wrap {
+    height: item-spacing(7);
+
+    &::after {
+      margin-bottom: 15px;
+    }
+
+    select {
+      white-space: pre-wrap;
+      margin-bottom: 15px;
+    }
+  }
 }
diff --git a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs
index 2cc02c74d3..28afdbdcff 100644
--- a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs
+++ b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-classification.hbs
@@ -94,6 +94,17 @@
             {{/radio-button-composer}}
           </span>{{/row.cell}}
       {{/body.row}}
+    {{else}}
+
+      <tr class="dataset-field-content__empty dataset-field-content__empty dataset-field-content__empty">
+        <td class="text-center" colspan="2">
+          {{empty-state
+            heading="Dataset has not been marked as containing Member data"
+            subHead="Click 'See More' below to view all available types of dataset member data"
+          }}
+        </td>
+      </tr>
+
     {{/each}}
   {{/table.body}}
 
diff --git a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs
index 34661c9969..78655e222a 100644
--- a/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs
+++ b/wherehows-web/app/templates/datasets/dataset-compliance/-dataset-compliance-entities.hbs
@@ -189,9 +189,9 @@
             {{/if}}
           {{/row.cell}}
 
-          {{#row.cell}}
+          {{#row.cell class="dataset-compliance-fields__tall-cell dataset-compliance-fields__tall-cell"}}
             {{ember-selector
-              class="nacho-select--hidden-state"
+              class="nacho-select--hidden-state nacho-select--pre-wrap"
               values=classifiers
               selected=row.classification
               disabled=(or (not isEditing) (not row.logicalType))