diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index d19bef702..8c4ed0437 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2219,7 +2219,7 @@
       "id": "c2d29077-30c4-45cf-81c9-b5790294e11e",
       "comment": "",
       "command": "click",
-      "target": "css=.btn-info > translate-i18n",
+      "target": "css=.btn-info",
       "targets": [
         ["css=.btn-info > translate-i18n", "css:finder"],
         ["xpath=//div[2]/button/translate-i18n", "xpath:position"],
@@ -2230,7 +2230,7 @@
       "id": "f2e3d420-5cf5-4165-94da-41688839cf82",
       "comment": "",
       "command": "click",
-      "target": "css=.btn-link:nth-child(1) > translate-i18n",
+      "target": "css=.btn-link:nth-child(1)",
       "targets": [
         ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"],
         ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],
@@ -2253,7 +2253,7 @@
       "id": "68972f7d-8268-4701-865c-585a39987208",
       "comment": "",
       "command": "click",
-      "target": "css=tr:nth-child(2) .custom-control-label",
+      "target": "css=tr:nth-child(3) .custom-control-label",
       "targets": [
         ["css=tr:nth-child(2) .custom-control-label", "css:finder"],
         ["xpath=//tr[2]/td/div/label", "xpath:position"]
@@ -2270,6 +2270,13 @@
         ["xpath=//button[contains(.,'Compare Selected(2)')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "98aafaee-a430-4a2d-9aa5-b4c9ce0c4908",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.mb-4:nth-child(2) primitive-property:nth-child(1) .d-block:nth-child(2)",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1334-2.side b/backend/src/integration/resources/SHIBUI-1334-2.side
index e20c9ba3d..555b73c93 100644
--- a/backend/src/integration/resources/SHIBUI-1334-2.side
+++ b/backend/src/integration/resources/SHIBUI-1334-2.side
@@ -119,6 +119,13 @@
         ["xpath=//li[2]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "d072327c-78b4-4bdb-8020-b825cd26592d",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/xmlId",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "86262eda-4a44-41b0-b7aa-fa46406e2601",
       "comment": "",
@@ -578,15 +585,9 @@
     }, {
       "id": "5636ef67-71fb-4bca-ba58-7ecf926c7bf0",
       "comment": "",
-      "command": "click",
-      "target": "id=/xmlId",
-      "targets": [
-        ["id=/xmlId", "id"],
-        ["name=field38", "name"],
-        ["css=#\\/xmlId", "css:finder"],
-        ["xpath=//input[@id='/xmlId']", "xpath:attributes"],
-        ["xpath=//custom-string/div/input", "xpath:position"]
-      ],
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
       "value": ""
     }, {
       "id": "7d641e58-47ce-4d20-908c-e0002ff73cfa",
@@ -600,7 +601,14 @@
         ["xpath=//input[@id='/xmlId']", "xpath:attributes"],
         ["xpath=//custom-string/div/input", "xpath:position"]
       ],
-      "value": "123 v2"
+      "value": "123 version 2"
+    }, {
+      "id": "b78c81e9-41ac-41db-837a-0db6bd4f77eb",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "247b04c1-e690-42bc-ae15-dfbedb44d2e9",
       "comment": "",
@@ -624,6 +632,13 @@
         ["xpath=//button[contains(.,'Save')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "eb08417b-b8f0-46dc-9e32-e8daf3bc205d",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "cf005a45-74ae-4f7a-a53c-ed59d63f7114",
       "comment": "",
@@ -699,7 +714,7 @@
         ["xpath=//primitive-property[4]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'123 v2')]", "xpath:innerText"]
       ],
-      "value": "123 v2"
+      "value": "123 version 2"
     }, {
       "id": "a13198b9-7827-47e2-ade3-143b981d34ee",
       "comment": "",
@@ -782,17 +797,11 @@
       ],
       "value": ""
     }, {
-      "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a",
+      "id": "270a048e-b903-4bc1-b95b-06ffbdef99de",
       "comment": "",
-      "command": "click",
-      "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn",
-      "targets": [
-        ["css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn", "css:finder"],
-        ["xpath=(//button[@type='button'])[2]", "xpath:attributes"],
-        ["xpath=//div[@id='/httpMetadataResolverAttributes/connectionRequestTimeout-container']/div/div/button", "xpath:idRelative"],
-        ["xpath=//auto-complete/div/div/div/button", "xpath:position"],
-        ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
-      ],
+      "command": "pause",
+      "target": "3000",
+      "targets": [],
       "value": ""
     }, {
       "id": "1cde012c-d521-4fd5-a7d5-7a680bba0e7b",
@@ -806,7 +815,14 @@
       ],
       "value": ""
     }, {
-      "id": "d00ecf98-7425-467c-acbb-3b39918e3462",
+      "id": "863e9f5e-a3d6-47e9-8b65-de639029812a",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn",
+      "targets": [],
+      "value": "10000"
+    }, {
+      "id": "78967fb5-8f61-46ce-9c14-9b6ceb12b03a",
       "comment": "",
       "command": "click",
       "target": "css=#\\/httpMetadataResolverAttributes\\/connectionRequestTimeout-container .btn",
@@ -818,6 +834,13 @@
         ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "8277f894-0bbd-41f7-b3bb-1aba2a0f80be",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "8ba62572-354d-47f4-bb72-f9309c1cb201",
       "comment": "",
@@ -844,6 +867,13 @@
         ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "7014a534-b908-482f-85d2-7f7031741b04",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "337ac160-7990-425f-83da-2788d8a0985e",
       "comment": "",
@@ -869,6 +899,13 @@
         ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "c28e3ee6-e536-4eb7-914b-896b2ec2cb9e",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "34693225-4754-4b27-92ee-3e37304a8cd7",
       "comment": "",
@@ -893,6 +930,13 @@
         ["xpath=//button[contains(.,'Save')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "c3ad6c24-736a-492a-8952-b368e123d8e1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "linkText=Test Metadata Provider",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "8868c054-2e6a-403e-ba2b-499a56730d71",
       "comment": "",
@@ -911,7 +955,7 @@
       "id": "0092cd5c-a885-4a48-a233-b3af447b02bc",
       "comment": "",
       "command": "click",
-      "target": "css=.btn-link:nth-child(1) > translate-i18n",
+      "target": "css=.btn-link:nth-child(1)",
       "targets": [
         ["css=.btn-link:nth-child(1) > translate-i18n", "css:finder"],
         ["xpath=//div[@id='navigation']/div/a/translate-i18n", "xpath:idRelative"],
diff --git a/backend/src/integration/resources/SHIBUI-1361.side b/backend/src/integration/resources/SHIBUI-1361.side
index 8185b484e..ae87cd2b7 100644
--- a/backend/src/integration/resources/SHIBUI-1361.side
+++ b/backend/src/integration/resources/SHIBUI-1361.side
@@ -601,6 +601,13 @@
       "target": "id=/xmlId",
       "targets": [],
       "value": "10000"
+    }, {
+      "id": "0aae114c-3e79-4d57-8f40-e669887a8545",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "7d641e58-47ce-4d20-908c-e0002ff73cfa",
       "comment": "",
@@ -702,6 +709,13 @@
         ["xpath=//button[contains(.,'  Restore')]", "xpath:innerText"]
       ],
       "value": "10000"
+    }, {
+      "id": "271939a6-6196-4c14-aa13-e6c31e0373c2",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c223e329-733c-41eb-9e85-c6f69a840179",
       "comment": "",
@@ -857,6 +871,13 @@
         ["xpath=//button[contains(.,'Toggle Dropdown')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "6e01f905-fd32-45a5-9517-9dd12191f7ae",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/httpMetadataResolverAttributes/connectionRequestTimeout__option--1",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "8ba62572-354d-47f4-bb72-f9309c1cb201",
       "comment": "",
@@ -883,6 +904,13 @@
         ["xpath=//div[2]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "01d5f751-6964-4fd8-a0de-36fd79d7be99",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/httpMetadataResolverAttributes/connectionTimeout__option--2",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "337ac160-7990-425f-83da-2788d8a0985e",
       "comment": "",
@@ -908,6 +936,13 @@
         ["xpath=//div[3]/sf-form-element/div/sf-widget-chooser/datalist-component/div/auto-complete/div/div/div/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "99c7ec5a-ad8c-4970-b97f-27997098c0d6",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/httpMetadataResolverAttributes/socketTimeout__option--3",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "34693225-4754-4b27-92ee-3e37304a8cd7",
       "comment": "",
@@ -932,6 +967,13 @@
         ["xpath=//button[contains(.,'Save')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "4e2831c6-d1ba-409d-a0cc-7a25dad75421",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "linkText=Test Metadata Provider",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "8868c054-2e6a-403e-ba2b-499a56730d71",
       "comment": "",
@@ -1050,6 +1092,13 @@
       "target": "isDate",
       "targets": [],
       "value": "true"
+    }, {
+      "id": "48fc4781-3313-4f56-8546-00e8210d9641",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "2cfe222d-a506-4f2b-8840-4b4a76cf2bfb",
       "comment": "",
@@ -1065,7 +1114,7 @@
       "id": "a10e3e37-28f1-403f-b572-8b4020de7904",
       "comment": "",
       "command": "click",
-      "target": "css=tr:nth-child(2) .custom-control-label",
+      "target": "css=tr:nth-child(3) .custom-control-label",
       "targets": [
         ["css=tr:nth-child(2) .custom-control-label", "css:finder"],
         ["xpath=//tr[2]/td/div/label", "xpath:position"]
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 621dc4e63..673a47728 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -60,6 +60,7 @@ action.restore=Restore
 value.enabled=Enabled
 value.disabled=Disabled
 value.current=Current
+value.not-current=Not Current
 value.none=None
 value.file=File
 value.memory=Memory
diff --git a/ui/src/app/metadata/configuration/action/configuration.action.ts b/ui/src/app/metadata/configuration/action/configuration.action.ts
index 8a12d47c8..b1eb9c00a 100644
--- a/ui/src/app/metadata/configuration/action/configuration.action.ts
+++ b/ui/src/app/metadata/configuration/action/configuration.action.ts
@@ -71,13 +71,13 @@ export class SetMetadataModel implements Action {
     constructor(public payload: Metadata) { }
 }
 
-export class SetDefinition implements Action {
+export class SetConfigurationDefinition implements Action {
     readonly type = ConfigurationActionTypes.SET_DEFINITION;
 
     constructor(public payload: Wizard<Metadata>) { }
 }
 
-export class SetSchema implements Action {
+export class SetConfigurationSchema implements Action {
     readonly type = ConfigurationActionTypes.SET_SCHEMA;
 
     constructor(public payload: Schema) { }
@@ -105,8 +105,8 @@ export type ConfigurationActionsUnion =
     | LoadXmlSuccess
     | LoadXmlError
     | SetMetadata
-    | SetDefinition
-    | SetSchema
+    | SetConfigurationDefinition
+    | SetConfigurationSchema
     | SetXml
     | DownloadXml
     | ClearConfiguration;
diff --git a/ui/src/app/metadata/configuration/action/restore.action.ts b/ui/src/app/metadata/configuration/action/restore.action.ts
index 290367054..978e9eee4 100644
--- a/ui/src/app/metadata/configuration/action/restore.action.ts
+++ b/ui/src/app/metadata/configuration/action/restore.action.ts
@@ -1,27 +1,25 @@
 import { Action } from '@ngrx/store';
 import { Metadata } from '../../domain/domain.type';
+import { VersionRequest } from '../model/request';
 
 export enum RestoreActionTypes {
-    SELECT_VERSION_SUCCESS = '[Restore Version] Select Version Success',
-    SELECT_VERSION_ERROR = '[Restore Version] Select Version Error',
-    SELECT_VERSION_REQUEST = '[Restore Version] Select Version Request',
-
     RESTORE_VERSION_REQUEST = '[Restore Version] Restore Version Request',
     RESTORE_VERSION_SUCCESS = '[Restore Version] Restore Version Success',
     RESTORE_VERSION_ERROR = '[Restore Version] Restore Version Error',
 
-    CLEAR_VERSION = '[Restore Version] Clear Versions'
-}
+    UPDATE_RESTORATION_REQUEST = '[Restore Version] Update Changes Request',
+    UPDATE_RESTORATION_SUCCESS = '[Restore Version] Update Changes Success',
+
+    UPDATE_STATUS = '[Restore Version] Update Restore Form Status',
+    SET_SAVING_STATUS = '[Restore Version] Set Saving Status',
 
-export interface VersionRequest {
-    type: string;
-    id: string;
-    version: string;
+    CLEAR_VERSION = '[Restore Version] Clear Versions',
+    CANCEL_RESTORE = '[Restore Version] Cancel Restore'
 }
 
 export class RestoreVersionRequest implements Action {
     readonly type = RestoreActionTypes.RESTORE_VERSION_REQUEST;
-    constructor(public payload: VersionRequest) { }
+    constructor() { }
 }
 
 export class RestoreVersionSuccess implements Action {
@@ -34,32 +32,39 @@ export class RestoreVersionError implements Action {
     constructor(public payload: any) { }
 }
 
-export class SelectVersionRestoreRequest implements Action {
-    readonly type = RestoreActionTypes.SELECT_VERSION_REQUEST;
+export class UpdateRestorationChangesRequest implements Action {
+    readonly type = RestoreActionTypes.UPDATE_RESTORATION_REQUEST;
+    constructor(public payload: Partial<Metadata>) { }
+}
 
-    constructor(public payload: VersionRequest) { }
+export class UpdateRestorationChangesSuccess implements Action {
+    readonly type = RestoreActionTypes.UPDATE_RESTORATION_SUCCESS;
+    constructor(public payload: Partial<Metadata>) { }
 }
 
-export class SelectVersionRestoreSuccess implements Action {
-    readonly type = RestoreActionTypes.SELECT_VERSION_SUCCESS;
+export class UpdateRestoreFormStatus implements Action {
+    readonly type = RestoreActionTypes.UPDATE_STATUS;
 
-    constructor(public payload: Metadata) { }
+    constructor(public payload: { [key: string]: string }) { }
 }
-export class SelectVersionRestoreError implements Action {
-    readonly type = RestoreActionTypes.SELECT_VERSION_ERROR;
 
-    constructor(public payload: any) { }
+export class SetSavingStatus implements Action {
+    readonly type = RestoreActionTypes.SET_SAVING_STATUS;
+
+    constructor(public payload: boolean) { }
 }
 
-export class ClearVersionRestore implements Action {
-    readonly type = RestoreActionTypes.CLEAR_VERSION;
+export class CancelRestore implements Action {
+    readonly type = RestoreActionTypes.CANCEL_RESTORE;
+    constructor() { }
 }
 
 export type RestoreActionsUnion =
-    | SelectVersionRestoreRequest
-    | SelectVersionRestoreError
-    | SelectVersionRestoreSuccess
     | RestoreVersionRequest
     | RestoreVersionSuccess
     | RestoreVersionError
-    | ClearVersionRestore;
+    | UpdateRestorationChangesRequest
+    | UpdateRestorationChangesSuccess
+    | UpdateRestoreFormStatus
+    | SetSavingStatus
+    | CancelRestore;
diff --git a/ui/src/app/metadata/configuration/action/version.action.ts b/ui/src/app/metadata/configuration/action/version.action.ts
new file mode 100644
index 000000000..0379a240b
--- /dev/null
+++ b/ui/src/app/metadata/configuration/action/version.action.ts
@@ -0,0 +1,40 @@
+import { Action } from '@ngrx/store';
+import { Metadata } from '../../domain/domain.type';
+import { VersionRequest } from '../model/request';
+
+export enum VersionActionTypes {
+    SELECT_VERSION_SUCCESS = '[Version] Select Version Success',
+    SELECT_VERSION_ERROR = '[Version] Select Version Error',
+    SELECT_VERSION_REQUEST = '[Version] Select Version Request',
+
+    CLEAR_VERSION = '[Version] Clear Versions'
+}
+
+export class SelectVersionRequest implements Action {
+    readonly type = VersionActionTypes.SELECT_VERSION_REQUEST;
+
+    constructor(public payload: VersionRequest) { }
+}
+
+export class SelectVersionSuccess implements Action {
+    readonly type = VersionActionTypes.SELECT_VERSION_SUCCESS;
+
+    constructor(public payload: Metadata) { }
+}
+export class SelectVersionError implements Action {
+    readonly type = VersionActionTypes.SELECT_VERSION_ERROR;
+
+    constructor(public payload: any) { }
+}
+
+export class ClearVersion implements Action {
+    readonly type = VersionActionTypes.CLEAR_VERSION;
+
+    constructor() { }
+}
+
+export type VersionActionsUnion =
+    | SelectVersionRequest
+    | SelectVersionError
+    | SelectVersionSuccess
+    | ClearVersion;
diff --git a/ui/src/app/metadata/configuration/component/editor.component.html b/ui/src/app/metadata/configuration/component/editor.component.html
new file mode 100644
index 000000000..fd71771aa
--- /dev/null
+++ b/ui/src/app/metadata/configuration/component/editor.component.html
@@ -0,0 +1,14 @@
+<div class="alert alert-danger d-flex justify-content-between font-weight-bold mb-3" *ngIf="lockable">
+    <span class="d-flex justify-content-between">
+        <toggle-switch id="toggle" [formControl]="lock"></toggle-switch>
+        <span class="p-1">{{ lock.value ? 'Locked' : 'Unlocked' }}</span>
+    </span>
+    <span class="p-1">For Advanced Knowledge Only</span>
+</div>
+<sf-form
+    [schema]="schema"
+    [model]="model"
+    [validators]="validators"
+    [bindings]="bindings"
+    (onChange)="change.emit($event.value)"
+    (onErrorChange)="status.emit($event)"></sf-form>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/component/editor.component.ts b/ui/src/app/metadata/configuration/component/editor.component.ts
new file mode 100644
index 000000000..59f3ef375
--- /dev/null
+++ b/ui/src/app/metadata/configuration/component/editor.component.ts
@@ -0,0 +1,29 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { Metadata } from '../../domain/domain.type';
+
+
+@Component({
+    selector: 'metadata-editor',
+    templateUrl: './editor.component.html',
+    styleUrls: []
+})
+export class MetadataEditorComponent {
+
+    @Input() schema: any;
+    @Input() bindings: any;
+    @Input() validators: { [key: string]: any };
+    @Input() model: Metadata;
+    @Input() lockable: boolean;
+
+    @Output() change: EventEmitter<any> = new EventEmitter();
+    @Output() status: EventEmitter<any> = new EventEmitter();
+    @Output() onLockChange: EventEmitter<any> = new EventEmitter();
+
+    lock: FormControl = new FormControl(true);
+
+    constructor() {
+        this.lock.valueChanges.subscribe(locked => this.onLockChange.emit(locked));
+    }
+}
+
diff --git a/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html b/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html
index b8df62a11..cf1cfe3be 100644
--- a/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html
+++ b/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex justify-content-start align-items-center">
     <span class="mr-2">{{ index + 1 }}</span>
-    <div class="d-flex justify-content-between">
+    <div class="d-flex justify-content-between" *ngIf="editable">
         <button class="btn btn-link btn-sm" (click)="onUpdateOrderUp.emit(filter)" [disabled]="isFirst">
             <i class="fa fa-arrow-circle-up fa-2x sr-hidden"></i>
             <span class="sr-only" translate="action.move-up">Move Up</span>
@@ -19,7 +19,7 @@
 </div>
 <div *ngIf="open">
     <hr class="my-2" />
-    <div class="d-flex justify-content-end mb-2">
+    <div class="d-flex justify-content-end mb-2" *ngIf="editable">
         <div class="d-flex justify-content-between">
             <a class="btn btn-link"
                 [routerLink]="['../../', 'filter', filter.resourceId, 'edit']">
diff --git a/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.ts b/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.ts
index ede42a55a..9e5cb7630 100644
--- a/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.ts
+++ b/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.ts
@@ -16,6 +16,7 @@ export class FilterConfigurationListItemComponent implements OnChanges {
     @Input() index: number;
     @Input() isFirst: boolean;
     @Input() isLast: boolean;
+    @Input() editable: boolean;
 
     @Output() onUpdateOrderUp: EventEmitter<MetadataFilter> = new EventEmitter();
     @Output() onUpdateOrderDown: EventEmitter<MetadataFilter> = new EventEmitter();
diff --git a/ui/src/app/metadata/configuration/component/filter-configuration-list.component.html b/ui/src/app/metadata/configuration/component/filter-configuration-list.component.html
index c49a7738c..03d89d651 100644
--- a/ui/src/app/metadata/configuration/component/filter-configuration-list.component.html
+++ b/ui/src/app/metadata/configuration/component/filter-configuration-list.component.html
@@ -6,6 +6,7 @@
             [index]="i"
             [isFirst]="isFirst"
             [isLast]="isLast"
+            [editable]="editable"
             (onUpdateOrderDown)="onUpdateOrderDown.emit($event)"
             (onUpdateOrderUp)="onUpdateOrderUp.emit($event)"
             (onRemove)="onRemove.emit($event)"></filter-configuration-list-item>
diff --git a/ui/src/app/metadata/configuration/component/filter-configuration-list.component.ts b/ui/src/app/metadata/configuration/component/filter-configuration-list.component.ts
index 5208a7f4c..17f377480 100644
--- a/ui/src/app/metadata/configuration/component/filter-configuration-list.component.ts
+++ b/ui/src/app/metadata/configuration/component/filter-configuration-list.component.ts
@@ -1,8 +1,10 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { FilterListComponent } from '../../filter/component/filter-list.component';
 
 @Component({
     selector: 'filter-configuration-list',
     templateUrl: './filter-configuration-list.component.html'
 })
-export class FilterConfigurationListComponent extends FilterListComponent { }
+export class FilterConfigurationListComponent extends FilterListComponent {
+    @Input() editable = true;
+}
diff --git a/ui/src/app/metadata/configuration/component/history-list.component.html b/ui/src/app/metadata/configuration/component/history-list.component.html
index 168d0cf19..668308311 100644
--- a/ui/src/app/metadata/configuration/component/history-list.component.html
+++ b/ui/src/app/metadata/configuration/component/history-list.component.html
@@ -21,13 +21,11 @@
                 </div>
             </td>
             <td>
-                <a [routerLink]="['../', 'options']" [queryParams]="{'version': version.id}">
-                    <ng-container>
-                        {{ version.date | date:DATE_FORMAT }}&nbsp;
-                        <ng-container *ngIf="i === 0">
-                            (<translate-i18n key="label.current">Current</translate-i18n>)
-                        </ng-container>
-                    </ng-container>
+                <a [routerLink]="['../', 'options']" *ngIf="i === 0">
+                    {{ version.date | date:DATE_FORMAT }}&nbsp;(<translate-i18n key="label.current">Current</translate-i18n>)
+                </a>
+                <a [routerLink]="['../', 'version', version.id, 'options']" *ngIf="i > 0">
+                    {{ version.date | date:DATE_FORMAT }}
                 </a>
             </td>
             <td>{{ version.creator }}</td>
diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html
index f5ab2814b..f4826cfe6 100644
--- a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html
+++ b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html
@@ -1,8 +1,7 @@
 <div *ngIf="configuration">
     <section *ngFor="let section of configuration.sections; let i = index;" class="mb-4">
         <div class="config-group">
-            <div class="numbered-header d-flex justify-content-start bg-light align-items-center"
-                [ngClass]="{'py-2': !editable}">
+            <div class="numbered-header d-flex justify-content-start bg-light align-items-center">
                 <h2 class="title h4 m-0 flex-grow-1">
                     <span *ngIf="numbered"
                         class="d-inline-block px-2 py-1 mb-0 h4 number border border-secondary bg-white rounded-lg">
diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html
index 9041ae00e..5278ed3bd 100644
--- a/ui/src/app/metadata/configuration/component/metadata-header.component.html
+++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html
@@ -2,16 +2,17 @@
     <div class="card-body">
         <h5 class="card-title version-title">
             <translate-i18n key="label.saved">Saved</translate-i18n>:&nbsp;
-            <span class="save-date">{{ version.date | date:DATE_FORMAT }}</span>
+            <span class="save-date">{{ version.modifiedDate | date:DATE_FORMAT }}</span>
             <br />
             <translate-i18n key="label.by">By</translate-i18n>:&nbsp;
-            <span class="author">{{ version.creator }}</span>
+            <span class="author">{{ version.createdBy }}</span>
         </h5>
         <p class="card-text">
             <span class="badge badge-primary" *ngIf="isEnabled" translate="value.enabled">Enabled</span>
             <span class="badge badge-danger" *ngIf="!isEnabled" translate="value.disabled">Disabled</span>
             &nbsp;
             <span class="badge badge-primary" *ngIf="isCurrent" translate="value.current">Current</span>
+            <span class="badge badge-warning" *ngIf="!isCurrent" translate="value.not-current">Not Current</span>
         </p>
     </div>
 </div>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts
index e8db42c36..f3cfd0d45 100644
--- a/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/metadata-header.component.spec.ts
@@ -9,7 +9,6 @@ import { MetadataHeaderComponent } from './metadata-header.component';
         <metadata-header
             [isEnabled]="isEnabled"
             [version]="version"
-            [versionNumber]="versionNumber"
             [isCurrent]="isCurrent"
             ></metadata-header>
     `
@@ -25,7 +24,6 @@ class TestHostComponent {
         creator: 'foobar',
         date: new Date().toDateString()
     };
-    versionNumber = 1;
     isCurrent = false;
 }
 
diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.ts
index 590be316e..cc0df37b1 100644
--- a/ui/src/app/metadata/configuration/component/metadata-header.component.ts
+++ b/ui/src/app/metadata/configuration/component/metadata-header.component.ts
@@ -1,6 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { Metadata, MetadataTypes } from '../../domain/domain.type';
-import { MetadataVersion } from '../model/version';
+import { Metadata } from '../../domain/domain.type';
 
 import { CONFIG_DATE_FORMAT } from '../configuration.values';
 
@@ -12,8 +11,7 @@ import { CONFIG_DATE_FORMAT } from '../configuration.values';
 
 export class MetadataHeaderComponent {
     @Input() isEnabled: boolean;
-    @Input() version: MetadataVersion;
-    @Input() versionNumber: number;
+    @Input() version: Metadata;
     @Input() isCurrent: boolean;
 
     DATE_FORMAT = CONFIG_DATE_FORMAT;
diff --git a/ui/src/app/metadata/configuration/component/array-property.component.html b/ui/src/app/metadata/configuration/component/property/array-property.component.html
similarity index 100%
rename from ui/src/app/metadata/configuration/component/array-property.component.html
rename to ui/src/app/metadata/configuration/component/property/array-property.component.html
diff --git a/ui/src/app/metadata/configuration/component/array-property.component.scss b/ui/src/app/metadata/configuration/component/property/array-property.component.scss
similarity index 100%
rename from ui/src/app/metadata/configuration/component/array-property.component.scss
rename to ui/src/app/metadata/configuration/component/property/array-property.component.scss
diff --git a/ui/src/app/metadata/configuration/component/array-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/array-property.component.spec.ts
similarity index 89%
rename from ui/src/app/metadata/configuration/component/array-property.component.spec.ts
rename to ui/src/app/metadata/configuration/component/property/array-property.component.spec.ts
index 614738b06..c0dbcbb16 100644
--- a/ui/src/app/metadata/configuration/component/array-property.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/property/array-property.component.spec.ts
@@ -3,13 +3,13 @@ import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
-import { Property } from '../../domain/model/property';
-import { MockI18nModule } from '../../../../testing/i18n.stub';
-import { SCHEMA } from '../../../../testing/form-schema.stub';
-import { getStepProperty } from '../../domain/utility/configuration';
+import { Property } from '../../../domain/model/property';
+import { MockI18nModule } from '../../../../../testing/i18n.stub';
+import { SCHEMA } from '../../../../../testing/form-schema.stub';
+import { getStepProperty } from '../../../domain/utility/configuration';
 import { ArrayPropertyComponent } from './array-property.component';
-import { AttributesService } from '../../domain/service/attributes.service';
-import { MockAttributeService } from '../../../../testing/attributes.stub';
+import { AttributesService } from '../../../domain/service/attributes.service';
+import { MockAttributeService } from '../../../../../testing/attributes.stub';
 import { of } from 'rxjs';
 
 @Component({
diff --git a/ui/src/app/metadata/configuration/component/array-property.component.ts b/ui/src/app/metadata/configuration/component/property/array-property.component.ts
similarity index 86%
rename from ui/src/app/metadata/configuration/component/array-property.component.ts
rename to ui/src/app/metadata/configuration/component/property/array-property.component.ts
index a17ad01da..2c4de49bd 100644
--- a/ui/src/app/metadata/configuration/component/array-property.component.ts
+++ b/ui/src/app/metadata/configuration/component/property/array-property.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnChanges, Output, EventEmitter } from '@angular/core';
-import { Property } from '../../domain/model/property';
+import { Property } from '../../../domain/model/property';
 import { Observable, of } from 'rxjs';
-import { AttributesService } from '../../domain/service/attributes.service';
+import { AttributesService } from '../../../domain/service/attributes.service';
 import { ConfigurationPropertyComponent } from './configuration-property.component';
-import UriValidator from '../../../shared/validation/uri.validator';
+import UriValidator from '../../../../shared/validation/uri.validator';
 
 @Component({
     selector: 'array-property',
diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/configuration-property.component.spec.ts
similarity index 85%
rename from ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts
rename to ui/src/app/metadata/configuration/component/property/configuration-property.component.spec.ts
index aa7fd9478..cccfd9114 100644
--- a/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/property/configuration-property.component.spec.ts
@@ -2,11 +2,11 @@ import { Component, ViewChild, Input } from '@angular/core';
 import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
-import { Property } from '../../domain/model/property';
-import { MockI18nModule } from '../../../../testing/i18n.stub';
-import { SCHEMA } from '../../../../testing/form-schema.stub';
-import { getStepProperties, getStepProperty } from '../../domain/utility/configuration';
+import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
+import { Property } from '../../../domain/model/property';
+import { MockI18nModule } from '../../../../../testing/i18n.stub';
+import { SCHEMA } from '../../../../../testing/form-schema.stub';
+import { getStepProperty } from '../../../domain/utility/configuration';
 import { ConfigurationPropertyComponent } from './configuration-property.component';
 
 @Component({
diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.ts b/ui/src/app/metadata/configuration/component/property/configuration-property.component.ts
similarity index 91%
rename from ui/src/app/metadata/configuration/component/configuration-property.component.ts
rename to ui/src/app/metadata/configuration/component/property/configuration-property.component.ts
index 5418bde30..7e666bc03 100644
--- a/ui/src/app/metadata/configuration/component/configuration-property.component.ts
+++ b/ui/src/app/metadata/configuration/component/property/configuration-property.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { Property } from '../../domain/model/property';
+import { Property } from '../../../domain/model/property';
 
 @Component({
     selector: 'configuration-property',
diff --git a/ui/src/app/metadata/configuration/component/filter-target-property.component.html b/ui/src/app/metadata/configuration/component/property/filter-target-property.component.html
similarity index 100%
rename from ui/src/app/metadata/configuration/component/filter-target-property.component.html
rename to ui/src/app/metadata/configuration/component/property/filter-target-property.component.html
diff --git a/ui/src/app/metadata/configuration/component/filter-target-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/filter-target-property.component.spec.ts
similarity index 79%
rename from ui/src/app/metadata/configuration/component/filter-target-property.component.spec.ts
rename to ui/src/app/metadata/configuration/component/property/filter-target-property.component.spec.ts
index 98c08d4c4..d1308787d 100644
--- a/ui/src/app/metadata/configuration/component/filter-target-property.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/property/filter-target-property.component.spec.ts
@@ -3,15 +3,12 @@ import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
-import { Property } from '../../domain/model/property';
-import { MockI18nModule } from '../../../../testing/i18n.stub';
-import { SCHEMA } from '../../../../testing/form-schema.stub';
-import { getStepProperty } from '../../domain/utility/configuration';
+import { Property } from '../../../domain/model/property';
+import { MockI18nModule } from '../../../../../testing/i18n.stub';
+import { SCHEMA } from '../../../../../testing/form-schema.stub';
+import { getStepProperty } from '../../../domain/utility/configuration';
 import { FilterTargetPropertyComponent } from './filter-target-property.component';
-import { PrimitivePropertyComponent } from './primitive-property.component';
-import { ArrayPropertyComponentStub, PrimitivePropertyComponentStub } from '../../../../testing/property-component.stub';
-import { AttributesService } from '../../domain/service/attributes.service';
-import { of } from 'rxjs';
+import { ArrayPropertyComponentStub, PrimitivePropertyComponentStub } from '../../../../../testing/property-component.stub';
 
 @Component({
     template: `
diff --git a/ui/src/app/metadata/configuration/component/filter-target-property.component.ts b/ui/src/app/metadata/configuration/component/property/filter-target-property.component.ts
similarity index 91%
rename from ui/src/app/metadata/configuration/component/filter-target-property.component.ts
rename to ui/src/app/metadata/configuration/component/property/filter-target-property.component.ts
index 6b7ebf216..8c0e89b00 100644
--- a/ui/src/app/metadata/configuration/component/filter-target-property.component.ts
+++ b/ui/src/app/metadata/configuration/component/property/filter-target-property.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { Property } from '../../domain/model/property';
+import { Property } from '../../../domain/model/property';
 import { ConfigurationPropertyComponent } from './configuration-property.component';
 
 @Component({
diff --git a/ui/src/app/metadata/configuration/component/object-property.component.html b/ui/src/app/metadata/configuration/component/property/object-property.component.html
similarity index 100%
rename from ui/src/app/metadata/configuration/component/object-property.component.html
rename to ui/src/app/metadata/configuration/component/property/object-property.component.html
diff --git a/ui/src/app/metadata/configuration/component/object-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/object-property.component.spec.ts
similarity index 87%
rename from ui/src/app/metadata/configuration/component/object-property.component.spec.ts
rename to ui/src/app/metadata/configuration/component/property/object-property.component.spec.ts
index 8817711c9..d9ddcdd97 100644
--- a/ui/src/app/metadata/configuration/component/object-property.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/property/object-property.component.spec.ts
@@ -3,11 +3,11 @@ import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
-import { Property } from '../../domain/model/property';
-import { MockI18nModule } from '../../../../testing/i18n.stub';
+import { Property } from '../../../domain/model/property';
+import { MockI18nModule } from '../../../../../testing/i18n.stub';
 import { ObjectPropertyComponent } from './object-property.component';
-import { SCHEMA } from '../../../../testing/form-schema.stub';
-import { getStepProperty } from '../../domain/utility/configuration';
+import { SCHEMA } from '../../../../../testing/form-schema.stub';
+import { getStepProperty } from '../../../domain/utility/configuration';
 import { PrimitivePropertyComponent } from './primitive-property.component';
 import { ArrayPropertyComponent } from './array-property.component';
 import { FilterTargetPropertyComponent } from './filter-target-property.component';
diff --git a/ui/src/app/metadata/configuration/component/object-property.component.ts b/ui/src/app/metadata/configuration/component/property/object-property.component.ts
similarity index 89%
rename from ui/src/app/metadata/configuration/component/object-property.component.ts
rename to ui/src/app/metadata/configuration/component/property/object-property.component.ts
index 1fafafa25..9eef4afbd 100644
--- a/ui/src/app/metadata/configuration/component/object-property.component.ts
+++ b/ui/src/app/metadata/configuration/component/property/object-property.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { Property } from '../../domain/model/property';
+import { Property } from '../../../domain/model/property';
 import { ConfigurationPropertyComponent } from './configuration-property.component';
 
 @Component({
diff --git a/ui/src/app/metadata/configuration/component/primitive-property.component.html b/ui/src/app/metadata/configuration/component/property/primitive-property.component.html
similarity index 100%
rename from ui/src/app/metadata/configuration/component/primitive-property.component.html
rename to ui/src/app/metadata/configuration/component/property/primitive-property.component.html
diff --git a/ui/src/app/metadata/configuration/component/primitive-property.component.spec.ts b/ui/src/app/metadata/configuration/component/property/primitive-property.component.spec.ts
similarity index 92%
rename from ui/src/app/metadata/configuration/component/primitive-property.component.spec.ts
rename to ui/src/app/metadata/configuration/component/property/primitive-property.component.spec.ts
index 9ce81bfb5..dbc3eed4f 100644
--- a/ui/src/app/metadata/configuration/component/primitive-property.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/property/primitive-property.component.spec.ts
@@ -3,8 +3,8 @@ import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-import { Property } from '../../domain/model/property';
-import { MockI18nModule } from '../../../../testing/i18n.stub';
+import { Property } from '../../../domain/model/property';
+import { MockI18nModule } from '../../../../../testing/i18n.stub';
 import { PrimitivePropertyComponent } from './primitive-property.component';
 
 @Component({
diff --git a/ui/src/app/metadata/configuration/component/primitive-property.component.ts b/ui/src/app/metadata/configuration/component/property/primitive-property.component.ts
similarity index 100%
rename from ui/src/app/metadata/configuration/component/primitive-property.component.ts
rename to ui/src/app/metadata/configuration/component/property/primitive-property.component.ts
diff --git a/ui/src/app/metadata/configuration/configuration.module.ts b/ui/src/app/metadata/configuration/configuration.module.ts
index 906bed24d..ae332ddf3 100644
--- a/ui/src/app/metadata/configuration/configuration.module.ts
+++ b/ui/src/app/metadata/configuration/configuration.module.ts
@@ -11,10 +11,12 @@ import { ConfigurationComponent } from './container/configuration.component';
 import { MetadataConfigurationService } from './service/configuration.service';
 import * as fromConfig from './reducer';
 import { MetadataConfigurationEffects } from './effect/configuration.effect';
-import { ConfigurationPropertyComponent } from './component/configuration-property.component';
-import { PrimitivePropertyComponent } from './component/primitive-property.component';
-import { ObjectPropertyComponent } from './component/object-property.component';
-import { ArrayPropertyComponent } from './component/array-property.component';
+import { ConfigurationPropertyComponent } from './component/property/configuration-property.component';
+import { PrimitivePropertyComponent } from './component/property/primitive-property.component';
+import { ObjectPropertyComponent } from './component/property/object-property.component';
+import { ArrayPropertyComponent } from './component/property/array-property.component';
+import { FilterTargetPropertyComponent } from './component/property/filter-target-property.component';
+
 import { MetadataOptionsComponent } from './container/metadata-options.component';
 import { MetadataXmlComponent } from './container/metadata-xml.component';
 import { MetadataHeaderComponent } from './component/metadata-header.component';
@@ -29,9 +31,19 @@ import { FilterModule } from '../filter/filter.module';
 import { FilterConfigurationListComponent } from './component/filter-configuration-list.component';
 import { FilterConfigurationListItemComponent } from './component/filter-configuration-list-item.component';
 import { SharedModule } from '../../shared/shared.module';
-import { FilterTargetPropertyComponent } from './component/filter-target-property.component';
+
 import { RestoreComponent } from './container/restore.component';
-import { RestoreVersionEffects } from './effect/restore.effect';
+import { RestoreEffects } from './effect/restore.effect';
+import { VersionComponent } from './container/version.component';
+import { VersionOptionsComponent } from './container/version-options.component';
+import { VersionEffects } from './effect/version.effect';
+import { MetadataEditorComponent } from './component/editor.component';
+import { WizardModule } from '../../wizard/wizard.module';
+import { FormModule } from '../../schema-form/schema-form.module';
+import { RestoreEditComponent } from './container/restore-edit.component';
+import { RestoreEditStepComponent } from './container/restore-edit-step.component';
+
+import { IndexResolver } from './service/index-resolver.service';
 
 @NgModule({
     declarations: [
@@ -50,7 +62,12 @@ import { RestoreVersionEffects } from './effect/restore.effect';
         FilterConfigurationListComponent,
         FilterConfigurationListItemComponent,
         FilterTargetPropertyComponent,
-        RestoreComponent
+        RestoreComponent,
+        VersionComponent,
+        VersionOptionsComponent,
+        MetadataEditorComponent,
+        RestoreEditComponent,
+        RestoreEditStepComponent
     ],
     entryComponents: [],
     imports: [
@@ -60,11 +77,14 @@ import { RestoreVersionEffects } from './effect/restore.effect';
         RouterModule,
         DomainModule,
         FilterModule,
-        SharedModule
+        SharedModule,
+        WizardModule,
+        FormModule
     ],
     exports: [],
     providers: [
-        DatePipe
+        DatePipe,
+        IndexResolver
     ]
 })
 export class MetadataConfigurationModule {
@@ -88,7 +108,8 @@ export class MetadataConfigurationModule {
                 MetadataConfigurationEffects,
                 MetadataHistoryEffects,
                 CompareVersionEffects,
-                RestoreVersionEffects
+                RestoreEffects,
+                VersionEffects
             ])
     ],
     providers: []
diff --git a/ui/src/app/metadata/configuration/configuration.routing.ts b/ui/src/app/metadata/configuration/configuration.routing.ts
index dc3f5df99..fec3c84da 100644
--- a/ui/src/app/metadata/configuration/configuration.routing.ts
+++ b/ui/src/app/metadata/configuration/configuration.routing.ts
@@ -5,6 +5,11 @@ import { MetadataXmlComponent } from './container/metadata-xml.component';
 import { MetadataHistoryComponent } from './container/metadata-history.component';
 import { MetadataComparisonComponent } from './container/metadata-comparison.component';
 import { RestoreComponent } from './container/restore.component';
+import { VersionComponent } from './container/version.component';
+import { VersionOptionsComponent } from './container/version-options.component';
+import { RestoreEditComponent } from './container/restore-edit.component';
+import { IndexResolver } from './service/index-resolver.service';
+import { RestoreEditStepComponent } from './container/restore-edit-step.component';
 
 export const ConfigurationRoutes: Routes = [
     {
@@ -32,8 +37,35 @@ export const ConfigurationRoutes: Routes = [
                 component: MetadataComparisonComponent
             },
             {
-                path: 'restore',
-                component: RestoreComponent
+                path: 'version/:version',
+                component: VersionComponent,
+                children: [
+                    {
+                        path: 'options',
+                        component: VersionOptionsComponent
+                    },
+                    {
+                        path: 'restore',
+                        component: RestoreComponent
+                    },
+                    {
+                        path: 'edit',
+                        redirectTo: 'edit/common'
+                    },
+                    {
+                        path: 'edit',
+                        component: RestoreEditComponent,
+                        children: [
+                            {
+                                path: ':index',
+                                component: RestoreEditStepComponent,
+                                resolve: {
+                                    index: IndexResolver
+                                }
+                            }
+                        ]
+                    }
+                ]
             }
         ]
     }
diff --git a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts
index 0d2fca0d3..b1d9bc2f2 100644
--- a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts
+++ b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts
@@ -1,10 +1,9 @@
-import { Component, ViewChild, Input } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { TestBed, async, ComponentFixture } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule, combineReducers } from '@ngrx/store';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { MetadataConfiguration } from '../model/metadata-configuration';
 import { ConfigurationComponent } from './configuration.component';
 import * as fromConfiguration from '../reducer';
 import * as fromProviders from '../../provider/reducer';
@@ -19,11 +18,6 @@ import { MockI18nModule } from '../../../../testing/i18n.stub';
 class TestHostComponent {
     @ViewChild(ConfigurationComponent)
     public componentUnderTest: ConfigurationComponent;
-
-    configuration: MetadataConfiguration = {
-        dates: [],
-        sections: []
-    };
 }
 
 describe('Metadata Configuration Page Component', () => {
@@ -59,12 +53,4 @@ describe('Metadata Configuration Page Component', () => {
     it('should load metadata objects', async(() => {
         expect(app).toBeTruthy();
     }));
-
-    describe('hasVersion function', () => {
-        it('should determine if a version is defined', () => {
-            expect(app.hasVersion([[{id: 'foo'}], { version: 'foo' }])).toBe('foo');
-            expect(app.hasVersion([[{ id: 'foo' }], {}])).toBe('foo');
-            expect(app.hasVersion([[], {}])).toBeNull();
-        });
-    });
 });
diff --git a/ui/src/app/metadata/configuration/container/configuration.component.ts b/ui/src/app/metadata/configuration/container/configuration.component.ts
index 295f90257..c1e2daf35 100644
--- a/ui/src/app/metadata/configuration/container/configuration.component.ts
+++ b/ui/src/app/metadata/configuration/container/configuration.component.ts
@@ -1,13 +1,12 @@
-import { Component, ChangeDetectionStrategy, OnDestroy, HostListener } from '@angular/core';
-import { ActivatedRoute, Router, Scroll, Event } from '@angular/router';
-import { takeUntil, map, withLatestFrom, filter, timeout, delay } from 'rxjs/operators';
+import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { takeUntil, map } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
-import { Observable, Subject, interval, combineLatest } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 
 import * as fromConfiguration from '../reducer';
 
 import { ClearConfiguration, SetMetadata } from '../action/configuration.action';
-import { LoadHistoryRequest, ClearHistory, SelectVersion } from '../action/history.action';
 import * as fromReducer from '../reducer';
 
 @Component({
@@ -22,39 +21,20 @@ export class ConfigurationComponent implements OnDestroy {
     name$: Observable<string>;
     type$: Observable<string>;
 
-    hasVersion = ([collection, params]) => params.version || collection && collection.length > 0 ? collection[0].id : null;
-
     constructor(
         private store: Store<fromConfiguration.ConfigurationState>,
         private routerState: ActivatedRoute
     ) {
 
-        combineLatest(
-            this.routerState.params,
-            this.routerState.queryParams
-        ).pipe(
+        this.routerState.params.pipe(
             takeUntil(this.ngUnsubscribe),
-            map(([{ id, type }, { version }]) => new SetMetadata({
+            map(({ id, type, version }) => new SetMetadata({
                 id,
                 type,
                 version
             }))
         ).subscribe(this.store);
 
-        this.routerState.params.pipe(
-            takeUntil(this.ngUnsubscribe),
-            map(params => new LoadHistoryRequest({ id: params.id, type: params.type }))
-        ).subscribe(store);
-
-        this.store.select(fromReducer.getVersionCollection).pipe(
-            filter(collection => collection && collection.length > 0),
-            takeUntil(this.ngUnsubscribe),
-            withLatestFrom(
-                this.routerState.queryParams
-            ),
-            map(this.hasVersion)
-        ).subscribe(version => this.store.dispatch(new SelectVersion(version)));
-
         this.name$ = this.store.select(fromReducer.getConfigurationModelName);
         this.type$ = this.store.select(fromReducer.getConfigurationModelType);
     }
@@ -63,6 +43,5 @@ export class ConfigurationComponent implements OnDestroy {
         this.ngUnsubscribe.next();
         this.ngUnsubscribe.complete();
         this.store.dispatch(new ClearConfiguration());
-        this.store.dispatch(new ClearHistory());
     }
 }
diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
index 7117b7bf6..8e652d1c2 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.html
@@ -4,7 +4,7 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
     <ng-container *ngSwitchDefault translate="label.provider">Provider</ng-container>
     Configuration
 </h2>
-<div class="" [ngClass]="{
+<div *ngIf="!(loading$ | async)" class="" [ngClass]="{
     'container-fluid': (numVersions$ | async) > 2,
     'container': (numVersions$ | async) <= 2
 }">
@@ -14,5 +14,9 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
             <translate-i18n key="action.version-history">Version History</translate-i18n>
         </a>
     </div>
-    <metadata-configuration [configuration]="versions$ | async"></metadata-configuration>
+    <metadata-configuration [configuration]="versions$ | async" [editable]="false"></metadata-configuration>
+</div>
+<div *ngIf="loading$ | async" class="d-flex justify-content-center">
+    <i class="fa fa-spinner fa-pulse fa-4x fa-fw"></i>
+    <span class="sr-only">Loading...</span>
 </div>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
index cec29c2a6..1b1834fa1 100644
--- a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
@@ -1,10 +1,10 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { ActivatedRoute } from '@angular/router';
 import { map } from 'rxjs/operators';
-import { ConfigurationState, getVersionConfigurations, getVersionConfigurationCount } from '../reducer';
-import { CompareVersionRequest } from '../action/compare.action';
+import { ConfigurationState, getComparisonConfigurations, getComparisonConfigurationCount } from '../reducer';
+import { CompareVersionRequest, ClearVersions } from '../action/compare.action';
 import { MetadataConfiguration } from '../model/metadata-configuration';
 import * as fromReducer from '../reducer';
 
@@ -14,11 +14,12 @@ import * as fromReducer from '../reducer';
     templateUrl: './metadata-comparison.component.html',
     styleUrls: []
 })
-export class MetadataComparisonComponent {
+export class MetadataComparisonComponent implements OnDestroy {
 
     versions$: Observable<MetadataConfiguration>;
     numVersions$: Observable<number>;
     type$: Observable<string>;
+    loading$: Observable<boolean> = this.store.select(fromReducer.getComparisonLoading);
 
     constructor(
         private store: Store<ConfigurationState>,
@@ -26,11 +27,16 @@ export class MetadataComparisonComponent {
     ) {
         this.activatedRoute.queryParams.pipe(
             map(params => params.versions),
+            map(versions => Array.isArray(versions) ? versions : [versions]),
             map(versions => new CompareVersionRequest(versions))
         ).subscribe(this.store);
 
-        this.versions$ = this.store.select(getVersionConfigurations);
-        this.numVersions$ = this.store.select(getVersionConfigurationCount);
+        this.versions$ = this.store.select(getComparisonConfigurations);
+        this.numVersions$ = this.store.select(getComparisonConfigurationCount);
         this.type$ = this.store.select(fromReducer.getConfigurationModelType);
     }
+
+    ngOnDestroy(): void {
+        this.store.dispatch(new ClearVersions());
+    }
 }
diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.html b/ui/src/app/metadata/configuration/container/metadata-history.component.html
index 5291b4907..23c2b4595 100644
--- a/ui/src/app/metadata/configuration/container/metadata-history.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-history.component.html
@@ -1,9 +1,13 @@
 <h2 class="mb-4">
     Version History
 </h2>
-<div class="container">
+<div class="container" *ngIf="!(loading$ | async)">
     <history-list
         [history]="history$ | async"
         (compare)="compareVersions($event)"
         (restore)="restoreVersion($event)"></history-list>
 </div>
+<div *ngIf="loading$ | async" class="d-flex justify-content-center">
+    <i class="fa fa-spinner fa-pulse fa-4x fa-fw"></i>
+    <span class="sr-only">Loading...</span>
+</div>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.ts b/ui/src/app/metadata/configuration/container/metadata-history.component.ts
index 7d817b94f..c2c1d0a1a 100644
--- a/ui/src/app/metadata/configuration/container/metadata-history.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-history.component.ts
@@ -1,11 +1,17 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
+import { Observable, combineLatest, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';
-import { ConfigurationState, getVersionCollection } from '../reducer';
+import {
+    ConfigurationState,
+    getVersionCollection,
+    getConfigurationModelId,
+    getConfigurationModelKind,
+    getHistoryLoading
+} from '../reducer';
 import { MetadataVersion } from '../model/version';
-import { CompareVersionRequest } from '../action/compare.action';
 import { Router, ActivatedRoute } from '@angular/router';
-import { map } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs/operators';
+import { LoadHistoryRequest, ClearHistory } from '../action/history.action';
 
 @Component({
     selector: 'metadata-history',
@@ -13,15 +19,27 @@ import { map } from 'rxjs/operators';
     templateUrl: './metadata-history.component.html',
     styleUrls: []
 })
-export class MetadataHistoryComponent {
+export class MetadataHistoryComponent implements OnDestroy {
+
+    private ngUnsubscribe: Subject<void> = new Subject<void>();
 
     history$: Observable<MetadataVersion[]>;
+    loading$: Observable<boolean> = this.store.select(getHistoryLoading);
 
     constructor(
         private store: Store<ConfigurationState>,
         private router: Router,
         private route: ActivatedRoute
     ) {
+        combineLatest(
+            this.store.select(getConfigurationModelId),
+            this.store.select(getConfigurationModelKind)
+        ).pipe(
+            takeUntil(this.ngUnsubscribe),
+            map(([id, kind]) => ({ id, type: kind })),
+            map(request => new LoadHistoryRequest(request))
+        ).subscribe(store);
+
         this.history$ = this.store.select(getVersionCollection)
             .pipe(map(versions => this.sortVersionsByDate(versions)));
     }
@@ -47,11 +65,16 @@ export class MetadataHistoryComponent {
 
     restoreVersion(version: MetadataVersion): void {
         this.router.navigate(
-            [ '../', 'restore' ],
+            [ '../', 'version', version.id, 'restore' ],
             {
-                queryParams: { version: version.id },
                 relativeTo: this.route
             }
         );
     }
+
+    ngOnDestroy() {
+        this.ngUnsubscribe.next();
+        this.ngUnsubscribe.complete();
+        this.store.dispatch(new ClearHistory());
+    }
 }
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html
index ebed36bf3..390d6981c 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.html
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html
@@ -6,9 +6,8 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
 <div class="container" id="header">
     <metadata-header
         [isEnabled]="isEnabled$ | async"
-        [version]="version$ | async"
-        [versionNumber]="versionNumber$ | async"
-        [isCurrent]="isCurrent$ | async"
+        [version]="model$ | async"
+        [isCurrent]="true"
         ></metadata-header>
     <div class="px-3 my-3 d-flex justify-content-between" id="navigation">
         <div>
@@ -32,10 +31,16 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
                 translate="action.xml">XML</a>
         </div>
     </div>
-    <metadata-configuration
-        [configuration]="configuration$ | async"
-        id="configuration">
-    </metadata-configuration>
+    <ng-container *ngIf="configuration$ | async">
+        <metadata-configuration [configuration]="configuration$ | async" id="configuration"></metadata-configuration>
+    </ng-container>
+    <ng-container *ngIf="!(configuration$ | async)">
+        <metadata-configuration [configuration]="configuration$ | async" id="configuration"></metadata-configuration>
+        <div class="d-flex justify-content-center">
+            <i class="fa fa-spinner fa-pulse fa-4x fa-fw"></i>
+            <span class="sr-only">Loading...</span>
+        </div>
+    </ng-container>
     <div *ngIf="kind === 'provider'" id="filters">
         <div class="numbered-header d-flex justify-content-start bg-light align-items-center">
             <h2 class="title h4 m-0 ml-2 flex-grow-1">
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts
index ddd4f0df6..8b3d3281f 100644
--- a/ui/src/app/metadata/configuration/container/metadata-options.component.ts
+++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts
@@ -9,17 +9,13 @@ import { takeUntil, filter } from 'rxjs/operators';
 import {
     ConfigurationState,
     getConfigurationSections,
-    getSelectedVersion,
-    getSelectedVersionNumber,
     getSelectedIsCurrent,
     getConfigurationModelEnabled,
     getConfigurationHasXml,
     getConfigurationModel,
-    getConfigurationDefinition,
     getConfigurationModelType
 } from '../reducer';
 import { MetadataConfiguration } from '../model/metadata-configuration';
-import { MetadataVersion } from '../model/version';
 import { MetadataFilter } from '../../domain/model';
 import { getAdditionalFilters } from '../../filter/reducer';
 import {
@@ -32,7 +28,7 @@ import {
 
 import { Metadata } from '../../domain/domain.type';
 import { DeleteFilterComponent } from '../../provider/component/delete-filter.component';
-import { Wizard } from '../../../wizard/model';
+import { ClearHistory } from '../action/history.action';
 
 @Component({
     selector: 'metadata-options-page',
@@ -42,52 +38,29 @@ import { Wizard } from '../../../wizard/model';
 })
 export class MetadataOptionsComponent implements OnDestroy {
 
-    private ngUnsubscribe: Subject<void> = new Subject<void>();
+    protected ngUnsubscribe: Subject<void> = new Subject<void>();
 
-    configuration$: Observable<MetadataConfiguration>;
-    isEnabled$: Observable<boolean>;
-    version$: Observable<MetadataVersion>;
-    versionNumber$: Observable<number>;
-    isCurrent$: Observable<boolean>;
-    hasXml$: Observable<boolean>;
-    filters$: Observable<unknown[]>;
-    model$: Observable<Metadata>;
-    definition: Wizard<any>;
-    type$: Observable<string>;
+    configuration$: Observable<MetadataConfiguration> = this.store.select(getConfigurationSections);
+    isEnabled$: Observable<boolean> = this.store.select(getConfigurationModelEnabled);
+    isCurrent$: Observable<boolean> = this.store.select(getSelectedIsCurrent);
+    hasXml$: Observable<boolean> = this.store.select(getConfigurationHasXml);
+    filters$: Observable<unknown[]> = this.store.select(getAdditionalFilters);
+    model$: Observable<Metadata> = this.store.select(getConfigurationModel);
+    type$: Observable<string> = this.store.select(getConfigurationModelType);
     id: string;
     kind: string;
 
-    htmlTags = ['DIV', 'A', 'METADATA-CONFIGURATION', 'METADATA-HEADER'];
-    currentSection: string;
-
     constructor(
-        private store: Store<ConfigurationState>,
-        private modalService: NgbModal,
-        private router: Router,
-        private scroller: ViewportScroller
+        protected store: Store<ConfigurationState>,
+        protected modalService: NgbModal,
+        protected scroller: ViewportScroller
     ) {
-        this.configuration$ = this.store.select(getConfigurationSections);
-        this.model$ = this.store.select(getConfigurationModel);
-        this.isEnabled$ = this.store.select(getConfigurationModelEnabled);
-        this.version$ = this.store.select(getSelectedVersion);
-        this.versionNumber$ = this.store.select(getSelectedVersionNumber);
-        this.isCurrent$ = this.store.select(getSelectedIsCurrent);
-        this.hasXml$ = this.store.select(getConfigurationHasXml);
-        this.filters$ = this.store.select(getAdditionalFilters);
-        this.type$ = this.store.select(getConfigurationModelType);
-
         this.model$
             .pipe(
                 takeUntil(this.ngUnsubscribe),
                 filter(model => !!model)
             )
             .subscribe(p => this.setModel(p));
-
-        this.store.select(getConfigurationDefinition)
-            .pipe(
-                takeUntil(this.ngUnsubscribe)
-            )
-            .subscribe(d => this.definition = d);
     }
 
     setModel(data: Metadata): void {
@@ -129,5 +102,6 @@ export class MetadataOptionsComponent implements OnDestroy {
         this.ngUnsubscribe.complete();
 
         this.store.dispatch(new ClearFilters());
+        this.store.dispatch(new ClearHistory());
     }
 }
diff --git a/ui/src/app/metadata/configuration/container/restore-edit-step.component.html b/ui/src/app/metadata/configuration/container/restore-edit-step.component.html
new file mode 100644
index 000000000..be953b86b
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/restore-edit-step.component.html
@@ -0,0 +1,9 @@
+<metadata-editor
+    [schema]="schema$ | async"
+    [model]="model$ | async"
+    [validators]="validators$ | async"
+    [lockable]="lockable$ | async"
+    (change)="onChange($event)"
+    (status)="statusChange$.next($event)"
+    (onLockChange)="lockChange$.next($event)"
+></metadata-editor>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/container/restore-edit-step.component.spec.ts b/ui/src/app/metadata/configuration/container/restore-edit-step.component.spec.ts
new file mode 100644
index 000000000..d42f0be51
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/restore-edit-step.component.spec.ts
@@ -0,0 +1,107 @@
+import { Component, ViewChild, NO_ERRORS_SCHEMA } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, combineReducers, Store } from '@ngrx/store';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { RestoreEditStepComponent } from './restore-edit-step.component';
+import * as fromConfiguration from '../reducer';
+import * as fromProviders from '../../provider/reducer';
+import * as fromResolvers from '../../resolver/reducer';
+import * as fromWizard from '../../../wizard/reducer';
+import { MockI18nModule } from '../../../../testing/i18n.stub';
+
+import {
+    RestoreActionTypes
+} from '../action/restore.action';
+import { WizardActionTypes } from '../../../wizard/action/wizard.action';
+
+@Component({
+    template: `
+        <restore-edit-step></restore-edit-step>
+    `
+})
+class TestHostComponent {
+    @ViewChild(RestoreEditStepComponent)
+    public componentUnderTest: RestoreEditStepComponent;
+}
+
+describe('Restore Version Edit Step Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: RestoreEditStepComponent;
+    let store: Store<fromConfiguration.State>;
+    let dispatchSpy;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule,
+                StoreModule.forRoot({
+                    'metadata-configuration': combineReducers(fromConfiguration.reducers),
+                    'provider': combineReducers(fromProviders.reducers),
+                    'resolver': combineReducers(fromResolvers.reducers),
+                    'wizard': combineReducers(fromWizard.reducers)
+                }),
+                MockI18nModule,
+                RouterTestingModule
+            ],
+            declarations: [
+                RestoreEditStepComponent,
+                TestHostComponent
+            ],
+            schemas: [
+                NO_ERRORS_SCHEMA
+            ]
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        dispatchSpy = spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should compile', () => {
+        expect(app).toBeTruthy();
+    });
+
+    describe('onChange', () => {
+        it('should dispatch an update changes event', () => {
+            app.onChange({ name: 'test' });
+            expect(store.dispatch).toHaveBeenCalled();
+            expect(dispatchSpy.calls.mostRecent().args[0].type).toBe(RestoreActionTypes.UPDATE_RESTORATION_REQUEST);
+        });
+    });
+
+    describe('updateStatus', () => {
+        it('should dispatch an update form status event', () => {
+            app.updateStatus({ value: 'foo' }, 'common');
+            expect(store.dispatch).toHaveBeenCalled();
+            expect(dispatchSpy.calls.mostRecent().args[0].type).toBe(RestoreActionTypes.UPDATE_STATUS);
+        });
+
+        it('should dispatch an update form status event', () => {
+            app.updateStatus({}, 'common');
+            expect(store.dispatch).toHaveBeenCalled();
+            expect(dispatchSpy.calls.mostRecent().args[0].type).toBe(RestoreActionTypes.UPDATE_STATUS);
+        });
+    });
+
+    describe('updateLock', () => {
+        it('should dispatch a LockEditor event when passed a locked status', () => {
+            app.updateLock(true);
+            expect(store.dispatch).toHaveBeenCalled();
+            expect(dispatchSpy.calls.mostRecent().args[0].type).toBe(WizardActionTypes.LOCK);
+        });
+
+        it('should dispatch a UnlockEditor event when passed a locked status', () => {
+            app.updateLock(false);
+            expect(store.dispatch).toHaveBeenCalled();
+            expect(dispatchSpy.calls.mostRecent().args[0].type).toBe(WizardActionTypes.UNLOCK);
+        });
+    });
+});
diff --git a/ui/src/app/metadata/configuration/container/restore-edit-step.component.ts b/ui/src/app/metadata/configuration/container/restore-edit-step.component.ts
new file mode 100644
index 000000000..2a9a73a0e
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/restore-edit-step.component.ts
@@ -0,0 +1,84 @@
+import { Component, OnDestroy } from '@angular/core';
+import { Observable, combineLatest, of, Subject } from 'rxjs';
+import { ActivatedRoute } from '@angular/router';
+import { Store } from '@ngrx/store';
+import {
+    ConfigurationState, getFormattedModel
+} from '../reducer';
+import { getWizardDefinition, getSchema, getValidators, getCurrent, getWizardIndex } from '../../../wizard/reducer';
+import { Wizard, WizardStep } from '../../../wizard/model';
+import { Metadata } from '../../domain/domain.type';
+import { map, switchMap, withLatestFrom, filter } from 'rxjs/operators';
+import { NAV_FORMATS } from '../../domain/component/editor-nav.component';
+import { UpdateRestorationChangesRequest, UpdateRestoreFormStatus } from '../action/restore.action';
+import { LockEditor, UnlockEditor } from '../../../wizard/action/wizard.action';
+import { takeUntil } from 'rxjs/operators';
+
+@Component({
+    selector: 'restore-edit-step',
+    templateUrl: './restore-edit-step.component.html',
+    styleUrls: []
+})
+
+export class RestoreEditStepComponent implements OnDestroy {
+
+    private ngUnsubscribe: Subject<void> = new Subject<void>();
+
+    readonly lockChange$: Subject<boolean> = new Subject<boolean>();
+    readonly statusChange$: Subject<any> = new Subject<any>();
+
+    definition$: Observable<Wizard<Metadata>> = this.store.select(getWizardDefinition);
+    schema$: Observable<any> = this.store.select(getSchema);
+    model$: Observable<Metadata> = this.store.select(getFormattedModel);
+    step$: Observable<WizardStep> = this.store.select(getCurrent);
+
+    lockable$: Observable<boolean> = this.step$.pipe(filter(s => !!s), map(step => step.locked));
+
+    validators$: Observable<any>;
+
+    formats = NAV_FORMATS;
+
+    constructor(
+        private store: Store<ConfigurationState>
+    ) {
+        this.validators$ = this.definition$.pipe(
+            filter(def => !!def),
+            map(def => def.validatorParams),
+            switchMap(params => combineLatest(params.map(p => this.store.select(p)))),
+            switchMap(selections => this.store.select(getValidators(selections)))
+        );
+
+        this.step$
+            .pipe(takeUntil(this.ngUnsubscribe), filter(step => !!step))
+            .subscribe(s => this.lockChange$.next(s.locked ? true : false));
+
+        this.lockChange$
+            .pipe(takeUntil(this.ngUnsubscribe))
+            .subscribe(locked => this.updateLock(locked));
+
+        this.statusChange$
+            .pipe(
+                takeUntil(this.ngUnsubscribe),
+                withLatestFrom(this.store.select(getWizardIndex))
+            )
+            .subscribe(([errors, currentPage]) => this.updateStatus(errors, currentPage));
+    }
+
+    onChange(changes: any): void {
+        this.store.dispatch(new UpdateRestorationChangesRequest(changes));
+    }
+
+    updateStatus(errors, currentPage) {
+        const status = { [currentPage]: !(errors.value) ? 'VALID' : 'INVALID' };
+        this.store.dispatch(new UpdateRestoreFormStatus(status));
+    }
+
+    updateLock(locked: boolean) {
+        this.store.dispatch(locked ? new LockEditor() : new UnlockEditor());
+    }
+
+    ngOnDestroy() {
+        this.ngUnsubscribe.next();
+        this.ngUnsubscribe.complete();
+    }
+}
diff --git a/ui/src/app/metadata/configuration/container/restore-edit.component.html b/ui/src/app/metadata/configuration/container/restore-edit.component.html
new file mode 100644
index 000000000..7b1569f9a
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/restore-edit.component.html
@@ -0,0 +1,50 @@
+<section *ngIf="model$ | async" [attr.aria-label]="'Edit metadata ' + kind$ + ' - ' + (model$ | async).name" tabindex="0">
+    <div class="row">
+        <div class="col-6 d-lg-none order-1">
+            <editor-nav
+                [format]="formats.DROPDOWN"
+                [status]="status$ | async">
+            </editor-nav>
+        </div>
+        <div class="col-6 col-lg-3 order-2 text-right">
+            <button class="btn btn-info"
+                (click)="save()"
+                [disabled]="(isInvalid$ | async) || (isSaving$ | async)"
+                aria-label="Save changes to the metadata source. You will return to the dashboard"
+                role="button">
+                <i class="fa fa-fw fa-lg" [ngClass]="{
+                    'fa-save': !(isSaving$ | async),
+                    'fa-spinner': (isSaving$ | async),
+                    'fa-pulse': (isSaving$ | async)
+                }"></i>
+                <translate-i18n key="action.save">Save</translate-i18n>
+            </button>
+            &nbsp;
+            <button class="btn btn-secondary"
+                (click)="cancel()" aria-label="Cancel changes, go back to dashboard"
+                role="button">
+                <translate-i18n key="action.cancel">Cancel</translate-i18n>
+            </button>
+        </div>
+        <div class="col-xs-12 col-lg-9 order-lg-1 order-3">
+            <div class="alert alert-danger alert-compact mt-3 mt-lg-0"
+                *ngIf="(isInvalid$ | async)">
+                <i class="fa fa-fw fa-exclamation-triangle fa-lg" aria-hidden="true"></i>
+                <translate-i18n key="message.editor-invalid">All forms must be valid before changes can be saved!</translate-i18n>
+            </div>
+        </div>
+    </div>
+    <hr />
+    <div class="row">
+        <div class="col-lg-3 d-none d-lg-block">
+            <editor-nav
+                [status]="status$ | async"
+                [format]="formats.TABS">
+            </editor-nav>
+        </div>
+        <div class="col-lg-9">
+            <router-outlet></router-outlet>
+        </div>
+    </div>
+</section>
+
diff --git a/ui/src/app/metadata/configuration/container/restore-edit.component.spec.ts b/ui/src/app/metadata/configuration/container/restore-edit.component.spec.ts
new file mode 100644
index 000000000..847ab5623
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/restore-edit.component.spec.ts
@@ -0,0 +1,79 @@
+import { Component, ViewChild, NO_ERRORS_SCHEMA } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, combineReducers, Store } from '@ngrx/store';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { RestoreEditComponent } from './restore-edit.component';
+import * as fromConfiguration from '../reducer';
+import * as fromProviders from '../../provider/reducer';
+import * as fromResolvers from '../../resolver/reducer';
+import { MockI18nModule } from '../../../../testing/i18n.stub';
+import { RestoreActionTypes } from '../action/restore.action';
+
+@Component({
+    template: `
+        <restore-edit></restore-edit>
+    `
+})
+class TestHostComponent {
+    @ViewChild(RestoreEditComponent)
+    public componentUnderTest: RestoreEditComponent;
+}
+
+describe('Restore Version Edit Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: RestoreEditComponent;
+    let store: Store<fromConfiguration.State>;
+    let dispatchSpy;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule,
+                StoreModule.forRoot({
+                    'metadata-configuration': combineReducers(fromConfiguration.reducers),
+                    'provider': combineReducers(fromProviders.reducers),
+                    'resolver': combineReducers(fromResolvers.reducers)
+                }),
+                MockI18nModule,
+                RouterTestingModule
+            ],
+            declarations: [
+                RestoreEditComponent,
+                TestHostComponent
+            ],
+            schemas: [ NO_ERRORS_SCHEMA ]
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        dispatchSpy = spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should compile', () => {
+        expect(app).toBeTruthy();
+    });
+
+    describe('save', () => {
+        it('should dispatch a save request event', () => {
+            app.save();
+            expect(store.dispatch).toHaveBeenCalled();
+            expect(dispatchSpy.calls.mostRecent().args[0].type).toBe(RestoreActionTypes.RESTORE_VERSION_REQUEST);
+        });
+    });
+
+    describe('cancel', () => {
+        it('should dispatch a cancel request event', () => {
+            app.cancel();
+            expect(store.dispatch).toHaveBeenCalled();
+            expect(dispatchSpy.calls.mostRecent().args[0].type).toBe(RestoreActionTypes.CANCEL_RESTORE);
+        });
+    });
+});
diff --git a/ui/src/app/metadata/configuration/container/restore-edit.component.ts b/ui/src/app/metadata/configuration/container/restore-edit.component.ts
new file mode 100644
index 000000000..7bd939ee4
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/restore-edit.component.ts
@@ -0,0 +1,51 @@
+import { Component } from '@angular/core';
+import { Observable, of } from 'rxjs';
+import { Store } from '@ngrx/store';
+import {
+    ConfigurationState,
+    getConfigurationModelKind,
+    getRestorationIsSaving,
+    getRestorationIsValid,
+    getInvalidRestorationForms
+} from '../../configuration/reducer';
+import { RestoreVersionRequest, CancelRestore } from '../action/restore.action';
+import { NAV_FORMATS } from '../../domain/component/editor-nav.component';
+import { Metadata } from '../../domain/domain.type';
+import { getVersionModel } from '../reducer';
+import { map } from 'rxjs/operators';
+
+
+@Component({
+    selector: 'restore-edit',
+    templateUrl: './restore-edit.component.html',
+    styleUrls: []
+})
+
+export class RestoreEditComponent {
+
+    model$: Observable<Metadata> = this.store.select(getVersionModel);
+    kind$: Observable<string> = this.store.select(getConfigurationModelKind);
+
+    isInvalid$: Observable<boolean> = this.store.select(getRestorationIsValid).pipe(map(v => !v));
+    status$: Observable<any> = this.store.select(getInvalidRestorationForms);
+    isSaving$: Observable<boolean> = this.store.select(getRestorationIsSaving);
+
+    validators$: Observable<any>;
+
+    formats = NAV_FORMATS;
+
+    constructor(
+        private store: Store<ConfigurationState>
+    ) {
+        // this.status$.subscribe(console.log);
+    }
+
+    save() {
+        this.store.dispatch(new RestoreVersionRequest());
+    }
+
+    cancel() {
+        this.store.dispatch(new CancelRestore());
+    }
+}
+
diff --git a/ui/src/app/metadata/configuration/container/restore.component.html b/ui/src/app/metadata/configuration/container/restore.component.html
index 77fc2c7cb..3072dbfc3 100644
--- a/ui/src/app/metadata/configuration/container/restore.component.html
+++ b/ui/src/app/metadata/configuration/container/restore.component.html
@@ -1,20 +1,26 @@
-<h2 class="mb-4" *ngIf="date$ | async">
-    <translate-i18n key="label.restore-version" [params]="{ 'date': date$ | async }">
-        Restore Version ( date )
-    </translate-i18n>
-</h2>
-<div class="d-flex justify-content-center align-items-center">
-    <div class="card m-4 w-50">
-        <div class="card-body">
-            <h3 class="card-title" translate="message.create-new-version-from-version">
-                Create New Version from Previous Settings
-            </h3>
-            <p translate="message.restoring-this-version-will-copy"
-                [translateParams]="{ 'date': date$ | async }">
-                Restoring this version will copy the Version ( date ) configuration and create a new Version from the selected version settings. You can then edit the configuration before saving the new version.
-            </p>
-            <a [routerLink]="['../', 'history']" class="btn btn-light" translate="action.cancel">Cancel</a>&nbsp;
-            <button class="btn btn-primary" (click)="restore()" translate="action.restore">Restore</button>
+<ng-container *ngIf="loaded$ | async">
+    <h2 class="mb-4">
+        <translate-i18n key="label.restore-version" [params]="{ 'date': (date$ | async) }">
+            Restore Version ( date )
+        </translate-i18n>
+    </h2>
+    <div class="d-flex justify-content-center align-items-center">
+        <div class="card m-4 w-50">
+            <div class="card-body">
+                <h3 class="card-title" translate="message.create-new-version-from-version">
+                    Create New Version from Previous Settings
+                </h3>
+                <p translate="message.restoring-this-version-will-copy"
+                    [translateParams]="{ 'date': date$ | async }">
+                    Restoring this version will copy the Version ( date ) configuration and create a new Version from the selected version settings. You can then edit the configuration before saving the new version.
+                </p>
+                <button class="btn btn-light" (click)="cancel()" translate="action.cancel">Cancel</button>&nbsp;
+                <button class="btn btn-primary" (click)="restore()" translate="action.restore">Restore</button>
+            </div>
         </div>
     </div>
-</div>
+</ng-container>
+<div *ngIf="loading$ | async" class="d-flex justify-content-center">
+    <i class="fa fa-spinner fa-pulse fa-4x fa-fw"></i>
+    <span class="sr-only">Loading...</span>
+</div>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/container/restore.component.spec.ts b/ui/src/app/metadata/configuration/container/restore.component.spec.ts
index e79cbcac9..36420e2f6 100644
--- a/ui/src/app/metadata/configuration/container/restore.component.spec.ts
+++ b/ui/src/app/metadata/configuration/container/restore.component.spec.ts
@@ -11,6 +11,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub';
 import { RestoreComponent } from './restore.component';
 import { of } from 'rxjs';
 import { DatePipe } from '@angular/common';
+import { Router } from '@angular/router';
 
 @Component({
     template: `
@@ -28,6 +29,7 @@ describe('Metadata Restore Page Component', () => {
     let instance: TestHostComponent;
     let app: RestoreComponent;
     let store: Store<fromConfiguration.State>;
+    let router: Router;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
@@ -51,6 +53,7 @@ describe('Metadata Restore Page Component', () => {
         }).compileComponents();
 
         store = TestBed.get(Store);
+        router = TestBed.get(Router);
         spyOn(store, 'dispatch');
         spyOn(store, 'select').and.callFake(() => of(new Date().toDateString()));
 
@@ -62,15 +65,15 @@ describe('Metadata Restore Page Component', () => {
 
     it('should load metadata objects', async(() => {
         expect(app).toBeTruthy();
-        expect(store.select).toHaveBeenCalledTimes(4);
+        expect(store.select).toHaveBeenCalledTimes(2);
         expect(store.dispatch).not.toHaveBeenCalled();
     }));
 
     describe('restore method', () => {
-        it('should emit a value from the restore subject', () => {
-            spyOn(app.subj, 'next').and.callThrough();
+        it('should navigate to the restore edit page', () => {
+            spyOn(router, 'navigate').and.callThrough();
             app.restore();
-            expect(app.subj.next).toHaveBeenCalled();
+            expect(router.navigate).toHaveBeenCalled();
         });
     });
 });
diff --git a/ui/src/app/metadata/configuration/container/restore.component.ts b/ui/src/app/metadata/configuration/container/restore.component.ts
index 0b6faff29..bb8ffc2cf 100644
--- a/ui/src/app/metadata/configuration/container/restore.component.ts
+++ b/ui/src/app/metadata/configuration/container/restore.component.ts
@@ -1,13 +1,14 @@
-import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
-import { ActivatedRoute, } from '@angular/router';
+import { Component, ChangeDetectionStrategy } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Subject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import * as fromConfiguration from '../reducer';
 import { CONFIG_DATE_FORMAT } from '../configuration.values';
-import { RestoreVersionRequest, SelectVersionRestoreRequest } from '../action/restore.action';
-import { withLatestFrom, map, takeUntil } from 'rxjs/operators';
+import { CancelRestore } from '../action/restore.action';
+import { map } from 'rxjs/operators';
+
 import { DatePipe } from '@angular/common';
+import { Router, ActivatedRoute } from '@angular/router';
 
 @Component({
     selector: 'restore-component',
@@ -15,48 +16,27 @@ import { DatePipe } from '@angular/common';
     templateUrl: './restore.component.html',
     styleUrls: []
 })
-export class RestoreComponent implements OnDestroy {
-
-    readonly subj = new Subject<any>();
-    restore$ = this.subj.asObservable();
+export class RestoreComponent {
 
+    dateString$ = this.store.select(fromConfiguration.getConfigurationVersionDate);
+    loading$ = this.store.select(fromConfiguration.getVersionLoading);
+    loaded$ = this.loading$.pipe(map(loading => !loading));
     date$: Observable<string>;
-    kind$: Observable<string> = this.store.select(fromConfiguration.getConfigurationModelKind);
-    id$: Observable<string> = this.store.select(fromConfiguration.getConfigurationModelId);
 
     constructor(
         private store: Store<fromConfiguration.ConfigurationState>,
         private datePipe: DatePipe,
+        private router: Router,
         private route: ActivatedRoute
     ) {
-        this.restore$.pipe(
-            withLatestFrom(
-                this.store.select(fromConfiguration.getSelectedVersionId),
-                this.kind$,
-                this.id$
-            ),
-            map(([restore, version, type, id]) => new RestoreVersionRequest({ id, type, version }))
-        ).subscribe(this.store);
-
-        this.date$ = this.store
-            .select(fromConfiguration.getConfigurationVersionDate)
-            .pipe(
-                map((date) => this.datePipe.transform(date, CONFIG_DATE_FORMAT))
-            );
-
-        this.route.queryParams.pipe(
-            takeUntil(this.subj),
-            map(params => params.version),
-            withLatestFrom(this.id$, this.kind$),
-            map(([version, id, type]) => new SelectVersionRestoreRequest({ version, id, type }))
-        ).subscribe(this.store);
+        this.date$ = this.dateString$.pipe(map((date) => this.datePipe.transform(date, CONFIG_DATE_FORMAT)));
     }
 
     restore() {
-        this.subj.next();
+        this.router.navigate(['../', 'edit'], { relativeTo: this.route });
     }
 
-    ngOnDestroy(): void {
-        this.subj.complete();
+    cancel() {
+        this.store.dispatch(new CancelRestore());
     }
 }
diff --git a/ui/src/app/metadata/configuration/container/version-options.component.html b/ui/src/app/metadata/configuration/container/version-options.component.html
new file mode 100644
index 000000000..c4590848f
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/version-options.component.html
@@ -0,0 +1,47 @@
+<h2 class="mb-4" [ngSwitch]="type$ | async">
+    <ng-container *ngSwitchCase="'resolver'" translate="label.source">Source</ng-container>
+    <ng-container *ngSwitchDefault translate="label.provider">Provider</ng-container>
+    Configuration
+</h2>
+<div class="container" id="header" *ngIf="!(loading$ | async)">
+    <metadata-header
+        [isEnabled]="isEnabled$ | async"
+        [version]="model$ | async"
+        [isCurrent]="false"
+        ></metadata-header>
+    <div class="px-3 my-3 d-flex justify-content-between" id="navigation">
+        <div>
+            <a class="btn btn-link" [routerLink]="['/', 'metadata', kind, id, 'configuration', 'history']">
+                <i class="fa fa-history sr-hidden"></i>&nbsp;
+                <translate-i18n key="action.version-history">Version History</translate-i18n>
+            </a>
+            <button class="btn btn-link" (click)="onScrollTo('filters')" *ngIf="kind === 'provider'">
+                <i class="fa fa-arrow-down sr-hidden"></i>&nbsp;
+                <translate-i18n key="label.filters">Filters</translate-i18n>
+            </button>
+        </div>
+    </div>
+    <metadata-configuration
+        [configuration]="configuration$ | async"
+        [editable]="false"
+        id="configuration">
+    </metadata-configuration>
+    <div *ngIf="kind === 'provider'" id="filters">
+        <div class="numbered-header d-flex justify-content-start bg-light align-items-center">
+            <h2 class="title h4 m-0 ml-2 flex-grow-1">
+                <span class="text" translate="label.filters">Filters</span>
+            </h2>
+        </div>
+        <filter-configuration-list
+            [editable]="false"
+            [filters]="filters$ | async"></filter-configuration-list>
+    </div>
+    <button class="btn btn-link" (click)="onScrollTo('header')">
+        <i class="fa fa-chevron-up sr-hidden"></i>&nbsp;
+        <translate-i18n key="action.back-to-top">Back to Top</translate-i18n>
+    </button>
+</div>
+<div *ngIf="loading$ | async" class="d-flex justify-content-center">
+    <i class="fa fa-spinner fa-pulse fa-4x fa-fw"></i>
+    <span class="sr-only">Loading...</span>
+</div>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/container/version-options.component.spec.ts b/ui/src/app/metadata/configuration/container/version-options.component.spec.ts
new file mode 100644
index 000000000..86f78f839
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/version-options.component.spec.ts
@@ -0,0 +1,82 @@
+import { Component, ViewChild, NO_ERRORS_SCHEMA } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, combineReducers } from '@ngrx/store';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { VersionOptionsComponent } from './version-options.component';
+import * as fromConfiguration from '../reducer';
+import * as fromProviders from '../../provider/reducer';
+import * as fromResolvers from '../../resolver/reducer';
+import { MockI18nModule } from '../../../../testing/i18n.stub';
+import { Metadata } from '../../domain/domain.type';
+import { ViewportScroller } from '@angular/common';
+
+@Component({
+    template: `
+        <version-options-page></version-options-page>
+    `
+})
+class TestHostComponent {
+    @ViewChild(VersionOptionsComponent)
+    public componentUnderTest: VersionOptionsComponent;
+}
+
+describe('Metadata Version Options Page Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: VersionOptionsComponent;
+    let scroller: ViewportScroller;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule,
+                StoreModule.forRoot({
+                    'metadata-configuration': combineReducers(fromConfiguration.reducers),
+                    'provider': combineReducers(fromProviders.reducers),
+                    'resolver': combineReducers(fromResolvers.reducers)
+                }),
+                MockI18nModule,
+                RouterTestingModule
+            ],
+            declarations: [
+                VersionOptionsComponent,
+                TestHostComponent
+            ],
+            schemas: [ NO_ERRORS_SCHEMA ]
+        }).compileComponents();
+
+        scroller = TestBed.get(ViewportScroller);
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should compile', () => {
+        expect(app).toBeTruthy();
+    });
+
+    describe('setModel method', () => {
+        it('should set attributes based on the passed data', () => {
+            app.setModel({ id: 'foo', '@type': 'bar' } as Metadata);
+            expect(app.id).toBe('foo');
+            expect(app.kind).toBe('provider');
+
+            app.setModel({ resourceId: 'baz' } as Metadata);
+            expect(app.id).toBe('baz');
+            expect(app.kind).toBe('resolver');
+        });
+    });
+
+    describe('onScrollTo method', () => {
+        it('should set attributes based on the passed data', () => {
+            spyOn(scroller, 'scrollToAnchor');
+            app.onScrollTo('foo');
+            expect(scroller.scrollToAnchor).toHaveBeenCalledWith('foo');
+        });
+    });
+});
diff --git a/ui/src/app/metadata/configuration/container/version-options.component.ts b/ui/src/app/metadata/configuration/container/version-options.component.ts
new file mode 100644
index 000000000..9059f079f
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/version-options.component.ts
@@ -0,0 +1,73 @@
+import { Store } from '@ngrx/store';
+import { Component, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ViewportScroller } from '@angular/common';
+import { takeUntil, filter } from 'rxjs/operators';
+
+import {
+    ConfigurationState,
+    getConfigurationSections,
+    getSelectedVersion,
+    getConfigurationModelEnabled,
+    getConfigurationModelType,
+    getVersionModelFilters,
+    getVersionLoading
+} from '../reducer';
+import { MetadataConfiguration } from '../model/metadata-configuration';
+import { MetadataVersion } from '../model/version';
+import {
+    ClearFilters
+} from '../../filter/action/collection.action';
+
+import { Metadata } from '../../domain/domain.type';
+import { getVersionModel, getVersionConfigurationSections } from '../reducer';
+
+@Component({
+    selector: 'version-options-page',
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    templateUrl: './version-options.component.html',
+    styleUrls: []
+})
+export class VersionOptionsComponent implements OnDestroy {
+
+    protected ngUnsubscribe: Subject<void> = new Subject<void>();
+
+    configuration$: Observable<MetadataConfiguration> = this.store.select(getVersionConfigurationSections);
+    isEnabled$: Observable<boolean> = this.store.select(getConfigurationModelEnabled);
+    model$: Observable<Metadata> = this.store.select(getVersionModel);
+    type$: Observable<string> = this.store.select(getConfigurationModelType);
+    filters$: Observable<any[]> = this.store.select(getVersionModelFilters);
+    loading$: Observable<boolean> = this.store.select(getVersionLoading);
+    id: string;
+    kind: string;
+
+    constructor(
+        protected store: Store<ConfigurationState>,
+        protected modalService: NgbModal,
+        protected scroller: ViewportScroller
+    ) {
+        this.model$
+            .pipe(
+                takeUntil(this.ngUnsubscribe),
+                filter(model => !!model)
+            )
+            .subscribe(p => this.setModel(p));
+    }
+
+    setModel(data: Metadata): void {
+        this.id = 'resourceId' in data ? data.resourceId : data.id;
+        this.kind = '@type' in data ? 'provider' : 'resolver';
+    }
+
+    onScrollTo(element): void {
+        this.scroller.scrollToAnchor(element);
+    }
+
+    ngOnDestroy(): void {
+        this.ngUnsubscribe.next();
+        this.ngUnsubscribe.complete();
+
+        this.store.dispatch(new ClearFilters());
+    }
+}
diff --git a/ui/src/app/metadata/configuration/container/version.component.html b/ui/src/app/metadata/configuration/container/version.component.html
new file mode 100644
index 000000000..90c6b6463
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/version.component.html
@@ -0,0 +1 @@
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/container/version.component.spec.ts b/ui/src/app/metadata/configuration/container/version.component.spec.ts
new file mode 100644
index 000000000..ae745f1b4
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/version.component.spec.ts
@@ -0,0 +1,56 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, combineReducers } from '@ngrx/store';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { VersionComponent } from './version.component';
+import * as fromConfiguration from '../reducer';
+import * as fromProviders from '../../provider/reducer';
+import * as fromResolvers from '../../resolver/reducer';
+import { MockI18nModule } from '../../../../testing/i18n.stub';
+
+@Component({
+    template: `
+        <version-page></version-page>
+    `
+})
+class TestHostComponent {
+    @ViewChild(VersionComponent)
+    public componentUnderTest: VersionComponent;
+}
+
+describe('Metadata Version Page Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: VersionComponent;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule,
+                StoreModule.forRoot({
+                    'metadata-configuration': combineReducers(fromConfiguration.reducers),
+                    'provider': combineReducers(fromProviders.reducers),
+                    'resolver': combineReducers(fromResolvers.reducers)
+                }),
+                MockI18nModule,
+                RouterTestingModule
+            ],
+            declarations: [
+                VersionComponent,
+                TestHostComponent
+            ],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should compile', () => {
+        expect(app).toBeTruthy();
+    });
+});
diff --git a/ui/src/app/metadata/configuration/container/version.component.ts b/ui/src/app/metadata/configuration/container/version.component.ts
new file mode 100644
index 000000000..22c31601b
--- /dev/null
+++ b/ui/src/app/metadata/configuration/container/version.component.ts
@@ -0,0 +1,42 @@
+import { Component, OnDestroy } from '@angular/core';
+import { Subscription, Subject } from 'rxjs';
+import { Store } from '@ngrx/store';
+
+import { ActivatedRoute } from '@angular/router';
+import * as fromConfiguration from '../reducer';
+import { SelectVersionRequest } from '../action/version.action';
+import { map, withLatestFrom } from 'rxjs/operators';
+
+@Component({
+    selector: 'version-page',
+    templateUrl: './version.component.html',
+    styleUrls: []
+})
+
+export class VersionComponent implements OnDestroy {
+    private ngUnsubscribe: Subject<void> = new Subject<void>();
+    actionsSubscription: Subscription;
+
+    constructor(
+        private store: Store<fromConfiguration.State>,
+        private route: ActivatedRoute,
+    ) {
+        this.route
+            .params
+            .pipe(
+                withLatestFrom(
+                    this.store.select(fromConfiguration.getConfigurationModelKind),
+                    this.store.select(fromConfiguration.getConfigurationModelId)
+                ),
+                map(([ params, kind, id ]) => ({ version: params.version, id, type: kind })),
+                map(request => new SelectVersionRequest(request))
+            )
+            .subscribe(this.store);
+    }
+
+    ngOnDestroy() {
+        this.ngUnsubscribe.next();
+        this.ngUnsubscribe.complete();
+    }
+}
+
diff --git a/ui/src/app/metadata/configuration/effect/configuration.effect.ts b/ui/src/app/metadata/configuration/effect/configuration.effect.ts
index b9719469d..91ce3d37a 100644
--- a/ui/src/app/metadata/configuration/effect/configuration.effect.ts
+++ b/ui/src/app/metadata/configuration/effect/configuration.effect.ts
@@ -9,10 +9,10 @@ import { MetadataConfigurationService } from '../service/configuration.service';
 import {
     ConfigurationActionTypes,
     SetMetadata,
-    SetDefinition,
+    SetConfigurationDefinition,
     LoadSchemaRequest,
     LoadSchemaSuccess,
-    SetSchema,
+    SetConfigurationSchema,
     LoadSchemaError,
     LoadXmlSuccess,
     LoadXmlError,
@@ -34,6 +34,11 @@ import {
 import { MetadataHistoryService } from '../service/history.service';
 import { Metadata } from '../../domain/domain.type';
 import { SelectVersion } from '../action/history.action';
+import {
+    SetDefinition,
+    LoadSchemaSuccess as LoadWizardSchemaSuccess,
+    LoadSchemaRequest as LoadWizardSchemaRequest
+} from '../../../wizard/action/wizard.action';
 
 @Injectable()
 export class MetadataConfigurationEffects {
@@ -79,21 +84,33 @@ export class MetadataConfigurationEffects {
     @Effect()
     setDefinitionOnResolverDataLoad$ = this.actions$.pipe(
         ofType<SelectResolverSuccess>(ResolverCollectionActionTypes.SELECT_SUCCESS),
-        map(action => new SetDefinition(this.configService.getDefinition('resolver')))
+        map(action => new SetConfigurationDefinition(this.configService.getDefinition('resolver')))
     );
 
     @Effect()
     setDefinitionOnProviderLoad$ = this.actions$.pipe(
         ofType<SelectProviderSuccess>(ProviderCollectionActionTypes.SELECT_PROVIDER_SUCCESS),
-        map(action => new SetDefinition(this.configService.getDefinition(action.payload['@type'])))
+        map(action => new SetConfigurationDefinition(this.configService.getDefinition(action.payload['@type'])))
     );
 
     @Effect()
     loadSchemaOnDefinitionSet$ = this.actions$.pipe(
-        ofType<SetDefinition>(ConfigurationActionTypes.SET_DEFINITION),
+        ofType<SetConfigurationDefinition>(ConfigurationActionTypes.SET_DEFINITION),
         map(action => new LoadSchemaRequest(action.payload.schema))
     );
 
+    @Effect()
+    setWizardDefinition$ = this.actions$.pipe(
+        ofType<SetConfigurationDefinition>(ConfigurationActionTypes.SET_DEFINITION),
+        map(action => new SetDefinition(action.payload))
+    );
+
+    @Effect()
+    setWizardSchema$ = this.actions$.pipe(
+        ofType<LoadSchemaSuccess>(ConfigurationActionTypes.LOAD_SCHEMA_SUCCESS),
+        map(action => new LoadWizardSchemaSuccess(action.payload))
+    );
+
     @Effect()
     loadSchemaData$ = this.actions$.pipe(
         ofType<LoadSchemaRequest>(ConfigurationActionTypes.LOAD_SCHEMA_REQUEST),
@@ -110,7 +127,7 @@ export class MetadataConfigurationEffects {
     @Effect()
     setSchema$ = this.actions$.pipe(
         ofType<LoadSchemaSuccess>(ConfigurationActionTypes.LOAD_SCHEMA_SUCCESS),
-        map(action => new SetSchema(action.payload))
+        map(action => new SetConfigurationSchema(action.payload))
     );
 
     @Effect({dispatch: false})
diff --git a/ui/src/app/metadata/configuration/effect/restore.effect.ts b/ui/src/app/metadata/configuration/effect/restore.effect.ts
index df5272ced..7be47103e 100644
--- a/ui/src/app/metadata/configuration/effect/restore.effect.ts
+++ b/ui/src/app/metadata/configuration/effect/restore.effect.ts
@@ -1,52 +1,90 @@
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
-import { map, catchError, switchMap } from 'rxjs/operators';
+import { map, catchError, switchMap, withLatestFrom } from 'rxjs/operators';
 
 import {
     RestoreActionTypes,
-    SelectVersionRestoreRequest,
-    SelectVersionRestoreError,
-    SelectVersionRestoreSuccess,
     RestoreVersionRequest,
     RestoreVersionSuccess,
-    RestoreVersionError
+    RestoreVersionError,
+    CancelRestore,
+    UpdateRestorationChangesRequest,
+    UpdateRestorationChangesSuccess,
+    SetSavingStatus
 } from '../action/restore.action';
 import { MetadataHistoryService } from '../service/history.service';
 import { of } from 'rxjs';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Router } from '@angular/router';
 
 import { AddNotification } from '../../../notification/action/notification.action';
 import { Notification, NotificationType } from '../../../notification/model/notification';
+import { Store } from '@ngrx/store';
+import {
+    ConfigurationState,
+    getConfigurationModel,
+    getConfigurationModelId,
+    getConfigurationModelKind,
+    getConfigurationDefinition,
+    getRestorationModel
+} from '../reducer';
+import { SetMetadata } from '../action/configuration.action';
 import { removeNulls } from '../../../shared/util';
+import { getModel } from '../../../wizard/reducer';
 
 
 @Injectable()
-export class RestoreVersionEffects {
-
-    @Effect()
-    selectVersionFromId$ = this.actions$.pipe(
-        ofType<SelectVersionRestoreRequest>(RestoreActionTypes.SELECT_VERSION_REQUEST),
-        map(action => action.payload),
-        switchMap(({ type, id, version }) => {
-            return this.historyService.getVersion(id, type, version).pipe(
-                map(v => new SelectVersionRestoreSuccess(v)),
-                catchError(err => of(new SelectVersionRestoreError(err)))
-            );
-        })
-    );
+export class RestoreEffects {
 
     @Effect()
     restoreVersion$ = this.actions$.pipe(
         ofType<RestoreVersionRequest>(RestoreActionTypes.RESTORE_VERSION_REQUEST),
-        map(action => action.payload),
-        switchMap(({ id, type, version }) =>
-            this.historyService.restoreVersion(id, type, version).pipe(
-                map(v => new RestoreVersionSuccess({ id, type, model: v })),
+        withLatestFrom(
+            this.store.select(getConfigurationModelId),
+            this.store.select(getConfigurationModelKind),
+            this.store.select(getConfigurationModel),
+            this.store.select(getRestorationModel)
+        ),
+        switchMap(([action, id, kind, current, version]) =>
+            this.historyService.updateVersion(id, kind, removeNulls({
+                ...version,
+                version: current.version
+            })).pipe(
+                map(v => new RestoreVersionSuccess({ id, type: kind, model: v })),
                 catchError(err => of(new RestoreVersionError(err)))
             )
         )
     );
 
+    @Effect()
+    restoreVersionSaving$ = this.actions$.pipe(
+        ofType<RestoreVersionRequest>(RestoreActionTypes.RESTORE_VERSION_REQUEST),
+        map(() => new SetSavingStatus(true))
+    );
+
+    @Effect()
+    restoreVersionSaved$ = this.actions$.pipe(
+        ofType<RestoreVersionSuccess>(RestoreActionTypes.RESTORE_VERSION_SUCCESS),
+        map(() => new SetSavingStatus(false))
+    );
+
+    @Effect()
+    restoreVersionError$ = this.actions$.pipe(
+        ofType<RestoreVersionError>(RestoreActionTypes.RESTORE_VERSION_ERROR),
+        map(() => new SetSavingStatus(false))
+    );
+
+    @Effect({ dispatch: false })
+    restoreVersionCancel$ = this.actions$.pipe(
+        ofType<CancelRestore>(RestoreActionTypes.CANCEL_RESTORE),
+        withLatestFrom(
+            this.store.select(getConfigurationModelId),
+            this.store.select(getConfigurationModelKind)
+        ),
+        switchMap(([action, id, kind]) =>
+            this.router.navigate(['/', 'metadata', kind, id, 'configuration', 'history'])
+        )
+    );
+
     @Effect()
     restoreVersionSuccessNotification$ = this.actions$.pipe(
         ofType<RestoreVersionSuccess>(RestoreActionTypes.RESTORE_VERSION_SUCCESS),
@@ -69,10 +107,44 @@ export class RestoreVersionEffects {
         )
     );
 
+    @Effect()
+    restoreVersionSuccessReload$ = this.actions$.pipe(
+        ofType<RestoreVersionSuccess>(RestoreActionTypes.RESTORE_VERSION_SUCCESS),
+        map(action => action.payload),
+        map(({id, type}) =>
+            new SetMetadata({ id, type })
+        )
+    );
+
+    @Effect()
+    updateRestorationChanges$ = this.actions$.pipe(
+        ofType<UpdateRestorationChangesRequest>(RestoreActionTypes.UPDATE_RESTORATION_REQUEST),
+        map(action => action.payload),
+        withLatestFrom(
+            this.store.select(getConfigurationDefinition),
+            this.store.select(getConfigurationModelKind),
+            this.store.select(getConfigurationModel)
+        ),
+        map(([changes, definition, kind, original]) => {
+            let parsed = definition.parser(changes);
+            if (kind === 'provider') {
+                parsed = {
+                    ...parsed,
+                    metadataFilters: [
+                        ...original.metadataFilters,
+                        ...(parsed.metadataFilters || [])
+                    ]
+                };
+            }
+            return (parsed);
+        }),
+        map(changes => new UpdateRestorationChangesSuccess(changes))
+    );
+
     constructor(
+        private store: Store<ConfigurationState>,
         private historyService: MetadataHistoryService,
         private actions$: Actions,
-        private router: Router,
-        private route: ActivatedRoute
+        private router: Router
     ) { }
 }
diff --git a/ui/src/app/metadata/configuration/effect/version.effect.ts b/ui/src/app/metadata/configuration/effect/version.effect.ts
new file mode 100644
index 000000000..e48a60cd1
--- /dev/null
+++ b/ui/src/app/metadata/configuration/effect/version.effect.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects';
+import { map, catchError, switchMap } from 'rxjs/operators';
+
+import {
+    VersionActionTypes,
+    SelectVersionRequest,
+    SelectVersionError,
+    SelectVersionSuccess
+} from '../action/version.action';
+import { MetadataHistoryService } from '../service/history.service';
+import { of } from 'rxjs';
+
+
+@Injectable()
+export class VersionEffects {
+
+    @Effect()
+    selectVersionFromId$ = this.actions$.pipe(
+        ofType<SelectVersionRequest>(VersionActionTypes.SELECT_VERSION_REQUEST),
+        map(action => action.payload),
+        switchMap(({ type, id, version }) => this.historyService.getVersion(id, type, version).pipe(
+            map(v => new SelectVersionSuccess(v)),
+            catchError(err => of(new SelectVersionError(err)))
+        ))
+    );
+
+    constructor(
+        private historyService: MetadataHistoryService,
+        private actions$: Actions
+    ) { }
+}
diff --git a/ui/src/app/metadata/configuration/model/request.ts b/ui/src/app/metadata/configuration/model/request.ts
new file mode 100644
index 000000000..0e4e16bec
--- /dev/null
+++ b/ui/src/app/metadata/configuration/model/request.ts
@@ -0,0 +1,5 @@
+export interface VersionRequest {
+    type: string;
+    id: string;
+    version: string;
+}
diff --git a/ui/src/app/metadata/configuration/reducer/compare.reducer.ts b/ui/src/app/metadata/configuration/reducer/compare.reducer.ts
index ea674238f..d2d346ca3 100644
--- a/ui/src/app/metadata/configuration/reducer/compare.reducer.ts
+++ b/ui/src/app/metadata/configuration/reducer/compare.reducer.ts
@@ -3,16 +3,29 @@ import { Metadata } from '../../domain/domain.type';
 
 export interface State {
     models: Metadata[];
-    loaded: Boolean;
+    loaded: boolean;
+    loading: boolean;
 }
 
 export const initialState: State = {
     models: [],
-    loaded: false
+    loaded: false,
+    loading: false
 };
 
 export function reducer(state = initialState, action: CompareActionsUnion): State {
     switch (action.type) {
+        case CompareActionTypes.COMPARE_METADATA_REQUEST:
+            return {
+                ...state,
+                loading: true
+            };
+        case CompareActionTypes.COMPARE_METADATA_ERROR:
+        case CompareActionTypes.COMPARE_METADATA_SUCCESS:
+            return {
+                ...state,
+                loading: false
+            };
         case CompareActionTypes.SET_VERSIONS:
             return {
                 ...state,
@@ -31,3 +44,4 @@ export function reducer(state = initialState, action: CompareActionsUnion): Stat
 
 export const getVersionModels = (state: State) => state.models;
 export const getVersionModelsLoaded = (state: State) => state.loaded;
+export const getComparisonLoading = (state: State) => state.loading;
diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts
index a0dd05d58..714da74b4 100644
--- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts
+++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.spec.ts
@@ -27,7 +27,7 @@ describe('Configuration Reducer', () => {
 
     describe('SET_DEFINITION action', () => {
         it('should set the state definition', () => {
-            const action = new actions.SetDefinition(definition);
+            const action = new actions.SetConfigurationDefinition(definition);
             const result = reducer(initialState, action);
 
             expect(result).toEqual({ ...initialState, definition });
@@ -36,7 +36,7 @@ describe('Configuration Reducer', () => {
 
     describe('SET_SCHEMA action', () => {
         it('should set the state schema', () => {
-            const action = new actions.SetSchema(schema);
+            const action = new actions.SetConfigurationSchema(schema);
             const result = reducer(initialState, action);
 
             expect(result).toEqual({ ...initialState, schema });
diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts
index f6976f7e2..d1dc13129 100644
--- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts
+++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts
@@ -9,6 +9,7 @@ export interface State {
     schema: Schema;
     definition: Wizard<Metadata>;
     xml: string;
+    loading: boolean;
 }
 
 export const initialState: State = {
@@ -16,7 +17,8 @@ export const initialState: State = {
     modelId: null,
     schema: null,
     definition: null,
-    xml: ''
+    xml: '',
+    loading: false
 };
 
 export function reducer(state = initialState, action: ConfigurationActionsUnion): State {
diff --git a/ui/src/app/metadata/configuration/reducer/history.reducer.ts b/ui/src/app/metadata/configuration/reducer/history.reducer.ts
index 8a2566f59..6fcc154f7 100644
--- a/ui/src/app/metadata/configuration/reducer/history.reducer.ts
+++ b/ui/src/app/metadata/configuration/reducer/history.reducer.ts
@@ -4,6 +4,7 @@ import { MetadataVersion } from '../model/version';
 
 export interface HistoryState extends EntityState<MetadataVersion> {
     selectedVersionId: string;
+    loading: boolean;
 }
 
 export function sortByDate(a: MetadataVersion, b: MetadataVersion): number {
@@ -16,11 +17,23 @@ export const adapter: EntityAdapter<MetadataVersion> = createEntityAdapter<Metad
 });
 
 export const initialState: HistoryState = adapter.getInitialState({
-    selectedVersionId: null
+    selectedVersionId: null,
+    loading: false
 });
 
 export function reducer(state = initialState, action: HistoryActionsUnion): HistoryState {
     switch (action.type) {
+        case HistoryActionTypes.LOAD_HISTORY_REQUEST:
+            return {
+                ...state,
+                loading: true
+            };
+        case HistoryActionTypes.LOAD_HISTORY_ERROR:
+        case HistoryActionTypes.LOAD_HISTORY_SUCCESS:
+            return {
+                ...state,
+                loading: false
+            };
         case HistoryActionTypes.SET_HISTORY:
             return adapter.addAll(action.payload.versions, {
                 ...state,
@@ -48,3 +61,5 @@ export const {
     selectAll: selectAllVersions,
     selectTotal: selectVersionTotal
 } = adapter.getSelectors();
+
+export const getHistoryLoading = (state: HistoryState) => state.loading;
diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts
index ab217de6d..62ecb8404 100644
--- a/ui/src/app/metadata/configuration/reducer/index.ts
+++ b/ui/src/app/metadata/configuration/reducer/index.ts
@@ -4,11 +4,12 @@ import * as fromRoot from '../../../app.reducer';
 import * as fromConfiguration from './configuration.reducer';
 import * as fromHistory from './history.reducer';
 import * as fromCompare from './compare.reducer';
+import * as fromVersion from './version.reducer';
 import * as fromRestore from './restore.reducer';
 import { WizardStep } from '../../../wizard/model';
 
 import * as utils from '../../domain/utility/configuration';
-import { getSplitSchema } from '../../../wizard/reducer';
+import { getSplitSchema, getModel } from '../../../wizard/reducer';
 import { getInCollectionFn } from '../../domain/domain.util';
 import { MetadataConfiguration } from '../model/metadata-configuration';
 import { Metadata } from '../../domain/domain.type';
@@ -20,13 +21,15 @@ export interface ConfigurationState {
     configuration: fromConfiguration.State;
     history: fromHistory.HistoryState;
     compare: fromCompare.State;
-    restore: fromRestore.State;
+    version: fromVersion.State;
+    restore: fromRestore.RestoreState;
 }
 
 export const reducers = {
     configuration: fromConfiguration.reducer,
     history: fromHistory.reducer,
     compare: fromCompare.reducer,
+    version: fromVersion.reducer,
     restore: fromRestore.reducer
 };
 
@@ -39,6 +42,7 @@ export const getState = createFeatureSelector<ConfigurationState>('metadata-conf
 export const getConfigurationStateFn = (state: ConfigurationState) => state.configuration;
 export const getHistoryStateFn = (state: ConfigurationState) => state.history;
 export const getCompareStateFn = (state: ConfigurationState) => state.compare;
+export const getVersionStateFn = (state: ConfigurationState) => state.version;
 export const getRestoreStateFn = (state: ConfigurationState) => state.restore;
 
 export const getConfigurationState = createSelector(getState, getConfigurationStateFn);
@@ -73,9 +77,9 @@ export const assignValueToProperties = (models, properties, definition: any): an
 };
 
 export const getConfigurationSectionsFn = (models, definition, schema): MetadataConfiguration => {
-    return !definition || !schema ? null :
+    return !definition || !schema || !models ? null :
         ({
-            dates: models.map(m => m.modifiedDate),
+            dates: models.map(m => m ? m.modifiedDate : null),
             sections: definition.steps
                 .filter(step => step.id !== 'summary')
                 .map(
@@ -117,6 +121,7 @@ export const getConfigurationModelTypeFn =
 
 export const getHistoryState = createSelector(getState, getHistoryStateFn);
 
+export const getHistoryLoading = createSelector(getHistoryState, fromHistory.getHistoryLoading);
 export const getVersionEntities = createSelector(getHistoryState, fromHistory.selectVersionEntities);
 export const getSelectedVersionId = createSelector(getHistoryState, fromHistory.getSelectedVersionId);
 export const getVersionIds = createSelector(getHistoryState, fromHistory.selectVersionIds);
@@ -139,21 +144,88 @@ export const getSelectedIsCurrent = createSelector(
 // Version Comparison
 
 export const getCompareState = createSelector(getState, getCompareStateFn);
-export const getVersionModels = createSelector(getCompareState, fromCompare.getVersionModels);
-export const getVersionModelsLoaded = createSelector(getCompareState, fromCompare.getVersionModelsLoaded);
-export const getVersionConfigurations = createSelector(
-    getVersionModels,
+export const getComparisonLoading = createSelector(getCompareState, fromCompare.getComparisonLoading);
+export const getComparisonModels = createSelector(getCompareState, fromCompare.getVersionModels);
+export const getComparisonModelsLoaded = createSelector(getCompareState, fromCompare.getVersionModelsLoaded);
+export const getComparisonConfigurations = createSelector(
+    getComparisonModels,
     getConfigurationDefinition,
     getConfigurationSchema,
     getConfigurationSectionsFn
 );
 
-export const getVersionConfigurationCount = createSelector(getVersionConfigurations, (config) => config ? config.dates.length : 0);
+export const getComparisonConfigurationCount = createSelector(getComparisonConfigurations, (config) => config ? config.dates.length : 0);
 
 // Version Restoration
 
 export const getRestoreState = createSelector(getState, getRestoreStateFn);
-export const getRestoreModel = createSelector(getRestoreState, fromRestore.getVersionModel);
+
+export const filterPluginTypes = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
+export const isAdditionalFilter = (type) => filterPluginTypes.indexOf(type) === -1;
+
+export const getVersionModelFiltersFn =
+    (model, kind) => kind === 'provider' ?
+    model.metadataFilters.filter(filter => isAdditionalFilter(filter['@type'])) :
+    null;
+
+export const getVersionState = createSelector(getState, getVersionStateFn);
+
+export const getVersionLoading = createSelector(getVersionState, fromVersion.isVersionLoading);
+
+export const getVersionModel = createSelector(getVersionState, fromVersion.getVersionModel);
+export const getVersionModels = createSelector(getVersionModel, (model) => model ? [model] : null);
+export const getVersionConfigurationSections = createSelector(
+    getVersionModels,
+    getConfigurationDefinition,
+    getConfigurationSchema,
+    getConfigurationSectionsFn
+);
+
+export const getVersionModelFilters = createSelector(
+    getVersionModel,
+    getConfigurationModelKind,
+    getVersionModelFiltersFn
+);
+
+export const getRestorationIsValid = createSelector(getRestoreState, fromRestore.isRestorationValid);
+export const getRestorationIsSaved = createSelector(getRestoreState, fromRestore.isRestorationSaved);
+export const getRestorationChanges = createSelector(getRestoreState, fromRestore.getChanges);
+export const getRestorationIsSaving = createSelector(getRestoreState, fromRestore.isRestorationSaving);
+export const getRestorationFormStatus = createSelector(getRestoreState, fromRestore.getFormStatus);
+export const getInvalidRestorationForms = createSelector(getRestoreState, fromRestore.getInvalidRestorationForms);
+
+export const getFormattedModel = createSelector(
+    getVersionModel,
+    getConfigurationDefinition,
+    (model, definition) => definition ? definition.formatter(model) : null
+);
+
+export const getFormattedChanges = createSelector(
+    getRestorationChanges,
+    getConfigurationDefinition,
+    (model, definition) => definition ? definition.formatter(model) : null
+);
+
+export const getFormattedModelWithChanges = createSelector(
+    getVersionModel,
+    getRestorationChanges,
+    getConfigurationDefinition,
+    (model, changes, definition) => definition ? definition.formatter({
+        ...model,
+        ...changes
+    }) : null
+);
+
+export const getRestorationModel = createSelector(
+    getVersionModel,
+    getRestorationChanges,
+    getModel,
+    (model, changes, empty) => ({
+        ...model,
+        ...empty,
+        ...changes
+    })
+);
 
 // Mixed states
 
@@ -183,4 +255,4 @@ export const getConfigurationModelType = createSelector(getConfigurationModel, g
 
 export const getConfigurationHasXml = createSelector(getConfigurationXml, xml => !!xml);
 export const getConfigurationFilters = createSelector(getConfigurationModel, model => model.metadataFilters);
-export const getConfigurationVersionDate = createSelector(getRestoreModel, version => version && version.modifiedDate);
+export const getConfigurationVersionDate = createSelector(getVersionModel, version => version && version.modifiedDate);
diff --git a/ui/src/app/metadata/configuration/reducer/restore.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/restore.reducer.spec.ts
index e69de29bb..97795549b 100644
--- a/ui/src/app/metadata/configuration/reducer/restore.reducer.spec.ts
+++ b/ui/src/app/metadata/configuration/reducer/restore.reducer.spec.ts
@@ -0,0 +1,98 @@
+import { reducer } from './restore.reducer';
+import * as fromRestore from './restore.reducer';
+import {
+    RestoreActionTypes,
+    RestoreActionsUnion,
+    UpdateRestorationChangesSuccess,
+    SetSavingStatus,
+    UpdateRestoreFormStatus
+} from '../action/restore.action';
+import { Metadata } from '../../domain/domain.type';
+
+describe('Restore Reducer', () => {
+
+    const baseState = fromRestore.initialState;
+
+    describe('undefined action', () => {
+        it('should return the default state', () => {
+            const result = reducer(undefined, {} as any);
+
+            expect(result).toEqual(fromRestore.initialState);
+        });
+    });
+
+    describe(`${RestoreActionTypes.UPDATE_RESTORATION_SUCCESS} action`, () => {
+        it('should set the state metadata model', () => {
+            const serviceEnabled = true;
+            const action = new UpdateRestorationChangesSuccess({ serviceEnabled });
+            const result = reducer(fromRestore.initialState, action);
+
+            expect(result.changes).toEqual({serviceEnabled} as Metadata);
+        });
+    });
+
+    describe(`${RestoreActionTypes.SET_SAVING_STATUS} action`, () => {
+        it('should set the state saving status', () => {
+            const action = new SetSavingStatus(true);
+            const result = reducer(fromRestore.initialState, action);
+
+            expect(result.saving).toBe(true);
+        });
+    });
+
+    describe(`${RestoreActionTypes.UPDATE_STATUS} action`, () => {
+        it('should set the state saving status', () => {
+            const action = new UpdateRestoreFormStatus({foo: 'INVALID'});
+            const result = reducer(fromRestore.initialState, action);
+
+            expect(result.status.foo).toBe('INVALID');
+        });
+    });
+
+    describe('selector function', () => {
+        describe('getChanges', () => {
+            it('should return the selected version id', () => {
+                expect(fromRestore.getChanges({ ...baseState, changes: { serviceEnabled: false } })).toEqual({ serviceEnabled: false });
+            });
+        });
+
+        describe('isRestorationSaved', () => {
+            it('should return false if there are outstanding changes', () => {
+                expect(fromRestore.isRestorationSaved({ ...baseState, changes: { name: 'too' } })).toBe(false);
+            });
+
+            it('should return true if there are no outstanding changes', () => {
+                expect(fromRestore.isRestorationSaved({ ...baseState, changes: {} })).toBe(true);
+            });
+        });
+
+        describe('getFormStatus', () => {
+            it('should return the current form status', () => {
+                expect(fromRestore.getFormStatus({ ...baseState, status: { common: 'INVALID' } })).toEqual({ common: 'INVALID' });
+            });
+        });
+
+        describe('isRestorationSaving', () => {
+            it('should return the saving status', () => {
+                expect(fromRestore.isRestorationSaving({ ...baseState })).toBe(false);
+                expect(fromRestore.isRestorationSaving({ ...baseState, saving: true })).toBe(true);
+            });
+        });
+
+        describe('isRestorationValid', () => {
+            it('should return false if any forms have an invalid status', () => {
+                expect(fromRestore.isRestorationValid({ ...baseState, status: { common: 'INVALID' } })).toBe(false);
+            });
+
+            it('should return true if all forms have a valid status', () => {
+                expect(fromRestore.isRestorationValid({ ...baseState, status: { common: 'VALID' } })).toBe(true);
+            });
+        });
+
+        describe('getInvalidRestorationForms', () => {
+            it('should return the form names that are invalid', () => {
+                expect(fromRestore.getInvalidRestorationForms({ ...baseState, status: { common: 'INVALID' } })).toEqual(['common']);
+            });
+        });
+    });
+});
diff --git a/ui/src/app/metadata/configuration/reducer/restore.reducer.ts b/ui/src/app/metadata/configuration/reducer/restore.reducer.ts
index 16bac9afb..e0c58c2b7 100644
--- a/ui/src/app/metadata/configuration/reducer/restore.reducer.ts
+++ b/ui/src/app/metadata/configuration/reducer/restore.reducer.ts
@@ -1,46 +1,54 @@
-import { RestoreActionTypes, RestoreActionsUnion } from '../action/restore.action';
 import { Metadata } from '../../domain/domain.type';
+import { RestoreActionTypes, RestoreActionsUnion } from '../action/restore.action';
 
-export interface State {
-    model: Metadata;
-    selectedVersionId: string;
-    selectedVersionType: string;
-    selectedMetadataId: string;
-    loaded: Boolean;
+export interface RestoreState {
+    saving: boolean;
+    status: { [key: string]: string };
+    changes: Partial<Metadata>;
 }
 
-export const initialState: State = {
-    model: null,
-    selectedVersionId: null,
-    selectedMetadataId: null,
-    selectedVersionType: null,
-    loaded: false
+export const initialState: RestoreState = {
+    saving: false,
+    status: {},
+    changes: {} as Metadata
 };
 
-export function reducer(state = initialState, action: RestoreActionsUnion): State {
+export function reducer(state = initialState, action: RestoreActionsUnion): RestoreState {
     switch (action.type) {
-        case RestoreActionTypes.SELECT_VERSION_REQUEST:
+        case RestoreActionTypes.UPDATE_RESTORATION_SUCCESS:
             return {
                 ...state,
-                selectedMetadataId: action.payload.id,
-                selectedVersionId: action.payload.version,
-                selectedVersionType: action.payload.type
+                changes: {
+                    ...state.changes,
+                    ...action.payload
+                }
             };
-        case RestoreActionTypes.SELECT_VERSION_SUCCESS:
+        case RestoreActionTypes.SET_SAVING_STATUS:
             return {
                 ...state,
-                model: action.payload,
-                loaded: true
+                saving: action.payload
             };
-        case RestoreActionTypes.CLEAR_VERSION:
+        case RestoreActionTypes.UPDATE_STATUS: {
             return {
-                ...initialState
+                ...state,
+                status: {
+                    ...state.status,
+                    ...action.payload
+                }
             };
+        }
         default: {
             return state;
         }
     }
 }
 
-export const getVersionModel = (state: State) => state.model;
-export const getVersionModelLoaded = (state: State) => state.loaded;
+export const isRestorationSaved = (state: RestoreState) => !Object.keys(state.changes).length;
+export const getChanges = (state: RestoreState) => state.changes;
+export const isRestorationSaving = (state: RestoreState) => state.saving;
+export const getFormStatus = (state: RestoreState) => state.status;
+
+export const isRestorationValid = (state: RestoreState) =>
+    !Object.keys(state.status).some(key => state.status[key] === ('INVALID'));
+export const getInvalidRestorationForms = (state: RestoreState) =>
+    Object.keys(state.status).filter(key => state.status[key] === 'INVALID');
diff --git a/ui/src/app/metadata/configuration/reducer/version.reducer.spec.ts b/ui/src/app/metadata/configuration/reducer/version.reducer.spec.ts
new file mode 100644
index 000000000..a564df384
--- /dev/null
+++ b/ui/src/app/metadata/configuration/reducer/version.reducer.spec.ts
@@ -0,0 +1,108 @@
+import {
+    reducer,
+    getVersionModel,
+    getVersionModelLoaded,
+    getSelectedMetadataId,
+    getSelectedVersionId,
+    getSelectedVersionType
+} from './version.reducer';
+import * as fromVersion from './version.reducer';
+import {
+    VersionActionTypes,
+    SelectVersionRequest,
+    ClearVersion,
+    SelectVersionSuccess
+} from '../action/version.action';
+import { Metadata } from '../../domain/domain.type';
+import { VersionRequest } from '../model/request';
+
+describe('Restore Reducer', () => {
+
+    let baseState;
+
+    const req: VersionRequest = {
+        type: 'provider',
+        version: 'foo',
+        id: 'bar'
+    };
+
+    const model: Metadata = {
+        id: 'bar',
+        name: 'foo',
+        '@type': 'MetadataProvider',
+        type: 'provider',
+        resourceId: 'foo',
+        createdBy: 'bar'
+    };
+
+    beforeEach(() => {
+        baseState = { ...fromVersion.initialState };
+    });
+
+    describe('undefined action', () => {
+        it('should return the default state', () => {
+            const result = reducer(undefined, {} as any);
+
+            expect(result).toEqual(baseState);
+        });
+    });
+
+    describe(`${VersionActionTypes.SELECT_VERSION_REQUEST} action`, () => {
+        it('should set the needed metadata properties', () => {
+            const action = new SelectVersionRequest(req);
+            const result = reducer(baseState, action);
+
+            expect(result.selectedMetadataId).toEqual(req.id);
+        });
+    });
+
+    describe(`${VersionActionTypes.SELECT_VERSION_SUCCESS} action`, () => {
+        it('should set the needed metadata properties', () => {
+            const action = new SelectVersionSuccess(model as Metadata);
+            const result = reducer(baseState, action);
+
+            expect(result).toEqual({ ...baseState, model, loaded: true });
+        });
+    });
+
+    describe(`${VersionActionTypes.CLEAR_VERSION} action`, () => {
+        it('should set the needed metadata properties', () => {
+            const action = new ClearVersion();
+            const result = reducer(baseState, action);
+
+            expect(result).toEqual(baseState);
+        });
+    });
+
+    describe('selector function', () => {
+        describe('getSelectedMetadataId', () => {
+            it('should return the selected version id', () => {
+                expect(getVersionModel({ ...baseState, model })).toEqual(model);
+            });
+        });
+
+        describe('getSelectedMetadataVersion', () => {
+            it('should return the selected version id', () => {
+                expect(getVersionModelLoaded({ ...baseState, loaded: true })).toBe(true);
+            });
+        });
+
+        describe('getSelectedMetadataId', () => {
+            it('should return the selected resource id', () => {
+                expect(getSelectedMetadataId({ ...baseState, selectedMetadataId: req.id})).toEqual(req.id);
+            });
+        });
+
+        describe('getSelectedMetadataType', () => {
+            it('should return the selected version type', () => {
+                expect(getSelectedVersionType({ ...baseState, selectedVersionType: req.type })).toEqual(req.type);
+            });
+        });
+
+        describe('getSelectedMetadataType', () => {
+            it('should return the selected version id', () => {
+                expect(getSelectedVersionId({ ...baseState, selectedVersionId: req.version })).toEqual(req.version);
+            });
+        });
+    });
+});
diff --git a/ui/src/app/metadata/configuration/reducer/version.reducer.ts b/ui/src/app/metadata/configuration/reducer/version.reducer.ts
new file mode 100644
index 000000000..caaf1f085
--- /dev/null
+++ b/ui/src/app/metadata/configuration/reducer/version.reducer.ts
@@ -0,0 +1,62 @@
+import { VersionActionTypes, VersionActionsUnion } from '../action/version.action';
+import { Metadata } from '../../domain/domain.type';
+
+export interface State {
+    model: Metadata;
+    selectedVersionId: string;
+    selectedVersionType: string;
+    selectedMetadataId: string;
+    loaded: boolean;
+    loading: boolean;
+}
+
+export const initialState: State = {
+    model: null,
+    selectedVersionId: null,
+    selectedMetadataId: null,
+    selectedVersionType: null,
+    loaded: false,
+    loading: false
+};
+
+export function reducer(state = initialState, action: VersionActionsUnion): State {
+    switch (action.type) {
+        case VersionActionTypes.SELECT_VERSION_REQUEST:
+            return {
+                ...state,
+                selectedMetadataId: action.payload.id,
+                selectedVersionId: action.payload.version,
+                selectedVersionType: action.payload.type,
+                loading: true
+            };
+        case VersionActionTypes.SELECT_VERSION_SUCCESS:
+            return {
+                ...state,
+                model: action.payload,
+                loaded: true,
+                loading: false
+            };
+        case VersionActionTypes.SELECT_VERSION_ERROR:
+            return {
+                ...state,
+                model: null,
+                loaded: false,
+                loading: false
+            };
+        case VersionActionTypes.CLEAR_VERSION:
+            return {
+                ...initialState
+            };
+        default: {
+            return state;
+        }
+    }
+}
+
+export const getVersionModel = (state: State) => state.model;
+export const getVersionModelLoaded = (state: State) => state.loaded;
+export const isVersionLoading = (state: State) => state.loading;
+
+export const getSelectedMetadataId = (state: State) => state.selectedMetadataId;
+export const getSelectedVersionId = (state: State) => state.selectedVersionId;
+export const getSelectedVersionType = (state: State) => state.selectedVersionType;
diff --git a/ui/src/app/metadata/configuration/service/history.service.spec.ts b/ui/src/app/metadata/configuration/service/history.service.spec.ts
index 0927f8e70..e4fa72dac 100644
--- a/ui/src/app/metadata/configuration/service/history.service.spec.ts
+++ b/ui/src/app/metadata/configuration/service/history.service.spec.ts
@@ -80,21 +80,4 @@ describe(`Attributes Service`, () => {
             }
         )));
     });
-
-    describe('restoreVersion method', () => {
-        it(`should send a put request`, async(inject([MetadataHistoryService, HttpTestingController],
-            (service: MetadataHistoryService, backend: HttpTestingController) => {
-                const resourceId = 'foo';
-                const type = 'resource';
-                const versionId = '1';
-                const response = {version: 'bar'} as Metadata;
-                spyOn(service, 'getVersions').and.returnValue(of([response, { ...response, version: 'foo' }]));
-                spyOn(service, 'updateVersion').and.returnValue(of(response));
-                service.restoreVersion(resourceId, type, versionId).subscribe(updated => {
-                    expect(service.getVersions).toHaveBeenCalled();
-                    expect(service.updateVersion).toHaveBeenCalled();
-                });
-            }
-        )));
-    });
 });
diff --git a/ui/src/app/metadata/configuration/service/history.service.ts b/ui/src/app/metadata/configuration/service/history.service.ts
index 6a5f79607..9d3edc212 100644
--- a/ui/src/app/metadata/configuration/service/history.service.ts
+++ b/ui/src/app/metadata/configuration/service/history.service.ts
@@ -1,14 +1,12 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { Observable, of, forkJoin } from 'rxjs';
+import { Observable, forkJoin } from 'rxjs';
 import { MetadataHistory } from '../model/history';
 
 import { PATHS } from '../../configuration/configuration.values';
 import { MetadataVersion } from '../model/version';
-import { map, catchError, switchMap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { Metadata } from '../../domain/domain.type';
-import { withLatestFrom } from 'rxjs-compat/operator/withLatestFrom';
-import { removeNulls } from '../../../shared/util';
 
 @Injectable()
 export class MetadataHistoryService {
@@ -34,7 +32,7 @@ export class MetadataHistoryService {
         ));
     }
 
-    getVersion(resourceId: string, type: string, versionId?: string): Observable<Metadata> {
+    getVersion(resourceId: string, type: string, versionId: string = null): Observable<Metadata> {
         const api = versionId ?
             `/${this.base}/${PATHS[type]}/${resourceId}/${this.path}/${versionId}`
             :
@@ -45,12 +43,4 @@ export class MetadataHistoryService {
     updateVersion(resourceId: string, type: string, model: Metadata): Observable<Metadata> {
         return this.http.put<Metadata>(`/${this.base}/${PATHS[type]}/${resourceId}`, model);
     }
-
-    restoreVersion(resourceId: string, type: string, versionId: string): Observable<Metadata> {
-        return this.getVersions(resourceId, [null, versionId], type).pipe(
-            switchMap(([current, toRestore]) =>
-                this.updateVersion(resourceId, type, { ...removeNulls(toRestore), version: current.version })
-            )
-        );
-    }
 }
diff --git a/ui/src/app/metadata/configuration/service/index-resolver.service.ts b/ui/src/app/metadata/configuration/service/index-resolver.service.ts
new file mode 100644
index 000000000..4bbc5e07e
--- /dev/null
+++ b/ui/src/app/metadata/configuration/service/index-resolver.service.ts
@@ -0,0 +1,14 @@
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { WizardState } from '../../../wizard/reducer';
+import { SetIndex } from '../../../wizard/action/wizard.action';
+
+@Injectable()
+export class IndexResolver implements Resolve<void> {
+    constructor(private store: Store<WizardState>) { }
+
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+        this.store.dispatch(new SetIndex(route.params.index));
+    }
+}
diff --git a/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts b/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts
index 107ef7241..ecd51b1b9 100644
--- a/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts
+++ b/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts
@@ -12,6 +12,8 @@ import { SummaryPropertyComponent } from './summary-property.component';
 import { SCHEMA } from '../../../../testing/form-schema.stub';
 import { MockI18nModule } from '../../../../testing/i18n.stub';
 import { MetadataProviderWizard } from '../../provider/model';
+import { AttributesService } from '../service/attributes.service';
+import { MockAttributeService } from '../../../../testing/attributes.stub';
 
 @Component({
     template: `
@@ -54,7 +56,8 @@ describe('Provider Wizard Summary Component', () => {
                 TestHostComponent
             ],
             providers: [
-                { provide: WidgetRegistry, useClass: DefaultWidgetRegistry }
+                { provide: WidgetRegistry, useClass: DefaultWidgetRegistry },
+                { provide: AttributesService, useClass: MockAttributeService }
             ]
         }).compileComponents();
 
diff --git a/ui/src/app/metadata/domain/component/wizard-summary.component.ts b/ui/src/app/metadata/domain/component/wizard-summary.component.ts
index e8b8deb34..80f246c83 100644
--- a/ui/src/app/metadata/domain/component/wizard-summary.component.ts
+++ b/ui/src/app/metadata/domain/component/wizard-summary.component.ts
@@ -34,29 +34,28 @@ export class WizardSummaryComponent implements OnChanges {
 
     ngOnChanges(changes: SimpleChanges): void {
         if (changes.summary && this.summary) {
-            const schemas = this.summary.schema;
+            const schema = this.summary.schema;
             const model = this.summary.model;
             const def = this.summary.definition;
             const steps = def.steps;
 
-            const schema = Object.keys(schemas).reduce((coll, key) => ({
-                ...merge(coll, schemas[key])
-            }), {} as any);
-
             this.sections = steps
                 .filter(step => step.id !== 'summary')
                 .map(
                     (step: WizardStep, num: number) => {
+                        const { id, index, label } = step;
+                        const split = getSplitSchema(schema, step);
+                        const properties = getStepProperties(
+                            split,
+                            def.formatter(model),
+                            schema.definitions || {}
+                        );
                         return ({
-                            id: step.id,
+                            id,
                             pageNumber: num + 1,
-                            index: step.index,
-                            label: step.label,
-                            properties: getStepProperties(
-                                getSplitSchema(schema, step),
-                                def.formatter(model),
-                                schema.definitions || {}
-                            )
+                            index,
+                            label,
+                            properties
                         });
                     }
                 );
diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts
index 02b1a2625..106ebcf1d 100644
--- a/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts
+++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts
@@ -3,6 +3,7 @@ import { MetadataResolver } from '../metadata-resolver';
 import { FormProperty } from 'ngx-schema-form/lib/model/formproperty';
 import { ArrayProperty } from 'ngx-schema-form/lib/model/arrayproperty';
 import { ObjectProperty } from 'ngx-schema-form/lib/model/objectproperty';
+import { getAllOtherIds } from '../../../resolver/reducer';
 
 /*istanbul ignore next */
 export class MetadataSourceBase implements Wizard<MetadataResolver> {
@@ -11,6 +12,8 @@ export class MetadataSourceBase implements Wizard<MetadataResolver> {
     steps: WizardStep[] = [];
     schema = '';
 
+    validatorParams = [getAllOtherIds];
+
     bindings = {
         '/securityInfo/x509CertificateAvailable': [
             {
@@ -86,7 +89,6 @@ export class MetadataSourceBase implements Wizard<MetadataResolver> {
         const checkOrg = (value, property, form) => {
             const org = property.parent;
             const orgValue = org.value || {};
-            console.log(orgValue);
             const err = Object.keys(orgValue) && !value ? {
                 code: 'ORG_INCOMPLETE',
                 path: `#${property.path}`,
diff --git a/ui/src/app/metadata/filter/model/entity-attributes.filter.ts b/ui/src/app/metadata/filter/model/entity-attributes.filter.ts
index 78ee24e43..a2642ddc9 100644
--- a/ui/src/app/metadata/filter/model/entity-attributes.filter.ts
+++ b/ui/src/app/metadata/filter/model/entity-attributes.filter.ts
@@ -2,6 +2,7 @@ import { FormDefinition } from '../../../wizard/model';
 import { MetadataFilter } from '../../domain/model';
 import { removeNulls } from '../../../shared/util';
 import { EntityAttributesFilterEntity } from '../../domain/entity';
+import { getFilterNames } from '../reducer';
 
 export const EntityAttributesFilter: FormDefinition<MetadataFilter> = {
     label: 'EntityAttributes',
@@ -10,6 +11,7 @@ export const EntityAttributesFilter: FormDefinition<MetadataFilter> = {
     getEntity(filter: MetadataFilter): EntityAttributesFilterEntity {
         return new EntityAttributesFilterEntity(filter);
     },
+    validatorParams: [getFilterNames],
     getValidators(namesList: string[] = []): any {
         const validators = {
             '/': (value, property, form_current) => {
diff --git a/ui/src/app/metadata/filter/model/nameid.filter.ts b/ui/src/app/metadata/filter/model/nameid.filter.ts
index f3cf67960..9751d4ce9 100644
--- a/ui/src/app/metadata/filter/model/nameid.filter.ts
+++ b/ui/src/app/metadata/filter/model/nameid.filter.ts
@@ -1,6 +1,7 @@
 import { FormDefinition } from '../../../wizard/model';
 import { MetadataFilter } from '../../domain/model';
 import { NameIDFormatFilterEntity } from '../../domain/entity/filter/nameid-format-filter';
+import { getFilterNames } from '../reducer';
 
 export const NameIDFilter: FormDefinition<MetadataFilter> = {
     label: 'NameIDFormat',
@@ -9,6 +10,7 @@ export const NameIDFilter: FormDefinition<MetadataFilter> = {
     getEntity(filter: MetadataFilter): NameIDFormatFilterEntity {
         return new NameIDFormatFilterEntity(filter);
     },
+    validatorParams: [getFilterNames],
     getValidators(namesList: string[] = []): any {
         const validators = {
             '/': (value, property, form_current) => {
diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts
index 093dc85c1..a9013176a 100644
--- a/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts
@@ -52,8 +52,7 @@ describe('Provider Edit Step Component', () => {
                                     }
                                 }
                             },
-                            locked: false,
-                            schemaCollection: []
+                            locked: false
                         }
                     })
                 })
diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
index be79bb1fa..c869c8e9c 100644
--- a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { Store } from '@ngrx/store';
+import { FormControl } from '@angular/forms';
 
 import * as fromProvider from '../reducer';
 import { UpdateStatus } from '../action/editor.action';
@@ -9,9 +10,8 @@ import { MetadataProvider } from '../../domain/model';
 import { LockEditor, UnlockEditor } from '../../../wizard/action/wizard.action';
 
 import * as fromWizard from '../../../wizard/reducer';
-import { withLatestFrom, map, skipWhile, distinctUntilChanged, takeUntil, filter } from 'rxjs/operators';
+import { withLatestFrom, map, distinctUntilChanged, filter } from 'rxjs/operators';
 import { UpdateProvider } from '../action/entity.action';
-import { FormControl } from '@angular/forms';
 
 @Component({
     selector: 'provider-edit-step',
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 bd6ed6698..a5601d594 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
@@ -62,8 +62,7 @@ describe('Provider Edit Component', () => {
                             schemaPath: '',
                             loading: false,
                             schema: {},
-                            locked: false,
-                            schemaCollection: []
+                            locked: false
                         }
                     })
                 }),
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index 125966878..f501f7cb8 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -63,7 +63,7 @@ export class ProviderWizardComponent implements OnDestroy {
 
         this.summary$ = combineLatest(
             this.store.select(fromWizard.getWizardDefinition),
-            this.store.select(fromWizard.getSchemaCollection),
+            this.store.select(fromWizard.getSchemaObject),
             this.store.select(fromProvider.getEntityChanges)
         ).pipe(
             map(([ definition, schema, model ]) => ({ definition, schema, model }))
diff --git a/ui/src/app/metadata/provider/effect/editor.effect.ts b/ui/src/app/metadata/provider/effect/editor.effect.ts
index f9ac13baf..60ec2d719 100644
--- a/ui/src/app/metadata/provider/effect/editor.effect.ts
+++ b/ui/src/app/metadata/provider/effect/editor.effect.ts
@@ -12,8 +12,7 @@ import {
     LoadSchemaSuccess,
     LoadSchemaFail,
     SetDefinition,
-    WizardActionTypes,
-    AddSchema
+    WizardActionTypes
 } from '../../../wizard/action/wizard.action';
 import { ResetChanges } from '../action/entity.action';
 
@@ -38,14 +37,6 @@ export class EditorEffects {
         )
     );
 
-    @Effect()
-    $loadSchemaSuccess = this.actions$.pipe(
-        ofType<LoadSchemaSuccess>(WizardActionTypes.LOAD_SCHEMA_SUCCESS),
-        map(action => action.payload),
-        withLatestFrom(this.store.select(fromWizard.getWizardIndex)),
-        map(([schema, id]) => new AddSchema({ id, schema }))
-    );
-
     @Effect()
     $resetChanges = this.actions$.pipe(
         ofType<SetDefinition>(WizardActionTypes.SET_DEFINITION),
diff --git a/ui/src/app/metadata/provider/model/base.provider.form.ts b/ui/src/app/metadata/provider/model/base.provider.form.ts
index a27a1cbc6..1fce5263d 100644
--- a/ui/src/app/metadata/provider/model/base.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/base.provider.form.ts
@@ -1,11 +1,13 @@
 import { Wizard } from '../../../wizard/model';
 import { BaseMetadataProvider } from '../../domain/model/providers';
+import { getFilteredProviderNames, getFilteredProviderXmlIds } from '../reducer';
 
 export const BaseMetadataProviderEditor: Wizard<BaseMetadataProvider> = {
     label: 'BaseMetadataProvider',
     type: 'BaseMetadataResolver',
     schema: '',
-    getValidators(namesList: string[]): any {
+    validatorParams: [getFilteredProviderNames, getFilteredProviderXmlIds],
+    getValidators(namesList: string[], xmlIdList: string[]): any {
         const validators = {
             '/': (value, property, form_current) => {
                 let errors;
@@ -29,6 +31,15 @@ export const BaseMetadataProviderEditor: Wizard<BaseMetadataProvider> = {
                     params: [value]
                 } : null;
                 return err;
+            },
+            '/xmlId': (value, property, form) => {
+                const err = xmlIdList.indexOf(value) > -1 ? {
+                    code: 'INVALID_ID',
+                    path: `#${property.path}`,
+                    message: 'message.id-unique',
+                    params: [value]
+                } : null;
+                return err;
             }
         };
         return validators;
diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
index 2583e3c69..9ef3bf2bb 100644
--- a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
@@ -17,16 +17,7 @@ export const DynamicHttpMetadataProviderWizard: Wizard<DynamicHttpMetadataProvid
         return base;
     },
     getValidators(namesList: string[] = [], xmlIdList: string[] = []): any {
-        const validators = BaseMetadataProviderEditor.getValidators(namesList);
-        validators['/xmlId'] = (value, property, form) => {
-            const err = xmlIdList.indexOf(value) > -1 ? {
-                code: 'INVALID_ID',
-                path: `#${property.path}`,
-                message: 'message.id-unique',
-                params: [value]
-            } : null;
-            return err;
-        };
+        const validators = BaseMetadataProviderEditor.getValidators(namesList, xmlIdList);
 
         validators['/metadataRequestURLConstructionScheme'] = (value, property, form) => {
             let errors;
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
index 228feab69..d3e4d9995 100644
--- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -18,16 +18,7 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
         return base;
     },
     getValidators(namesList: string[] = [], xmlIdList: string[] = []): any {
-        const validators = BaseMetadataProviderEditor.getValidators(namesList);
-        validators['/xmlId'] = (value, property, form) => {
-            const err = xmlIdList.indexOf(value) > -1 ? {
-                code: 'INVALID_ID',
-                path: `#${property.path}`,
-                message: 'message.id-unique',
-                params: [value]
-            } : null;
-            return err;
-        };
+        const validators = BaseMetadataProviderEditor.getValidators(namesList, xmlIdList);
         validators['/metadataURL'] = (value, property, form) => {
             return !UriValidator.isUri(value) ? {
                 code: 'INVALID_URI',
diff --git a/ui/src/app/metadata/provider/model/file-system.provider.form.ts b/ui/src/app/metadata/provider/model/file-system.provider.form.ts
index 331a53c99..fcf780ac5 100644
--- a/ui/src/app/metadata/provider/model/file-system.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-system.provider.form.ts
@@ -16,19 +16,6 @@ export const FileSystemMetadataProviderWizard: Wizard<FileSystemMetadataProvider
         }
         return base;
     },
-    getValidators(namesList: string[] = [], xmlIdList: string[] = []): any {
-        const validators = BaseMetadataProviderEditor.getValidators(namesList);
-        validators['/xmlId'] = (value, property, form) => {
-            const err = xmlIdList.indexOf(value) > -1 ? {
-                code: 'INVALID_ID',
-                path: `#${property.path}`,
-                message: 'message.id-unique',
-                params: [value]
-            } : null;
-            return err;
-        };
-        return validators;
-    },
     schema: '/api/ui/MetadataResolver/FilesystemMetadataResolver',
     steps: [
         {
diff --git a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
index aeeef302a..c53562873 100644
--- a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts
@@ -17,19 +17,6 @@ export const LocalDynamicMetadataProviderWizard: Wizard<LocalDynamicMetadataProv
         }
         return base;
     },
-    getValidators(namesList: string[] = [], xmlIdList: string[] = []): any {
-        const validators = BaseMetadataProviderEditor.getValidators(namesList);
-        validators['/xmlId'] = (value, property, form) => {
-            const err = xmlIdList.indexOf(value) > -1 ? {
-                code: 'INVALID_ID',
-                path: `#${property.path}`,
-                message: 'message.id-unique',
-                params: [value]
-            } : null;
-            return err;
-        };
-        return validators;
-    },
     schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
     steps: [
         {
diff --git a/ui/src/app/metadata/provider/reducer/index.ts b/ui/src/app/metadata/provider/reducer/index.ts
index d40313299..562a4ab44 100644
--- a/ui/src/app/metadata/provider/reducer/index.ts
+++ b/ui/src/app/metadata/provider/reducer/index.ts
@@ -66,9 +66,19 @@ export const getProviderIds = createSelector(getCollectionState, fromCollection.
 export const getProviderCollectionIsLoaded = createSelector(getCollectionState, fromCollection.getIsLoaded);
 
 export const getProviderNames = createSelector(getAllProviders, (providers: MetadataProvider[]) => providers.map(p => p.name));
+export const getFilteredProviderNames = createSelector(
+    getProviderNames,
+    getSelectedProvider, (names, provider) => names.filter(name => name !== provider.name)
+);
+
 
 export const getProviderFilters = createSelector(getSelectedProvider, provider => provider.metadataFilters);
 
 export const getProviderXmlIds = createSelector(getAllProviders, (providers: MetadataProvider[]) => providers.map(p => p.xmlId));
 export const getOrderedProviders = createSelector(getAllProviders, getProviderOrder, utils.mergeOrderFn);
 export const getOrderedProvidersInSearch = createSelector(getAllProviders, getProviderOrder, utils.mergeOrderFn);
+
+export const getFilteredProviderXmlIds = createSelector(
+    getProviderXmlIds,
+    getSelectedProvider, (ids, provider) => ids.filter(id => id !== provider.xmlId)
+);
diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts
index 56c4784a7..c64445dd4 100644
--- a/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/resolver-wizard-step.component.spec.ts
@@ -66,11 +66,6 @@ describe('Resolver Wizard Step Component', () => {
                             index: 'common',
                             disabled: false,
                             definition: new MetadataSourceWizard(),
-                            schemaCollection: {
-                                common: {
-                                    ...schema
-                                }
-                            },
                             schemaPath: '/foo/bar',
                             loading: false,
                             schema: {
diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts
index 1b6c5df32..3cec9bf25 100644
--- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts
+++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.spec.ts
@@ -72,11 +72,6 @@ describe('Resolver Wizard Component', () => {
                             index: 'page',
                             disabled: false,
                             definition: new MetadataSourceWizard(),
-                            schemaCollection: {
-                                page: {
-                                    ...schema
-                                }
-                            },
                             schemaPath: '/foo/bar',
                             loading: false,
                             schema: {
diff --git a/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts b/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts
index 3ccddc90e..56848ad5e 100644
--- a/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts
+++ b/ui/src/app/metadata/resolver/container/resolver-wizard.component.ts
@@ -117,13 +117,13 @@ export class ResolverWizardComponent implements OnDestroy, CanComponentDeactivat
 
         this.summary$ = combine(
             this.store.select(fromWizard.getWizardDefinition),
-            this.store.select(fromWizard.getSchemaCollection),
-            this.store.select(fromResolver.getEntityChanges)
+            this.store.select(fromWizard.getSchemaObject),
+            this.store.select(fromResolver.getDraftModelWithChanges)
         ).pipe(
             map(([definition, schema, model]) => (
                 {
                     definition,
-                    schema,
+                    schema: schema || {},
                     model
                 }
             ))
diff --git a/ui/src/app/metadata/resolver/reducer/index.ts b/ui/src/app/metadata/resolver/reducer/index.ts
index bf38715d9..a1cc5256d 100644
--- a/ui/src/app/metadata/resolver/reducer/index.ts
+++ b/ui/src/app/metadata/resolver/reducer/index.ts
@@ -5,6 +5,7 @@ import * as fromSearch from './search.reducer';
 import * as fromCopy from './copy.reducer';
 import * as fromDraft from './draft.reducer';
 import * as fromCollection from './collection.reducer';
+import * as fromWizard from '../../../wizard/reducer';
 
 import { combineAllFn, getEntityIdsFn, getInCollectionFn, doesExistFn } from '../../domain/domain.util';
 
@@ -103,3 +104,23 @@ export const getAllResolvers = createSelector(getDraftCollection, getResolverCol
 export const getAllResolverIds = createSelector(getDraftIds, getResolverIds, combineAllFn);
 
 export const getAllEntityIds = createSelector(getAllResolvers, getEntityIdsFn);
+
+export const getAllOtherIds = createSelector(
+    getAllResolvers,
+    getSelectedResolverId,
+    (ids, selected) => ids.filter(id => id !== selected)
+);
+
+export const getDraftModelWithChanges = createSelector(
+    fromWizard.getSchema,
+    fromWizard.getModel,
+    getSelectedDraft,
+    getEntityChanges,
+    fromWizard.getWizardDefinition,
+    (schema, wizardModel, selectedDraft, changes, definition) => definition.formatter({
+        ...wizardModel,
+        ...selectedDraft,
+        ...changes
+    })
+);
+
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 a4f377035..58cf01c46 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 [for]="id" class="d-flex justify-content-between control-label">
+    <label [for]="formProperty._canonicalPath" class="d-flex justify-content-between control-label">
         <span [ngClass]="{'sr-only': formProperty.parent.schema.type === 'array'}">
             <translate-i18n [key]="schema.title">{{ schema.title }}</translate-i18n>
             <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 1f59e0ab5..95c1ed3dd 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -1,4 +1,9 @@
-<div id="{{ id }}-container" class="dropdown form-group" (keydown)="handleKeyDown($event)" role='combobox' [attr.aria-expanded]="(menuIsVisible$ | async) ? 'true' : 'false'">
+<div id="{{ id }}-container"
+    class="dropdown form-group"
+    (keydown)="handleKeyDown($event)"
+    role='combobox'
+    [attr.aria-expanded]="(menuIsVisible$ | async) ? 'true' : 'false'"
+    [attr.aria-label]="id">
     <div [ngClass]="{'input-group': dropdown}">
         <input
             #inputField
diff --git a/ui/src/app/wizard/action/wizard.action.ts b/ui/src/app/wizard/action/wizard.action.ts
index 83a5f08a5..3e630f1a1 100644
--- a/ui/src/app/wizard/action/wizard.action.ts
+++ b/ui/src/app/wizard/action/wizard.action.ts
@@ -58,12 +58,6 @@ export class Previous implements Action {
     constructor(public payload: string) { }
 }
 
-export class AddSchema implements Action {
-    readonly type = WizardActionTypes.ADD_SCHEMA;
-
-    constructor(public payload: { id: string, schema: any }) { }
-}
-
 export class ClearWizard implements Action {
     readonly type = WizardActionTypes.CLEAR;
 }
@@ -102,7 +96,6 @@ export type WizardActionUnion =
     | Next
     | Previous
     | ClearWizard
-    | AddSchema
     | LoadSchemaRequest
     | LoadSchemaSuccess
     | LoadSchemaFail
diff --git a/ui/src/app/wizard/model/form-definition.ts b/ui/src/app/wizard/model/form-definition.ts
index 3f03957c0..bde8e10ad 100644
--- a/ui/src/app/wizard/model/form-definition.ts
+++ b/ui/src/app/wizard/model/form-definition.ts
@@ -1,8 +1,11 @@
+import { Selector } from '@ngrx/store';
+
 export interface FormDefinition<T> {
     label: string;
     type: string;
     schema: string;
     bindings?: any;
+    validatorParams: any;
     getEntity?(entity: any): any;
     parser(changes: Partial<T>, schema?: any);
     formatter(changes: Partial<T>, schema?: any);
diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
index 4c3321c62..d85d930be 100644
--- a/ui/src/app/wizard/reducer/index.ts
+++ b/ui/src/app/wizard/reducer/index.ts
@@ -2,8 +2,6 @@ import * as fromRoot from '../../app.reducer';
 import * as fromWizard from './wizard.reducer';
 import { createFeatureSelector, createSelector } from '@ngrx/store';
 import { Wizard, WizardStep } from '../model';
-import { diff } from 'deep-object-diff';
-import { SchemaService } from '../../schema-form/service/schema.service';
 
 export interface WizardState {
     wizard: fromWizard.State;
@@ -46,7 +44,6 @@ export const getState = createSelector(getWizardState, getWizardStateFn);
 export const getWizardIndex = createSelector(getState, fromWizard.getIndex);
 export const getWizardIsDisabled = createSelector(getState, fromWizard.getDisabled);
 export const getWizardDefinition = createSelector(getState, fromWizard.getDefinition);
-export const getSchemaCollection = createSelector(getState, fromWizard.getCollection);
 
 export const getSchemaPath = (wizard: Wizard<any>) => wizard ? wizard.schema : null;
 
@@ -135,3 +132,9 @@ export const getSchemaObject = createSelector(getState, fromWizard.getSchema);
 export const getParsedSchema = createSelector(getSchemaObject, getLocked, getSchemaParseFn);
 
 export const getSchema = createSelector(getParsedSchema, getCurrent, getSplitSchema);
+
+export const getWizardDefinitionValidationParams = createSelector(getWizardDefinition, def => def.validatorParams);
+
+export const getValidators = (params: any) => createSelector(getWizardDefinition, (definition) => {
+    return definition.getValidators(...params);
+});
diff --git a/ui/src/app/wizard/reducer/wizard.reducer.spec.ts b/ui/src/app/wizard/reducer/wizard.reducer.spec.ts
index 8a50eb116..8276a2d68 100644
--- a/ui/src/app/wizard/reducer/wizard.reducer.spec.ts
+++ b/ui/src/app/wizard/reducer/wizard.reducer.spec.ts
@@ -3,7 +3,6 @@ import * as selectors from './wizard.reducer';
 import {
     WizardActionTypes,
     ClearWizard,
-    AddSchema,
     SetDisabled,
     SetDefinition,
     SetIndex,
@@ -34,12 +33,6 @@ describe('Wizard Reducer', () => {
         });
     });
 
-    describe(`${WizardActionTypes.ADD_SCHEMA}`, () => {
-        it('should add the payload to the schema collection', () => {
-            expect(reducer(snapshot, new AddSchema({id: 'foo', schema: SCHEMA })).schemaCollection).toEqual({ 'foo': SCHEMA });
-        });
-    });
-
     describe(`${WizardActionTypes.SET_DISABLED}`, () => {
         it('should set the disabled property on the wizard', () => {
             expect(reducer(snapshot, new SetDisabled(true)).disabled).toBe(true);
@@ -108,7 +101,6 @@ describe('Wizard Reducer', () => {
 
     describe('selector functions', () => {
         it('should return pieces of state', () => {
-            expect(selectors.getCollection(snapshot)).toEqual(snapshot.schemaCollection);
             expect(selectors.getDefinition(snapshot)).toEqual(snapshot.definition);
             expect(selectors.getDisabled(snapshot)).toEqual(snapshot.disabled);
             expect(selectors.getIndex(snapshot)).toEqual(snapshot.index);
diff --git a/ui/src/app/wizard/reducer/wizard.reducer.ts b/ui/src/app/wizard/reducer/wizard.reducer.ts
index 603fbaeda..819a82533 100644
--- a/ui/src/app/wizard/reducer/wizard.reducer.ts
+++ b/ui/src/app/wizard/reducer/wizard.reducer.ts
@@ -5,8 +5,6 @@ export interface State {
     index: string;
     disabled: boolean;
     definition: Wizard<any>;
-    schemaCollection: { [id: string]: any };
-
     schemaPath: string;
     loading: boolean;
     schema: any;
@@ -17,8 +15,6 @@ export const initialState: State = {
     index: null,
     disabled: false,
     definition: null,
-    schemaCollection: {},
-
     schemaPath: null,
     loading: false,
     schema: null,
@@ -62,16 +58,6 @@ export function reducer(state = initialState, action: WizardActionUnion): State
                 locked: false
             };
         }
-
-        case WizardActionTypes.ADD_SCHEMA: {
-            return {
-                ...state,
-                schemaCollection: {
-                    ...state.schemaCollection,
-                    [action.payload.id]: action.payload.schema
-                }
-            };
-        }
         case WizardActionTypes.SET_DISABLED: {
             return {
                 ...state,
@@ -121,4 +107,3 @@ export const getLocked = (state: State) => state.locked;
 export const getIndex = (state: State) => state.index;
 export const getDisabled = (state: State) => state.disabled;
 export const getDefinition = (state: State) => state.definition;
-export const getCollection = (state: State) => state.schemaCollection;