diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
index 8f8d3b34f..17b5742e3 100644
--- a/ui/src/app/app.component.html
+++ b/ui/src/app/app.component.html
@@ -58,8 +58,10 @@
         </ul>
     </div>
 </nav>
-<router-outlet></router-outlet>
-<notification-list></notification-list>
+<main role="main">
+    <router-outlet></router-outlet>
+    <notification-list></notification-list>
+</main>
 <footer>
     <div class="row">
         <div class="col-md-8 copyright">
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
index 05cb75832..29ce63571 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
@@ -15,6 +15,7 @@ import { ProviderEditorNavComponent } from '../component/provider-editor-nav.com
 import { NgbModalStub } from '../../../../testing/modal.stub';
 import { MetadataProvider } from '../../domain/model';
 import { of } from 'rxjs';
+import { DifferentialService } from '../../../core/service/differential.service';
 
 @Component({
     template: `
@@ -44,7 +45,11 @@ describe('Provider Edit Component', () => {
         TestBed.configureTestingModule({
             imports: [
                 NgbDropdownModule.forRoot(),
-                RouterTestingModule,
+                RouterTestingModule.withRoutes([
+                    {path: 'edit', children: []},
+                    {path: 'foo', children: []},
+                    {path: '', children: []}
+                ]),
                 SharedModule,
                 StoreModule.forRoot({
                     provider: combineReducers(fromRoot.reducers),
@@ -64,6 +69,7 @@ describe('Provider Edit Component', () => {
                 ProviderEditorNavComponent
             ],
             providers: [
+                DifferentialService,
                 { provide: NgbModal, useClass: NgbModalStub },
                 { provide: ActivatedRoute, useValue: activatedRoute },
                 { provide: APP_BASE_HREF, useValue: '/' }
diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.html b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
index ca6c3cccc..cada4d76f 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.html
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
@@ -42,7 +42,7 @@ <h3 class="tag tag-primary">
                 role="button">
                 <span class="label pull-left" i18n="@@action--save">Save</span>
                 <span class="direction pull-right">
-                    <i class="fa fa-fw fa-lg next d-block fa-2x"
+                    <i class="fa fa-fw next d-block fa-2x"
                         [ngClass]="{
                             'fa-save': !(wizardIsSaving$ | async),
                             'fa-spinner': (wizardIsSaving$ | async),
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 36fd55936..3e794dbe6 100644
--- a/ui/src/app/metadata/resolver/container/confirm-copy.component.html
+++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
@@ -30,7 +30,11 @@ <h3 class="tag tag-primary">
                     <button class="nav-link save btn" aria-label="Save" role="button" (click)="onSave(resolver)" [disabled]="saving$ | async">
                         <span class="label pull-left" i18n="@@action--save">Save</span>
                         <span class="direction pull-right">
-                            <i class="fa fa-fw fa-save next d-block fa-2x"></i>
+                            <i class="fa fa-fw next d-block fa-2x"
+                                [ngClass]="{
+                                    'fa-save': !(saving$ | async),
+                                    'fa-spinner fa-pulse': (saving$ | async)
+                                }"></i>
                             <ng-container i18n="@@action--save">Save</ng-container>
                         </span>
                     </button>
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.html b/ui/src/app/schema-form/widget/datalist/datalist.component.html
index 6b3c9286d..ea1af0ec9 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -1,5 +1,5 @@
 <div class="widget form-group">
-    <label [attr.for]="id" class="d-flex justify-content-between control-label">
+    <label [attr.for]="id" [id]="id" class="d-flex justify-content-between control-label">
         <span>
             {{ schema.title }}
             <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
@@ -22,6 +22,6 @@
         [placeholder]="schema.placeholder || ''"
         [attr.disabled]="schema.readOnly?true:null"
         role="textbox"
-        aria-label="Name ID Format (type for auto-complete)">
+        [attr.aria-label]="schema.title">
     </auto-complete>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/schema-form/widget/number/number.component.html b/ui/src/app/schema-form/widget/number/number.component.html
index 6fe04cf82..d44edff92 100644
--- a/ui/src/app/schema-form/widget/number/number.component.html
+++ b/ui/src/app/schema-form/widget/number/number.component.html
@@ -20,5 +20,6 @@
         [attr.placeholder]="schema.placeholder"
         [attr.maxLength]="schema.maxLength || null"
         [attr.minLength]="schema.minLength || null"
-        [attr.step]="schema.multipleOf || schema.widget.step">
-</div>
\ No newline at end of file
+        [attr.step]="schema.multipleOf || schema.widget.step"
+        [attr.aria-label]="schema.title">
+</div>
diff --git a/ui/src/app/schema-form/widget/select/select.component.html b/ui/src/app/schema-form/widget/select/select.component.html
index 174f6798d..0a3913d4e 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -18,7 +18,8 @@
     <select *ngIf="schema.type !== 'array'"
         [formControl]="control"
         [attr.name]="name"
-        class="form-control">
+        class="form-control"
+        [attr.aria-label]="schema.title">
         <option disabled selected>{{ schema.placeholder || schema.title }}</option>
         <option *ngFor="let option of schema.oneOf" [ngValue]="option.enum[0]">{{option.description}}</option>
     </select>
@@ -26,4 +27,4 @@
         <option *ngFor="let option of schema.items.oneOf" [ngValue]="option.enum[0]">{{option.description}}</option>
     </select>
     <input *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control">
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/schema-form/widget/string/string.component.html b/ui/src/app/schema-form/widget/string/string.component.html
index d5703b37a..1e948381d 100644
--- a/ui/src/app/schema-form/widget/string/string.component.html
+++ b/ui/src/app/schema-form/widget/string/string.component.html
@@ -20,7 +20,8 @@
         [attr.placeholder]="schema.placeholder"
         [attr.maxLength]="schema.maxLength || null"
         [attr.minLength]="schema.minLength || null"
-        [attr.disabled]="(schema.widget.id=='color' && schema.readOnly)?true:null">
+        [attr.disabled]="(schema.widget.id=='color' && schema.readOnly)?true:null"
+        [attr.aria-label]="schema.title">
     <input *ngIf="(schema.widget.id === 'color' && schema.readOnly)" [attr.name]="name" type="hidden" [formControl]="control">
     <small class="form-text text-danger" *ngIf="errorMessages && errorMessages.length && control.touched">
         {{ errorMessages }}
diff --git a/ui/src/app/schema-form/widget/textarea/textarea.component.html b/ui/src/app/schema-form/widget/textarea/textarea.component.html
index 7b4168af1..429a3fcde 100644
--- a/ui/src/app/schema-form/widget/textarea/textarea.component.html
+++ b/ui/src/app/schema-form/widget/textarea/textarea.component.html
@@ -20,5 +20,6 @@
         [attr.maxLength]="schema.maxLength || null"
         [attr.minLength]="schema.minLength || null"
         [rows]="schema.widget.rows || 5"
-        [formControl]="control"></textarea>
-</div>
\ No newline at end of file
+        [formControl]="control"
+        [attr.aria-label]="schema.title"></textarea>
+</div>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 103ed7467..8f952f520 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -13,6 +13,7 @@
             [attr.aria-activedescendant]="activeDescendant"
             [placeholder]="placeholder"
             attr.aria-owns="{{ id }}__listbox"
+            [attr.aria-labelledby]="id"
             (focus)="handleInputFocus()"
             (blur)="handleInputBlur()"
         />
@@ -21,6 +22,7 @@
                 type="button"
                 aria-haspopup="true"
                 aria-expanded="false"
+                [attr.aria-labelledby]="id"
                 (click)="state.setState({menuOpen: !state.currentState.menuOpen})">
                 <i class="fa fa-caret-down"></i>
             </button>
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index ec12ca657..e90e9d6f8 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -51,7 +51,7 @@ <h3 class="tag tag-primary">
                     Save
                 </span>
                 <span class="direction pull-right">
-                    <i class="fa fa-fw fa-lg next d-block fa-2x"
+                    <i class="fa fa-fw next d-block fa-2x"
                         [ngClass]="{
                             'fa-save': !(disabled$ | async),
                             'fa-spinner': (disabled$ | async),