diff --git a/backend/build.gradle b/backend/build.gradle
index 45a500c86..ca484d6cb 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -8,6 +8,7 @@ plugins {
 }
 
 apply plugin: 'io.spring.dependency-management'
+apply plugin: 'jacoco'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -194,3 +195,15 @@ tasks.withType(JavaExec) {
 compileJava {
     dependsOn generateSources
 }
+
+jacoco {
+    toolVersion = '0.8.1'
+}
+
+jacocoTestReport {
+    reports {
+        xml.enabled = false
+        csv.enabled = false
+        html.destination = file("${buildDir}/jacocoHtml")
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index f094ff2f9..34029e28a 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -1,9 +1,14 @@
 package edu.internet2.tier.shibboleth.admin.ui.service
 
 import com.google.common.base.Predicate
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.*
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.SignatureValidationFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ResourceBackedMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
@@ -157,6 +162,30 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
         )
     }
 
+    void constructXmlNodeForResolver(FilesystemMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
+        markupBuilderDelegate.MetadataProvider(id: resolver.name,
+                'xsi:type': 'FilesystemMetadataProvider',
+                metadataFile: resolver.metadataFile,
+
+                requireValidMetadata: !resolver.requireValidMetadata ?: null,
+                failFastInitialization: !resolver.failFastInitialization ?: null,
+                sortKey: resolver.sortKey,
+                criterionPredicateRegistryRef: resolver.criterionPredicateRegistryRef,
+                useDefaultPredicateRegistry: !resolver.useDefaultPredicateRegistry ?: null,
+                satisfyAnyPredicates: resolver.satisfyAnyPredicates ?: null,
+
+                parserPoolRef: resolver.reloadableMetadataResolverAttributes?.parserPoolRef,
+                minRefreshDelay: resolver.reloadableMetadataResolverAttributes?.minRefreshDelay,
+                maxRefreshDelay: resolver.reloadableMetadataResolverAttributes?.maxRefreshDelay,
+                refreshDelayFactor: resolver.reloadableMetadataResolverAttributes?.refreshDelayFactor,
+                indexesRef: resolver.reloadableMetadataResolverAttributes?.indexesRef,
+                resolveViaPredicatesOnly: resolver.reloadableMetadataResolverAttributes?.resolveViaPredicatesOnly ?: null,
+                expirationWarningThreshold: resolver.reloadableMetadataResolverAttributes?.expirationWarningThreshold) {
+
+            childNodes()
+        }
+    }
+
     void constructXmlNodeForResolver(DynamicHttpMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
         markupBuilderDelegate.MetadataProvider(id: resolver.name,
                 'xsi:type': 'DynamicHttpMetadataProvider',
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FilesystemMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FilesystemMetadataResolver.java
new file mode 100644
index 000000000..0e16c8353
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/FilesystemMetadataResolver.java
@@ -0,0 +1,29 @@
+package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+
+/**
+ * @author Bill Smith (wsmith@unicon.net)
+ */
+@Entity
+@EqualsAndHashCode(callSuper = true)
+@Getter
+@Setter
+@ToString
+public class FilesystemMetadataResolver extends MetadataResolver {
+
+    public FilesystemMetadataResolver() {
+        type = "FilesystemMetadataResolver";
+    }
+
+    private String metadataFile;
+
+    @Embedded
+    private ReloadableMetadataResolverAttributes reloadableMetadataResolverAttributes;
+}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
index adbb30f0d..e5b1221c1 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
@@ -33,7 +33,9 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@type", visible = true)
 @JsonSubTypes({@JsonSubTypes.Type(value = LocalDynamicMetadataResolver.class, name = "LocalDynamicMetadataResolver"),
         @JsonSubTypes.Type(value = FileBackedHttpMetadataResolver.class, name = "FileBackedHttpMetadataResolver"),
-        @JsonSubTypes.Type(value = DynamicHttpMetadataResolver.class, name = "DynamicHttpMetadataResolver")})
+        @JsonSubTypes.Type(value = DynamicHttpMetadataResolver.class, name = "DynamicHttpMetadataResolver"),
+        @JsonSubTypes.Type(value = FilesystemMetadataResolver.class, name = "FilesystemMetadataResolver"),
+        @JsonSubTypes.Type(value = ResourceBackedMetadataResolver.class, name = "ResourceBackedMetadataResolver")})
 public class MetadataResolver extends AbstractAuditable {
 
     @JsonProperty("@type")
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java
index 2133d88eb..5737d0162 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolver.java
@@ -18,6 +18,10 @@
 @ToString
 public class ResourceBackedMetadataResolver extends MetadataResolver {
 
+    public ResourceBackedMetadataResolver() {
+        type = "ResourceBackedMetadataResolver";
+    }
+
     @Embedded
     private ReloadableMetadataResolverAttributes reloadableMetadataResolverAttributes;
 
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
index 03ae982a5..cb6592990 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
@@ -1,8 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller
 
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
+import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
+import edu.internet2.tier.shibboleth.admin.util.AttributeUtility
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import org.opensaml.saml.metadata.resolver.MetadataResolver
@@ -18,6 +22,7 @@ import org.springframework.http.HttpHeaders
 import org.springframework.test.context.ActiveProfiles
 
 import spock.lang.Specification
+import spock.lang.Unroll
 
 import static org.springframework.http.HttpMethod.PUT
 
@@ -34,10 +39,22 @@ class MetadataResolversControllerIntegrationTests extends Specification {
     @Autowired
     MetadataResolverRepository metadataResolverRepository
 
+    @Autowired
+    AttributeUtility attributeUtility
+
+    ObjectMapper mapper
+    TestObjectGenerator generator
+
     JsonSlurper jsonSlurper = new JsonSlurper()
 
     static BASE_URI = '/api/MetadataResolvers'
 
+    def setup() {
+        generator = new TestObjectGenerator(attributeUtility)
+        mapper = new ObjectMapper()
+        mapper.enable(SerializationFeature.INDENT_OUTPUT)
+    }
+
     def cleanup() {
         metadataResolverRepository.deleteAll()
     }
@@ -130,24 +147,31 @@ class MetadataResolversControllerIntegrationTests extends Specification {
         result.statusCodeValue == 404
     }
 
-    def "POST new DynamicHttpMetadataResolver -> /api/MetadataResolvers"() {
+    @Unroll
+    def "POST new DynamicHttpMetadataResolver of type #resolverType -> /api/MetadataResolvers"(String resolverType) {
         given: 'New MetadataResolver JSON representation'
-        def resolver = [name: 'Test DynamicHttpMetadataResolver', '@type': 'DynamicHttpMetadataResolver']
+        def resolver = generator.buildRandomMetadataResolverOfType(resolverType)
 
         when: 'POST request is made with new DynamicHttpMetadataResolver JSON representation'
-        def result = this.restTemplate.postForEntity(BASE_URI, createRequestHttpEntityFor { JsonOutput.toJson(resolver) }, String)
+        def result = this.restTemplate.postForEntity(BASE_URI, createRequestHttpEntityFor { mapper.writeValueAsString(resolver) }, String)
 
         then:
         result.statusCodeValue == 201
         result.headers.Location[0].contains(BASE_URI)
+
+        where:
+            resolverType     | _
+            'DynamicHttp'    | _
+            'FileBacked'     | _
+            'LocalDynamic'   | _
+            'ResourceBacked' | _
+            'Filesystem'     | _
     }
 
-    def "PUT concrete MetadataResolver with updated changes -> /api/MetadataResolvers/{resourceId}"() {
+    @Unroll
+    def "PUT concrete MetadataResolver of type #resolverType with updated changes -> /api/MetadataResolvers/{resourceId}"(String resolverType) {
         given: 'One resolver is available in data store'
-        def resolver = new DynamicHttpMetadataResolver().with {
-            it.name = 'Test DynamicHttpMetadataResolver'
-            it
-        }
+        def resolver = generator.buildRandomMetadataResolverOfType(resolverType)
         def resolverResourceId = resolver.resourceId
         metadataResolverRepository.save(resolver)
 
@@ -171,6 +195,13 @@ class MetadataResolversControllerIntegrationTests extends Specification {
         then:
         updatedResolverMap.name == 'Updated DynamicHttpMetadataResolver'
 
+        where:
+            resolverType     | _
+            'DynamicHttp'    | _
+            'FileBacked'     | _
+            'LocalDynamic'   | _
+            'ResourceBacked' | _
+            'Filesystem'     | _
     }
 
     def "PUT concrete MetadataResolver with version conflict -> /api/MetadataResolvers/{resourceId}"() {
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
index 03b737da9..9c367c1d6 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -215,6 +215,19 @@ class JPAMetadataResolverServiceImplTests extends Specification {
         generatedXmlIsTheSameAsExpectedXml('/conf/546-classpath.xml', domBuilder.parseText(writer.toString()))
     }
 
+    def 'test generating FilesystemMetadataResolver xml snippet'() {
+        given:
+        def resolver = testObjectGenerator.filesystemMetadataResolver()
+
+        when:
+        genXmlSnippet(markupBuilder) {
+            JPAMetadataResolverServiceImpl.cast(metadataResolverService).constructXmlNodeForResolver(resolver, it) {}
+        }
+
+        then:
+        generatedXmlIsTheSameAsExpectedXml('/conf/520.xml', domBuilder.parseText(writer.toString()))
+    }
+
     static genXmlSnippet(MarkupBuilder xml, Closure xmlNodeGenerator) {
         xml.MetadataProvider('id': 'ShibbolethMetadata',
                 'xmlns': 'urn:mace:shibboleth:2.0:metadata',
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
index 77e96e82d..4652fe361 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -376,6 +376,45 @@ class TestObjectGenerator {
         return contactPerson
     }
 
+    MetadataResolver buildRandomMetadataResolverOfType(String metadataResolverType) {
+        def randomResolver
+        switch (metadataResolverType) {
+            case 'DynamicHttp':
+                randomResolver = dynamicHttpMetadataResolver()
+                break
+            case 'FileBacked':
+                randomResolver = fileBackedHttpMetadataResolver()
+                break
+            case 'LocalDynamic':
+                randomResolver = localDynamicMetadataResolver()
+                break
+            case 'ResourceBacked':
+                randomResolver = resourceBackedMetadataResolverForSVN()
+                break
+            case 'Filesystem':
+                randomResolver = filesystemMetadataResolver()
+                break;
+            default:
+                throw new RuntimeException("Did you forget to create a TestObjectGenerator.<type>MetadataResolver method for resolverType: ${metadataResolverType} ?");
+        }
+        randomResolver
+    }
+
+    FilesystemMetadataResolver filesystemMetadataResolver() {
+        new FilesystemMetadataResolver().with {
+            it.name = 'FilesystemMetadata'
+            it.metadataFile = 'some metadata filename'
+
+            it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
+                it.minRefreshDelay = 'PT5M'
+                it.maxRefreshDelay = 'PT1H'
+                it.refreshDelayFactor = 0.75
+                it
+            }
+            it
+        }
+    }
+
     FileBackedHttpMetadataResolver fileBackedHttpMetadataResolver() {
         new FileBackedHttpMetadataResolver().with {
             it.name = 'HTTPMetadata'
diff --git a/backend/src/test/resources/conf/520.xml b/backend/src/test/resources/conf/520.xml
new file mode 100644
index 000000000..6e813f232
--- /dev/null
+++ b/backend/src/test/resources/conf/520.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file is an EXAMPLE metadata configuration file. -->
+<MetadataProvider xmlns="urn:mace:shibboleth:2.0:metadata"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  id="ShibbolethMetadata"
+                  xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd"
+                  xsi:type="ChainingMetadataProvider">
+    <MetadataProvider id="FilesystemMetadata"
+                      maxRefreshDelay="PT1H"
+                      metadataFile="some metadata filename"
+                      minRefreshDelay="PT5M"
+                      refreshDelayFactor="0.75"
+                      xsi:type="FilesystemMetadataProvider"/>
+</MetadataProvider>
diff --git a/ui/src/app/metadata/manager/component/provider-search.component.html b/ui/src/app/metadata/manager/component/provider-search.component.html
index ad739471d..2a0682179 100644
--- a/ui/src/app/metadata/manager/component/provider-search.component.html
+++ b/ui/src/app/metadata/manager/component/provider-search.component.html
@@ -1,6 +1,6 @@
 <form [formGroup]="searchForm">
     <label for="search" class="sr-only" i18n="@@action--search">Search</label>
-    <div class="input-group">
+    <div class="input-group input-group-sm">
         <input
             id="search"
             type="text"
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
new file mode 100644
index 000000000..cf446c1d1
--- /dev/null
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
@@ -0,0 +1,17 @@
+<section class="section">
+    <div class="section-body border border-top-0 border-primary">
+        <div class="section-header bg-primary p-2 text-light">
+            <div class="row justify-content-between">
+                <div class="col-12">
+                    <span class="lead" i18n="@@label--current-metadata-sources">Current Metadata Providers</span>
+                </div>
+            </div>
+        </div>
+        <div class="p-3">
+            <code><pre>{{ providers$ | async | json }}</pre></code>
+        </div>
+    </div>
+</section>
+
+
+
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
new file mode 100644
index 000000000..fd43e20c6
--- /dev/null
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+import { MetadataProvider } from '../../domain/model';
+import { Observable } from '../../../../../node_modules/rxjs';
+import { Store } from '@ngrx/store';
+import { ProviderState, getAllProviders } from '../../provider/reducer';
+
+@Component({
+    selector: 'dashboard-providers-list',
+    templateUrl: './dashboard-providers-list.component.html'
+})
+
+export class DashboardProvidersListComponent {
+
+    providers$: Observable<MetadataProvider[]>;
+
+    constructor(
+        private store: Store<ProviderState>
+    ) {
+        this.providers$ = this.store.select(getAllProviders);
+    }
+}
diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html
new file mode 100644
index 000000000..647b976a0
--- /dev/null
+++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.html
@@ -0,0 +1,44 @@
+<section class="section">
+    <div class="section-body border border-top-0 border-primary">
+        <div class="section-header bg-primary p-2 text-light">
+            <div class="row justify-content-between">
+                <div class="col-md-8">
+                    <span class="lead" i18n="@@label--current-metadata-sources">Current Metadata Sources</span>
+                </div>
+                <div class="col-md-4">
+                    <provider-search
+                        [query]="searchQuery$ | async"
+                        [searching]="loading$ | async"
+                        (search)="search($event)">
+                    </provider-search>
+                </div>
+            </div>
+        </div>
+        <div class="p-3">
+            <ul class="list-unstyled m-0">
+                <li *ngFor="let entity of limited$ | async; index as i"
+                    [ngClass]="{'mt-2': i > 0}"
+                    aria-label="Provider Item Accordion. Press Spacebar to open">
+                    <entity-item
+                        [entity]="entity"
+                        [isOpen]="(entitiesOpen$ | async)[entity.getId()]"
+                        (select)="edit(entity)"
+                        (toggle)="toggleEntity(entity)"
+                        (preview)="openPreviewDialog(entity)"
+                        (delete)="deleteResolver(entity)">
+                    </entity-item>
+                </li>
+            </ul>
+            <div class="mt-3 clearfix" *ngIf="(total$ | async) > limit">
+                <ngb-pagination
+                    class="float-right"
+                    [collectionSize]="total$ | async"
+                    [page]="page"
+                    [pageSize]="limit"
+                    (pageChange)="changePage($event)"
+                    aria-label="Pages">
+                </ngb-pagination>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/ui/src/app/metadata/manager/container/manager.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts
similarity index 92%
rename from ui/src/app/metadata/manager/container/manager.component.spec.ts
rename to ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts
index 7d92250bd..9a9a8150d 100644
--- a/ui/src/app/metadata/manager/container/manager.component.spec.ts
+++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts
@@ -5,7 +5,6 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
 import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap/pagination/pagination.module';
 import { NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap/modal/modal.module';
-import { ManagerComponent } from './manager.component';
 import * as fromDashboard from '../reducer';
 import { ProviderSearchComponent } from '../component/provider-search.component';
 import { EntityItemComponent } from '../component/entity-item.component';
@@ -13,14 +12,15 @@ import { DeleteDialogComponent } from '../component/delete-dialog.component';
 import { RouterStub } from '../../../../testing/router.stub';
 import { NgbModalStub } from '../../../../testing/modal.stub';
 import { FileBackedHttpMetadataResolver } from '../../domain/entity';
+import { DashboardResolversListComponent } from './dashboard-resolvers-list.component';
 
 
-describe('Metadata Manager Page', () => {
-    let fixture: ComponentFixture<ManagerComponent>;
+describe('Dashboard Resolvers List Page', () => {
+    let fixture: ComponentFixture<DashboardResolversListComponent>;
     let store: Store<fromDashboard.DashboardState>;
     let router: Router;
     let modal: NgbModal;
-    let instance: ManagerComponent;
+    let instance: DashboardResolversListComponent;
 
     let draft = new FileBackedHttpMetadataResolver({
             entityId: 'foo',
@@ -48,14 +48,14 @@ describe('Metadata Manager Page', () => {
                 NgbModalModule
             ],
             declarations: [
-                ManagerComponent,
+                DashboardResolversListComponent,
                 ProviderSearchComponent,
                 EntityItemComponent,
                 DeleteDialogComponent
             ],
         });
 
-        fixture = TestBed.createComponent(ManagerComponent);
+        fixture = TestBed.createComponent(DashboardResolversListComponent);
         instance = fixture.componentInstance;
         store = TestBed.get(Store);
         router = TestBed.get(Router);
diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts
new file mode 100644
index 000000000..962efd52e
--- /dev/null
+++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { MetadataEntity, MetadataResolver } from '../../domain/model';
+import { MetadataTypes, Metadata } from '../../domain/domain.type';
+import * as searchActions from '../action/search.action';
+import * as fromDashboard from '../reducer';
+import { ToggleEntityDisplay } from '../action/manager.action';
+import { DeleteDialogComponent } from '../component/delete-dialog.component';
+import { PreviewEntity } from '../../domain/action/entity.action';
+import { RemoveDraftRequest } from '../../resolver/action/draft.action';
+
+@Component({
+    selector: 'dashboard-resolvers-list',
+    templateUrl: './dashboard-resolvers-list.component.html'
+})
+
+export class DashboardResolversListComponent implements OnInit {
+    searchQuery$: Observable<string>;
+    resolvers$: Observable<MetadataEntity[]>;
+    loading$: Observable<boolean>;
+
+    total$: Observable<number>;
+    page = 1;
+    limit = 8;
+    limited$: Observable<MetadataEntity[]>;
+
+    entitiesOpen$: Observable<{ [key: string]: boolean }>;
+
+    constructor(
+        private store: Store<fromDashboard.DashboardState>,
+        private router: Router,
+        private modalService: NgbModal
+    ) {
+        this.resolvers$ = store.select(fromDashboard.getSearchResults);
+        this.searchQuery$ = store.select(fromDashboard.getSearchQuery);
+        this.loading$ = store.select(fromDashboard.getSearchLoading);
+        this.entitiesOpen$ = store.select(fromDashboard.getOpenProviders);
+
+        this.total$ = this.resolvers$.pipe(map(list => list.length));
+
+        this.limited$ = this.getPagedResolvers(this.page, this.resolvers$);
+    }
+
+    ngOnInit(): void {
+        this.search();
+    }
+
+    getPagedResolvers(page: number, list$: Observable<MetadataEntity[]>): Observable<MetadataEntity[]> {
+        return list$.pipe(
+            map((providers: MetadataEntity[]) => {
+                let maxIndex = (page * this.limit) - 1,
+                    minIndex = ((page - 1) * this.limit);
+                return providers.filter((resolver: MetadataEntity, index: number) => (maxIndex >= index && index >= minIndex));
+            })
+        );
+    }
+
+    changePage(index: number): void {
+        this.page = index;
+        this.limited$ = this.getPagedResolvers(index, this.resolvers$);
+    }
+
+    search(query: string = ''): void {
+        this.store.dispatch(new searchActions.SearchAction(query));
+        this.page = 1;
+    }
+
+    edit(entity: MetadataEntity): void {
+        this.router.navigate(['metadata', 'resolver', entity.getId(), entity.isDraft() ? 'wizard' : 'edit']);
+    }
+
+    toggleEntity(entity: MetadataEntity): void {
+        this.store.dispatch(new ToggleEntityDisplay(entity.getId()));
+    }
+
+    openPreviewDialog(entity: MetadataEntity): void {
+        this.store.dispatch(new PreviewEntity(entity));
+    }
+
+    deleteResolver(entity: MetadataResolver): void {
+        this.modalService
+            .open(DeleteDialogComponent)
+            .result
+            .then(
+                success => {
+                    this.store.dispatch(new RemoveDraftRequest(entity));
+                },
+                err => {
+                    console.log('Cancelled');
+                }
+            );
+    }
+}
diff --git a/ui/src/app/metadata/manager/container/manager.component.html b/ui/src/app/metadata/manager/container/manager.component.html
index 10df850b2..c77eb319f 100644
--- a/ui/src/app/metadata/manager/container/manager.component.html
+++ b/ui/src/app/metadata/manager/container/manager.component.html
@@ -1,42 +1,11 @@
 <div class="container-fluid p-3" role="main">
-    <section class="section">
-        <div class="section-header bg-primary p-2 text-light">
-            <div class="row justify-content-between">
-                <div class="col-md-8">
-                    <span class="lead" i18n="@@label--current-metadata-sources">Current Metadata Sources</span>
-                </div>
-                <div class="col-md-4">
-                    <provider-search
-                        [query]="searchQuery$ | async"
-                        [searching]="loading$ | async"
-                        (search)="search($event)">
-                    </provider-search>
-                </div>
-            </div>
-        </div>
-        <div class="section-body p-2 border border-top-0 border-primary">
-            <ul class="list-unstyled m-0">
-                <li *ngFor="let entity of limited$ | async; index as i" [ngClass]="{'mt-2': i > 0}" aria-label="Provider Item Accordion. Press Spacebar to open">
-                    <entity-item
-                        [entity]="entity"
-                        [isOpen]="(entitiesOpen$ | async)[entity.getId()]"
-                        (select)="edit(entity)"
-                        (toggle)="toggleEntity(entity)"
-                        (preview)="openPreviewDialog(entity)"
-                        (delete)="deleteResolver(entity)">
-                    </entity-item>
-                </li>
-            </ul>
-            <div class="mt-3 clearfix" *ngIf="(total$ | async) > limit">
-                <ngb-pagination
-                    class="float-right"
-                    [collectionSize]="total$ | async"
-                    [page]="page"
-                    [pageSize]="limit"
-                    (pageChange)="changePage($event)"
-                    aria-label="Pages">
-                </ngb-pagination>
-            </div>
-        </div>
-    </section>
+    <ul class="nav nav-tabs">
+        <li class="nav-item">
+            <a class="nav-link" [routerLink]="['./', 'resolvers']" routerLinkActive="active">Sources</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" [routerLink]="['./', 'providers']" routerLinkActive="active">Providers</a>
+        </li>
+    </ul>
+    <router-outlet></router-outlet>
 </div>
diff --git a/ui/src/app/metadata/manager/container/manager.component.scss b/ui/src/app/metadata/manager/container/manager.component.scss
index e740b1be2..be974d8a3 100644
--- a/ui/src/app/metadata/manager/container/manager.component.scss
+++ b/ui/src/app/metadata/manager/container/manager.component.scss
@@ -1,5 +1,15 @@
+@import '../../../../theme/palette';
+
 :host {
     .lead {
         line-height: 36px;
     }
+
+    .nav-tabs, .nav-link.active {
+        border-color: $blue;
+    }
+
+    .nav-link:hover {
+        border-bottom-color: $blue;
+    }
 }
\ No newline at end of file
diff --git a/ui/src/app/metadata/manager/container/manager.component.ts b/ui/src/app/metadata/manager/container/manager.component.ts
index 0fe3a8a42..77a9b0cbb 100644
--- a/ui/src/app/metadata/manager/container/manager.component.ts
+++ b/ui/src/app/metadata/manager/container/manager.component.ts
@@ -1,110 +1,10 @@
-import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
-import { Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { MetadataEntity, MetadataResolver } from '../../domain/model';
-import { MetadataTypes, Metadata } from '../../domain/domain.type';
-import * as searchActions from '../action/search.action';
-import * as fromDashboard from '../reducer';
-import { ToggleEntityDisplay } from '../action/manager.action';
-import { DeleteDialogComponent } from '../component/delete-dialog.component';
-import { PreviewEntity } from '../../domain/action/entity.action';
-import { RemoveDraftRequest } from '../../resolver/action/draft.action';
+import { Component } from '@angular/core';
 
 @Component({
     selector: 'manager-page',
-    changeDetection: ChangeDetectionStrategy.OnPush,
     templateUrl: './manager.component.html',
     styleUrls: ['./manager.component.scss']
 })
-export class ManagerComponent implements OnInit {
-    searchQuery$: Observable<string>;
-    resolvers$: Observable<MetadataEntity[]>;
-    loading$: Observable<boolean>;
-
-    total$: Observable<number>;
-    page = 1;
-    limit = 8;
-    limited$: Observable<MetadataEntity[]>;
-
-    entitiesOpen$: Observable<{[key: string]: boolean}>;
-
-    filterOptions = ['all', MetadataTypes.FILTER, MetadataTypes.PROVIDER];
-    filtering$: Observable<string>;
-    filtering = 'all';
-
-    constructor(
-        private store: Store<fromDashboard.DashboardState>,
-        private router: Router,
-        private modalService: NgbModal
-    ) {
-        this.resolvers$ = store.select(fromDashboard.getSearchResults);
-        this.searchQuery$ = store.select(fromDashboard.getSearchQuery);
-        this.loading$ = store.select(fromDashboard.getSearchLoading);
-        this.entitiesOpen$ = store.select(fromDashboard.getOpenProviders);
-        this.filtering$ = store.select(fromDashboard.getFilterType);
-        this.filtering$.subscribe(f => this.filtering = f);
-
-        this.total$ = this.resolvers$.pipe(map(list => list.length));
-
-        this.limited$ = this.getPagedResolvers(this.page, this.resolvers$);
-    }
-
-    ngOnInit (): void {
-        this.search();
-        this.changeFilter('all');
-    }
-
-    getPagedResolvers(page: number, list$: Observable<MetadataEntity[]>): Observable<MetadataEntity[]> {
-        return list$.pipe(
-            map((providers: MetadataEntity[]) => {
-                let maxIndex = (page * this.limit) - 1,
-                    minIndex = ((page - 1) * this.limit);
-                return providers.filter((resolver: MetadataEntity, index: number) =>  (maxIndex >= index && index >= minIndex) );
-            })
-        );
-    }
-
-    changeFilter(type: string): void {
-        this.store.dispatch(new searchActions.FilterAction(type));
-    }
-
-    changePage(index: number): void {
-        this.page = index;
-        this.limited$ = this.getPagedResolvers(index, this.resolvers$);
-    }
-
-    search(query: string = ''): void {
-        this.store.dispatch(new searchActions.SearchAction(query));
-        this.page = 1;
-    }
-
-    edit(entity: MetadataEntity): void {
-        this.router.navigate(['metadata', 'resolver', entity.getId(), entity.isDraft() ? 'wizard' : 'edit']);
-    }
-
-    toggleEntity(entity: MetadataEntity): void {
-        this.store.dispatch(new ToggleEntityDisplay(entity.getId()));
-    }
-
-    openPreviewDialog(entity: MetadataEntity): void {
-        this.store.dispatch(new PreviewEntity(entity));
-    }
-
-    deleteResolver(entity: MetadataResolver): void {
-        this.modalService
-            .open(DeleteDialogComponent)
-            .result
-            .then(
-                success => {
-                    this.store.dispatch(new RemoveDraftRequest(entity));
-                },
-                err => {
-                    console.log('Cancelled');
-                }
-            );
-    }
+export class ManagerComponent {
+    constructor() {}
 }
diff --git a/ui/src/app/metadata/manager/manager.module.ts b/ui/src/app/metadata/manager/manager.module.ts
index e94b4192a..ed29e36c9 100644
--- a/ui/src/app/metadata/manager/manager.module.ts
+++ b/ui/src/app/metadata/manager/manager.module.ts
@@ -10,6 +10,8 @@ import { EffectsModule } from '@ngrx/effects';
 import { ManagerComponent } from './container/manager.component';
 import { EntityItemComponent } from './component/entity-item.component';
 import { ProviderSearchComponent } from './component/provider-search.component';
+import { DashboardResolversListComponent } from './container/dashboard-resolvers-list.component';
+import { DashboardProvidersListComponent } from './container/dashboard-providers-list.component';
 import { reducers } from './reducer';
 import { SearchEffects } from './effect/search.effects';
 import { DeleteDialogComponent } from './component/delete-dialog.component';
@@ -21,7 +23,9 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
         ManagerComponent,
         EntityItemComponent,
         ProviderSearchComponent,
-        DeleteDialogComponent
+        DeleteDialogComponent,
+        DashboardResolversListComponent,
+        DashboardProvidersListComponent
     ],
     entryComponents: [
         DeleteDialogComponent
diff --git a/ui/src/app/metadata/manager/manager.routing.ts b/ui/src/app/metadata/manager/manager.routing.ts
new file mode 100644
index 000000000..9f9c21179
--- /dev/null
+++ b/ui/src/app/metadata/manager/manager.routing.ts
@@ -0,0 +1,17 @@
+import { Routes } from '@angular/router';
+import { DashboardResolversListComponent } from './container/dashboard-resolvers-list.component';
+import { DashboardProvidersListComponent } from './container/dashboard-providers-list.component';
+import { ManagerComponent } from './container/manager.component';
+
+export const ManagerRoutes: Routes = [
+    { path: '', redirectTo: 'manager', pathMatch: 'prefix' },
+    {
+        path: 'manager',
+        component: ManagerComponent,
+        children: [
+            { path: '', redirectTo: 'resolvers', pathMatch: 'prefix' },
+            { path: 'resolvers', component: DashboardResolversListComponent },
+            { path: 'providers', component: DashboardProvidersListComponent },
+        ]
+    }
+];
diff --git a/ui/src/app/metadata/metadata.routing.ts b/ui/src/app/metadata/metadata.routing.ts
index 31223e7c4..c9423fdbf 100644
--- a/ui/src/app/metadata/metadata.routing.ts
+++ b/ui/src/app/metadata/metadata.routing.ts
@@ -1,21 +1,20 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-
-import { ManagerComponent } from './manager/container/manager.component';
 import { MetadataPageComponent } from './metadata.component';
 
 import { ResolverRoutes } from './resolver/resolver.routing';
 import { ProviderRoutes } from './provider/provider.routing';
+import { ManagerRoutes } from './manager/manager.routing';
 
 const routes: Routes = [
     {
         path: '',
         component: MetadataPageComponent,
         children: [
-            { path: '', component: ManagerComponent },
+            ...ManagerRoutes,
             ...ResolverRoutes,
             ...ProviderRoutes
-        ]
+        ],
     },
 ];
 
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
index 5a471dfdd..1a737839e 100644
--- a/ui/src/app/metadata/provider/effect/collection.effect.ts
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -21,7 +21,7 @@ import { MetadataProviderService } from '../../domain/service/provider.service';
 export class CollectionEffects {
 
     @Effect()
-    loadFilters$ = this.actions$.pipe(
+    loadProviders$ = this.actions$.pipe(
         ofType<LoadProviderRequest>(ProviderCollectionActionTypes.LOAD_PROVIDER_REQUEST),
         switchMap(() =>
             this.providerService
diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
index 9a625fa79..6bc1af8e7 100644
--- a/ui/src/app/metadata/provider/reducer/collection.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
@@ -24,12 +24,11 @@ export const initialState: CollectionState = adapter.getInitialState({
 export function reducer(state = initialState, action: ProviderCollectionActionsUnion): CollectionState {
     switch (action.type) {
         case ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS: {
-            let s = adapter.addAll(action.payload, {
+            return adapter.addAll(action.payload, {
                 ...state,
                 selectedProviderId: state.selectedProviderId,
                 loaded: true
             });
-            return s;
         }
 
         case ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS: {
diff --git a/ui/src/app/schema-form/registry.ts b/ui/src/app/schema-form/registry.ts
index d197dcf2c..f99f9eece 100644
--- a/ui/src/app/schema-form/registry.ts
+++ b/ui/src/app/schema-form/registry.ts
@@ -1,12 +1,11 @@
 import { BooleanRadioComponent } from './widget/boolean-radio/boolean-radio.component';
 import { FieldsetComponent } from './widget/fieldset/fieldset.component';
-import { CustomStringComponent } from './widget/text/string.component';
+import { CustomStringComponent } from './widget/string/string.component';
 
 import { WidgetRegistry } from 'ngx-schema-form';
 
 import { ButtonWidget } from 'ngx-schema-form';
 import { FileWidget } from 'ngx-schema-form';
-import { IntegerWidget } from 'ngx-schema-form';
 import { ObjectWidget } from 'ngx-schema-form';
 import { RadioWidget } from 'ngx-schema-form';
 import { RangeWidget } from 'ngx-schema-form';
@@ -15,6 +14,7 @@ import { DatalistComponent } from './widget/datalist/datalist.component';
 import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 import { CustomTextAreaComponent } from './widget/textarea/textarea.component';
 import { CustomArrayComponent } from './widget/array/array.component';
+import { CustomIntegerComponent } from './widget/number/number.component';
 
 
 export class CustomWidgetRegistry extends WidgetRegistry {
@@ -44,13 +44,13 @@ export class CustomWidgetRegistry extends WidgetRegistry {
 
         this.register('textarea', CustomTextAreaComponent);
 
+        this.register('integer', CustomIntegerComponent);
+        this.register('number', CustomIntegerComponent);
+
         this.register('datalist', DatalistComponent);
 
         /* NGX-Form */
         this.register('object', ObjectWidget);
-
-        this.register('integer', IntegerWidget);
-        this.register('number', IntegerWidget);
         this.register('range', RangeWidget);
 
         this.register('file', FileWidget);
diff --git a/ui/src/app/schema-form/schema-form.module.ts b/ui/src/app/schema-form/schema-form.module.ts
index d51ae2269..8e01833f5 100644
--- a/ui/src/app/schema-form/schema-form.module.ts
+++ b/ui/src/app/schema-form/schema-form.module.ts
@@ -6,7 +6,7 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { BooleanRadioComponent } from './widget/boolean-radio/boolean-radio.component';
 import { SchemaService } from './service/schema.service';
 import { FieldsetComponent } from './widget/fieldset/fieldset.component';
-import { CustomStringComponent } from './widget/text/string.component';
+import { CustomStringComponent } from './widget/string/string.component';
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
 import { SharedModule } from '../shared/shared.module';
 import { CustomSelectComponent } from './widget/select/select.component';
@@ -14,6 +14,7 @@ import { DatalistComponent } from './widget/datalist/datalist.component';
 import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 import { CustomTextAreaComponent } from './widget/textarea/textarea.component';
 import { CustomArrayComponent } from './widget/array/array.component';
+import { CustomIntegerComponent } from './widget/number/number.component';
 
 export const COMPONENTS = [
     BooleanRadioComponent,
@@ -23,7 +24,8 @@ export const COMPONENTS = [
     DatalistComponent,
     CustomCheckboxComponent,
     CustomTextAreaComponent,
-    CustomArrayComponent
+    CustomArrayComponent,
+    CustomIntegerComponent
 ];
 
 @NgModule({
diff --git a/ui/src/app/schema-form/service/schema.service.ts b/ui/src/app/schema-form/service/schema.service.ts
index 20177e115..e041528b1 100644
--- a/ui/src/app/schema-form/service/schema.service.ts
+++ b/ui/src/app/schema-form/service/schema.service.ts
@@ -12,4 +12,24 @@ export class SchemaService {
     get(path: string): Observable<any> {
         return this.http.get<any>(`${path}`);
     }
+
+    isRequired(formProperty: any): boolean {
+        let required = false;
+        if (!formProperty) {
+            return false;
+        }
+        let requiredFields = formProperty.parent.schema.required || [];
+        let fieldPath = formProperty.path;
+        let controlName = fieldPath.substr(fieldPath.lastIndexOf('/') + 1);
+        required = requiredFields.indexOf(controlName) > -1;
+
+        if (!required) {
+            const conditions = formProperty.parent.schema.anyOf || [];
+            conditions.forEach(el => {
+                requiredFields = el.required || [];
+                required = !required ? requiredFields.indexOf(controlName) > -1 : required;
+            });
+        }
+        return required;
+    }
 }
diff --git a/ui/src/app/schema-form/widget/check/checkbox.component.html b/ui/src/app/schema-form/widget/check/checkbox.component.html
index f8f94af1a..d47aa2d4c 100644
--- a/ui/src/app/schema-form/widget/check/checkbox.component.html
+++ b/ui/src/app/schema-form/widget/check/checkbox.component.html
@@ -8,9 +8,9 @@
                     [indeterminate]="control.value !== false && control.value !== true ? true :null"
                     type="checkbox"
                     [attr.disabled]="schema.readOnly"
-                    id="{{ schema.id }}-control">
-                <input id="{{ schema.id }}-control" *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control">
-                <label for="{{ schema.id }}-control" class="custom-control-label">
+                    id="{{ name }}"
+                    [disableValidation]="true">
+                <label for="{{ name }}" class="custom-control-label">
                     {{ schema.title }}
                 </label>
             </div>
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 9df975a27..94242cc8a 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -1,6 +1,9 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="d-flex justify-content-between control-label">
-        <span>{{ schema.title }}</span>
+        <span>
+            {{ schema.title }}
+            <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
+        </span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
@@ -16,6 +19,7 @@
         [matches]="schema.widget.data"
         [required]="true"
         [dropdown]="true"
+        [placeholder]="schema.placeholder"
         role="textbox"
         aria-label="Name ID Format (type for auto-complete)">
     </auto-complete>
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.ts b/ui/src/app/schema-form/widget/datalist/datalist.component.ts
index ca5d8ba58..ab6041500 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.ts
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.ts
@@ -1,10 +1,20 @@
 import { Component, OnChanges } from '@angular/core';
 
 import { ControlWidget } from 'ngx-schema-form';
-import { OneOf } from '../../model/one-of';
+import { SchemaService } from '../../service/schema.service';
 
 @Component({
     selector: 'datalist-component',
     templateUrl: `./datalist.component.html`
 })
-export class DatalistComponent extends ControlWidget {}
+export class DatalistComponent extends ControlWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/schema-form/widget/number/number.component.html b/ui/src/app/schema-form/widget/number/number.component.html
new file mode 100644
index 000000000..6fe04cf82
--- /dev/null
+++ b/ui/src/app/schema-form/widget/number/number.component.html
@@ -0,0 +1,24 @@
+<div class="widget form-group">
+    <label [attr.for]="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></span>
+        <span *ngIf="schema.description">
+            <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
+            <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
+                [ngbPopover]="tooltip"
+                i18n-aria-label="@@tooltip--instruction"
+                aria-label="Information icon - press spacebar to read additional information for this form field"></i>
+        </span>
+    </label>
+    <span *ngIf="schema.description" class="formHelp">{{schema.description}}</span>
+    <input [attr.readonly]="schema.readOnly?true:null"
+        [name]="name"
+        class="text-widget integer-widget form-control"
+        [formControl]="control"
+        [attr.type]="'number'"
+        [attr.min]="schema.minimum"
+        [attr.max]="schema.maximum"
+        [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
diff --git a/ui/src/app/schema-form/widget/number/number.component.ts b/ui/src/app/schema-form/widget/number/number.component.ts
new file mode 100644
index 000000000..0f4cdcba9
--- /dev/null
+++ b/ui/src/app/schema-form/widget/number/number.component.ts
@@ -0,0 +1,21 @@
+import {
+    Component,
+} from '@angular/core';
+import { IntegerWidget } from 'ngx-schema-form';
+import { SchemaService } from '../../service/schema.service';
+
+@Component({
+    selector: 'integer-component',
+    templateUrl: `./number.component.html`
+})
+export class CustomIntegerComponent extends IntegerWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
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 7b4bf8173..4a60d6425 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -1,6 +1,9 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="horizontal control-label" *ngIf="schema.title">
-        {{ schema.title }}
+        <span>
+            {{ schema.title }}
+            <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
+        </span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
@@ -12,8 +15,12 @@
     <span *ngIf="schema.description" class="sr-only">
         {{ schema.description }}
     </span>
-    <select *ngIf="schema.type !== 'array'" [formControl]="control" [attr.name]="name" [attr.disabled]="schema.readOnly" class="form-control">
-        <option disabled selected>{{ schema.title }}</option>
+    <select *ngIf="schema.type !== 'array'"
+        [formControl]="control"
+        [attr.name]="name"
+        [attr.disabled]="schema.readOnly"
+        class="form-control">
+        <option disabled selected>{{ schema.placeholder || schema.title }}</option>
         <option *ngFor="let option of schema.oneOf" [ngValue]="option.enum[0]">{{option.description}}</option>
     </select>
     <select *ngIf="schema.type === 'array'" multiple [formControl]="control" [attr.name]="name" [attr.disabled]="schema.readOnly" class="form-control">
diff --git a/ui/src/app/schema-form/widget/select/select.component.ts b/ui/src/app/schema-form/widget/select/select.component.ts
index 15e90e04f..e673a5e89 100644
--- a/ui/src/app/schema-form/widget/select/select.component.ts
+++ b/ui/src/app/schema-form/widget/select/select.component.ts
@@ -1,9 +1,20 @@
 import { Component } from '@angular/core';
 
-import { ControlWidget } from 'ngx-schema-form';
+import { SelectWidget } from 'ngx-schema-form';
+import { SchemaService } from '../../service/schema.service';
 
 @Component({
     selector: 'select-component',
     templateUrl: `./select.component.html`
 })
-export class CustomSelectComponent extends ControlWidget { }
+export class CustomSelectComponent extends SelectWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/schema-form/widget/text/string.component.html b/ui/src/app/schema-form/widget/string/string.component.html
similarity index 89%
rename from ui/src/app/schema-form/widget/text/string.component.html
rename to ui/src/app/schema-form/widget/string/string.component.html
index 435c2079a..10f19f0ab 100644
--- a/ui/src/app/schema-form/widget/text/string.component.html
+++ b/ui/src/app/schema-form/widget/string/string.component.html
@@ -1,6 +1,6 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="d-flex justify-content-between control-label">
-        <span>{{ schema.title }}</span>
+        <span>{{ schema.title }} <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i></span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
@@ -25,7 +25,7 @@
     <small class="form-text text-danger" *ngIf="errorMessages && errorMessages.length && control.touched">
         {{ errorMessages }}
     </small>
-    <small class="form-text text-muted" *ngIf="!(control.touched && errorMessages.length) && schema.widget.help">
+    <small class="form-text text-muted" *ngIf="!(control.touched && errorMessages && errorMessages.length) && schema.widget.help">
         {{ schema.widget.help }}
     </small>
 </div>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/text/string.component.scss b/ui/src/app/schema-form/widget/string/string.component.scss
similarity index 100%
rename from ui/src/app/schema-form/widget/text/string.component.scss
rename to ui/src/app/schema-form/widget/string/string.component.scss
diff --git a/ui/src/app/schema-form/widget/string/string.component.ts b/ui/src/app/schema-form/widget/string/string.component.ts
new file mode 100644
index 000000000..2de93e371
--- /dev/null
+++ b/ui/src/app/schema-form/widget/string/string.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { StringWidget } from 'ngx-schema-form';
+import { Validators } from '@angular/forms';
+import { SchemaService } from '../../service/schema.service';
+
+@Component({
+    selector: 'custom-string',
+    templateUrl: `./string.component.html`,
+    styleUrls: ['../widget.component.scss']
+})
+export class CustomStringComponent extends StringWidget {
+
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/schema-form/widget/text/string.component.ts b/ui/src/app/schema-form/widget/text/string.component.ts
deleted file mode 100644
index cf46aa6e2..000000000
--- a/ui/src/app/schema-form/widget/text/string.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-import { StringWidget } from 'ngx-schema-form';
-
-@Component({
-    selector: 'custom-string',
-    templateUrl: `./string.component.html`,
-    styleUrls: ['../widget.component.scss']
-})
-export class CustomStringComponent extends StringWidget {}
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 55260ac43..a4e0a3953 100644
--- a/ui/src/app/schema-form/widget/textarea/textarea.component.html
+++ b/ui/src/app/schema-form/widget/textarea/textarea.component.html
@@ -1,6 +1,9 @@
 <div class="widget form-group">
     <label [attr.for]="id" class="d-flex justify-content-between control-label">
-        <span>{{ schema.title }}</span>
+        <span>
+            {{ schema.title }}
+            <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
+        </span>
         <span *ngIf="schema.description">
             <ng-template #tooltip i18n="@@tooltip--description">{{ schema.description }}</ng-template>
             <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg"
diff --git a/ui/src/app/schema-form/widget/textarea/textarea.component.ts b/ui/src/app/schema-form/widget/textarea/textarea.component.ts
index 6586d7d1f..0f68e524f 100644
--- a/ui/src/app/schema-form/widget/textarea/textarea.component.ts
+++ b/ui/src/app/schema-form/widget/textarea/textarea.component.ts
@@ -1,9 +1,20 @@
 import { Component } from '@angular/core';
 
 import { TextAreaWidget } from 'ngx-schema-form';
+import { SchemaService } from '../../service/schema.service';
 
 @Component({
   selector: 'textarea-component',
   templateUrl: `./textarea.component.html`
 })
-export class CustomTextAreaComponent extends TextAreaWidget {}
+export class CustomTextAreaComponent extends TextAreaWidget {
+    constructor(
+        private widgetService: SchemaService
+    ) {
+        super();
+    }
+
+    get required(): boolean {
+        return this.widgetService.isRequired(this.formProperty);
+    }
+}
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 26d51dbcf..6820973fd 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -11,6 +11,7 @@
             type="text"
             role="textbox"
             [attr.aria-activedescendant]="activeDescendant"
+            [placeholder]="placeholder"
             attr.aria-owns="{{ id }}__listbox"
             (focus)="handleInputFocus()"
             (blur)="handleInputBlur()"
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.ts b/ui/src/app/shared/autocomplete/autocomplete.component.ts
index 6044b1757..bbe92dfa7 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.ts
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.ts
@@ -49,6 +49,7 @@ export class AutoCompleteComponent implements OnInit, OnDestroy, OnChanges, Afte
     @Input() limit = 0;
     @Input() processing = false;
     @Input() dropdown = false;
+    @Input() placeholder = '';
 
     @Output() more: EventEmitter<any> = new EventEmitter<any>();
     @Output() onChange: EventEmitter<string> = new EventEmitter<string>();
diff --git a/ui/src/assets/schema/provider/filebacked-http-common.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
index 3bf433b29..65c919add 100644
--- a/ui/src/assets/schema/provider/filebacked-http-common.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
@@ -12,22 +12,51 @@
         "satisfyAnyPredicates"
     ],
     "required": ["id", "metadataURL"],
+    "dependencies": {
+        "initializeFromBackupFile": {"required": ["backingFile", "backupFileInitNextRefreshDelay"]}
+    },
+    "anyOf": [
+        {
+            "properties": {
+                "initializeFromBackupFile": {
+                    "enum": [
+                        true
+                    ]
+                }
+            },
+            "required": [
+                "backingFile",
+                "backupFileInitNextRefreshDelay"
+            ]
+        },
+        {
+            "properties": {
+                "initializeFromBackupFile": {
+                    "enum": [
+                        false
+                    ]
+                }
+            }
+        }
+    ],
     "properties": {
         "id": {
             "title": "ID",
-            "description": "Unique Identifier",
+            "description": "Identifier for logging, identification for command line reload, etc.",
             "type": "string",
-            "default": ""
+            "default": "",
+            "minLength": 1
         },
         "metadataURL": {
             "title": "Metadata URL",
-            "description": "Metadata URL",
+            "description": "Identifier for logging, identification for command line reload, etc.",
             "type": "string",
-            "default": ""
+            "default": "",
+            "minLength": 1
         },
         "initializeFromBackupFile": {
             "title": "Initialize From Backup File?",
-            "description": "Initialize From Backup File?",
+            "description": "Flag indicating whether initialization should first attempt to load metadata from the backup file.  If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -50,8 +79,9 @@
         },
         "backingFile": {
             "title": "Backing File",
-            "description": "Backing File",
+            "description": "Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead.",
             "type": "string",
+            "default": "",
             "visibleIf": {
                 "initializeFromBackupFile": [
                     true
@@ -60,7 +90,7 @@
         },
         "backupFileInitNextRefreshDelay": {
             "title": "Backup File Init Next Refresh Delay",
-            "description": "Backup File Init Next Refresh Delay",
+            "description": "Delay duration after which to schedule next HTTP refresh when initialized from the backing file.",
             "type": "string",
             "visibleIf": {
                 "initializeFromBackupFile": [
@@ -70,7 +100,7 @@
         },
         "requireValidMetadata": {
             "title": "Require Valid Metadata?",
-            "description": "Require Valid Metadata?",
+            "description": "Whether candidate metadata found by the resolver must be valid in order to be returned (where validity is implementation specific, but in SAML cases generally depends on a validUntil attribute.) If this flag is true, then invalid candidate metadata will not be returned.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -93,7 +123,7 @@
         },
         "failFastInitialization": {
             "title": "Fail Fast Initialization?",
-            "description": "Fail Fast Initialization?",
+            "description": "Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -116,7 +146,7 @@
         },
         "useDefaultPredicateRegistry": {
             "title": "Use Default Predicate Registry?",
-            "description": "Use Default Predicate Registry?",
+            "description": "Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
@@ -139,7 +169,7 @@
         },
         "satisfyAnyPredicates": {
             "title": "Satisy Any Predicates?",
-            "description": "Satisy Any Predicates?",
+            "description": "Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).",
             "type": "boolean",
             "widget": {
                 "id": "boolean-radio"
diff --git a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
index 98ec3eed9..66e4d5b0f 100644
--- a/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-filters.schema.json
@@ -15,7 +15,7 @@
                     "properties": {
                         "maxValidityInterval": {
                             "title": "Max Validity Interval",
-                            "description": "Max Validity Interval",
+                            "description": "Defines the window within which the metadata is valid.",
                             "type": "number",
                             "default": 0
                         }
@@ -30,18 +30,19 @@
                     "properties": {
                         "requireSignedRoot": {
                             "title": "Require Signed Root",
-                            "description": "Require Signed Root",
+                            "description": "If true, this fails to load metadata with no signature on the root XML element.",
                             "type": "boolean",
                             "default": true
                         },
                         "certificateFile": {
                             "title": "Certificate File",
-                            "description": "Certificate File",
+                            "description": "A key used to verify the signature. Conflicts with trustEngineRef and both of the child elements.",
                             "type": "string",
                             "widget": "textarea",
                             "default": ""
                         }
-                    }
+                    },
+                    "required": ["certificateFile"]
                 },
                 "EntityRoleWhiteList": {
                     "title": "Entity Role Whitelist Filter",
@@ -77,13 +78,13 @@
                         },
                         "removeRolelessEntityDescriptors": {
                             "title": "Remove Roleless Entity Descriptors?",
-                            "description": "Remove Roleless Entity Descriptors?",
+                            "description": "Controls whether to keep entity descriptors that contain no roles.",
                             "type": "boolean",
                             "default": true
                         },
                         "removeEmptyEntitiesDescriptors": {
                             "title": "Remove Empty Entities Descriptors?",
-                            "description": "Remove Empty Entities Descriptors?",
+                            "description": "Controls whether to keep entities descriptors that contain no entity descriptors.",
                             "type": "boolean",
                             "default": true
                         }
diff --git a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json b/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
index 9fa60f808..bba9e57b5 100644
--- a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
@@ -6,8 +6,9 @@
             "properties": {
                 "minRefreshDelay": {
                     "title": "Min Refresh Delay",
-                    "description": "",
+                    "description": "Lower bound on the next refresh from the time calculated based on the metadata's expiration.",
                     "type": "string",
+                    "placeholder": "Duration",
                     "widget": {
                         "id": "datalist",
                         "data": [
@@ -26,8 +27,9 @@
                 },
                 "maxRefreshDelay": {
                     "title": "Max Refresh Delay",
-                    "description": "",
+                    "description": "Upper bound on the next refresh from the time calculated based on the metadata's expiration.",
                     "type": "string",
+                    "placeholder": "Duration",
                     "widget": {
                         "id": "datalist",
                         "data": [
@@ -46,13 +48,20 @@
                 },
                 "refreshDelayFactor": {
                     "title": "Refresh Delay Factor",
-                    "description": "",
+                    "description": "A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata's expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.",
                     "type": "number",
+                    "widget": {
+                        "id": "number",
+                        "step": 0.01
+                    },
+                    "placeholder": "Real Number (between 0.0 and 1.0)",
+                    "minimum": 0,
+                    "maximum": 1,
                     "default": null
                 },
                 "resolveViaPredicatesOnly": {
                     "title": "Resolve Via Predicates Only?",
-                    "description": "",
+                    "description": "Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.",
                     "type": "boolean",
                     "widget": {
                         "id": "boolean-radio"
@@ -75,8 +84,9 @@
                 },
                 "expirationWarningThreshold": {
                     "title": "Expiration Warning Threshold",
-                    "description": "",
+                    "description": "For each attempted metadata refresh (whether or not fresh metadata is obtained), if requireValidMetadata is true, and there is a validUntil XML attribute on the document root element, and the difference between validUntil and the current time is less than expirationWarningThreshold, the system logs a warning about the impending expiration.",
                     "type": "string",
+                    "placeholder": "Duration",
                     "widget": {
                         "id": "datalist",
                         "data": [
diff --git a/ui/src/assets/schema/provider/metadata-provider.schema.json b/ui/src/assets/schema/provider/metadata-provider.schema.json
index f5a840f35..e11a3cc30 100644
--- a/ui/src/assets/schema/provider/metadata-provider.schema.json
+++ b/ui/src/assets/schema/provider/metadata-provider.schema.json
@@ -7,7 +7,7 @@
     "properties": {
         "name": {
             "title": "Metadata Provider Name (Dashboard Display Only)",
-            "description": "Metadata Provider Name (Dashboard Display Only)",
+            "description": "Metadata Provider Name",
             "type": "string",
             "widget": {
                 "id": "string",
@@ -17,7 +17,7 @@
         "@type": {
             "title": "Metadata Provider Type",
             "description": "Metadata Provider Type",
-            "ui:placeholder": "Select a metadata provider type",
+            "placeholder": "Select a metadata provider type",
             "type": "string",
             "widget": {
                 "id": "select"