diff --git a/package.json b/package.json
index d98f3947..13537c87 100644
--- a/package.json
+++ b/package.json
@@ -354,7 +354,7 @@
   },
   "dependencies": {
     "@folio/plugin-find-organization": "^5.0.0",
-    "@folio/stripes-acq-components": "~5.1.0",
+    "@folio/stripes-acq-components": "~6.0.0",
     "lodash": "^4.17.5",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.20",
diff --git a/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap b/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
index 44a75480..5fe6df20 100644
--- a/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
+++ b/src/OrganizationIntegration/OrganizationIntegrationForm/__snapshots__/OrganizationIntegrationForm.test.js.snap
@@ -107,45 +107,46 @@ exports[`OrganizationIntegrationForm should render correct form structure 1`] =
                 data-test-accordion-section="true"
                 id="integrationInfo"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                  tabindex="-1"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion1"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-integrationInfo"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion1"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-integrationInfo"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.info
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.info
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -294,45 +295,46 @@ exports[`OrganizationIntegrationForm should render correct form structure 1`] =
                 data-test-accordion-section="true"
                 id="edi"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                  tabindex="-1"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion2"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-edi"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion2"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-edi"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.edi
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.edi
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -872,45 +874,46 @@ exports[`OrganizationIntegrationForm should render correct form structure 1`] =
                 data-test-accordion-section="true"
                 id="ftp"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                  tabindex="-1"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion3"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-ftp"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion3"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-ftp"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.ftp
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.ftp
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -1351,45 +1354,46 @@ exports[`OrganizationIntegrationForm should render correct form structure 1`] =
                 data-test-accordion-section="true"
                 id="scheduling"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                  tabindex="-1"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion4"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-scheduling"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion4"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-scheduling"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.scheduling
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.scheduling
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
diff --git a/src/OrganizationIntegration/OrganizationIntegrationView/__snapshots__/OrganizationIntegrationView.test.js.snap b/src/OrganizationIntegration/OrganizationIntegrationView/__snapshots__/OrganizationIntegrationView.test.js.snap
index 746e0083..08a4a91a 100644
--- a/src/OrganizationIntegration/OrganizationIntegrationView/__snapshots__/OrganizationIntegrationView.test.js.snap
+++ b/src/OrganizationIntegration/OrganizationIntegrationView/__snapshots__/OrganizationIntegrationView.test.js.snap
@@ -177,44 +177,46 @@ exports[`OrganizationIntegrationView should render correct view structure 1`] =
                 data-test-accordion-section="true"
                 id="integrationInfo"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion1"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-integrationInfo"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion1"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-integrationInfo"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.info
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.info
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -332,44 +334,46 @@ exports[`OrganizationIntegrationView should render correct view structure 1`] =
                 data-test-accordion-section="true"
                 id="edi"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion2"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-edi"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion2"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-edi"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.edi
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.edi
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -730,44 +734,46 @@ exports[`OrganizationIntegrationView should render correct view structure 1`] =
                 data-test-accordion-section="true"
                 id="ftp"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion3"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-ftp"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion3"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-ftp"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.ftp
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.ftp
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -1030,44 +1036,46 @@ exports[`OrganizationIntegrationView should render correct view structure 1`] =
                 data-test-accordion-section="true"
                 id="scheduling"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion4"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-scheduling"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion4"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-scheduling"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.integration.scheduling
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.integration.scheduling
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
diff --git a/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap
index 8a422061..42ebbbcf 100644
--- a/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationContactInfoForm/__snapshots__/OrganizationContactInfoForm.test.js.snap
@@ -14,6 +14,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
           class="repeatableField hasMargin"
           data-test-repeatable-field="true"
           id="addresses"
+          tabindex="-1"
         >
           <legend
             class="headline size-medium margin-medium font-weight-bold"
@@ -348,6 +349,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                 id="downshift-:r1:-menu"
                                 role="listbox"
                                 style="max-height: 174px;"
+                                tabindex="-1"
                               />
                             </div>
                           </div>
@@ -439,6 +441,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                 id="downshift-:r3:-menu"
                                 role="listbox"
                                 style="max-height: 174px;"
+                                tabindex="-1"
                               />
                             </div>
                           </div>
@@ -697,6 +700,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
           class="repeatableField hasMargin"
           data-test-repeatable-field="true"
           id="phone-numbers"
+          tabindex="-1"
         >
           <legend
             class="headline size-medium margin-medium font-weight-bold"
@@ -943,6 +947,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                 id="downshift-:r7:-menu"
                                 role="listbox"
                                 style="max-height: 174px;"
+                                tabindex="-1"
                               />
                             </div>
                           </div>
@@ -1139,6 +1144,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
           class="repeatableField hasMargin"
           data-test-repeatable-field="true"
           id="emails"
+          tabindex="-1"
         >
           <legend
             class="headline size-medium margin-medium font-weight-bold"
@@ -1360,6 +1366,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                 id="downshift-:rb:-menu"
                                 role="listbox"
                                 style="max-height: 174px;"
+                                tabindex="-1"
                               />
                             </div>
                           </div>
@@ -1556,6 +1563,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
           class="repeatableField hasMargin"
           data-test-repeatable-field="true"
           id="urls"
+          tabindex="-1"
         >
           <legend
             class="headline size-medium margin-medium font-weight-bold"
@@ -1777,6 +1785,7 @@ exports[`OrganizationContactInfoForm should render correct structure with define
                                 id="downshift-:rf:-menu"
                                 role="listbox"
                                 style="max-height: 174px;"
+                                tabindex="-1"
                               />
                             </div>
                           </div>
diff --git a/src/Organizations/OrganizationForm/OrganizationContactPeopleForm/__snapshots__/OrganizationContactPeopleForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationContactPeopleForm/__snapshots__/OrganizationContactPeopleForm.test.js.snap
index 26d79086..572e57e0 100644
--- a/src/Organizations/OrganizationForm/OrganizationContactPeopleForm/__snapshots__/OrganizationContactPeopleForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationContactPeopleForm/__snapshots__/OrganizationContactPeopleForm.test.js.snap
@@ -9,169 +9,170 @@ exports[`OrganizationContactPeopleForm should render correct structure 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
-          class="mclContainer"
-          style="position: relative; overflow: hidden; height: auto; width: 100%;"
-          tabindex="-1"
-        >
-          <div
-            aria-live="assertive"
-            aria-relevant="additions"
-            class="sr-only"
-          />
+        <div>
           <div
-            aria-rowcount="2"
-            class=""
-            data-total-count="0"
-            id="contact-list"
-            role="grid"
-            tabindex="0"
+            class="mclContainer"
+            style="position: relative; overflow: hidden; height: auto; width: 100%;"
           >
             <div
-              class="mclHeaderContainer"
+              aria-live="assertive"
+              aria-relevant="additions"
+              class="sr-only"
+            />
+            <div
+              aria-rowcount="2"
+              class=""
+              data-total-count="0"
+              id="contact-list"
+              role="grid"
+              tabindex="0"
             >
               <div
-                aria-rowindex="1"
-                class="mclHeaderRow"
-                role="row"
-                style="display: flex; width: 17px;"
+                class="mclHeaderContainer"
               >
                 <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-contactname"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
-                >
-                  ui-organizations.contactPeople.name
-                </div>
-                <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-contactcategories"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
-                >
-                  ui-organizations.contactPeople.categories
-                </div>
-                <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-contactemails"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
-                >
-                  ui-organizations.contactPeople.emails
-                </div>
-                <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-notes"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
+                  aria-rowindex="1"
+                  class="mclHeaderRow"
+                  role="row"
+                  style="display: flex; width: 17px;"
                 >
-                  ui-organizations.contactPeople.note
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-contactname"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  >
+                    ui-organizations.contactPeople.name
+                  </div>
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-contactcategories"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  >
+                    ui-organizations.contactPeople.categories
+                  </div>
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-contactemails"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  >
+                    ui-organizations.contactPeople.emails
+                  </div>
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-notes"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  >
+                    ui-organizations.contactPeople.note
+                  </div>
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-unassigncontact"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  />
                 </div>
-                <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-unassigncontact"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
-                />
               </div>
-            </div>
-            <div
-              class="mclScrollable"
-              style="position: static; width: 100%;"
-            >
               <div
-                class="mclRowContainer"
-                role="rowgroup"
-                style="position: static;"
+                class="mclScrollable"
+                style="position: static; width: 100%;"
               >
                 <div
-                  aria-rowindex="2"
-                  class="mclRowFormatterContainer"
-                  data-row-index="row-0"
-                  role="row"
+                  class="mclRowContainer"
+                  role="rowgroup"
                   style="position: static;"
                 >
-                  <a
-                    aria-label=""
-                    class="mclRow mclIsOdd mclIsInteractive alignLastColToEnd"
-                    data-row-inner="0"
-                    href="/organizations/contacts/e0fb5df2-cdf1-11e8-a8d5-f2801f1b9fd1/view"
-                    style="min-width: 0px;"
-                    tabindex="0"
+                  <div
+                    aria-rowindex="2"
+                    class="mclRowFormatterContainer"
+                    data-row-index="row-0"
+                    role="row"
+                    style="position: static;"
                   >
-                    <div
-                      class="mclCell mclCellStyle"
-                      role="gridcell"
+                    <a
+                      aria-label=""
+                      class="mclRow mclIsOdd mclIsInteractive alignLastColToEnd"
+                      data-row-inner="0"
+                      href="/organizations/contacts/e0fb5df2-cdf1-11e8-a8d5-f2801f1b9fd1/view"
+                      style="min-width: 0px;"
+                      tabindex="0"
                     >
-                      Brownstein, Carrie
-                    </div>
-                    <div
-                      class="mclCell mclCellStyle"
-                      role="gridcell"
-                    />
-                    <div
-                      class="mclCell mclCellStyle"
-                      role="gridcell"
-                    >
-                      cust.service03@amazon.com
-                    </div>
-                    <div
-                      class="mclCell mclCellStyle"
-                      role="gridcell"
-                    >
-                      <span
-                        class="text"
-                        title="notes"
+                      <div
+                        class="mclCell mclCellStyle"
+                        role="gridcell"
                       >
-                        notes
-                      </span>
-                    </div>
-                    <div
-                      class="mclCell mclCellStyle"
-                      role="gridcell"
-                    >
-                      <button
-                        aria-label="ui-organizations.contacts.button.unassign"
-                        class="button fieldControl align-end"
-                        data-test-unassign-contact="true"
-                        type="button"
+                        Brownstein, Carrie
+                      </div>
+                      <div
+                        class="mclCell mclCellStyle"
+                        role="gridcell"
+                      />
+                      <div
+                        class="mclCell mclCellStyle"
+                        role="gridcell"
+                      >
+                        cust.service03@amazon.com
+                      </div>
+                      <div
+                        class="mclCell mclCellStyle"
+                        role="gridcell"
                       >
                         <span
-                          class="inner"
+                          class="text"
+                          title="notes"
                         >
-                          <span>
-                            Icon
-                          </span>
+                          notes
                         </span>
-                      </button>
-                    </div>
-                  </a>
-                </div>
-                <div
-                  class="mclEndOfListContainer"
-                  data-end-of-list="1"
-                >
+                      </div>
+                      <div
+                        class="mclCell mclCellStyle"
+                        role="gridcell"
+                      >
+                        <button
+                          aria-label="ui-organizations.contacts.button.unassign"
+                          class="button fieldControl align-end"
+                          data-test-unassign-contact="true"
+                          type="button"
+                        >
+                          <span
+                            class="inner"
+                          >
+                            <span>
+                              Icon
+                            </span>
+                          </span>
+                        </button>
+                      </div>
+                    </a>
+                  </div>
                   <div
-                    class="mclCenteredContainer"
-                    style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
+                    class="mclEndOfListContainer"
+                    data-end-of-list="1"
                   >
                     <div
-                      class="textCentered"
-                      data-test-layout="true"
+                      class="mclCenteredContainer"
+                      style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
                     >
                       <div
-                        class="mclEndOfList"
+                        class="textCentered"
                         data-test-layout="true"
                       >
-                        <span>
-                          Icon
-                        </span>
+                        <div
+                          class="mclEndOfList"
+                          data-test-layout="true"
+                        >
+                          <span>
+                            Icon
+                          </span>
+                        </div>
                       </div>
                     </div>
                   </div>
diff --git a/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap
index 66aa8099..9c170901 100644
--- a/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationInterfacesForm/__snapshots__/OrganizationInterfacesForm.test.js.snap
@@ -9,94 +9,75 @@ exports[`OrganizationInterfacesForm should render correct structure 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
-          class="mclContainer"
-          style="position: relative; overflow: hidden; height: auto; width: 100%;"
-          tabindex="-1"
-        >
-          <div
-            aria-live="assertive"
-            aria-relevant="additions"
-            class="sr-only"
-          />
+        <div>
           <div
-            aria-rowcount="2"
-            class=""
-            data-total-count="0"
-            id="interface-list"
-            role="grid"
-            tabindex="0"
+            class="mclContainer"
+            style="position: relative; overflow: hidden; height: auto; width: 100%;"
           >
             <div
-              class="mclHeaderContainer"
+              aria-live="assertive"
+              aria-relevant="additions"
+              class="sr-only"
+            />
+            <div
+              aria-rowcount="2"
+              class=""
+              data-total-count="0"
+              id="interface-list"
+              role="grid"
+              tabindex="0"
             >
               <div
-                aria-rowindex="1"
-                class="mclHeaderRow"
-                role="row"
-                style="display: flex; width: 17px;"
+                class="mclHeaderContainer"
               >
                 <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-interfacename"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
-                >
-                  ui-organizations.interface.name
-                </div>
-                <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-interfaceurl"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
+                  aria-rowindex="1"
+                  class="mclHeaderRow"
+                  role="row"
+                  style="display: flex; width: 17px;"
                 >
-                  ui-organizations.interface.url
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-interfacename"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  >
+                    ui-organizations.interface.name
+                  </div>
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-interfaceurl"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  >
+                    ui-organizations.interface.url
+                  </div>
+                  <div
+                    aria-sort="none"
+                    class="mclHeader"
+                    id="list-column-unassigninterface"
+                    role="columnheader"
+                    style="flex: 0 0 auto;"
+                  />
                 </div>
-                <div
-                  aria-sort="none"
-                  class="mclHeader"
-                  id="list-column-unassigninterface"
-                  role="columnheader"
-                  style="flex: 0 0 auto;"
-                />
               </div>
-            </div>
-            <div
-              class="mclScrollable"
-              style="position: static; width: 100%;"
-            >
               <div
-                class="mclRowContainer"
-                role="rowgroup"
-                style="position: static;"
+                class="mclScrollable"
+                style="position: static; width: 100%;"
               >
                 <div
-                  aria-rowindex="2"
-                  class="mclRowFormatterContainer"
-                  data-row-index="row-0"
-                  role="row"
+                  class="mclRowContainer"
+                  role="rowgroup"
                   style="position: static;"
                 >
-                  <a
-                    aria-label=""
-                    class="mclRow mclIsOdd mclIsInteractive alignLastColToEnd"
-                    data-row-inner="0"
-                    href="/organizations/interface/793b9d42-ae12-41d7-a36a-f33e5b9e82c5/view"
-                    style="min-width: 0px;"
-                    tabindex="0"
-                  >
-                    <div
-                      class="mclCell mclCellStyle"
-                      role="gridcell"
-                    >
-                      GOBI
-                    </div>
-                  </a>
                   <div
-                    class="mclCell mclCellStyle"
-                    role="gridcell"
+                    aria-rowindex="2"
+                    class="mclRowFormatterContainer"
+                    data-row-index="row-0"
+                    role="row"
+                    style="position: static;"
                   >
                     <a
                       aria-label=""
@@ -105,56 +86,76 @@ exports[`OrganizationInterfacesForm should render correct structure 1`] = `
                       href="/organizations/interface/793b9d42-ae12-41d7-a36a-f33e5b9e82c5/view"
                       style="min-width: 0px;"
                       tabindex="0"
-                    />
-                    <a
-                      class="root"
-                      data-test-text-link="true"
-                      href="www.gobi3.com"
-                      rel="noopener noreferrer"
-                      target="_blank"
                     >
-                      www.gobi3.com
+                      <div
+                        class="mclCell mclCellStyle"
+                        role="gridcell"
+                      >
+                        GOBI
+                      </div>
                     </a>
-                  </div>
-                  <div
-                    class="mclCell mclCellStyle"
-                    role="gridcell"
-                  >
-                    <button
-                      aria-label="ui-organizations.interface.button.unassign"
-                      class="button fieldControl align-end"
-                      data-test-unassign-interface="true"
-                      type="button"
+                    <div
+                      class="mclCell mclCellStyle"
+                      role="gridcell"
                     >
-                      <span
-                        class="inner"
+                      <a
+                        aria-label=""
+                        class="mclRow mclIsOdd mclIsInteractive alignLastColToEnd"
+                        data-row-inner="0"
+                        href="/organizations/interface/793b9d42-ae12-41d7-a36a-f33e5b9e82c5/view"
+                        style="min-width: 0px;"
+                        tabindex="0"
+                      />
+                      <a
+                        class="root"
+                        data-test-text-link="true"
+                        href="www.gobi3.com"
+                        rel="noopener noreferrer"
+                        target="_blank"
                       >
-                        <span>
-                          Icon
+                        www.gobi3.com
+                      </a>
+                    </div>
+                    <div
+                      class="mclCell mclCellStyle"
+                      role="gridcell"
+                    >
+                      <button
+                        aria-label="ui-organizations.interface.button.unassign"
+                        class="button fieldControl align-end"
+                        data-test-unassign-interface="true"
+                        type="button"
+                      >
+                        <span
+                          class="inner"
+                        >
+                          <span>
+                            Icon
+                          </span>
                         </span>
-                      </span>
-                    </button>
+                      </button>
+                    </div>
                   </div>
-                </div>
-                <div
-                  class="mclEndOfListContainer"
-                  data-end-of-list="1"
-                >
                   <div
-                    class="mclCenteredContainer"
-                    style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
+                    class="mclEndOfListContainer"
+                    data-end-of-list="1"
                   >
                     <div
-                      class="textCentered"
-                      data-test-layout="true"
+                      class="mclCenteredContainer"
+                      style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
                     >
                       <div
-                        class="mclEndOfList"
+                        class="textCentered"
                         data-test-layout="true"
                       >
-                        <span>
-                          Icon
-                        </span>
+                        <div
+                          class="mclEndOfList"
+                          data-test-layout="true"
+                        >
+                          <span>
+                            Icon
+                          </span>
+                        </div>
                       </div>
                     </div>
                   </div>
diff --git a/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap
index 2c62b02d..8b925fc6 100644
--- a/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationSummaryForm/__snapshots__/OrganizationSummaryForm.test.js.snap
@@ -449,6 +449,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
                 id="downshift-:r3:-menu"
                 role="listbox"
                 style="max-height: 174px;"
+                tabindex="-1"
               />
             </div>
           </div>
@@ -711,6 +712,7 @@ exports[`OrganizationSummaryForm should render correct structure 1`] = `
           class="repeatableField hasMargin"
           data-test-repeatable-field="true"
           id="aliases"
+          tabindex="-1"
         >
           <legend
             class="headline size-medium margin-medium font-weight-bold"
diff --git a/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap b/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap
index 1c487b0d..30abf358 100644
--- a/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/OrganizationVendorInfoForm/__snapshots__/OrganizationVendorInfoForm.test.js.snap
@@ -596,45 +596,46 @@ exports[`OrganizationVendorInfoForm should render correct structure 1`] = `
             data-test-accordion-section="true"
             id="taxSection"
           >
-            <div
-              style="width: 100%; display: flex;"
-              tabindex="-1"
-            >
+            <div>
               <div
-                class="headerWrapper"
+                style="width: 100%; display: flex;"
               >
                 <div
-                  class="header default"
+                  class="headerWrapper"
                 >
-                  <h3
-                    class="headline size-medium margin-none font-weight-bold block"
-                    data-test-headline="true"
+                  <div
+                    class="header default"
                   >
-                    <button
-                      aria-controls="accordion1"
-                      aria-expanded="true"
-                      class="defaultCollapseButton"
-                      id="accordion-toggle-button-taxSection"
-                      type="button"
+                    <h3
+                      class="headline size-medium margin-none font-weight-bold block"
+                      data-test-headline="true"
                     >
-                      <span
-                        class="headerInner"
+                      <button
+                        aria-controls="accordion1"
+                        aria-expanded="true"
+                        class="defaultCollapseButton"
+                        id="accordion-toggle-button-taxSection"
+                        type="button"
                       >
                         <span
-                          class="defaultHeaderIcon"
+                          class="headerInner"
                         >
-                          <span>
-                            Icon
+                          <span
+                            class="defaultHeaderIcon"
+                          >
+                            <span>
+                              Icon
+                            </span>
                           </span>
+                          <div
+                            class="labelArea"
+                          >
+                            ui-organizations.vendorInfo.tax
+                          </div>
                         </span>
-                        <div
-                          class="labelArea"
-                        >
-                          ui-organizations.vendorInfo.tax
-                        </div>
-                      </span>
-                    </button>
-                  </h3>
+                      </button>
+                    </h3>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap b/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
index 57859091..1ef47e2c 100644
--- a/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
+++ b/src/Organizations/OrganizationForm/__snapshots__/OrganizationForm.test.js.snap
@@ -114,45 +114,46 @@ exports[`OrganizationForm should render correct form with metadata 1`] = `
                     data-test-accordion-section="true"
                     id="summarySection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion48"
-                              aria-expanded="true"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-summarySection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion48"
+                                aria-expanded="true"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-summarySection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.summary
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.summary
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -179,45 +180,46 @@ exports[`OrganizationForm should render correct form with metadata 1`] = `
                     data-test-accordion-section="true"
                     id="contactInformationSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion49"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-contactInformationSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion49"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-contactInformationSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.contactInformation
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.contactInformation
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -241,45 +243,46 @@ exports[`OrganizationForm should render correct form with metadata 1`] = `
                     data-test-accordion-section="true"
                     id="contactPeopleSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion50"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-contactPeopleSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion50"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-contactPeopleSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.contactPeople
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.contactPeople
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -303,45 +306,46 @@ exports[`OrganizationForm should render correct form with metadata 1`] = `
                     data-test-accordion-section="true"
                     id="interfacesSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion51"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-interfacesSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion51"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-interfacesSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.interface
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.interface
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -541,45 +545,46 @@ exports[`OrganizationForm should render correct non-vendor form structure 1`] =
                     data-test-accordion-section="true"
                     id="summarySection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion2"
-                              aria-expanded="true"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-summarySection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion2"
+                                aria-expanded="true"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-summarySection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.summary
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.summary
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -603,45 +608,46 @@ exports[`OrganizationForm should render correct non-vendor form structure 1`] =
                     data-test-accordion-section="true"
                     id="contactInformationSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion3"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-contactInformationSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion3"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-contactInformationSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.contactInformation
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.contactInformation
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -665,45 +671,46 @@ exports[`OrganizationForm should render correct non-vendor form structure 1`] =
                     data-test-accordion-section="true"
                     id="contactPeopleSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion4"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-contactPeopleSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion4"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-contactPeopleSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.contactPeople
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.contactPeople
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -727,45 +734,46 @@ exports[`OrganizationForm should render correct non-vendor form structure 1`] =
                     data-test-accordion-section="true"
                     id="interfacesSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion5"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-interfacesSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion5"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-interfacesSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.interface
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.interface
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -965,45 +973,46 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                     data-test-accordion-section="true"
                     id="summarySection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion19"
-                              aria-expanded="true"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-summarySection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion19"
+                                aria-expanded="true"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-summarySection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.summary
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.summary
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -1027,45 +1036,46 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                     data-test-accordion-section="true"
                     id="contactInformationSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion20"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-contactInformationSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion20"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-contactInformationSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.contactInformation
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.contactInformation
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -1089,45 +1099,46 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                     data-test-accordion-section="true"
                     id="contactPeopleSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion21"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-contactPeopleSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion21"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-contactPeopleSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.contactPeople
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.contactPeople
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -1151,45 +1162,46 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                     data-test-accordion-section="true"
                     id="interfacesSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion22"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-interfacesSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion22"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-interfacesSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.interface
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.interface
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -1213,45 +1225,46 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                     data-test-accordion-section="true"
                     id="vendorInformationSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion23"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-vendorInformationSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion23"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-vendorInformationSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.vendorInformation
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.vendorInformation
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -1275,45 +1288,46 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                     data-test-accordion-section="true"
                     id="agreementsSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion24"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-agreementsSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion24"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-agreementsSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.vendorTerms
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.vendorTerms
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -1337,45 +1351,46 @@ exports[`OrganizationForm should render correct vendor form structure 1`] = `
                     data-test-accordion-section="true"
                     id="accountsSection"
                   >
-                    <div
-                      style="width: 100%; display: flex;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        class="headerWrapper"
+                        style="width: 100%; display: flex;"
                       >
                         <div
-                          class="header default"
+                          class="headerWrapper"
                         >
-                          <h3
-                            class="headline size-medium margin-none font-weight-bold block"
-                            data-test-headline="true"
+                          <div
+                            class="header default"
                           >
-                            <button
-                              aria-controls="accordion25"
-                              aria-expanded="false"
-                              class="defaultCollapseButton"
-                              id="accordion-toggle-button-accountsSection"
-                              type="button"
+                            <h3
+                              class="headline size-medium margin-none font-weight-bold block"
+                              data-test-headline="true"
                             >
-                              <span
-                                class="headerInner"
+                              <button
+                                aria-controls="accordion25"
+                                aria-expanded="false"
+                                class="defaultCollapseButton"
+                                id="accordion-toggle-button-accountsSection"
+                                type="button"
                               >
                                 <span
-                                  class="defaultHeaderIcon"
+                                  class="headerInner"
                                 >
-                                  <span>
-                                    Icon
+                                  <span
+                                    class="defaultHeaderIcon"
+                                  >
+                                    <span>
+                                      Icon
+                                    </span>
                                   </span>
+                                  <div
+                                    class="labelArea"
+                                  >
+                                    ui-organizations.accounts
+                                  </div>
                                 </span>
-                                <div
-                                  class="labelArea"
-                                >
-                                  ui-organizations.accounts
-                                </div>
-                              </span>
-                            </button>
-                          </h3>
+                              </button>
+                            </h3>
+                          </div>
                         </div>
                       </div>
                     </div>
diff --git a/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap b/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
index 14c8be57..a06fa933 100644
--- a/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
+++ b/src/contacts/EditContact/__snapshots__/EditContact.test.js.snap
@@ -107,44 +107,46 @@ exports[`EditContact should render correct form structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-name"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion1"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-name"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion1"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-name"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.name
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.name
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -418,6 +420,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                 id="downshift-:r1:-menu"
                                 role="listbox"
                                 style="max-height: 174px;"
+                                tabindex="-1"
                               />
                             </div>
                           </div>
@@ -649,44 +652,46 @@ exports[`EditContact should render correct form structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-emails"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion2"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-emails"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion2"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-emails"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.emails
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.emails
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -712,6 +717,7 @@ exports[`EditContact should render correct form structure 1`] = `
                           class="repeatableField hasMargin"
                           data-test-repeatable-field="true"
                           id="emails"
+                          tabindex="-1"
                         >
                           <ul
                             class="repeatableFieldList"
@@ -941,6 +947,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                             id="downshift-:r5:-menu"
                                             role="listbox"
                                             style="max-height: 174px;"
+                                            tabindex="-1"
                                           />
                                         </div>
                                       </div>
@@ -1190,44 +1197,46 @@ exports[`EditContact should render correct form structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-phones"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion3"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-phones"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion3"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-phones"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.phoneNumbers
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.phoneNumbers
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -1253,6 +1262,7 @@ exports[`EditContact should render correct form structure 1`] = `
                           class="repeatableField hasMargin"
                           data-test-repeatable-field="true"
                           id="phoneNumbers"
+                          tabindex="-1"
                         >
                           <ul
                             class="repeatableFieldList"
@@ -1505,6 +1515,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                             id="downshift-:r9:-menu"
                                             role="listbox"
                                             style="max-height: 174px;"
+                                            tabindex="-1"
                                           />
                                         </div>
                                       </div>
@@ -1754,44 +1765,46 @@ exports[`EditContact should render correct form structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-urls"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion4"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-urls"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion4"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-urls"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.urls
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.urls
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -1817,6 +1830,7 @@ exports[`EditContact should render correct form structure 1`] = `
                           class="repeatableField hasMargin"
                           data-test-repeatable-field="true"
                           id="urls"
+                          tabindex="-1"
                         >
                           <ul
                             class="repeatableFieldList"
@@ -2046,6 +2060,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                             id="downshift-:rd:-menu"
                                             role="listbox"
                                             style="max-height: 174px;"
+                                            tabindex="-1"
                                           />
                                         </div>
                                       </div>
@@ -2295,44 +2310,46 @@ exports[`EditContact should render correct form structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-addresses"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion5"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-addresses"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion5"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-addresses"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.addresses
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.addresses
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -2358,6 +2375,7 @@ exports[`EditContact should render correct form structure 1`] = `
                           class="repeatableField hasMargin"
                           data-test-repeatable-field="true"
                           id="addresses"
+                          tabindex="-1"
                         >
                           <legend
                             class="headline size-medium margin-medium font-weight-bold"
@@ -2692,6 +2710,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                                 id="downshift-:rh:-menu"
                                                 role="listbox"
                                                 style="max-height: 174px;"
+                                                tabindex="-1"
                                               />
                                             </div>
                                           </div>
@@ -2783,6 +2802,7 @@ exports[`EditContact should render correct form structure 1`] = `
                                                 id="downshift-:rj:-menu"
                                                 role="listbox"
                                                 style="max-height: 174px;"
+                                                tabindex="-1"
                                               />
                                             </div>
                                           </div>
diff --git a/src/contacts/ViewContact/__snapshots__/ViewContact.test.js.snap b/src/contacts/ViewContact/__snapshots__/ViewContact.test.js.snap
index 45347466..7e455604 100644
--- a/src/contacts/ViewContact/__snapshots__/ViewContact.test.js.snap
+++ b/src/contacts/ViewContact/__snapshots__/ViewContact.test.js.snap
@@ -187,44 +187,46 @@ exports[`ViewContact should render correct structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-name"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion1"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-name"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion1"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-name"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.name
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.name
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -392,44 +394,46 @@ exports[`ViewContact should render correct structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-emails"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion2"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-emails"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion2"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-emails"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.emails
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.emails
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -444,152 +448,153 @@ exports[`ViewContact should render correct structure 1`] = `
                     id="accordion2"
                     role="region"
                   >
-                    <div
-                      class="mclContainer"
-                      style="position: relative; overflow: hidden; height: auto; width: 100%;"
-                      tabindex="-1"
-                    >
+                    <div>
                       <div
-                        aria-live="assertive"
-                        aria-relevant="additions"
-                        class="sr-only"
-                      />
-                      <div
-                        aria-rowcount="2"
-                        class=""
-                        data-total-count="0"
-                        role="grid"
-                        tabindex="0"
+                        class="mclContainer"
+                        style="position: relative; overflow: hidden; height: auto; width: 100%;"
                       >
                         <div
-                          class="mclHeaderContainer"
+                          aria-live="assertive"
+                          aria-relevant="additions"
+                          class="sr-only"
+                        />
+                        <div
+                          aria-rowcount="2"
+                          class=""
+                          data-total-count="0"
+                          role="grid"
+                          tabindex="0"
                         >
                           <div
-                            aria-rowindex="1"
-                            class="mclHeaderRow"
-                            role="row"
-                            style="display: flex; width: 17px;"
+                            class="mclHeaderContainer"
                           >
                             <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-email"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.email
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-emaildescription"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.description
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-emaillanguage"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.language
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-emailcategories"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.categories
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-emailprimary"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
+                              aria-rowindex="1"
+                              class="mclHeaderRow"
+                              role="row"
+                              style="display: flex; width: 17px;"
                             >
-                              ui-organizations.primaryItem
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-email"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.email
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-emaildescription"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.description
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-emaillanguage"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.language
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-emailcategories"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.categories
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-emailprimary"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.primaryItem
+                              </div>
                             </div>
                           </div>
-                        </div>
-                        <div
-                          class="mclScrollable"
-                          style="position: static; width: 100%;"
-                          tabindex="0"
-                        >
                           <div
-                            class="mclRowContainer"
-                            role="rowgroup"
-                            style="position: static;"
+                            class="mclScrollable"
+                            style="position: static; width: 100%;"
+                            tabindex="0"
                           >
                             <div
-                              aria-rowindex="2"
-                              class="mclRowFormatterContainer"
-                              data-row-index="row-0"
-                              role="row"
+                              class="mclRowContainer"
+                              role="rowgroup"
                               style="position: static;"
                             >
                               <div
-                                class="mclRow mclIsOdd"
-                                data-row-inner="0"
-                                style="min-width: 0px;"
+                                aria-rowindex="2"
+                                class="mclRowFormatterContainer"
+                                data-row-index="row-0"
+                                role="row"
+                                style="position: static;"
                               >
                                 <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  cust.service03@amazon.com
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
+                                  class="mclRow mclIsOdd"
+                                  data-row-inner="0"
+                                  style="min-width: 0px;"
                                 >
-                                  customer service
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  English
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  Customer Service
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  ui-organizations.primaryItem
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    cust.service03@amazon.com
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    customer service
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    English
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    Customer Service
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    ui-organizations.primaryItem
+                                  </div>
                                 </div>
                               </div>
-                            </div>
-                            <div
-                              class="mclEndOfListContainer"
-                              data-end-of-list="1"
-                            >
                               <div
-                                class="mclCenteredContainer"
-                                style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
+                                class="mclEndOfListContainer"
+                                data-end-of-list="1"
                               >
                                 <div
-                                  class="textCentered"
-                                  data-test-layout="true"
+                                  class="mclCenteredContainer"
+                                  style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
                                 >
                                   <div
-                                    class="mclEndOfList"
+                                    class="textCentered"
                                     data-test-layout="true"
                                   >
-                                    <span>
-                                      Icon
-                                    </span>
+                                    <div
+                                      class="mclEndOfList"
+                                      data-test-layout="true"
+                                    >
+                                      <span>
+                                        Icon
+                                      </span>
+                                    </div>
                                   </div>
                                 </div>
                               </div>
@@ -606,44 +611,46 @@ exports[`ViewContact should render correct structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-phones"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion3"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-phones"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion3"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-phones"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.phoneNumbers
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.phoneNumbers
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -658,152 +665,153 @@ exports[`ViewContact should render correct structure 1`] = `
                     id="accordion3"
                     role="region"
                   >
-                    <div
-                      class="mclContainer"
-                      style="position: relative; overflow: hidden; height: auto; width: 100%;"
-                      tabindex="-1"
-                    >
-                      <div
-                        aria-live="assertive"
-                        aria-relevant="additions"
-                        class="sr-only"
-                      />
+                    <div>
                       <div
-                        aria-rowcount="2"
-                        class=""
-                        data-total-count="0"
-                        role="grid"
-                        tabindex="0"
+                        class="mclContainer"
+                        style="position: relative; overflow: hidden; height: auto; width: 100%;"
                       >
                         <div
-                          class="mclHeaderContainer"
+                          aria-live="assertive"
+                          aria-relevant="additions"
+                          class="sr-only"
+                        />
+                        <div
+                          aria-rowcount="2"
+                          class=""
+                          data-total-count="0"
+                          role="grid"
+                          tabindex="0"
                         >
                           <div
-                            aria-rowindex="1"
-                            class="mclHeaderRow"
-                            role="row"
-                            style="display: flex; width: 17px;"
+                            class="mclHeaderContainer"
                           >
                             <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-phonenumber"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.phoneNumber
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-phonetype"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.type
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-phonelanguage"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.language
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-phonecategories"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.categories
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-phoneprimary"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
+                              aria-rowindex="1"
+                              class="mclHeaderRow"
+                              role="row"
+                              style="display: flex; width: 17px;"
                             >
-                              ui-organizations.primaryItem
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-phonenumber"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.phoneNumber
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-phonetype"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.type
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-phonelanguage"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.language
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-phonecategories"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.categories
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-phoneprimary"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.primaryItem
+                              </div>
                             </div>
                           </div>
-                        </div>
-                        <div
-                          class="mclScrollable"
-                          style="position: static; width: 100%;"
-                          tabindex="0"
-                        >
                           <div
-                            class="mclRowContainer"
-                            role="rowgroup"
-                            style="position: static;"
+                            class="mclScrollable"
+                            style="position: static; width: 100%;"
+                            tabindex="0"
                           >
                             <div
-                              aria-rowindex="2"
-                              class="mclRowFormatterContainer"
-                              data-row-index="row-0"
-                              role="row"
+                              class="mclRowContainer"
+                              role="rowgroup"
                               style="position: static;"
                             >
                               <div
-                                class="mclRow mclIsOdd"
-                                data-row-inner="0"
-                                style="min-width: 0px;"
+                                aria-rowindex="2"
+                                class="mclRowFormatterContainer"
+                                data-row-index="row-0"
+                                role="row"
+                                style="position: static;"
                               >
                                 <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  1-888-238-22090
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  Mobile
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
+                                  class="mclRow mclIsOdd"
+                                  data-row-inner="0"
+                                  style="min-width: 0px;"
                                 >
-                                  English
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  Customer Service
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  ui-organizations.primaryItem
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    1-888-238-22090
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    Mobile
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    English
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    Customer Service
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    ui-organizations.primaryItem
+                                  </div>
                                 </div>
                               </div>
-                            </div>
-                            <div
-                              class="mclEndOfListContainer"
-                              data-end-of-list="1"
-                            >
                               <div
-                                class="mclCenteredContainer"
-                                style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
+                                class="mclEndOfListContainer"
+                                data-end-of-list="1"
                               >
                                 <div
-                                  class="textCentered"
-                                  data-test-layout="true"
+                                  class="mclCenteredContainer"
+                                  style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
                                 >
                                   <div
-                                    class="mclEndOfList"
+                                    class="textCentered"
                                     data-test-layout="true"
                                   >
-                                    <span>
-                                      Icon
-                                    </span>
+                                    <div
+                                      class="mclEndOfList"
+                                      data-test-layout="true"
+                                    >
+                                      <span>
+                                        Icon
+                                      </span>
+                                    </div>
                                   </div>
                                 </div>
                               </div>
@@ -820,44 +828,46 @@ exports[`ViewContact should render correct structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-urls"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion4"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-urls"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion4"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-urls"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.urls
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.urls
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -872,159 +882,160 @@ exports[`ViewContact should render correct structure 1`] = `
                     id="accordion4"
                     role="region"
                   >
-                    <div
-                      class="mclContainer"
-                      style="position: relative; overflow: hidden; height: auto; width: 100%;"
-                      tabindex="-1"
-                    >
-                      <div
-                        aria-live="assertive"
-                        aria-relevant="additions"
-                        class="sr-only"
-                      />
+                    <div>
                       <div
-                        aria-rowcount="2"
-                        class=""
-                        data-total-count="0"
-                        role="grid"
-                        tabindex="0"
+                        class="mclContainer"
+                        style="position: relative; overflow: hidden; height: auto; width: 100%;"
                       >
                         <div
-                          class="mclHeaderContainer"
+                          aria-live="assertive"
+                          aria-relevant="additions"
+                          class="sr-only"
+                        />
+                        <div
+                          aria-rowcount="2"
+                          class=""
+                          data-total-count="0"
+                          role="grid"
+                          tabindex="0"
                         >
                           <div
-                            aria-rowindex="1"
-                            class="mclHeaderRow"
-                            role="row"
-                            style="display: flex; width: 17px;"
+                            class="mclHeaderContainer"
                           >
                             <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-url"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.name
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-urldescription"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.description
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-urllanguage"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.language
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-urlcategories"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
-                            >
-                              ui-organizations.contactPeople.categories
-                            </div>
-                            <div
-                              aria-sort="none"
-                              class="mclHeader"
-                              id="list-column-urlprimary"
-                              role="columnheader"
-                              style="flex: 0 0 auto;"
+                              aria-rowindex="1"
+                              class="mclHeaderRow"
+                              role="row"
+                              style="display: flex; width: 17px;"
                             >
-                              ui-organizations.primaryItem
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-url"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.name
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-urldescription"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.description
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-urllanguage"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.language
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-urlcategories"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.contactPeople.categories
+                              </div>
+                              <div
+                                aria-sort="none"
+                                class="mclHeader"
+                                id="list-column-urlprimary"
+                                role="columnheader"
+                                style="flex: 0 0 auto;"
+                              >
+                                ui-organizations.primaryItem
+                              </div>
                             </div>
                           </div>
-                        </div>
-                        <div
-                          class="mclScrollable"
-                          style="position: static; width: 100%;"
-                        >
                           <div
-                            class="mclRowContainer"
-                            role="rowgroup"
-                            style="position: static;"
+                            class="mclScrollable"
+                            style="position: static; width: 100%;"
                           >
                             <div
-                              aria-rowindex="2"
-                              class="mclRowFormatterContainer"
-                              data-row-index="row-0"
-                              role="row"
+                              class="mclRowContainer"
+                              role="rowgroup"
                               style="position: static;"
                             >
                               <div
-                                class="mclRow mclIsOdd"
-                                data-row-inner="0"
-                                style="min-width: 0px;"
+                                aria-rowindex="2"
+                                class="mclRowFormatterContainer"
+                                data-row-index="row-0"
+                                role="row"
+                                style="position: static;"
                               >
                                 <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
+                                  class="mclRow mclIsOdd"
+                                  data-row-inner="0"
+                                  style="min-width: 0px;"
                                 >
-                                  <a
-                                    class="root"
-                                    data-test-text-link="true"
-                                    href="https://www.amazon.com"
-                                    rel="noopener noreferrer"
-                                    target="_blank"
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
                                   >
-                                    https://www.amazon.com
-                                  </a>
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  main website
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  en-us
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  Customer Service
-                                </div>
-                                <div
-                                  class="mclCell mclCellStyle"
-                                  role="gridcell"
-                                >
-                                  ui-organizations.primaryItem
+                                    <a
+                                      class="root"
+                                      data-test-text-link="true"
+                                      href="https://www.amazon.com"
+                                      rel="noopener noreferrer"
+                                      target="_blank"
+                                    >
+                                      https://www.amazon.com
+                                    </a>
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    main website
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    en-us
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    Customer Service
+                                  </div>
+                                  <div
+                                    class="mclCell mclCellStyle"
+                                    role="gridcell"
+                                  >
+                                    ui-organizations.primaryItem
+                                  </div>
                                 </div>
                               </div>
-                            </div>
-                            <div
-                              class="mclEndOfListContainer"
-                              data-end-of-list="1"
-                            >
                               <div
-                                class="mclCenteredContainer"
-                                style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
+                                class="mclEndOfListContainer"
+                                data-end-of-list="1"
                               >
                                 <div
-                                  class="textCentered"
-                                  data-test-layout="true"
+                                  class="mclCenteredContainer"
+                                  style="visibility: hidden; height: 0px; padding: 0px; width: 0px;"
                                 >
                                   <div
-                                    class="mclEndOfList"
+                                    class="textCentered"
                                     data-test-layout="true"
                                   >
-                                    <span>
-                                      Icon
-                                    </span>
+                                    <div
+                                      class="mclEndOfList"
+                                      data-test-layout="true"
+                                    >
+                                      <span>
+                                        Icon
+                                      </span>
+                                    </div>
                                   </div>
                                 </div>
                               </div>
@@ -1041,44 +1052,46 @@ exports[`ViewContact should render correct structure 1`] = `
                 data-test-accordion-section="true"
                 id="contact-addresses"
               >
-                <div
-                  style="width: 100%; display: flex;"
-                >
+                <div>
                   <div
-                    class="headerWrapper"
+                    style="width: 100%; display: flex;"
                   >
                     <div
-                      class="header default"
+                      class="headerWrapper"
                     >
-                      <h3
-                        class="headline size-medium margin-none font-weight-bold block"
-                        data-test-headline="true"
+                      <div
+                        class="header default"
                       >
-                        <button
-                          aria-controls="accordion5"
-                          aria-expanded="true"
-                          class="defaultCollapseButton"
-                          id="accordion-toggle-button-contact-addresses"
-                          type="button"
+                        <h3
+                          class="headline size-medium margin-none font-weight-bold block"
+                          data-test-headline="true"
                         >
-                          <span
-                            class="headerInner"
+                          <button
+                            aria-controls="accordion5"
+                            aria-expanded="true"
+                            class="defaultCollapseButton"
+                            id="accordion-toggle-button-contact-addresses"
+                            type="button"
                           >
                             <span
-                              class="defaultHeaderIcon"
+                              class="headerInner"
                             >
-                              <span>
-                                Icon
+                              <span
+                                class="defaultHeaderIcon"
+                              >
+                                <span>
+                                  Icon
+                                </span>
                               </span>
+                              <div
+                                class="labelArea"
+                              >
+                                ui-organizations.contactPeople.addresses
+                              </div>
                             </span>
-                            <div
-                              class="labelArea"
-                            >
-                              ui-organizations.contactPeople.addresses
-                            </div>
-                          </span>
-                        </button>
-                      </h3>
+                          </button>
+                        </h3>
+                      </div>
                     </div>
                   </div>
                 </div>