diff --git a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json
index bb98b8b67..c76434258 100644
--- a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json
+++ b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json
@@ -9,7 +9,7 @@
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-display-only",
-            "description": "tooltip.metadata-provider-name",
+            "description": "tooltip.metadata-provider-name-display-only",
             "type": "string",
             "widget": {
                 "id": "string",
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index f09ae298a..b7adb997b 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -14,7 +14,6 @@
                 <button
                     class="btn btn-outline-primary btn-sm"
                     id="addNewDropdown"
-                    role="button"
                     aria-haspopup="true"
                     aria-expanded="false"
                     ngbDropdownToggle>
@@ -57,7 +56,7 @@
         </ul>
     </div>
 </nav>
-<main role="main">
+<main>
     <router-outlet></router-outlet>
     <notification-list></notification-list>
 </main>
diff --git a/ui/src/app/metadata/domain/component/wizard-summary.component.html b/ui/src/app/metadata/domain/component/wizard-summary.component.html
index e1f578180..e7ea5dbf6 100644
--- a/ui/src/app/metadata/domain/component/wizard-summary.component.html
+++ b/ui/src/app/metadata/domain/component/wizard-summary.component.html
@@ -1,12 +1,12 @@
 <div class="row">
     <div class="col-xl-6 col-xs-12" *ngFor="let sections of columns">
-        <section class="px-3" *ngFor="let section of sections; let i = index;" role="list">
-            <button (click)="gotoPage(section.id)" class="tag tag-success tag-sm my-4 text-left" [attr.aria-label]="section.label | translate" role="button">
+        <section class="px-3" *ngFor="let section of sections; let i = index;">
+            <button (click)="gotoPage(section.id)" class="tag tag-success tag-sm my-4 text-left" [attr.aria-label]="section.label | translate">
                 <span class="index">{{ section.pageNumber }}</span>
                 <translate-i18n [key]="section.label">{{ section.label }}</translate-i18n>
             </button>
             <ng-container *ngFor="let prop of section.properties">
-                <summary-property [property]="prop" role="listitem"></summary-property>
+                <summary-property [property]="prop"></summary-property>
             </ng-container>
         </section>
     </div>
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
index e42137ebf..a7771dbef 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid p-3" role="main">
+<div class="container-fluid p-3" role="section">
     <section class="section">
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html
index e56dc4634..08633e938 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.html
+++ b/ui/src/app/metadata/filter/container/new-filter.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid p-3" role="main">
+<div class="container-fluid p-3" role="section">
     <section class="section">
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
diff --git a/ui/src/app/metadata/manager/container/manager.component.html b/ui/src/app/metadata/manager/container/manager.component.html
index 2c354d7e3..7803d47e5 100644
--- a/ui/src/app/metadata/manager/container/manager.component.html
+++ b/ui/src/app/metadata/manager/container/manager.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid p-3" role="main">
+<div class="container-fluid p-3" role="section">
     <ul class="nav nav-tabs">
         <li class="nav-item">
             <a class="nav-link" [routerLink]="['./', 'resolvers']" routerLinkActive="active" translate="label.metadata-sources">Metadata Sources</a>
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.html b/ui/src/app/metadata/provider/container/provider-wizard.component.html
index b1027711b..366bb70d5 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.html
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.html
@@ -7,11 +7,12 @@
         </div>
     </div>
     <div class="section-body p-4 border border-top-0 border-info">
-        <div class="container-fluid p-3" role="main">
+        <div class="container-fluid p-3">
             <wizard
                 (onNext)="next()"
                 (onPrevious)="previous()"
-                (onSave)="save()"></wizard>
+                (onSave)="save()"
+                role="navigation"></wizard>
             <hr />
             <div class="row">
                 <div class="col col-xl-6 col-lg-9 col-xs-12">
diff --git a/ui/src/app/metadata/resolver/container/blank-resolver.component.html b/ui/src/app/metadata/resolver/container/blank-resolver.component.html
index 5229f61f1..70ee5fa19 100644
--- a/ui/src/app/metadata/resolver/container/blank-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/blank-resolver.component.html
@@ -9,7 +9,7 @@ <h3 class="tag tag-primary">
                     </h3>
                 </li>
                 <li class="nav-item">
-                    <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information" role="button">
+                    <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information">
                         <span class="label pull-left">
                             2.
                             <translate-i18n key="label.org-info">Organization Information</translate-i18n>
diff --git a/ui/src/app/metadata/resolver/container/confirm-copy.component.html b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
index 1259dc568..808f4f3a8 100644
--- a/ui/src/app/metadata/resolver/container/confirm-copy.component.html
+++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid p-3" role="main">
+<div class="container-fluid p-3" role="section">
     <section class="section" aria-label="Add a new metadata source - how are you adding the metadata information?" tabindex="0">
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
@@ -10,7 +10,7 @@
         <div class="section-body p-4 border border-top-0 border-info">
             <ul class="nav nav-wizard m-3">
                 <li class="nav-item">
-                    <button class="nav-link previous btn clearfix" role="button" [routerLink]="['../']">
+                    <button class="nav-link previous btn clearfix" [routerLink]="['../']">
                         <span class="direction pull-left">
                             <i class="fa fa-fw fa-arrow-circle-left d-block fa-2x"></i>
                             <translate-i18n key="action.back">Back</translate-i18n>
@@ -27,7 +27,7 @@ <h3 class="tag tag-primary">
                     </h3>
                 </li>
                 <li class="nav-item">
-                    <button class="nav-link save btn" aria-label="Save" role="button" (click)="onSave(resolver)" [disabled]="saving$ | async">
+                    <button class="nav-link save btn" aria-label="Save" (click)="onSave(resolver)" [disabled]="saving$ | async">
                         <span class="label pull-left" translate="action.save">Save</span>
                         <span class="direction pull-right">
                             <i class="fa fa-fw next d-block fa-2x"
diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.html b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
index acbbd1908..58fd5bffe 100644
--- a/ui/src/app/metadata/resolver/container/copy-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
@@ -9,8 +9,7 @@ <h3 class="tag tag-primary">
                     </h3>
                 </li>
                 <li class="nav-item">
-                    <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information"
-                        role="button">
+                    <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information">
                         <span class="label pull-left" translate="label.finish-summary-validation">
                             Finished!
                         </span>
diff --git a/ui/src/app/metadata/resolver/container/new-resolver.component.html b/ui/src/app/metadata/resolver/container/new-resolver.component.html
index efaea7239..b20b15c51 100644
--- a/ui/src/app/metadata/resolver/container/new-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/new-resolver.component.html
@@ -1,4 +1,4 @@
-<div class="container-fluid p-3" role="main">
+<div class="container-fluid p-3" role="section">
     <section class="section" aria-label="Add a new metadata source - how are you adding the metadata information?" tabindex="0">
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
diff --git a/ui/src/app/metadata/resolver/container/upload-resolver.component.html b/ui/src/app/metadata/resolver/container/upload-resolver.component.html
index 8bae4bc0d..dcd14a93e 100644
--- a/ui/src/app/metadata/resolver/container/upload-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/upload-resolver.component.html
@@ -9,7 +9,7 @@ <h3 class="tag tag-primary">
                     </h3>
                 </li>
                 <li class="nav-item">
-                    <button class="nav-link next btn clearfix" (click)="save()" [disabled]="providerForm.invalid" aria-label="Save metadata resolver" role="button">
+                    <button class="nav-link next btn clearfix" (click)="save()" [disabled]="providerForm.invalid" aria-label="Save metadata resolver">
                         <span class="label pull-left" translate="action.save">
                             Save
                         </span>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 1af9bbe9e..d928a4c88 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -9,7 +9,6 @@
             class="form-control"
             autoComplete="off"
             type="text"
-            role="textbox"
             [attr.aria-activedescendant]="activeDescendant"
             [placeholder]="placeholder"
             attr.aria-owns="{{ id }}__listbox"
diff --git a/ui/src/app/shared/component/info-icon.component.html b/ui/src/app/shared/component/info-icon.component.html
index f73d5e0eb..62ec8195b 100644
--- a/ui/src/app/shared/component/info-icon.component.html
+++ b/ui/src/app/shared/component/info-icon.component.html
@@ -7,8 +7,6 @@
     [ngbPopover]="tooltipContent"
     [triggers]="triggers"
     [placement]="placement"
-    [attr.aria-flowto]="id"
-    role="tooltip"
     container="body">
     <i class="fa fa-fw fa-info-circle text-primary fa-lg"></i>
     <span class="sr-only" translate="tooltip.instruction"></span>
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index c3612bec2..2ab0dee60 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -1,8 +1,7 @@
 <nav *ngIf="(current$ | async) && (index$ | async)">
     <ul class="nav nav-wizard">
         <li class="nav-item" *ngIf="(previous$ | async)">
-            <button class="nav-link previous btn clearfix" (click)="onPrevious.emit(previousPage.index)" [disabled]="disabled$ | async"
-                [attr.aria-label]="previousPage.path" role="button">
+            <button class="nav-link previous btn clearfix" (click)="onPrevious.emit(previousPage.index)" [disabled]="disabled$ | async" [attr.aria-label]="previousPage.path">
                 <span class="direction pull-left">
                     <i class="fa fa-fw fa-arrow-circle-left d-block fa-2x"></i>
                     <translate-i18n key="action.back">Back</translate-i18n>
@@ -28,8 +27,7 @@ <h3 class="tag tag-primary">
             </h3>
         </li>
         <li class="nav-item" *ngIf="(next$ | async)">
-            <button class="nav-link next btn clearfix" (click)="onNext.emit(nextPage.index)" [disabled]="disabled$ | async" [attr.aria-label]="nextPage.path"
-                role="button">
+            <button class="nav-link next btn clearfix" (click)="onNext.emit(nextPage.index)" [disabled]="disabled$ | async" [attr.aria-label]="nextPage.path">
                 <span class="label pull-left">
                     <ng-container *ngIf="(next$ | async).index">{{ (next$ | async).index }}. </ng-container>
                     {{ (next$ | async).label | translate }}
@@ -43,7 +41,6 @@ <h3 class="tag tag-primary">
         <li class="nav-item" *ngIf="(last$ | async)">
             <button class="nav-link save btn"
                 aria-label="Save"
-                role="button"
                 [disabled]="disabled$ | async"
                 (click)="onSave.emit()">
                 <span class="label pull-left" translate="action.save">