diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Boolean/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Boolean/Default.cshtml
similarity index 90%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/Boolean/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Boolean/Default.cshtml
index a52c2970..a2a0b23e 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Boolean/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Boolean/Default.cshtml
@@ -1,7 +1,7 @@
 @model BooleanAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="@Model.AttributeDescriptor.CssClass form-check form-check-inline">
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/ContentTypeList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/ContentTypeList/Default.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/ContentTypeList/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/ContentTypeList/Default.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/DateTime/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DateTime/Default.cshtml
similarity index 95%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/DateTime/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DateTime/Default.cshtml
index df1a34c9..103285a4 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/DateTime/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DateTime/Default.cshtml
@@ -1,7 +1,7 @@
 @model DateTimeAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
   var includeDatePicker = Model.AttributeDescriptor.IncludeDatePicker?? true;
   var includeTimePicker = Model.AttributeDescriptor.IncludeTimePicker?? true;
 }
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/DisplayOptions/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DisplayOptions/Default.cshtml
similarity index 93%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/DisplayOptions/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DisplayOptions/Default.cshtml
index 4d974669..dbf4f77e 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/DisplayOptions/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/DisplayOptions/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<AttributeDescriptorTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="@Model.AttributeDescriptor.CssClass form-check form-check-inline">
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/FileList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/FileList/Default.cshtml
similarity index 90%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/FileList/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/FileList/Default.cshtml
index 970a890f..549cbfa3 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/FileList/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/FileList/Default.cshtml
@@ -1,7 +1,7 @@
 @model FileListAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 @if (Model.Files.Count > 0) {
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/FilePath/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/FilePath/Default.cshtml
similarity index 86%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/FilePath/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/FilePath/Default.cshtml
index 7f3a4aaa..d5445027 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/FilePath/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/FilePath/Default.cshtml
@@ -1,7 +1,7 @@
 @model FilePathAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <input
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/HTML/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml
similarity index 96%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/HTML/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml
index 54f43b39..2250995b 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/HTML/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/HTML/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<HtmlAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <style type="text/css">
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/LastModified/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/LastModified/Default.cshtml
similarity index 66%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/LastModified/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/LastModified/Default.cshtml
index a9988f23..69561566 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/LastModified/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/LastModified/Default.cshtml
@@ -1,7 +1,7 @@
 @model LastModifiedAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="label">
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/LastModifiedBy/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/LastModifiedBy/Default.cshtml
similarity index 67%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/LastModifiedBy/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/LastModifiedBy/Default.cshtml
index 387d5bc3..6065c63f 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/LastModifiedBy/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/LastModifiedBy/Default.cshtml
@@ -1,7 +1,7 @@
 @model LastModifiedByAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <div class="label">
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/NestedTopicList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/NestedTopicList/Default.cshtml
similarity index 98%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/NestedTopicList/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/NestedTopicList/Default.cshtml
index 785615cc..de220a77 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/NestedTopicList/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/NestedTopicList/Default.cshtml
@@ -1,7 +1,7 @@
 @model NestedTopicListAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <script type="text/javascript">
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Number/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Number/Default.cshtml
similarity index 89%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/Number/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Number/Default.cshtml
index 732689a8..4f8e8742 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Number/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Number/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<NumberAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <input
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Relationship/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Relationship/Default.cshtml
similarity index 97%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/Relationship/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Relationship/Default.cshtml
index 4153973c..19835b61 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Relationship/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Relationship/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<RelationshipAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
   var rootTopicKey = Model.AttributeDescriptor.RootTopic?.UniqueKey.Replace(":", "/") ?? Model.AttributeDescriptor.RootTopicKey?.Replace(":", "/") ?? "Root";
 }
 
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Text/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Text/Default.cshtml
similarity index 88%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/Text/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Text/Default.cshtml
index 540d3e4d..fe691a5f 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/Text/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/Text/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<TextAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <input
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/TextArea/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TextArea/Default.cshtml
similarity index 90%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/TextArea/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TextArea/Default.cshtml
index 92a61de7..7b6630dd 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/TextArea/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TextArea/Default.cshtml
@@ -1,7 +1,7 @@
 @model AttributeViewModel<TextAreaAttributeTopicViewModel>
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <textarea
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/TokenizedTopicList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml
similarity index 95%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/TokenizedTopicList/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml
index fadc670d..cfc13299 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/TokenizedTopicList/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TokenizedTopicList/Default.cshtml
@@ -1,7 +1,7 @@
 @model TokenizedTopicListAttributeViewModel
 
 @{
-  Layout = "~/Views/Editor/Components/_Layout.cshtml";
+  Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
   var rootTopicKey = Model.AttributeDescriptor.RootTopic?.UniqueKey.Replace(":", "/") ?? Model.AttributeDescriptor.RootTopicKey?.Replace(":", "/") ?? "Root";
 }
 
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/TopicList/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TopicList/Default.cshtml
similarity index 85%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/TopicList/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TopicList/Default.cshtml
index ba746af0..97d9b4f9 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Components/TopicList/Default.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TopicList/Default.cshtml
@@ -1,7 +1,7 @@
 @model TopicListAttributeViewModel
 
 @{
-    Layout = "~/Views/Editor/Components/_Layout.cshtml";
+    Layout = "~/Areas/Editor/Views/Editor/Components/_Layout.cshtml";
 }
 
 <select
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/TopicReference/Default.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TopicReference/Default.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/TopicReference/Default.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/TopicReference/Default.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Components/_Layout.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/_Layout.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Components/_Layout.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Components/_Layout.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/Editor/Edit.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml
similarity index 98%
rename from OnTopic.Editor.AspNetCore/Views/Editor/Edit.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml
index fe6e5593..5e934d15 100644
--- a/OnTopic.Editor.AspNetCore/Views/Editor/Edit.cshtml
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Editor/Edit.cshtml
@@ -1,7 +1,6 @@
 @model OnTopic.Editor.Models.EditorViewModel
 
 @{
-  Layout = "~/Views/Shared/_Layout.cshtml";
   ViewBag.Title = "Home Page";
   var bindingModel = new EditorBindingModel();
 }
diff --git a/OnTopic.Editor.AspNetCore/Views/Shared/CloseModal.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/CloseModal.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Shared/CloseModal.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/CloseModal.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/Shared/Error.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/Error.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Shared/Error.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/Error.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/Shared/_Layout.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Layout.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Shared/_Layout.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Layout.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/Shared/_Toolbar.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Toolbar.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Shared/_Toolbar.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_Toolbar.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/Shared/_TreeViewScript.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_TreeViewScript.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/Shared/_TreeViewScript.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/Shared/_TreeViewScript.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Views/_ViewImports.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/_ViewImports.cshtml
similarity index 100%
rename from OnTopic.Editor.AspNetCore/Views/_ViewImports.cshtml
rename to OnTopic.Editor.AspNetCore/Areas/Editor/Views/_ViewImports.cshtml
diff --git a/OnTopic.Editor.AspNetCore/Areas/Editor/Views/_ViewStart.cshtml b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/_ViewStart.cshtml
new file mode 100644
index 00000000..66e1fead
--- /dev/null
+++ b/OnTopic.Editor.AspNetCore/Areas/Editor/Views/_ViewStart.cshtml
@@ -0,0 +1,3 @@
+@{
+    Layout = "~/Areas/Editor/Views/Shared/_Layout.cshtml";
+}
diff --git a/OnTopic.Editor.AspNetCore/Views/_ViewStart.cshtml b/OnTopic.Editor.AspNetCore/Views/_ViewStart.cshtml
deleted file mode 100644
index 2de62418..00000000
--- a/OnTopic.Editor.AspNetCore/Views/_ViewStart.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@{
-    Layout = "~/Views/Shared/_Layout.cshtml";
-}