diff --git a/OnTopic.Editor.AspNetCore.Host/OnTopic.Editor.AspNetCore.Host.csproj b/OnTopic.Editor.AspNetCore.Host/OnTopic.Editor.AspNetCore.Host.csproj
index 381bc706..4255a40a 100644
--- a/OnTopic.Editor.AspNetCore.Host/OnTopic.Editor.AspNetCore.Host.csproj
+++ b/OnTopic.Editor.AspNetCore.Host/OnTopic.Editor.AspNetCore.Host.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OnTopic" Version="4.4.0" />
-    <PackageReference Include="OnTopic.ViewModels" Version="4.4.0" />
-    <PackageReference Include="OnTopic.AspNetCore.Mvc" Version="4.4.0" />
-    <PackageReference Include="OnTopic.Data.Caching" Version="4.4.0" />
-    <PackageReference Include="OnTopic.Data.Sql" Version="4.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.7" />
+    <PackageReference Include="OnTopic" Version="4.5.0" />
+    <PackageReference Include="OnTopic.ViewModels" Version="4.5.0" />
+    <PackageReference Include="OnTopic.AspNetCore.Mvc" Version="4.5.0" />
+    <PackageReference Include="OnTopic.Data.Caching" Version="4.5.0" />
+    <PackageReference Include="OnTopic.Data.Sql" Version="4.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/ContentTypeList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/ContentTypeList/Default.cshtml
index ef56dc16..4b8eeb59 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/ContentTypeList/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/ContentTypeList/Default.cshtml
@@ -14,21 +14,23 @@ else if (Model.TopicList.Count > 2) {
   </select>
 
   <script>
-    (function ($) {
-      $("#@($"ContentTypesFor_{Model.AttributeKey}")").change(function () {
-        var option = $('option:selected', this);
-        @if (Model.EnableModal?? false) {
-          <text>
-            initEditorModal('@Model.AttributeKey', option.text(), option.val(), @Model.OnModalClose); return false;
-          </text>
-        }
-        else {
-          <text>
-            window.location.href = option.val();
-          </text>
-        }
-      });
-    })(jQuery);
+    window.addEventListener('DOMContentLoaded', function () {
+      (function($) {
+        $("#@($"ContentTypesFor_{Model.AttributeKey}")").change(function () {
+          var option = $('option:selected', this);
+          @if (Model.EnableModal?? false) {
+            <text>
+              initEditorModal('@Model.AttributeKey', option.text(), option.val(), @Model.OnModalClose); return false;
+            </text>
+          }
+          else {
+            <text>
+              window.location.href = option.val();
+            </text>
+          }
+        });
+      })(jQuery);
+    });
   </script>
 
 }
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DateTime/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DateTime/Default.cshtml
index 103285a4..23e4943b 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DateTime/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DateTime/Default.cshtml
@@ -16,30 +16,32 @@
 />
 
 <script>
-  $(function() {
+  window.addEventListener('DOMContentLoaded', function() {
+    (function($) {
 
-    //Instantiate date and/or time picker
-    $('#@Html.IdFor(m => m.Value)')
-      .@(includeDatePicker? "date" : "")@(includeTimePicker? "time" : "")picker({
-        @if (includeDatePicker) {
-          <text>
-            dateFormat          : '@Model.AttributeDescriptor.DateFormat',
-            defaultDate         : '@Model.GetDefaultDate()',
-          </text>
-        }
-        @if (includeDatePicker && includeTimePicker) {
-          <text>
-            separator           : '@Model.AttributeDescriptor.DateTimeSeparator',
-          </text>
-        }
-        @if (includeTimePicker) {
-          <text>
-            timeFormat          : '@Model.AttributeDescriptor.TimeFormat',
-            defaultTime         : '@Model.GetDefaultTime()',
-          </text>
-        }
-        defaultValue            : '@Model.GetDefaultDate() @Model.GetDefaultTime()'
-      });
+      //Instantiate date and/or time picker
+      $('#@Html.IdFor(m => m.Value)')
+        .@(includeDatePicker? "date" : "")@(includeTimePicker? "time" : "")picker({
+          @if (includeDatePicker) {
+            <text>
+              dateFormat        : '@Model.AttributeDescriptor.DateFormat',
+              defaultDate       : '@Model.GetDefaultDate()',
+            </text>
+          }
+          @if (includeDatePicker && includeTimePicker) {
+            <text>
+              separator         : '@Model.AttributeDescriptor.DateTimeSeparator',
+            </text>
+          }
+          @if (includeTimePicker) {
+            <text>
+              timeFormat        : '@Model.AttributeDescriptor.TimeFormat',
+              defaultTime       : '@Model.GetDefaultTime()',
+            </text>
+          }
+          defaultValue          : '@Model.GetDefaultDate() @Model.GetDefaultTime()'
+        });
 
+    })(jQuery);
   });
 </script>
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml
index 67cebb09..a2c78fc0 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml
@@ -19,35 +19,16 @@
   asp-for                       ="Value"
   rows                          =@Model.AttributeDescriptor.Rows
   columns                       =@Model.AttributeDescriptor.Columns
-  class                         =@Model.AttributeDescriptor.CssClass
+  class                         ="@Model.AttributeDescriptor.CssClass form-control"
   placeholder                   =@Model.InheritedValue
   disabled                      =@(!Model.AttributeDescriptor.IsEnabled)
   required                      =@Model.AttributeDescriptor.IsRequired
 ></textarea>
 
 <script type="text/javascript">
-  (function ($) {
-
-    var textareaId              = '@Html.IdFor(m => m.Value)';
-
-    $('[id*="EditorModal"]').on('shown.bs.modal', function(e) {
-      $('.Modal [id*="@Html.IdFor(m => m.Value)"]').attr('id', '@Html.IdFor(m => m.Value)_Modal');
-      console.log('new id: ' + $('[id*="@Html.IdFor(m => m.Value)"]').attr('id'));
-      textareaId = '@Html.IdFor(m => m.Value)_Modal';
-      setEditorInstance(textareaId);
-      console.log(textareaId);
-      return;
-    });
-
-    setEditorInstance(textareaId);
-
-  })(jQuery);
-
-  function setEditorInstance(textareaId) {
-    CKEDITOR.replace(textareaId, {
-      height                    : '@Model.AttributeDescriptor.Height',
-      resize_maxHeight          : '@(Model.AttributeDescriptor.Height+300)',
-      customConfig              : '/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/CkEditor/customConfig.js'
-    });
-  }
+  CKEDITOR.replace(@Html.IdFor(m => m.Value), {
+    height                      : '@Model.AttributeDescriptor.Height',
+    resize_maxHeight            : '@(Model.AttributeDescriptor.Height+300)',
+    customConfig                : '/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/CkEditor/customConfig.js'
+  });
 </script>
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/IncomingRelationship/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/IncomingRelationship/Default.cshtml
new file mode 100644
index 00000000..57d73444
--- /dev/null
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/IncomingRelationship/Default.cshtml
@@ -0,0 +1,11 @@
+@model IncomingRelationshipAttributeViewModel
+
+@{
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
+}
+
+<ul>
+  @foreach(var relatedTopic in Model.RelatedTopics) {
+    <li><a href="@Url.Action("Edit", new { path = relatedTopic.WebPath })">@relatedTopic.Title</a></li>
+  }
+</ul>
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Instruction/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Instruction/Default.cshtml
new file mode 100644
index 00000000..f588ded5
--- /dev/null
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Instruction/Default.cshtml
@@ -0,0 +1,13 @@
+@model AttributeViewModel<InstructionAttributeTopicViewModel>
+
+@{
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
+}
+
+<div class="label">
+  <div class="alert alert-warning" role="alert">
+    @Html.Raw(@Model.AttributeDescriptor.Instructions)
+  </div>
+</div>
+
+<input type="hidden" asp-for="Value" />
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/NestedTopicList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/NestedTopicList/Default.cshtml
index cde62a49..5ae596f7 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/NestedTopicList/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/NestedTopicList/Default.cshtml
@@ -14,31 +14,39 @@
   <div id="@containerName"></div>
 
   <script type="text/javascript">
+
     var @($"{treeName}");
 
-    Ext.onReady(function () {
-
-      @($"{treeName}")          = new OnTopic.NestedTopics('@Model.UniqueKey', {
-        dataUrl                 : '/OnTopic/Json/@Model.WebPath/@attributeKey?ShowAll=true',
-        listeners               : {
-          click                 : function (n) {
-            var targetUrl       = "@($"{Url.Action("Edit")}/{attributeKey}/")" + n.attributes.key;
-            @if (Model.AttributeDescriptor.EnableModal?? true) {
-              <text>
-                initEditorModal('@attributeKey', n.attributes.text, targetUrl + '?IsModal=true', @($"{treeName}.refresh"));return false;
-              </text>
-            }
-            else {
-              <text>
-                location.href   = targetUrl;
-              </text>
+    window.addEventListener('DOMContentLoaded', function () {
+      (function($) {
+
+        Ext.onReady(function () {
+
+          @($"{treeName}")      = new OnTopic.NestedTopics('@Model.UniqueKey', {
+            dataUrl             : '/OnTopic/Json/@Model.WebPath/@attributeKey?ShowAll=true',
+            listeners           : {
+              click             : function (n) {
+                var targetUrl   = "@($"{Url.Action("Edit")}/{attributeKey}/")" + n.attributes.key;
+                @if (Model.AttributeDescriptor.EnableModal?? true) {
+                  <text>
+                    initEditorModal('@attributeKey', n.attributes.text, targetUrl + '?IsModal=true', @($"{treeName}.refresh"));
+                    return false;
+                  </text>
+                }
+                else {
+                  <text>
+                    location.href = targetUrl;
+                  </text>
+                }
+              }
             }
-          }
-        }
-      });
+          });
+
+          @($"{treeName}").render('@containerName');
 
-      @($"{treeName}").render('@containerName');
+        });
 
+      })(jQuery);
     });
 
   </script>
@@ -50,10 +58,10 @@
     values                      =@Model.AttributeDescriptor.PermittedContentTypes>
   </vc:content-type-list>
 
-  <div id="@($"EditorModal_{attributeKey}")" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+  <div id="@($"EditorModal_{attributeKey}")" class="modal fade" data-backdrop="static" data-keyboard="false" tabindex="-1"  role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
       <div class="modal-header page title">
-        <h2 id="@($"ModalTitle_{attributeKey}")"><!-- determined by modal open script caller --></h2>
+        <h2 id="@($"ModalTitle_{attributeKey}")" class="modal-title"><!-- determined by modal open script caller --></h2>
       </div>
       <div class="modal-content">
         <iframe id="@($"EditorFrame_{attributeKey}")" src="" width="100%" marginheight="0" frameborder="0">
@@ -64,10 +72,12 @@
   </div>
 
   <script>
-    $(function() {
-      $('[id^="EditorModal"]').on('hide.bs.modal', function (e) {
-        @($"{treeName}.refresh")();
-      });
+    window.addEventListener('DOMContentLoaded', function () {
+      (function($) {
+        $('[id^="EditorModal"]').on('hide.bs.modal', function(e) {
+          @($"{treeName}.refresh")();
+        });
+      })(jQuery);
     });
   </script>
 
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Relationship/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Relationship/Default.cshtml
index 7eaf92cb..004c2778 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Relationship/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Relationship/Default.cshtml
@@ -14,12 +14,16 @@
 <div id="@containerName"></div>
 
 <script type="text/javascript">
-  Ext.onReady(function(){
-    var tree                    = new OnTopic.SelectableTreeView({
-      dataUrl                   : '/OnTopic/Json/@rootTopicKey?ShowRoot=@descriptor.ShowRoot&ShowAll=true&RelatedNamespace=@descriptor.Key&RelatedTopicID=@Model.CurrentTopic.Id&AttributeName=@descriptor.AttributeKey&AttributeValue=@descriptor.AttributeValue&ExpandRelated=@descriptor.ExpandRelated',
-      checkAscendants           : @((descriptor.CheckAscendants is true).ToString().ToLower()),
-      backingField              : '@Html.IdFor(m => m.Value)'
-    });
-    tree.render('@containerName');
+  window.addEventListener('DOMContentLoaded', function () {
+    (function($) {
+      Ext.onReady(function () {
+        var tree = new OnTopic.SelectableTreeView({
+          dataUrl: '/OnTopic/Json/@rootTopicKey?ShowRoot=@descriptor.ShowRoot&ShowAll=true&RelatedNamespace=@descriptor.Key&RelatedTopicID=@Model.CurrentTopic.Id&AttributeName=@descriptor.AttributeKey&AttributeValue=@descriptor.AttributeValue&ExpandRelated=@descriptor.ExpandRelated',
+          checkAscendants: @((descriptor.CheckAscendants is true).ToString().ToLower()),
+          backingField: '@Html.IdFor(m => m.Value)'
+        });
+        tree.render('@containerName');
+      });
+    })(jQuery);
   });
 </script>
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Text/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Text/Default.cshtml
index fe691a5f..987b30c1 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Text/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Text/Default.cshtml
@@ -7,8 +7,11 @@
 <input
   type                          =@Model.AttributeDescriptor.InputType
   asp-for                       =@Model.Value
+  minlength                     =@Model.AttributeDescriptor.MinimumLength
   maxlength                     =@Model.AttributeDescriptor.MaximumLength
   class                         ="@Model.AttributeDescriptor.CssClass form-control"
+  title                         =@Model.AttributeDescriptor.ValidationMessage
+  pattern                       =@Model.AttributeDescriptor.Pattern
   placeholder                   =@Model.InheritedValue
   disabled                      =@(!Model.AttributeDescriptor.IsEnabled)
   required                      =@Model.AttributeDescriptor.IsRequired
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TextArea/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TextArea/Default.cshtml
index 7b6630dd..a40a4148 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TextArea/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TextArea/Default.cshtml
@@ -8,6 +8,7 @@
   asp-for                       ="Value"
   rows                          =@Model.AttributeDescriptor.Rows
   cols                          =@Model.AttributeDescriptor.Columns
+  minlength                     =@Model.AttributeDescriptor.MinimumLength
   maxlength                     =@Model.AttributeDescriptor.MaximumLength
   class                         ="@Model.AttributeDescriptor.CssClass form-control"
   placeholder                   =@Model.InheritedValue
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml
index 36ca6fc1..45527284 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml
@@ -18,21 +18,24 @@
 </div>
 
 <script>
-  $(function() {
-
-  //Create new instance of TokenizedTopics and set relevant properties
-    var topics                  = new TokenizedTopics();
-    topics.selector             = '#@Html.IdFor(m => m.Value)';
-    topics.scope                = '@rootTopicKey';
-    topics.attributeName        = '@descriptor.AttributeKey';
-    topics.attributeValue       = '@descriptor.AttributeValue';
-    topics.resultLimit          = '@descriptor.ResultLimit';
-    topics.tokenLimit           = @descriptor.TokenLimit;
-    topics.isAutoPostBack       = @((descriptor.AutoPostBack?? false).ToString().ToLower());
-    topics.selectedTopics       = @Html.Raw(Model.SelectedTopics);
-
-  //Fire TokenizedTopics.prototype.getTokenizedTopics() (and $([selector]).tokenInput())
-    topics.getTokenizedTopics();
+  window.addEventListener('DOMContentLoaded', function () {
+    (function($) {
+
+      //Create new instance of TokenizedTopics and set relevant properties
+      var topics                = new TokenizedTopics();
+      topics.selector           = '#@Html.IdFor(m => m.Value)';
+      topics.scope              = '@rootTopicKey';
+      topics.attributeName      = '@descriptor.AttributeKey';
+      topics.attributeValue     = '@descriptor.AttributeValue';
+      topics.resultLimit        = '@descriptor.ResultLimit';
+      topics.tokenLimit         = @descriptor.TokenLimit;
+      topics.isAutoPostBack     = @((descriptor.AutoPostBack?? false).ToString().ToLower());
+      topics.selectedTopics     = @Html.Raw(Model.SelectedTopics);
+
+      //Fire TokenizedTopics.prototype.getTokenizedTopics() (and $([selector]).tokenInput())
+      topics.getTokenizedTopics();
+
+    })(jQuery);
 
   });
 
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml
index 20d4b8b1..542829f2 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml
@@ -65,7 +65,7 @@
     </div>
 
     @if (!Model.IsModal) {
-      <div class="col-lg-3 callouts">
+      <div class="col-lg-3 callouts d-none d-lg-block">
         <div class="callout topic-info">
 
           <h3 class="h5">Topic Information</h3>
@@ -75,7 +75,7 @@
             <dt><i class="fa fa-database"></i> Topic ID</dt>
             <dd><a href="/Topic/@Model.Topic.Id/">@Model.Topic.Id</a></dd>
             <dt><i class="fa fa-eye"></i> Current</dt>
-            <dd><a href="@Model.Topic.WebPath">View Page</a></dd>
+            <dd><a href="@Model.Topic.WebPath" rel="noopener" target="_blank">View Page</a></dd>
           </dl>
 
         </div>
@@ -86,41 +86,35 @@
 
 </form>
 
-@section scripts {
-  <script>
-
-    $(function () {
-
-      /**
-       * Trigger jQuery validation
-       */
-      $('#EditorForm').validate({
-        ignore: [],
-        invalidHandler: function () {
-          setTimeout(function () {
-            $('.nav-tabs a small.required').remove();
-            $('.nav-tabs a.error').removeClass("error");
-            $('.tab-content.tab-validate .tab-pane:has(input.error)').each(function () {
-              var id = $(this).attr('id');
-              $('.nav-tabs').find('a[href^="#' + id + '"]').addClass("error").append(' <small class="required">*</small>');
-            });
-          });
-        }
+@section InlineScript {
+
+  /**
+  * Trigger jQuery validation
+  */
+  $('#EditorForm').validate({
+    ignore: [],
+    invalidHandler: function () {
+      setTimeout(function () {
+        $('.nav-tabs a small.required').remove();
+        $('.nav-tabs a.error').removeClass("error");
+        $('.tab-content.tab-validate .tab-pane:has(input.error, textarea.error, select.error)').each(function () {
+          var id = $(this).attr('id');
+          $('.nav-tabs').find('a[href^="#' + id + '"]').addClass("error").append(' <small class="required">*</small>');
+        });
       });
+    }
+  });
 
-      @if (Model.Topic.DerivedTopic != null) {
-        <text>
-          /**
-           * Disable required fields if derived topic, as missing values will be inherited
-           */
-          $('section input, section textarea, section select')
-            .not("section.Key input")
-            .removeAttr('required')
-            .rules('remove', 'required');
-        </text>
-      }
-
-    });
+  @if (Model.Topic.DerivedTopic != null) {
+    <text>
+      /**
+      * Disable required fields if derived topic, as missing values will be inherited
+      */
+      $('section input, section textarea, section select')
+        .not("section.Key input")
+        .removeAttr('required')
+        .rules('remove', 'required');
+    </text>
+  }
 
-  </script>
 }
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Layout.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Layout.cshtml
index 5156e461..2a21cb60 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Layout.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Layout.cshtml
@@ -9,12 +9,12 @@
     <title>@Model.Topic.Title (OnTopic)</title>
 
     <!-- Vendor Scripts -->
-    <script src="~/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/Vendor.js"></script>
     <script src="https://cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
-    <script src="https://use.fontawesome.com/fd4f92cdd7.js"></script>
+    <script src="~/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/Vendor.js" defer></script>
+    <script src="https://use.fontawesome.com/fd4f92cdd7.js" defer></script>
 
     <!-- Vendor Styles -->
-    <link rel="stylesheet" type="text/css" href="~/_content/OnTopic.Editor.AspNetCore/Shared/Styles/Vendor.css" />
+    <link rel="stylesheet" type="text/css" href="~/_content/OnTopic.Editor.AspNetCore/Shared/Styles/Vendor.css" asp-append-version="true" />
     <link rel="stylesheet" type="text/css" href="~/_content/OnTopic.Editor.AspNetCore/Shared/Styles/ExtJS/css/ext-all.css" />
     <link rel="stylesheet" type="text/css" href="~/_content/OnTopic.Editor.AspNetCore/Shared/Styles/ExtJS/css/xtheme-gray.css" />
 
@@ -34,7 +34,7 @@
           <div class="row">
 
             <!-- Site Name -->
-            <div class="col-md-2 col-sm-3 logotype lockup">
+            <div class="col-md-2 col-sm-3 d-none d-lg-block logotype lockup">
               <a href="~/">OnTopic</a>
             </div>
             <!-- /Site Name -->
@@ -56,7 +56,7 @@
 
         <!-- Primary (Treeview) Sidebar -->
         @if (!Model.IsModal) {
-          <nav id="Sidebar" class="col-md-2 col-sm-3 sidebar" role="navigation">
+          <nav id="Sidebar" class="col-md-2 col-sm-3 sidebar d-none d-sm-block" role="navigation">
             <div id="FixedSidebar">
               <div id="TreeView"></div>
               <text>
@@ -85,18 +85,31 @@
       </div>
     </main>
 
-    <script src="~/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/Scripts.js" asp-append-version="true"></script>
+    <script src="~/_content/OnTopic.Editor.AspNetCore/Shared/Scripts/Scripts.js" asp-append-version="true" defer></script>
 
-    @if (!Model.IsModal) {
-      <script>
-        Ext.onReady(function () {
-          var tree = new OnTopic.Navigation('@Model.Topic.UniqueKey');
-          tree.render('TreeView');
-        });
-      </script>
-    }
+    @RenderSection("Scripts", required: false)
+
+    <script>
+      /**
+        * Initialize Foundation and inline scripts
+        */
+      window.addEventListener('DOMContentLoaded', function() {
+        (function($) {
+
+          @if (!Model.IsModal) {
+            <text>
+              Ext.onReady(function () {
+                var tree = new OnTopic.Navigation('@Model.Topic.UniqueKey');
+                tree.render('TreeView');
+              });
+            </text>
+          }
+
+          @RenderSection("InlineScript", false)
 
-    @RenderSection("scripts", required: false)
+        })(jQuery);
+      });
+    </script>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Toolbar.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Toolbar.cshtml
index 11a79644..d0944732 100644
--- a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Toolbar.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Toolbar.cshtml
@@ -11,7 +11,7 @@
 
     @if (Model.Topic.VersionHistory.Count > 1) {
       <!-- Versions -->
-      <div id="VersionsDropdown" class="dropdown" style="display:inline-block;">
+      <div id="VersionsDropdown" class="dropdown d-none d-lg-inline-block" style="display:inline-block;">
         <button class="btn btn-sm btn-ancillary dropdown-toggle" type="button" id="VersionsButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <span class="fa fa-history"></span>
           Versions
@@ -36,7 +36,7 @@
 
     <!-- Export -->
     @if (!Model.IsModal) {
-      <a href="@Url.Action("Export", "Editor", new { path=Model.Topic.WebPath })" class="btn btn-ancillary btn-sm">
+      <a href="@Url.Action("Export", "Editor", new { path=Model.Topic.WebPath })" class="btn btn-ancillary btn-sm d-none d-lg-inline-block">
         <span class="fa fa-arrow-down"></span>
         Export
       </a>
@@ -64,7 +64,7 @@
       var displayGroupName      = displayGroups[i];
       var displayGroupId        = displayGroups[i].Replace(" ", String.Empty);
       <li class="nav-item">
-        <a id="Tab_@displayGroupId" class="nav-link @(i == 0 ? "active" : "")" href="#Group_@displayGroupId" data-toggle="tab" role="tab" aria-controls="#Group_@displayGroupId" @(i == 0 ? "aria-expanded=\"true\"" : "")>@displayGroupName</a>
+        <a id="Tab_@displayGroupId" class="nav-link @(i == 0 ? "active" : "")" href="#Group_@displayGroupId" data-toggle="tab" role="tab" aria-controls="#Group_@displayGroupId" aria-expanded="@(i == 0 ? "true" : "false")">@displayGroupName</a>
       </li>
     }
   </ul>
diff --git a/OnTopic.Editor.AspNetCore/Components/BooleanViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/BooleanViewComponent.cs
index 54df8aaa..f7b5aeca 100644
--- a/OnTopic.Editor.AspNetCore/Components/BooleanViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/BooleanViewComponent.cs
@@ -22,7 +22,7 @@ public class BooleanViewComponent: ViewComponent {
     | CONSTRUCTOR
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Initializes a new instance of a <see cref="LastModifiedViewComponent"/> with necessary dependencies.
+    ///   Initializes a new instance of a <see cref="BooleanViewComponent"/> with necessary dependencies.
     /// </summary>
     /// <returns>A topic <see cref="NavigationTopicViewComponentBase{T}"/>.</returns>
     public BooleanViewComponent() : base() { }
@@ -31,7 +31,7 @@ public BooleanViewComponent() : base() { }
     | METHOD: INVOKE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Assembles the view model for the <see cref="DefaultAttributeTypeViewComponent"/>.
+    ///   Assembles the view model for the <see cref="BooleanViewComponent"/>.
     /// </summary>
     public IViewComponentResult Invoke(
       EditingTopicViewModel currentTopic,
diff --git a/OnTopic.Editor.AspNetCore/Components/DefaultAttributeTypeViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/DefaultAttributeTypeViewComponent.cs
index ec64a870..08b60e7f 100644
--- a/OnTopic.Editor.AspNetCore/Components/DefaultAttributeTypeViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/DefaultAttributeTypeViewComponent.cs
@@ -3,6 +3,7 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
+using System;
 using Microsoft.AspNetCore.Mvc;
 using OnTopic.Editor.Models;
 using OnTopic.Editor.Models.Metadata;
@@ -24,6 +25,10 @@ namespace OnTopic.Editor.AspNetCore.Components {
   ///   still expected that derived classes be created, but by deriving from <see cref="DefaultAttributeTypeViewComponent"/>,
   ///   they do not need to implement their own <see cref="InvokeAsync(AttributeDescriptorTopicViewModel, String)"/> method.
   /// </remarks>
+  [Obsolete(
+    "While the DefaultAttributeType view component was originally implemented as a base class for other view components, it " +
+    "is no longer used and will be removed in the next major release of OnTopic."
+  )]
   public class DefaultAttributeTypeViewComponent : ViewComponent {
 
     /*==========================================================================================================================
diff --git a/OnTopic.Editor.AspNetCore/Components/DisplayOptionsViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/DisplayOptionsViewComponent.cs
index 2cc86951..7fec837a 100644
--- a/OnTopic.Editor.AspNetCore/Components/DisplayOptionsViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/DisplayOptionsViewComponent.cs
@@ -3,6 +3,7 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
+using System;
 
 namespace OnTopic.Editor.AspNetCore.Components {
 
@@ -12,6 +13,10 @@ namespace OnTopic.Editor.AspNetCore.Components {
   /// <summary>
   ///   Delivers a view model for a display options attribute type.
   /// </summary>
+  [Obsolete(
+    "The DisplayOptions view component is no longer supported and will be removed in the next major version of OnTopic. Use " +
+    "the TopicList view component instead, which can be bound to a LookupList content type to provide a list of options."
+  )]
   public class DisplayOptionsViewComponent: DefaultAttributeTypeViewComponent {
 
     /*==========================================================================================================================
diff --git a/OnTopic.Editor.AspNetCore/Components/FileListViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/FileListViewComponent.cs
index d81f08f1..a0b386dc 100644
--- a/OnTopic.Editor.AspNetCore/Components/FileListViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/FileListViewComponent.cs
@@ -34,7 +34,7 @@ public class FileListViewComponent: ViewComponent {
     | CONSTRUCTOR
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Initializes a new instance of a <see cref="FileViewComponent"/> with necessary dependencies.
+    ///   Initializes a new instance of a <see cref="FileListViewComponent"/> with necessary dependencies.
     /// </summary>
     public FileListViewComponent(IWebHostEnvironment webHostEnvironment): base() {
       _webHostEnvironment = webHostEnvironment;
@@ -44,7 +44,7 @@ public FileListViewComponent(IWebHostEnvironment webHostEnvironment): base() {
     | METHOD: INVOKE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Assembles the view model for the <see cref="DefaultAttributeTypeViewComponent"/>.
+    ///   Assembles the view model for the <see cref="FileListViewComponent"/>.
     /// </summary>
     public IViewComponentResult Invoke(
       EditingTopicViewModel currentTopic,
diff --git a/OnTopic.Editor.AspNetCore/Components/FilePathViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/FilePathViewComponent.cs
index 5b911cbf..edfaf706 100644
--- a/OnTopic.Editor.AspNetCore/Components/FilePathViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/FilePathViewComponent.cs
@@ -83,7 +83,7 @@ protected Topic? CurrentTopic {
     | METHOD: INVOKE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Assembles the view model for the <see cref="DefaultAttributeTypeViewComponent"/>.
+    ///   Assembles the view model for the <see cref="FilePathViewComponent"/>.
     /// </summary>
     public IViewComponentResult Invoke(
       EditingTopicViewModel currentTopic,
diff --git a/OnTopic.Editor.AspNetCore/Components/IncomingRelationshipViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/IncomingRelationshipViewComponent.cs
new file mode 100644
index 00000000..8cb29e93
--- /dev/null
+++ b/OnTopic.Editor.AspNetCore/Components/IncomingRelationshipViewComponent.cs
@@ -0,0 +1,99 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+using System;
+using Microsoft.AspNetCore.Mvc;
+using OnTopic.Editor.Models;
+using OnTopic.Editor.Models.Components.ViewModels;
+using OnTopic.Editor.Models.Metadata;
+using OnTopic.Repositories;
+using OnTopic.ViewModels;
+
+namespace OnTopic.Editor.AspNetCore.Components {
+
+  /*============================================================================================================================
+  | CLASS: INCOMING RELATIONSHIP (VIEW COMPONENT)
+  \---------------------------------------------------------------------------------------------------------------------------*/
+  /// <summary>
+  ///   Delivers a view model for an incoming relationship attribute type.
+  /// </summary>
+  public class IncomingRelationshipViewComponent : ViewComponent {
+
+    /*==========================================================================================================================
+    | PRIVATE VARIABLES
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    private readonly            ITopicRepository                _topicRepository;
+
+    /*==========================================================================================================================
+    | CONSTRUCTOR
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Initializes a new instance of a <see cref="IncomingRelationshipViewComponent"/> with necessary dependencies.
+    /// </summary>
+    public IncomingRelationshipViewComponent(ITopicRepository topicRepository) : base() {
+      _topicRepository          = topicRepository;
+    }
+
+    /*==========================================================================================================================
+    | METHOD: INVOKE
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Assembles the view model for the <see cref="IncomingRelationshipViewComponent"/>.
+    /// </summary>
+    public IViewComponentResult Invoke(
+      EditingTopicViewModel currentTopic,
+      IncomingRelationshipAttributeTopicViewModel attribute,
+      string htmlFieldPrefix
+    ) {
+
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Set HTML prefix
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      ViewData.TemplateInfo.HtmlFieldPrefix = htmlFieldPrefix;
+
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Establish view model
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      var model = new IncomingRelationshipAttributeViewModel(currentTopic, attribute);
+
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Set incoming relationships
+      >-------------------------------------------------------------------------------------------------------------------------
+      | ### NOTE JJC20200929: This would be a lot cleaner using the ITopicMappingService. But that would introduce an additional
+      | dependency on the StandardEditorComposer, which would be a breaking change. We can reevaluate this in the future if
+      | other view components would benefit from this.
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      var topic                 = _topicRepository.Load(currentTopic.UniqueKey);
+
+      foreach(var relatedTopic in topic.IncomingRelationships.GetTopics(attribute.RelationshipKey?? attribute.Key)) {
+        if (
+          !String.IsNullOrWhiteSpace(attribute.AttributeKey) &&
+          relatedTopic.Attributes.GetValue(attribute.AttributeKey) != attribute.AttributeValue
+        ) {
+          continue;
+        }
+        var relatedViewModel    = new TopicViewModel {
+          Id                    = relatedTopic.Id,
+          Key                   = relatedTopic.Key,
+          ContentType           = relatedTopic.ContentType,
+          UniqueKey             = relatedTopic.GetUniqueKey(),
+          WebPath               = relatedTopic.GetWebPath(),
+          IsHidden              = relatedTopic.IsHidden,
+          View                  = relatedTopic.View,
+          Title                 = relatedTopic.Title,
+          LastModified          = relatedTopic.LastModified
+        };
+        model.RelatedTopics.Add(relatedViewModel);
+      }
+
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Return view with view model
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      return View(model);
+
+    }
+
+  } // Class
+} // Namespace
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Components/InstructionViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/InstructionViewComponent.cs
new file mode 100644
index 00000000..46442552
--- /dev/null
+++ b/OnTopic.Editor.AspNetCore/Components/InstructionViewComponent.cs
@@ -0,0 +1,45 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+using Microsoft.AspNetCore.Mvc;
+using OnTopic.Editor.Models;
+using OnTopic.Editor.Models.Metadata;
+
+namespace OnTopic.Editor.AspNetCore.Components {
+
+  /*============================================================================================================================
+  | CLASS: INSTRUCTION (VIEW COMPONENT)
+  \---------------------------------------------------------------------------------------------------------------------------*/
+  /// <summary>
+  ///   Delivers a view model for an instruction attribute type.
+  /// </summary>
+  public class InstructionViewComponent: ViewComponent {
+
+    /*==========================================================================================================================
+    | CONSTRUCTOR
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Initializes a new instance of a <see cref="InstructionViewComponent"/> with necessary dependencies.
+    /// </summary>
+    /// <returns>A topic <see cref="NavigationTopicViewComponentBase{T}"/>.</returns>
+    public InstructionViewComponent() : base() { }
+
+    /*==========================================================================================================================
+    | METHOD: INVOKE
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Assembles the view model for the <see cref="InstructionViewComponent"/>.
+    /// </summary>
+    public IViewComponentResult Invoke(
+      EditingTopicViewModel currentTopic,
+      InstructionAttributeTopicViewModel attribute,
+      string htmlFieldPrefix
+    ) {
+      ViewData.TemplateInfo.HtmlFieldPrefix = htmlFieldPrefix;
+      return View(new AttributeViewModel<InstructionAttributeTopicViewModel>(currentTopic, attribute));
+    }
+
+  } // Class
+} // Namespace
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Components/NumberViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/NumberViewComponent.cs
index bf95d3af..b51a8983 100644
--- a/OnTopic.Editor.AspNetCore/Components/NumberViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/NumberViewComponent.cs
@@ -30,7 +30,7 @@ public NumberViewComponent() : base() { }
     | METHOD: INVOKE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Assembles the view model for the <see cref="DefaultAttributeTypeViewComponent"/>.
+    ///   Assembles the view model for the <see cref="NumberViewComponent"/>.
     /// </summary>
     public IViewComponentResult Invoke(
       EditingTopicViewModel currentTopic,
diff --git a/OnTopic.Editor.AspNetCore/Components/TextAreaViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/TextAreaViewComponent.cs
index d750ea88..69faccce 100644
--- a/OnTopic.Editor.AspNetCore/Components/TextAreaViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/TextAreaViewComponent.cs
@@ -31,7 +31,7 @@ public TextAreaViewComponent() : base() { }
     | METHOD: INVOKE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Assembles the view model for the <see cref="DefaultAttributeTypeViewComponent"/>.
+    ///   Assembles the view model for the <see cref="TextAreaViewComponent"/>.
     /// </summary>
     public IViewComponentResult Invoke(
       EditingTopicViewModel currentTopic,
diff --git a/OnTopic.Editor.AspNetCore/Components/TextViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/TextViewComponent.cs
index f0132d5d..dffbcf4d 100644
--- a/OnTopic.Editor.AspNetCore/Components/TextViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/TextViewComponent.cs
@@ -31,7 +31,7 @@ public TextViewComponent() : base() { }
     | METHOD: INVOKE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Assembles the view model for the <see cref="DefaultAttributeTypeViewComponent"/>.
+    ///   Assembles the view model for the <see cref="TextViewComponent"/>.
     /// </summary>
     public IViewComponentResult Invoke(
       EditingTopicViewModel currentTopic,
diff --git a/OnTopic.Editor.AspNetCore/Components/TopicReferenceViewComponent.cs b/OnTopic.Editor.AspNetCore/Components/TopicReferenceViewComponent.cs
index 71c2c109..443e2a6f 100644
--- a/OnTopic.Editor.AspNetCore/Components/TopicReferenceViewComponent.cs
+++ b/OnTopic.Editor.AspNetCore/Components/TopicReferenceViewComponent.cs
@@ -31,7 +31,7 @@ public TopicReferenceViewComponent() : base() {
     | METHOD: INVOKE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Assembles the view model for the <see cref="NestedTopicListViewComponent"/>.
+    ///   Assembles the view model for the <see cref="TopicReferenceViewComponent"/>.
     /// </summary>
     public IViewComponentResult Invoke(
       EditingTopicViewModel currentTopic,
diff --git a/OnTopic.Editor.AspNetCore/Controllers/EditorController.cs b/OnTopic.Editor.AspNetCore/Controllers/EditorController.cs
index 06857aaa..8578d51a 100644
--- a/OnTopic.Editor.AspNetCore/Controllers/EditorController.cs
+++ b/OnTopic.Editor.AspNetCore/Controllers/EditorController.cs
@@ -346,9 +346,6 @@ public async Task<IActionResult> Edit(
         else if (attribute.Key.Equals("Key")) {
           topic.Key = attributeValue.Value.Replace(" ", "");
         }
-        else if (String.IsNullOrEmpty(attributeValue.Value)) {
-          topic.Attributes.Remove(attribute.Key);
-        }
         else {
           topic.Attributes.SetValue(attribute.Key, attributeValue.Value);
         }
@@ -434,7 +431,7 @@ public IActionResult Delete(bool isModal = false) {
       | Lock the Topic repository before executing the delete
       \-------------------------------------------------------------------------------------------------------------------------*/
       lock (TopicRepository) {
-        TopicRepository.Delete(CurrentTopic);
+        TopicRepository.Delete(CurrentTopic, true);
       }
 
       /*--------------------------------------------------------------------------------------------------------------------------
@@ -718,15 +715,15 @@ public async Task<IActionResult> Import(IFormFile jsonFile, [Bind(Prefix = "Impo
       /*------------------------------------------------------------------------------------------------------------------------
       | DELETE UNMATCHED TOPICS
       >-------------------------------------------------------------------------------------------------------------------------
-      | ### HACK JJC20200327: The Data Transfer library doesnt have access to the ITopicRepository, so it can't delete topics.
+      | ### HACK JJC20200327: The Data Transfer library doesn't have access to the ITopicRepository, so it can't delete topics.
       | Instead, it removes them from the topic graph. But the ITopicRepository implementations don't have a means of detecting
-      | removed topics during a recursive save and, therefore, the deletions aren't persited to the database. To mitigate this,
+      | removed topics during a recursive save and, therefore, the deletions aren't persisted to the database. To mitigate this,
       | we evaluate the topic graph after the save, and then delete any orphans.
       \-----------------------------------------------------------------------------------------------------------------------*/
       var unmatchedTopics       = topics.Except(target.FindAll(t => !t.IsNew));
 
       foreach (var unmatchedTopic in unmatchedTopics) {
-        TopicRepository.Delete(unmatchedTopic);
+        TopicRepository.Delete(unmatchedTopic, true);
       }
 
       /*------------------------------------------------------------------------------------------------------------------------
diff --git a/OnTopic.Editor.AspNetCore/Infrastructure/AttributeBindingModelLookupService.cs b/OnTopic.Editor.AspNetCore/Infrastructure/AttributeBindingModelLookupService.cs
index 58ae0e91..a52f62e2 100644
--- a/OnTopic.Editor.AspNetCore/Infrastructure/AttributeBindingModelLookupService.cs
+++ b/OnTopic.Editor.AspNetCore/Infrastructure/AttributeBindingModelLookupService.cs
@@ -33,6 +33,8 @@ public AttributeBindingModelLookupService() : base() {
       Add(typeof(FileListAttributeBindingModel));
       Add(typeof(FilePathAttributeBindingModel));
       Add(typeof(HtmlAttributeBindingModel));
+      Add(typeof(IncomingRelationshipAttributeBindingModel));
+      Add(typeof(InstructionAttributeBindingModel));
       Add(typeof(LastModifiedAttributeBindingModel));
       Add(typeof(LastModifiedByAttributeBindingModel));
       Add(typeof(NestedTopicListAttributeBindingModel));
diff --git a/OnTopic.Editor.AspNetCore/Infrastructure/EditorViewModelLookupService.cs b/OnTopic.Editor.AspNetCore/Infrastructure/EditorViewModelLookupService.cs
index 3a4f2c35..4ce28a92 100644
--- a/OnTopic.Editor.AspNetCore/Infrastructure/EditorViewModelLookupService.cs
+++ b/OnTopic.Editor.AspNetCore/Infrastructure/EditorViewModelLookupService.cs
@@ -37,6 +37,8 @@ public EditorViewModelLookupService() : base() {
       Add(typeof(FileListAttributeTopicViewModel));
       Add(typeof(FilePathAttributeTopicViewModel));
       Add(typeof(HtmlAttributeTopicViewModel));
+      Add(typeof(IncomingRelationshipAttributeTopicViewModel));
+      Add(typeof(InstructionAttributeTopicViewModel));
       Add(typeof(LastModifiedAttributeTopicViewModel));
       Add(typeof(LastModifiedByAttributeTopicViewModel));
       Add(typeof(NestedTopicListAttributeTopicViewModel));
diff --git a/OnTopic.Editor.AspNetCore/OnTopic.Editor.AspNetCore.csproj b/OnTopic.Editor.AspNetCore/OnTopic.Editor.AspNetCore.csproj
index 71f7d8e2..0f3327cf 100644
--- a/OnTopic.Editor.AspNetCore/OnTopic.Editor.AspNetCore.csproj
+++ b/OnTopic.Editor.AspNetCore/OnTopic.Editor.AspNetCore.csproj
@@ -30,10 +30,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OnTopic" Version="4.4.0" />
+    <PackageReference Include="OnTopic" Version="4.5.0" />
     <PackageReference Include="OnTopic.Data.Transfer" Version="1.2.0" />
-    <PackageReference Include="OnTopic.ViewModels" Version="4.4.0" />
-    <PackageReference Include="OnTopic.AspNetCore.Mvc" Version="4.4.0" />
+    <PackageReference Include="OnTopic.ViewModels" Version="4.5.0" />
+    <PackageReference Include="OnTopic.AspNetCore.Mvc" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OnTopic.Editor.AspNetCore/Shared/Scripts/Layout.js b/OnTopic.Editor.AspNetCore/Shared/Scripts/Layout.js
index 8bfab9fa..84fa0b25 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Scripts/Layout.js
+++ b/OnTopic.Editor.AspNetCore/Shared/Scripts/Layout.js
@@ -18,8 +18,8 @@ $(function () {
   /*----------------------------------------------------------------------------------------------------------------------------
   | Establish initial variables
   \---------------------------------------------------------------------------------------------------------------------------*/
-  var $windowHeight     = $(window).height();
-  var $topBarHeight     = $('#HeaderContainer').height();
+  var $windowHeight             = $(window).height();
+  var $topBarHeight             = $('#HeaderContainer').height();
 
   /*----------------------------------------------------------------------------------------------------------------------------
   | Compensate for height of the header and toolbar
@@ -27,7 +27,7 @@ $(function () {
   $('body').css('padding-top', $topBarHeight + 'px');
   $(window).resize(function() {
     setTimeout(function() {
-      $topBarHeight     = $('#HeaderContainer').height();
+      $topBarHeight             = $('#HeaderContainer').height();
       $('body').css('padding-top', $topBarHeight + 'px');
     }, 50);
   });
@@ -35,8 +35,8 @@ $(function () {
   /*----------------------------------------------------------------------------------------------------------------------------
   | Set size and location of toolbar
   \---------------------------------------------------------------------------------------------------------------------------*/
-  var $dynamicFormWidth = $('#PageContentArea').width();
-  var $editorNavBar     = $('#Toolbar');
+  var $dynamicFormWidth         = $('#PageContentArea').width();
+  var $editorNavBar             = $('#Toolbar');
   if ($editorNavBar) {
     $editorNavBar.css('width', $dynamicFormWidth + 'px').css('top', $topBarHeight+1 + 'px');
   }
@@ -46,7 +46,7 @@ $(function () {
   \---------------------------------------------------------------------------------------------------------------------------*/
   $(window).resize(function() {
     setTimeout(function() {
-      $dynamicFormWidth = $('#PageContentArea').width();
+      $dynamicFormWidth         = $('#PageContentArea').width();
       $editorNavBar.css('width', $dynamicFormWidth + 'px').css('top', $topBarHeight+1 + 'px');
     }, 50);
   });
diff --git a/OnTopic.Editor.AspNetCore/Shared/Scripts/NestedTopicList.js b/OnTopic.Editor.AspNetCore/Shared/Scripts/NestedTopicList.js
index 743b371f..9b945475 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Scripts/NestedTopicList.js
+++ b/OnTopic.Editor.AspNetCore/Shared/Scripts/NestedTopicList.js
@@ -35,13 +35,13 @@ initEditorModal = function (namespace, title, targetUrl, onCloseFunction) {
   | Provide debug data for testing
   \---------------------------------------------------------------------------------------------------------------------------*/
   console.log('initEditorModal fired:');
-  console.log('namespace: ' + namespace);
-  console.log('title: ' + title);
-  console.log('targetUrl: ' + targetUrl);
+  console.log('namespace: '     + namespace);
+  console.log('title: '         + title);
+  console.log('targetUrl: '     + targetUrl);
   console.log('onCloseFunction: ' + onCloseFunction);
-  console.log('#EditorModal' + namespace + ': ' + $editorModal);
-  console.log('#ModalTitle' + namespace + ': ' + $modalTitle);
-  console.log('#EditorFrame' + namespace + ': ' + $editorFrame);
+  console.log('#EditorModal'    + namespace + ': ' + $editorModal);
+  console.log('#ModalTitle'     + namespace  + ': ' + $modalTitle);
+  console.log('#EditorFrame'    + namespace + ': ' + $editorFrame);
 
   /*----------------------------------------------------------------------------------------------------------------------------
   | Set modal window title
@@ -61,10 +61,8 @@ initEditorModal = function (namespace, title, targetUrl, onCloseFunction) {
   | Open modal window
   \---------------------------------------------------------------------------------------------------------------------------*/
   if ($editorModal) {
-    $editorModal.modal({
-      backdrop: 'static',
-      keyboard: false
-    });
+    $editorModal.modal();
+    $(".nav-tabs a.active").tab("show");
   }
 
 };
@@ -74,10 +72,8 @@ initEditorModal = function (namespace, title, targetUrl, onCloseFunction) {
 \-----------------------------------------------------------------------------------------------------------------------------*/
 /**
  * Closes the current modal window
- * @param {string} action - Default parameter supplied by JavaScript event (unused).
- * @param {string} namespace - The parent key of the nested topic container.
  */
-window.closeModal = function (action, namespace) {
+window.closeModal = function () {
   $('[id^="EditorModal"]').modal('hide');
 };
 
@@ -90,8 +86,7 @@ window.closeModal = function (action, namespace) {
   | Event Handler: Close Button
   \---------------------------------------------------------------------------------------------------------------------------*/
   $('#ModalCloseButton').on('click', function (e) {
-    window.parent.closeModal('canceled', '');
-    $('[id^="EditorModal"]').modal('hide');
+    window.parent.closeModal();
   });
 
   /*----------------------------------------------------------------------------------------------------------------------------
diff --git a/OnTopic.Editor.AspNetCore/Shared/Scripts/SelectableTreeView.js b/OnTopic.Editor.AspNetCore/Shared/Scripts/SelectableTreeView.js
index d2bf1a95..4e0b57e0 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Scripts/SelectableTreeView.js
+++ b/OnTopic.Editor.AspNetCore/Shared/Scripts/SelectableTreeView.js
@@ -30,10 +30,12 @@ OnTopic.SelectableTreeView = Ext.extend(Ext.tree.TreePanel, {
   /*============================================================================================================================
   | METHOD: SELECT TOPIC
   \---------------------------------------------------------------------------------------------------------------------------*/
-  selectTopic                   : function(node) {
-    node.checked                = true;
-    node.select();
-    return true;
+  selectTopic                   : function(node, rec) {
+    node.getUI().toggleCheck();
+    if (node.isExpanded() != node.getUI().isChecked()) {
+      node.toggle();
+    }
+    return false;
   },
 
   /*============================================================================================================================
@@ -99,7 +101,7 @@ OnTopic.SelectableTreeView = Ext.extend(Ext.tree.TreePanel, {
     \-------------------------------------------------------------------------------------------------------------------------*/
     var me = this;
 
-    me.on('click',              me.selectTopic,                 this);
+    me.on('beforeclick',        me.selectTopic,                 this);
     me.on('checkchange',        me.updateBackingField,          this);
 
   }
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_base.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_base.scss
index 7b6ee684..5a135b58 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_base.scss
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_base.scss
@@ -12,6 +12,7 @@
 @import "typography";
 @import "forms";
 @import "links";
+@import "lists";
 @import "icons";
 @import "buttons";
 @import "tabs";
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_buttons.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_buttons.scss
index b724a44e..8ec023ea 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_buttons.scss
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_buttons.scss
@@ -62,15 +62,4 @@
       margin-left               : 4px;
     }
   }
-}
-
-//----------------------------------------------------------------------------------------------
-// SIDEBAR
-//----------------------------------------------------------------------------------------------
-.sidebar {
-  .btn {
-    margin-top                  : 20px;
-    width                       : 100%;
-  }
-
 }
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_callouts.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_callouts.scss
index 93af9ed6..c3d66b62 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_callouts.scss
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_callouts.scss
@@ -22,11 +22,12 @@
 //----------------------------------------------------------------------------------------------
 .callout {
   &.topic-info {
-    position                    : fixed;
+    @extend                     .sticky-top;
+    top                         : 136px+15px;
+    z-index                     : 10;
     border                      : 1px solid $grey-lighter;
     padding                     : 15px;
-    width                       : 15%;
-    max-width                   : 200px;
+    width                       : 100%;
     h3,
     dt,
     dd {
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_forms.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_forms.scss
index 7c68c167..3d1afe30 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_forms.scss
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_forms.scss
@@ -48,7 +48,6 @@ input {
 }
 textarea {
   max-width                     : 100%;
-  min-height                    : 128px;
 }
 .form-control {
   border-radius                 : 1px;
@@ -119,8 +118,15 @@ span.radio {
 }
 
 //----------------------------------------------------------------------------------------------
-// BUTTONS
+// TOKEN INPUT
 //----------------------------------------------------------------------------------------------
+.token-input-list-facebook {
+  @extend .form-control;
+  border                        : 1px solid #ced4da !important;
+  width                         : 100% !important;
+  font-size                     : 1rem !important;
+  padding                       : .1rem !important;
+}
 
 //----------------------------------------------------------------------------------------------
 // VALIDATION
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_lists.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_lists.scss
new file mode 100644
index 00000000..5b0b9e65
--- /dev/null
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Base/_lists.scss
@@ -0,0 +1,38 @@
+//==============================================================================================
+// LISTS
+//----------------------------------------------------------------------------------------------
+// Defines styles for list elements.
+//==============================================================================================
+
+//----------------------------------------------------------------------------------------------
+// IMPORTS
+//----------------------------------------------------------------------------------------------
+@import "../variables";
+
+//----------------------------------------------------------------------------------------------
+// GLOBAL
+//----------------------------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------------------------
+// ATTRIBUTE BLOCKS
+//----------------------------------------------------------------------------------------------
+.attribute > .fields > ul {
+  list-style: unset;
+  list-style-type: none;
+  padding-left: 15px;
+  font-size: 13px;
+
+  > li {
+    list-style-position: inside;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-top: 6px;
+
+    &:before {
+      content: "–";
+      text-indent: -5px;
+      padding-right: 10px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Components/TreeView/_treeView.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Components/TreeView/_treeView.scss
index e5d09388..ae0ca0cc 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Styles/Components/TreeView/_treeView.scss
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Components/TreeView/_treeView.scss
@@ -13,22 +13,14 @@
 // LAYOUT
 //----------------------------------------------------------------------------------------------
 .sidebar {
-  padding-top                   : 50px;
-  padding-left                  : 0px;
   .treeview {
     margin-left                 : -16px; //Compensates .x-tree-node-indent
-    margin-bottom               : 25px;
     input[type="checkbox"] {
       display                   : none;
     }
   }
 }
 
-//----------------------------------------------------------------------------------------------
-// CORE
-//----------------------------------------------------------------------------------------------
-
-
 //----------------------------------------------------------------------------------------------
 // OVERRIDES
 //----------------------------------------------------------------------------------------------
@@ -173,7 +165,7 @@
           }
         }
         input[type="checkbox"] {
-          margin                : 0 0 0 3px;
+          margin                : 0 0 0 8px;
         }
       }
     }
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Layout/_layout.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Layout/_layout.scss
index cf2fb664..35ab3170 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Styles/Layout/_layout.scss
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Layout/_layout.scss
@@ -83,6 +83,23 @@ body {
   }
 }
 
+//----------------------------------------------------------------------------------------------
+// SIDEBAR
+//----------------------------------------------------------------------------------------------
+.sidebar {
+  padding-left                  : 0px;
+  padding-top                   : 50px;
+}
+
+#FixedSidebar {
+  @extend                       .sticky-top;
+  top                           : 136px;
+  .btn, select {
+    margin-bottom               : 20px;
+    width                       : 100%;
+  }
+}
+
 //----------------------------------------------------------------------------------------------
 // PRIMARY CONTENT AREA
 //----------------------------------------------------------------------------------------------
diff --git a/OnTopic.Editor.AspNetCore/Shared/Styles/Style.scss b/OnTopic.Editor.AspNetCore/Shared/Styles/Style.scss
index 22b781c6..05c1c8da 100644
--- a/OnTopic.Editor.AspNetCore/Shared/Styles/Style.scss
+++ b/OnTopic.Editor.AspNetCore/Shared/Styles/Style.scss
@@ -16,6 +16,54 @@
 // IMPORT EXTERNAL LIBRARIES
 //----------------------------------------------------------------------------------------------
 
+//----------------------------------------------------------------------------------------------
+// IMPORT TWITTER BOOTSTRAP
+//----------------------------------------------------------------------------------------------
+// Required
+@import "../../node_modules/bootstrap/scss/functions";
+@import "../../node_modules/bootstrap/scss/variables";
+@import "../../node_modules/bootstrap/scss/mixins";
+
+// Basics
+// @import "../../node_modules/bootstrap/scss/root";
+@import "../../node_modules/bootstrap/scss/reboot";
+@import "../../node_modules/bootstrap/scss/type";
+// @import "../../node_modules/bootstrap/scss/images";
+// @import "../../node_modules/bootstrap/scss/code";
+@import "../../node_modules/bootstrap/scss/grid";
+// @import "../../node_modules/bootstrap/scss/tables";
+
+// Extras
+@import "../../node_modules/bootstrap/scss/close";
+// @import "../../node_modules/bootstrap/scss/custom-forms";
+// @import "../../node_modules/bootstrap/scss/print";
+// @import "../../node_modules/bootstrap/scss/transitions";
+@import "../../node_modules/bootstrap/scss/utilities";
+
+// Components
+@import "../../node_modules/bootstrap/scss/alert";
+@import "../../node_modules/bootstrap/scss/badge";
+// @import "../../node_modules/bootstrap/scss/breadcrumb";
+// @import "../../node_modules/bootstrap/scss/button-group";
+@import "../../node_modules/bootstrap/scss/buttons";
+// @import "../../node_modules/bootstrap/scss/card";
+// @import "../../node_modules/bootstrap/scss/carousel";
+@import "../../node_modules/bootstrap/scss/dropdown";
+@import "../../node_modules/bootstrap/scss/forms";
+// @import "../../node_modules/bootstrap/scss/input-group";
+// @import "../../node_modules/bootstrap/scss/jumbotron";
+// @import "../../node_modules/bootstrap/scss/list-group";
+// @import "../../node_modules/bootstrap/scss/media";
+@import "../../node_modules/bootstrap/scss/modal";
+@import "../../node_modules/bootstrap/scss/nav";
+// @import "../../node_modules/bootstrap/scss/navbar";
+// @import "../../node_modules/bootstrap/scss/pagination";
+// @import "../../node_modules/bootstrap/scss/popover";
+// @import "../../node_modules/bootstrap/scss/progress";
+// @import "../../node_modules/bootstrap/scss/spinners";
+// @import "../../node_modules/bootstrap/scss/toasts";
+@import "../../node_modules/bootstrap/scss/tooltip";
+
 //----------------------------------------------------------------------------------------------
 // IMPORT OTHER MANIFESTS
 //----------------------------------------------------------------------------------------------
diff --git a/OnTopic.Editor.AspNetCore/StandardEditorComposer.cs b/OnTopic.Editor.AspNetCore/StandardEditorComposer.cs
index 43751a88..c36ae678 100644
--- a/OnTopic.Editor.AspNetCore/StandardEditorComposer.cs
+++ b/OnTopic.Editor.AspNetCore/StandardEditorComposer.cs
@@ -92,6 +92,8 @@ ITopicRepository          topicRepository
         nameof(FileListViewComponent)                           => new FileListViewComponent(_webHostEnvironment),
         nameof(FilePathViewComponent)                           => new FilePathViewComponent(topicRepository),
         nameof(HtmlViewComponent)                               => new HtmlViewComponent(),
+        nameof(IncomingRelationshipViewComponent)               => new IncomingRelationshipViewComponent(_topicRepository),
+        nameof(InstructionViewComponent)                        => new InstructionViewComponent(),
         nameof(LastModifiedViewComponent)                       => new LastModifiedViewComponent(),
         nameof(LastModifiedByViewComponent)                     => new LastModifiedByViewComponent(),
         nameof(NestedTopicListViewComponent)                    => new NestedTopicListViewComponent(_topicRepository),
diff --git a/OnTopic.Editor.AspNetCore/gulpFile.js b/OnTopic.Editor.AspNetCore/gulpFile.js
index 35e1ecfc..5961f8a3 100644
--- a/OnTopic.Editor.AspNetCore/gulpFile.js
+++ b/OnTopic.Editor.AspNetCore/gulpFile.js
@@ -43,6 +43,7 @@ const files = {
     js                          :   [ 'node_modules/jquery/dist/jquery.min.js',
                                       'node_modules/jquery-ui-dist/jquery-ui.min.js',
                                       'node_modules/jquery-validation/dist/jquery.validate.min.js',
+                                      'node_modules/jquery-validation/dist/additional-methods.min.js',
                                       'node_modules/popper.js/dist/umd/popper.min.js',
                                       'node_modules/bootstrap/dist/js/bootstrap.min.js',
                                       'node_modules/jquery-tokeninput/dist/js/jquery-tokeninput.min.js',
@@ -52,8 +53,7 @@ const files = {
                                       'node_modules/jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js',
                                       'node_modules/jquery.are-you-sure/jquery.are-you-sure.js'
                                     ],
-  css                           :   [ 'node_modules/bootstrap/dist/css/bootstrap.min.css',
-                                      'node_modules/jquery-ui-dist/jquery-ui.min.css',
+  css                           :   [ 'node_modules/jquery-ui-dist/jquery-ui.min.css',
                                       'node_modules/jquery-tokeninput/dist/css/token-input.min.css',
                                       'node_modules/jquery-tokeninput/dist/css/token-input-facebook.min.css',
                                       'node_modules/jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.css'
diff --git a/OnTopic.Editor.AspNetCore/package-lock.json b/OnTopic.Editor.AspNetCore/package-lock.json
index f81c91a4..8d73b7dd 100644
--- a/OnTopic.Editor.AspNetCore/package-lock.json
+++ b/OnTopic.Editor.AspNetCore/package-lock.json
@@ -1363,9 +1363,9 @@
       }
     },
     "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
+      "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
       "dev": true,
       "requires": {
         "is-obj": "^1.0.0"
@@ -4122,6 +4122,17 @@
             "dot-prop": "^4.1.1",
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
+          },
+          "dependencies": {
+            "dot-prop": {
+              "version": "4.2.1",
+              "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
+              "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+              "dev": true,
+              "requires": {
+                "is-obj": "^1.0.0"
+              }
+            }
           }
         }
       }
@@ -4183,6 +4194,17 @@
             "dot-prop": "^4.1.1",
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
+          },
+          "dependencies": {
+            "dot-prop": {
+              "version": "4.2.1",
+              "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
+              "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
+              "dev": true,
+              "requires": {
+                "is-obj": "^1.0.0"
+              }
+            }
           }
         }
       }
diff --git a/OnTopic.Editor.Models/Components/BindingModels/IncomingRelationshipAttributeBindingModel.cs b/OnTopic.Editor.Models/Components/BindingModels/IncomingRelationshipAttributeBindingModel.cs
new file mode 100644
index 00000000..78628391
--- /dev/null
+++ b/OnTopic.Editor.Models/Components/BindingModels/IncomingRelationshipAttributeBindingModel.cs
@@ -0,0 +1,35 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+
+namespace OnTopic.Editor.Models.Components.BindingModels {
+
+  /*============================================================================================================================
+  | CLASS: INCOMING RELATIONSHIP ATTRIBUTE (BINDING MODEL)
+  \---------------------------------------------------------------------------------------------------------------------------*/
+  /// <summary>
+  ///   Represents an instance of an incoming relationship attribute in the Topic Editor.
+  /// </summary>
+  public class IncomingRelationshipAttributeBindingModel : AttributeBindingModel {
+
+    /*==========================================================================================================================
+    | CONSTRUCTOR
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Initializes a new instance of the <see cref="RelationshipAttributeBindingModel"/> class.
+    /// </summary>
+    public IncomingRelationshipAttributeBindingModel() : base() {
+    }
+
+    /*==========================================================================================================================
+    | GET VALUE
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Retrieves the value associated with the attribute.
+    /// </summary>
+    public override string GetValue() => Value;
+
+  } // Class
+} // Namespace
\ No newline at end of file
diff --git a/OnTopic.Editor.Models/Components/BindingModels/InstructionAttributeBindingModel.cs b/OnTopic.Editor.Models/Components/BindingModels/InstructionAttributeBindingModel.cs
new file mode 100644
index 00000000..431f7f4f
--- /dev/null
+++ b/OnTopic.Editor.Models/Components/BindingModels/InstructionAttributeBindingModel.cs
@@ -0,0 +1,35 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+
+namespace OnTopic.Editor.Models.Components.BindingModels {
+
+  /*============================================================================================================================
+  | CLASS: INSTRUCTION ATTRIBUTE (BINDING MODEL)
+  \---------------------------------------------------------------------------------------------------------------------------*/
+  /// <summary>
+  ///   Represents an instance of an instruction attribute in the Topic Editor.
+  /// </summary>
+  public class InstructionAttributeBindingModel : AttributeBindingModel {
+
+    /*==========================================================================================================================
+    | CONSTRUCTOR
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Initializes a new instance of the <see cref="TextAttributeBindingModel"/> class.
+    /// </summary>
+    public InstructionAttributeBindingModel() : base() {
+    }
+
+    /*==========================================================================================================================
+    | GET VALUE
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Retrieves the value associated with the attribute.
+    /// </summary>
+    public override string GetValue() => Value;
+
+  } // Class
+} // Namespace
\ No newline at end of file
diff --git a/OnTopic.Editor.Models/Components/ViewModels/IncomingRelationshipAttributeViewModel.cs b/OnTopic.Editor.Models/Components/ViewModels/IncomingRelationshipAttributeViewModel.cs
new file mode 100644
index 00000000..a722a492
--- /dev/null
+++ b/OnTopic.Editor.Models/Components/ViewModels/IncomingRelationshipAttributeViewModel.cs
@@ -0,0 +1,51 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+using System.Collections.Generic;
+using OnTopic.Collections;
+using OnTopic.Editor.Models.Metadata;
+using OnTopic.ViewModels;
+
+namespace OnTopic.Editor.Models.Components.ViewModels {
+
+  /*============================================================================================================================
+  | CLASS: INCOMING RELATIONSHIP ATTRIBUTE (VIEW MODEL)
+  \---------------------------------------------------------------------------------------------------------------------------*/
+  /// <summary>
+  ///   Represents the data model for the <see cref="IncomingRelationshipViewComponent"/>. Additionally provides access to the
+  ///   underlying <see cref="AttributeDescriptorTopicViewModel"/> as well as the instance values for that attribute from the
+  ///   currently selected <see cref="Topic"/>.
+  /// </summary>
+  public class IncomingRelationshipAttributeViewModel: AttributeViewModel<IncomingRelationshipAttributeTopicViewModel> {
+
+    /*==========================================================================================================================
+    | CONSTRUCTOR
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Initializes a new instance of the <see cref="IncomingRelationshipAttributeViewModel"/> class.
+    /// </summary>
+    public IncomingRelationshipAttributeViewModel(
+      EditingTopicViewModel currentTopic,
+      IncomingRelationshipAttributeTopicViewModel attributeDescriptor,
+      string value = null,
+      string inheritedValue = null
+    ): base(
+      currentTopic,
+      attributeDescriptor,
+      value,
+      inheritedValue
+    ) { }
+
+    /*==========================================================================================================================
+    | PROPERTY: RELATED TOPICS
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Provides a list of <see cref="Topic"/>s which are related to the current <see cref="Topic"/> based on the specified
+    ///   <see cref="NamedTopicCollection.Name"/>.
+    /// </summary>
+    public List<TopicViewModel> RelatedTopics { get; set; } = new List<TopicViewModel>();
+
+  } // Class
+} // Namespace
\ No newline at end of file
diff --git a/OnTopic.Editor.Models/Metadata/AttributeDescriptorTopicViewModel.cs b/OnTopic.Editor.Models/Metadata/AttributeDescriptorTopicViewModel.cs
index c9a3dd1c..a579cbc5 100644
--- a/OnTopic.Editor.Models/Metadata/AttributeDescriptorTopicViewModel.cs
+++ b/OnTopic.Editor.Models/Metadata/AttributeDescriptorTopicViewModel.cs
@@ -72,6 +72,9 @@ public AttributeDescriptorTopicViewModel() {
     /// </summary>
     public string DisplayGroup { get; set; }
 
+    #region LegacyConfiguration
+    #pragma warning disable CS0618 // Type or member is obsolete
+
     /*==========================================================================================================================
     | PROPERTY: DEFAULT CONFIGURATION
     \-------------------------------------------------------------------------------------------------------------------------*/
@@ -112,9 +115,6 @@ public IDictionary<string, string> Configuration {
       }
     }
 
-    #region LegacyConfiguration
-    #pragma warning disable CS0618 // Type or member is obsolete
-
     /*==========================================================================================================================
     | METHOD: GET CONFIGURATION VALUE
     \-------------------------------------------------------------------------------------------------------------------------*/
@@ -123,7 +123,7 @@ public IDictionary<string, string> Configuration {
     ///   optionally returns a default value.
     /// </summary>
     [Obsolete(
-      "This property is exposed exclusively for backward compatibility during migration from the legacy editor. It will be " +
+      "This method is exposed exclusively for backward compatibility during migration from the legacy editor. It will be " +
       "removed in a future update. Values in DefaultConfiguration should be migrated to attributes on derivaties of the " +
       "AttributeDescriptor."
     )]
@@ -140,6 +140,11 @@ public string GetConfigurationValue(string key, string defaultValue = null) {
     /// <summary>
     ///   Retrieves a configuration value from the <see cref="Configuration"/> dictionary as a boolean value.
     /// </summary>
+    [Obsolete(
+      "This method is exposed exclusively for backward compatibility during migration from the legacy editor. It will be " +
+      "removed in a future update. Values in DefaultConfiguration should be migrated to attributes on derivaties of the " +
+      "AttributeDescriptor."
+    )]
     public bool GetBooleanConfigurationValue(string key, bool defaultValue = false) {
       if (Boolean.TryParse(GetConfigurationValue(key, defaultValue.ToString()), out var value)) {
         return value;
@@ -153,6 +158,11 @@ public bool GetBooleanConfigurationValue(string key, bool defaultValue = false)
     /// <summary>
     ///   Retrieves a configuration value from the <see cref="Configuration"/> dictionary as an integer value.
     /// </summary>
+    [Obsolete(
+      "This method is exposed exclusively for backward compatibility during migration from the legacy editor. It will be " +
+      "removed in a future update. Values in DefaultConfiguration should be migrated to attributes on derivaties of the " +
+      "AttributeDescriptor."
+    )]
     public int GetIntegerConfigurationValue(string key, int defaultValue = 0) {
       if (Int32.TryParse(GetConfigurationValue(key, defaultValue.ToString()), out var value)) {
         return value;
@@ -220,6 +230,7 @@ public int GetIntegerConfigurationValue(string key, int defaultValue = 0) {
     /// <summary>
     ///   Defines the CSS class names to be used, if any are configured.
     /// </summary>
+    [Obsolete("The CssClass attribute will be removed in OnTopic Editor 5.0.0.")]
     public string CssClass { get; set; }
 
   } //Class
diff --git a/OnTopic.Editor.Models/Metadata/IncomingRelationshipAttributeTopicViewModel.cs b/OnTopic.Editor.Models/Metadata/IncomingRelationshipAttributeTopicViewModel.cs
new file mode 100644
index 00000000..d994dc69
--- /dev/null
+++ b/OnTopic.Editor.Models/Metadata/IncomingRelationshipAttributeTopicViewModel.cs
@@ -0,0 +1,33 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+using OnTopic.Collections;
+using OnTopic.ViewModels;
+
+#nullable enable
+
+namespace OnTopic.Editor.Models.Metadata {
+
+  /*============================================================================================================================
+  | CLASS: INCOMING RELATIONSHIP ATTRIBUTE (TOPIC VIEW MODEL)
+  \---------------------------------------------------------------------------------------------------------------------------*/
+  /// <summary>
+  ///   Provides access to attributes associated with the <see cref="IncomingRelationshipViewComponent"/>.
+  /// </summary>
+  public class IncomingRelationshipAttributeTopicViewModel: QueryableTopicListAttributeTopicViewModel {
+
+    /*==========================================================================================================================
+    | RELATIONSHIP KEY
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Optionally provides the relationship key, which mapes to the <see cref="NamedTopicCollection.Name"/> property.
+    ///   Defaults to the <see cref="TopicViewModel.Key"/> if undefined.
+    /// </summary>
+    public string? RelationshipKey { get; set; }
+
+  } //Class
+} //Namespace
+
+#nullable restore
\ No newline at end of file
diff --git a/OnTopic.Editor.Models/Metadata/InstructionAttributeTopicViewModel.cs b/OnTopic.Editor.Models/Metadata/InstructionAttributeTopicViewModel.cs
new file mode 100644
index 00000000..1e3f5fd5
--- /dev/null
+++ b/OnTopic.Editor.Models/Metadata/InstructionAttributeTopicViewModel.cs
@@ -0,0 +1,30 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+
+#nullable enable
+
+namespace OnTopic.Editor.Models.Metadata {
+
+  /*============================================================================================================================
+  | CLASS: INSTRUCTION ATTRIBUTE (TOPIC VIEW MODEL)
+  \---------------------------------------------------------------------------------------------------------------------------*/
+  /// <summary>
+  ///   Provides access to attributes associated with the <see cref="InstructionViewComponent"/>.
+  /// </summary>
+  public class InstructionAttributeTopicViewModel: AttributeDescriptorTopicViewModel {
+
+    /*==========================================================================================================================
+    | INSTRUCTIONS
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Instructional text to embed in the OnTopic Editor.
+    /// </summary>
+    public string? Instructions { get; set; }
+
+  } //Class
+} //Namespace
+
+#nullable restore
\ No newline at end of file
diff --git a/OnTopic.Editor.Models/Metadata/TextAreaAttributeTopicViewModel.cs b/OnTopic.Editor.Models/Metadata/TextAreaAttributeTopicViewModel.cs
index 7802408a..cd7b2567 100644
--- a/OnTopic.Editor.Models/Metadata/TextAreaAttributeTopicViewModel.cs
+++ b/OnTopic.Editor.Models/Metadata/TextAreaAttributeTopicViewModel.cs
@@ -3,6 +3,7 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
+using System;
 
 #nullable enable
 
@@ -23,6 +24,7 @@ public class TextAreaAttributeTopicViewModel: AttributeDescriptorTopicViewModel
     ///   Gets or sets the number of columns (width) that the <see cref="HtmlViewComponent"/> should take up. Defaults to
     ///   <c>70</c>.
     /// </summary>
+    [Obsolete("The Columns attribute will be removed in OnTopic Editor 5.0.0.")]
     public int? Columns { get; set; }
 
     /*==========================================================================================================================
@@ -34,6 +36,14 @@ public class TextAreaAttributeTopicViewModel: AttributeDescriptorTopicViewModel
     /// </summary>
     public int? Rows { get; set; }
 
+    /*==========================================================================================================================
+    | MINIMUM LENGTH
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Gets or sets the length length of the field. Defaults to <c>0</c> if undefined.
+    /// </summary>
+    public int? MinimumLength { get; set; } = 10;
+
     /*==========================================================================================================================
     | MAXIMUM LENGTH
     \-------------------------------------------------------------------------------------------------------------------------*/
diff --git a/OnTopic.Editor.Models/Metadata/TextAttributeTopicViewModel.cs b/OnTopic.Editor.Models/Metadata/TextAttributeTopicViewModel.cs
index b4450645..a766d9b3 100644
--- a/OnTopic.Editor.Models/Metadata/TextAttributeTopicViewModel.cs
+++ b/OnTopic.Editor.Models/Metadata/TextAttributeTopicViewModel.cs
@@ -16,6 +16,14 @@ namespace OnTopic.Editor.Models.Metadata {
   /// </summary>
   public class TextAttributeTopicViewModel: AttributeDescriptorTopicViewModel {
 
+    /*==========================================================================================================================
+    | MINIMUM LENGTH
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Gets or sets the length length of the field. Defaults to <c>0</c> if undefined.
+    /// </summary>
+    public int? MinimumLength { get; set; }
+
     /*==========================================================================================================================
     | MAXIMUM LENGTH
     \-------------------------------------------------------------------------------------------------------------------------*/
@@ -32,6 +40,22 @@ public class TextAttributeTopicViewModel: AttributeDescriptorTopicViewModel {
     /// </summary>
     public string? InputType { get; set; }
 
+    /*==========================================================================================================================
+    | PATTERN
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Gets or sets a regular expression which should be used to validate the input.
+    /// </summary>
+    public string? Pattern { get; set; }
+
+    /*==========================================================================================================================
+    | VALIDATION MESSAGE
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Gets or sets a hint to provide if validation fails.
+    /// </summary>
+    public string? ValidationMessage { get; set; }
+
   } //Class
 } //Namespace
 
diff --git a/OnTopic.Editor.Models/OnTopic.Editor.Models.csproj b/OnTopic.Editor.Models/OnTopic.Editor.Models.csproj
index ba7568e1..6ffc8a6a 100644
--- a/OnTopic.Editor.Models/OnTopic.Editor.Models.csproj
+++ b/OnTopic.Editor.Models/OnTopic.Editor.Models.csproj
@@ -27,9 +27,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OnTopic" Version="4.4.0" />
+    <PackageReference Include="OnTopic" Version="4.5.0" />
     <PackageReference Include="OnTopic.Data.Transfer" Version="1.2.0" />
-    <PackageReference Include="OnTopic.ViewModels" Version="4.4.0" />
+    <PackageReference Include="OnTopic.ViewModels" Version="4.5.0" />
     <PackageReference Include="System.Text.Json" Version="4.6.0" />
   </ItemGroup>