diff --git a/wherehows-web/app/components/dataset-compliance.js b/wherehows-web/app/components/dataset-compliance.js
index 6a47de37db..2a59c7018e 100644
--- a/wherehows-web/app/components/dataset-compliance.js
+++ b/wherehows-web/app/components/dataset-compliance.js
@@ -68,7 +68,7 @@ export default Component.extend({
     ).mapBy('fieldName');
 
     if (fieldNamesAreUnique(fieldNames.sort())) {
-      return;
+      return set(this, '_hasBadData', false);
     }
 
     // Flag this component's data as problematic
diff --git a/wherehows-web/app/templates/components/dataset-author.hbs b/wherehows-web/app/templates/components/dataset-author.hbs
index f1e42368d1..b9bd823e14 100644
--- a/wherehows-web/app/templates/components/dataset-author.hbs
+++ b/wherehows-web/app/templates/components/dataset-author.hbs
@@ -33,9 +33,13 @@
         of Owner Type <code>Owner</code>
       </li>
     </ul>
+    <br>
+    <p>
+      Only owners that are not sourced from <code>SCM</code> can be removed
+      from this list. To remove any such owner(s), please make the change at the
+      source.</p>
   </div>
 
-
   {{#if errorMessage}}
     <div class="alert alert-danger" role="alert">{{errorMessage}}</div>
   {{/if}}
@@ -51,10 +55,70 @@
       <th>Full Name</th>
       <th>ID Type</th>
       <th>Source</th>
-      <th>Owner Type</th>
+      <th>
+        Owner Type
+
+        <!--TODO: DSS-6716-->
+        <!-- DRY out with wrapper component that takes the link as an attribute-->
+        <a
+          href="https://iwww.corp.linkedin.com/wiki/cf/display/DWH/Metadata+Acquisition#ProjectOverview-ownership">
+          <sup>
+        <span class="glyphicon glyphicon-question-sign"
+              title="Link to more information"></span>
+          </sup>
+        </a>
+      </th>
       <th>Confirmed</th>
       <th>Remove</th>
     </tr>
-  {{/each}}
-  </tbody>
-</table>
\ No newline at end of file
+    </thead>
+    <tbody data-attribute="owner-table">
+    {{#each owners as |owner|}}
+      <tr class="dataset-author-row">
+        <td class="dataset-author-cell"
+            onclick={{action "willEditUserName"
+                             value="currentTarget.classList"}}>
+          <label class="dataset-author-cell__name-tag">
+            {{owner.userName}}
+          </label>
+          <input class="userEntity dataset-author-cell__user-name"
+                 type="text"
+                 placeholder="Enter Username"
+                 autofocus="autofocus"
+                 title="{{owner.userName}}"
+                 value="{{owner.userName}}"
+                 onblur={{action "editUserName" owner}}/>
+        </td>
+        <td>{{owner.name}}</td>
+        <td>{{owner.idType}}</td>
+        <td>{{owner.source}}</td>
+        <td>
+          {{ember-selector
+            values=ownerTypes
+            selected=owner.type
+            change=(action "updateOwnerType" owner)}}
+        </td>
+        <td>
+          {{input
+            type="checkbox"
+            title=(if owner.confirmedBy owner.confirmedBy "Not confirmed")
+            checked=(readonly owner.confirmedBy)
+            change=(action "confirmOwner" owner)}}
+        </td>
+
+        <td>
+          <button class="nacho-button nacho-button--small"
+                  title={{if (contains (w "SCM") (w owner.source))
+                             "Owners sourced from SCM should be removed directly from SCM"
+                             "Remove"}}
+                    disabled={{contains (w "SCM") (w owner.source)}}
+            {{action "removeOwner" owner}}>
+            <i class="fa fa-trash"
+               aria-label="Remove Owner"></i>
+          </button>
+        </td>
+      </tr>
+    {{/each}}
+    </tbody>
+  </table>
+</div>
diff --git a/wherehows-web/app/templates/components/dataset-compliance.hbs b/wherehows-web/app/templates/components/dataset-compliance.hbs
index 76145f4df3..5292f0b0cc 100644
--- a/wherehows-web/app/templates/components/dataset-compliance.hbs
+++ b/wherehows-web/app/templates/components/dataset-compliance.hbs
@@ -29,6 +29,7 @@
 
   <section class="metadata-prompt" id="has-member">
     <header class="metadata-prompt__header">
+      <p class="metadata-prompt__page-number">Question 1 of 3</p>
       <p>Can any fields in this dataset's schema be used to identify a
         member?</p>
     </header>
@@ -64,6 +65,7 @@
   {{#if showOrgPrompt}}
     <section class="metadata-prompt" id="has-org">
       <header class="metadata-prompt__header">
+        <p class="metadata-prompt__page-number">Question 2 of 3</p>
         <p>Do fields in the schema contain the ID of an organization?</p>
       </header>
       <span>
@@ -97,6 +99,7 @@
   {{#if showGroupPrompt}}
     <section class="metadata-prompt" id="has-group">
       <header class="metadata-prompt__header">
+        <p class="metadata-prompt__page-number">Question 3 of 3</p>
         <p>Do fields in the schema contain the ID of a group?</p>
       </header>
       <span>
diff --git a/wherehows-web/app/templates/components/dataset-confidential.hbs b/wherehows-web/app/templates/components/dataset-confidential.hbs
index c4eb06a677..a1bbfa8490 100644
--- a/wherehows-web/app/templates/components/dataset-confidential.hbs
+++ b/wherehows-web/app/templates/components/dataset-confidential.hbs
@@ -22,8 +22,10 @@
         Which fields should be classified as Confidential or Highly Confidential
         (if any)?
 
+        <!--TODO: DSS-6716-->
+        <!-- DRY out with wrapper component that takes the link as an attribute-->
         <a
-          href="https://iwww.corp.linkedin.com/wiki/cf/display/HR/Exhibit+A+-+Data+Handling+Table">
+          href="https://iwww.corp.linkedin.com/wiki/cf/display/DWH/Metadata+Acquisition#ProjectOverview-confidential">
           <sup>
             More Info
 
@@ -53,8 +55,10 @@
       {{#head.column}}Data Type{{/head.column}}
       {{#head.column}}
         Security Classification
+        <!--TODO: DSS-6716-->
+        <!-- DRY out with wrapper component that takes the link as an attribute-->
         <a
-          href="https://iwww.corp.linkedin.com/wiki/cf/display/HR/Exhibit+A+-+Data+Handling+Table">
+          href="https://iwww.corp.linkedin.com/wiki/cf/display/DWH/Metadata+Acquisition#ProjectOverview-confidential">
           <sup>
         <span class="glyphicon glyphicon-question-sign"
               title="Link to more information"></span>
@@ -63,10 +67,12 @@
       {{/head.column}}
       {{#head.column}}
         Field Format
+        <!--TODO: DSS-6716-->
+        <!-- DRY out with wrapper component that takes the link as an attribute-->
         <a
-          href="https://iwww.corp.linkedin.com/wiki/cf/display/HR/Exhibit+A+-+Data+Handling+Table">
+          href="https://iwww.corp.linkedin.com/wiki/cf/display/DWH/Metadata+Acquisition#ProjectOverview-confidential">
           <sup>
-        <span class="glyphicon glyphicon-question-sign"
+          <span class="glyphicon glyphicon-question-sign"
               title="Link to more information"></span>
           </sup>
         </a>
diff --git a/wherehows-web/app/templates/components/dataset-schema-table.hbs b/wherehows-web/app/templates/components/dataset-schema-table.hbs
index ec4a04e13b..4e964f0a5e 100644
--- a/wherehows-web/app/templates/components/dataset-schema-table.hbs
+++ b/wherehows-web/app/templates/components/dataset-schema-table.hbs
@@ -14,8 +14,30 @@
   {{#table.head as |head|}}
     {{#head.column columnName="identifierField"}}Field{{/head.column}}
     {{#head.column columnName="dataType"}}Data Type{{/head.column}}
-    {{#head.column}}Member Identifier?{{/head.column}}
-    {{#head.column}}Is this field a Subject Owner?{{/head.column}}
+    {{#head.column}}
+      Member Identifier?
+      <!--TODO: DSS-6716-->
+      <!-- DRY out with wrapper component that takes the link as an attribute-->
+      <a
+        href="https://iwww.corp.linkedin.com/wiki/cf/display/DWH/Metadata+Acquisition#ProjectOverview-compliance">
+        <sup>
+        <span class="glyphicon glyphicon-question-sign"
+              title="Link to more information"></span>
+        </sup>
+      </a>
+    {{/head.column}}
+    {{#head.column}}
+      Is this field a Subject Owner?
+      <!--TODO: DSS-6716-->
+      <!-- DRY out with wrapper component that takes the link as an attribute-->
+      <a
+        href="https://iwww.corp.linkedin.com/wiki/cf/display/DWH/Metadata+Acquisition#ProjectOverview-compliance">
+        <sup>
+        <span class="glyphicon glyphicon-question-sign"
+              title="Link to more information"></span>
+        </sup>
+      </a>
+    {{/head.column}}
     {{#head.column}}Field Format{{/head.column}}
   {{/table.head}}
   {{#table.body as |body|}}
diff --git a/wherehows-web/app/templates/components/dataset-table-org-compliance.hbs b/wherehows-web/app/templates/components/dataset-table-org-compliance.hbs
index e02ee5702b..9a8d8dc7f2 100644
--- a/wherehows-web/app/templates/components/dataset-table-org-compliance.hbs
+++ b/wherehows-web/app/templates/components/dataset-table-org-compliance.hbs
@@ -14,7 +14,18 @@
   {{#table.head as |head|}}
     {{#head.column columnName="identifierField"}}Field{{/head.column}}
     {{#head.column columnName="dataType"}}Data Type{{/head.column}}
-    {{#head.column}}Organization Identifier?{{/head.column}}
+    {{#head.column}}
+      Organization Identifier?
+
+      <!--TODO: DSS-6716-->
+      <!-- DRY out with wrapper component that takes the link as an attribute-->
+      <a
+        href="https://iwww.corp.linkedin.com/wiki/cf/display/HR/Exhibit+A+-+Data+Handling+Table">
+        <sup>
+        <span class="glyphicon glyphicon-question-sign"
+              title="Link to more information"></span>
+        </sup>
+      </a>{{/head.column}}
     {{#head.column}}Field Format{{/head.column}}
   {{/table.head}}
   {{#table.body as |body|}}
diff --git a/wherehows-web/app/templates/navbar.hbs b/wherehows-web/app/templates/navbar.hbs
index 343870188b..98d900a4d1 100644
--- a/wherehows-web/app/templates/navbar.hbs
+++ b/wherehows-web/app/templates/navbar.hbs
@@ -52,6 +52,8 @@
               <span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span>
             </li>
             <li>
+              <!--TODO: DSS-6716-->
+              <!-- DRY out with wrapper component that takes the link as an attribute-->
               <a href="https://iwww.corp.linkedin.com/wiki/cf/display/ENGS/Metadata+Coverage"
                  title="Metadata Coverage"
                  target="_blank">