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 9e48fc9491..83614eb2c0 100644
--- a/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss
+++ b/wherehows-web/app/styles/components/dataset-compliance/_compliance-table.scss
@@ -43,7 +43,7 @@
   }
 
   &__identifier-column {
-    width: 35%;
+    width: 30%;
   }
 
   &__identifier-cell {
@@ -112,6 +112,7 @@
   &__add-field {
     &#{&} {
       font-weight: fw(normal, 4);
+      display: block;
     }
   }
 
@@ -210,6 +211,11 @@
     }
   }
 
+  &__tag-item {
+    display: flex;
+    flex-wrap: nowrap;
+  }
+
   &__tag-info {
     padding: item-spacing(1);
     margin-bottom: item-spacing(2);
diff --git a/wherehows-web/app/styles/vendor-extensions/_all.scss b/wherehows-web/app/styles/vendor-extensions/_all.scss
index 9d19e36ee8..0d67074513 100644
--- a/wherehows-web/app/styles/vendor-extensions/_all.scss
+++ b/wherehows-web/app/styles/vendor-extensions/_all.scss
@@ -1,2 +1,3 @@
 @import 'ember-power-select';
 @import 'ember-radio-button';
+@import 'ember-tooltip';
diff --git a/wherehows-web/app/styles/vendor-extensions/_ember-tooltip.scss b/wherehows-web/app/styles/vendor-extensions/_ember-tooltip.scss
new file mode 100644
index 0000000000..acf15ce2f9
--- /dev/null
+++ b/wherehows-web/app/styles/vendor-extensions/_ember-tooltip.scss
@@ -0,0 +1,3 @@
+.ember-tooltip {
+  z-index: z(dropdown);
+}
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 df68337649..b11bff65d1 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
@@ -193,203 +193,204 @@
                 {{#if (and isEditing (not row.isReadonly))}}
                   {{#each row.fieldChangeSet as |tag|}}
 
-                    {{#basic-dropdown as |tagDrop|}}
-                      {{#tagDrop.trigger
-                        class="dataset-compliance-fields__tag-info dataset-compliance-fields__tag-info--editable"}}
+                    <div class="dataset-compliance-fields__tag-item">
+                      {{#basic-dropdown as |tagDrop|}}
+                        {{#tagDrop.trigger
+                          class="dataset-compliance-fields__tag-info dataset-compliance-fields__tag-info--editable"}}
 
-                        <p class="dataset-compliance-fields__tag-info__text">
-                          {{#if tag.identifierType}}
-                            {{tag.identifierType}}{{if tag.logicalType (concat " (" tag.logicalType ")")}}
-                          {{else}}
-                            <span
-                              class="dataset-compliance-fields__tag-info__text dataset-compliance-fields__tag-info__text--obscure">
+                          <p class="dataset-compliance-fields__tag-info__text">
+                            {{#if tag.identifierType}}
+                              {{tag.identifierType}}{{if tag.logicalType (concat " (" tag.logicalType ")")}}
+                            {{else}}
+                              <span
+                                class="dataset-compliance-fields__tag-info__text dataset-compliance-fields__tag-info__text--obscure">
                           Select Field Type ...
                           </span>
-                          {{/if}}
-                        </p>
+                            {{/if}}
+                          </p>
 
-                      {{/tagDrop.trigger}}
-
-                      {{#tagDrop.content overlay=true class="dataset-compliance-fields__guided-modal"}}
-                        {{#dataset-compliance-field-tag
-                          sourceTag=tag
-                          parentHasSingleTag=row.hasSingleTag
-                          tagDidChange=(action "tagPropertiesUpdated")
-                          complianceFieldIdDropdownOptions=complianceFieldIdDropdownOptions
-                          complianceDataTypes=complianceDataTypes as |tagRowComponent|
-                        }}
-                          <article class="dataset-compliance-fields__field-tag__content">
-                            <section class="dataset-compliance-fields__compliance-info-column">
-                              <header class="dataset-compliance-fields__compliance-info-column__title">
-                                <strong>Select field type</strong>
-                              </header>
-
-                              <div class="dataset-compliance-fields__compliance-info-column__content">
-                                {{#track-ui-event category=trackableCategory.Compliance
-                                                  action=trackableEvent.Compliance.FieldIndentifier
-                                                  name=tagRowComponent.tag.identifierType as |metrics|}}
-
-                                  {{#each tagRowComponent.tagIdOptions as |tagOption|}}
-                                    {{#radio-button-composer
-                                      value=tagOption.value
-                                      name="datasetFieldClassification"
-                                      groupValue=(readonly tagRowComponent.tag.identifierType)
-                                      class="dataset-compliance-fields__tag-radio"
-                                      disabled=tagOption.isDisabled
-                                      disabledClass="dataset-compliance-fields__tag-radio--disabled"
-                                      checkedClass="dataset-compliance-fields__tag-radio--checked"
-                                      onMouseEnter=(action tagRowComponent.onFieldTagIdentifierEnter)
-                                      onMouseLeave=(action tagRowComponent.onFieldTagIdentifierLeave)
-                                      changed=(action metrics.trackOnAction (action tagRowComponent.tagIdentifierTypeDidChange))}}
-                                      {{tagOption.label}}
-                                    {{/radio-button-composer}}
-                                  {{/each}}
-
-                                {{/track-ui-event}}
-                              </div>
-                            </section>
-
-                            {{#if tagRowComponent.quickDesc}}
+                        {{/tagDrop.trigger}}
 
+                        {{#tagDrop.content overlay=true class="dataset-compliance-fields__guided-modal"}}
+                          {{#dataset-compliance-field-tag
+                            sourceTag=tag
+                            parentHasSingleTag=row.hasSingleTag
+                            tagDidChange=(action "tagPropertiesUpdated")
+                            complianceFieldIdDropdownOptions=complianceFieldIdDropdownOptions
+                            complianceDataTypes=complianceDataTypes as |tagRowComponent|
+                          }}
+                            <article class="dataset-compliance-fields__field-tag__content">
                               <section class="dataset-compliance-fields__compliance-info-column">
-                                <div class="dataset-compliance-fields__field-tag__quick-desc">
-                                  <strong>
-                                    {{tagRowComponent.quickDesc.title}}:
-                                  </strong>
+                                <header class="dataset-compliance-fields__compliance-info-column__title">
+                                  <strong>Select field type</strong>
+                                </header>
 
-                                  <p>
-                                    {{tagRowComponent.quickDesc.description}}
-                                  </p>
+                                <div class="dataset-compliance-fields__compliance-info-column__content">
+                                  {{#track-ui-event category=trackableCategory.Compliance
+                                                    action=trackableEvent.Compliance.FieldIndentifier
+                                                    name=tagRowComponent.tag.identifierType as |metrics|}}
+
+                                    {{#each tagRowComponent.tagIdOptions as |tagOption|}}
+                                      {{#radio-button-composer
+                                        value=tagOption.value
+                                        name="datasetFieldClassification"
+                                        groupValue=(readonly tagRowComponent.tag.identifierType)
+                                        class="dataset-compliance-fields__tag-radio"
+                                        disabled=tagOption.isDisabled
+                                        disabledClass="dataset-compliance-fields__tag-radio--disabled"
+                                        checkedClass="dataset-compliance-fields__tag-radio--checked"
+                                        onMouseEnter=(action tagRowComponent.onFieldTagIdentifierEnter)
+                                        onMouseLeave=(action tagRowComponent.onFieldTagIdentifierLeave)
+                                        changed=(action metrics.trackOnAction (action tagRowComponent.tagIdentifierTypeDidChange))}}
+                                        {{tagOption.label}}
+                                      {{/radio-button-composer}}
+                                    {{/each}}
+
+                                  {{/track-ui-event}}
                                 </div>
                               </section>
 
-                            {{else}}
+                              {{#if tagRowComponent.quickDesc}}
 
-                              {{#if tagRowComponent.isIdType}}
                                 <section class="dataset-compliance-fields__compliance-info-column">
-                                  <header class="dataset-compliance-fields__compliance-info-column__title">
-                                    <strong>Select field format</strong>
-                                  </header>
+                                  <div class="dataset-compliance-fields__field-tag__quick-desc">
+                                    <strong>
+                                      {{tagRowComponent.quickDesc.title}}:
+                                    </strong>
 
-                                  <div class="dataset-compliance-fields__compliance-info-column__content">
-                                    {{#track-ui-event category=trackableCategory.Compliance
-                                                      action=trackableEvent.Compliance.FieldFormat
-                                                      name=tagRowComponent.tag.logicalType as |metrics|}}
-
-                                      {{#each tagRowComponent.fieldFormats as |fieldFormat|}}
-                                        {{#radio-button-composer
-                                          value=fieldFormat.value
-                                          name="datasetFieldFieldFormat"
-                                          groupValue=(readonly tagRowComponent.tag.logicalType)
-                                          class="dataset-compliance-fields__tag-radio"
-                                          checkedClass="dataset-compliance-fields__tag-radio--checked"
-                                          changed=(action metrics.trackOnAction (action tagRowComponent.tagLogicalTypeDidChange))}}
-                                          {{fieldFormat.label}}
-                                        {{/radio-button-composer}}
-                                      {{/each}}
-
-                                    {{/track-ui-event}}
+                                    <p>
+                                      {{tagRowComponent.quickDesc.description}}
+                                    </p>
                                   </div>
                                 </section>
 
-                                {{#if tagRowComponent.showCustomInput}}
+                              {{else}}
+
+                                {{#if tagRowComponent.isIdType}}
                                   <section class="dataset-compliance-fields__compliance-info-column">
                                     <header class="dataset-compliance-fields__compliance-info-column__title">
-                                      <strong>Custom RegEx</strong>
-                                    </header>
-
-                                    <div
-                                      class="dataset-compliance-fields__compliance-info-column__content">
-
-                                      <div class="dataset-compliance-fields__text-pattern-wrap">
-                                        <div class="dataset-compliance-fields__text-pattern-wrap--input">
-                                          <input
-                                            placeholder="Enter a RegExp"
-                                            value="{{readonly tagRowComponent.tag.valuePattern}}"
-                                            disabled={{or (not isEditing) row.isReadonly}}
-                                              class="dataset-compliance-fields__text-pattern {{if
-                                          tagRowComponent.valuePatternError
-                                          'dataset-compliance-fields--missing-selection'}}"
-                                          oninput={{action tagRowComponent.tagValuePatternDidChange
-                                                           value="target.value"}}
-                                          >
-                                        </div>
-
-                                        {{more-info
-                                          link="http://go/metadata-custom-regex"
-                                          tooltip="Click for more information on RegExp format"
-                                        }}
-
-                                        {{#if tagRowComponent.valuePatternError}}
-                                          <div class="dataset-compliance-fields__text-pattern-wrap--error">
-                                            {{tagRowComponent.valuePatternError}}
-                                          </div>
-                                        {{/if}}
-                                      </div>
-                                    </div>
-                                  </section>
-                                {{/if}}
-
-                                {{#unless tagRowComponent.isTagFormatMissing}}
-                                  <section class="dataset-compliance-fields__compliance-info-column">
-                                    <header class="dataset-compliance-fields__compliance-info-column__title">
-                                      <strong>Is purge key?</strong>
+                                      <strong>Select field format</strong>
                                     </header>
 
                                     <div class="dataset-compliance-fields__compliance-info-column__content">
+                                      {{#track-ui-event category=trackableCategory.Compliance
+                                                        action=trackableEvent.Compliance.FieldFormat
+                                                        name=tagRowComponent.tag.logicalType as |metrics|}}
 
-                                      {{#radio-button-composer
-                                        value=false
-                                        name="datasetFieldOwnerToggle"
-                                        groupValue=(readonly tagRowComponent.tag.nonOwner)
-                                        class="dataset-compliance-fields__tag-radio"
-                                        checkedClass="dataset-compliance-fields__tag-radio--checked"
-                                        changed=(action tagRowComponent.tagOwnerDidChange)}}
-                                        Yes
-                                      {{/radio-button-composer}}
+                                        {{#each tagRowComponent.fieldFormats as |fieldFormat|}}
+                                          {{#radio-button-composer
+                                            value=fieldFormat.value
+                                            name="datasetFieldFieldFormat"
+                                            groupValue=(readonly tagRowComponent.tag.logicalType)
+                                            class="dataset-compliance-fields__tag-radio"
+                                            checkedClass="dataset-compliance-fields__tag-radio--checked"
+                                            changed=(action metrics.trackOnAction (action tagRowComponent.tagLogicalTypeDidChange))}}
+                                            {{fieldFormat.label}}
+                                          {{/radio-button-composer}}
+                                        {{/each}}
 
-                                      {{#radio-button-composer
-                                        value=true
-                                        name="datasetFieldOwnerToggle"
-                                        groupValue=(readonly tagRowComponent.tag.nonOwner)
-                                        class="dataset-compliance-fields__tag-radio"
-                                        checkedClass="dataset-compliance-fields__tag-radio--checked"
-                                        changed=(action tagRowComponent.tagOwnerDidChange)}}
-                                        No
-                                      {{/radio-button-composer}}
+                                      {{/track-ui-event}}
                                     </div>
                                   </section>
-                                {{/unless}}
+
+                                  {{#if tagRowComponent.showCustomInput}}
+                                    <section class="dataset-compliance-fields__compliance-info-column">
+                                      <header class="dataset-compliance-fields__compliance-info-column__title">
+                                        <strong>Custom RegEx</strong>
+                                      </header>
+
+                                      <div
+                                        class="dataset-compliance-fields__compliance-info-column__content">
+
+                                        <div class="dataset-compliance-fields__text-pattern-wrap">
+                                          <div class="dataset-compliance-fields__text-pattern-wrap--input">
+                                            <input
+                                              placeholder="Enter a RegExp"
+                                              value="{{readonly tagRowComponent.tag.valuePattern}}"
+                                              disabled={{or (not isEditing) row.isReadonly}}
+                                                class="dataset-compliance-fields__text-pattern {{if
+                                            tagRowComponent.valuePatternError
+                                            'dataset-compliance-fields--missing-selection'}}"
+                                            oninput={{action tagRowComponent.tagValuePatternDidChange
+                                                             value="target.value"}}
+                                            >
+                                          </div>
+
+                                          {{more-info
+                                            link="http://go/metadata-custom-regex"
+                                            tooltip="Click for more information on RegExp format"
+                                          }}
+
+                                          {{#if tagRowComponent.valuePatternError}}
+                                            <div class="dataset-compliance-fields__text-pattern-wrap--error">
+                                              {{tagRowComponent.valuePatternError}}
+                                            </div>
+                                          {{/if}}
+                                        </div>
+                                      </div>
+                                    </section>
+                                  {{/if}}
+
+                                  {{#unless tagRowComponent.isTagFormatMissing}}
+                                    <section class="dataset-compliance-fields__compliance-info-column">
+                                      <header class="dataset-compliance-fields__compliance-info-column__title">
+                                        <strong>Is purge key?</strong>
+                                      </header>
+
+                                      <div class="dataset-compliance-fields__compliance-info-column__content">
+
+                                        {{#radio-button-composer
+                                          value=false
+                                          name="datasetFieldOwnerToggle"
+                                          groupValue=(readonly tagRowComponent.tag.nonOwner)
+                                          class="dataset-compliance-fields__tag-radio"
+                                          checkedClass="dataset-compliance-fields__tag-radio--checked"
+                                          changed=(action tagRowComponent.tagOwnerDidChange)}}
+                                          Yes
+                                        {{/radio-button-composer}}
+
+                                        {{#radio-button-composer
+                                          value=true
+                                          name="datasetFieldOwnerToggle"
+                                          groupValue=(readonly tagRowComponent.tag.nonOwner)
+                                          class="dataset-compliance-fields__tag-radio"
+                                          checkedClass="dataset-compliance-fields__tag-radio--checked"
+                                          changed=(action tagRowComponent.tagOwnerDidChange)}}
+                                          No
+                                        {{/radio-button-composer}}
+                                      </div>
+                                    </section>
+                                  {{/unless}}
+                                {{/if}}
                               {{/if}}
-                            {{/if}}
-                          </article>
+                            </article>
 
-                          <footer class="dataset-compliance-fields__field-tag__footer">
-                            {{#if tagRowComponent.localTagHasDiverged}}
-                              <button
-                                class="nacho-button nacho-button--large-inverse"
-                                onclick={{action tagRowComponent.onFieldTagUpdate tagDrop.actions.close}}
-                                  disabled={{tagRowComponent.isTagReviewRequired}}>
-                                Done
-                              </button>
-                            {{/if}}
-                          </footer>
-                        {{/dataset-compliance-field-tag}}
-                      {{/tagDrop.content}}
-                    {{/basic-dropdown}}
+                            <footer class="dataset-compliance-fields__field-tag__footer">
+                              {{#if tagRowComponent.localTagHasDiverged}}
+                                <button
+                                  class="nacho-button nacho-button--large-inverse"
+                                  onclick={{action tagRowComponent.onFieldTagUpdate tagDrop.actions.close}}
+                                    disabled={{tagRowComponent.isTagReviewRequired}}>
+                                  Done
+                                </button>
+                              {{/if}}
+                            </footer>
+                          {{/dataset-compliance-field-tag}}
+                        {{/tagDrop.content}}
+                      {{/basic-dropdown}}
 
-                    {{#if (and isEditing (not row.hasSingleTag))}}
-                      <span class="nacho-tooltip" title="Delete Tag">
+                      {{#if (and isEditing (not row.hasSingleTag))}}
+                        <span class="nacho-tooltip" title="Delete Tag">
                       <button class="nacho-button nacho-button--tertiary dataset-compliance-fields__remove-tag"
                               onclick={{action row.onRemoveFieldTag tag}}>
                         {{fa-icon "trash"}}
                       </button>
                     </span>
-                    {{/if}}
+                      {{/if}}
+                    </div>
                   {{/each}}
 
                   {{#unless row.hasNoneTag}}
-                    <br>
                     <button
                       class="nacho-button nacho-button--tertiary dataset-compliance-fields__add-field"
                       onclick={{action row.onAddFieldTag}}>