diff --git a/src/Orchard.Web/Core/Common/Views/Models/DisplayTemplates/BodyAspect.ascx b/src/Orchard.Web/Core/Common/Views/Shared/DisplayTemplates/BodyAspect.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Common/Views/Models/DisplayTemplates/BodyAspect.ascx
rename to src/Orchard.Web/Core/Common/Views/Shared/DisplayTemplates/BodyAspect.ascx
diff --git a/src/Orchard.Web/Core/Common/Views/Models/EditorTemplates/BodyAspect.ascx b/src/Orchard.Web/Core/Common/Views/Shared/EditorTemplates/BodyAspect.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Common/Views/Models/EditorTemplates/BodyAspect.ascx
rename to src/Orchard.Web/Core/Common/Views/Shared/EditorTemplates/BodyAspect.ascx
diff --git a/src/Orchard.Web/Core/Common/Views/Models/EditorTemplates/OwnerEditorViewModel.ascx b/src/Orchard.Web/Core/Common/Views/Shared/EditorTemplates/OwnerEditorViewModel.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Common/Views/Models/EditorTemplates/OwnerEditorViewModel.ascx
rename to src/Orchard.Web/Core/Common/Views/Shared/EditorTemplates/OwnerEditorViewModel.ascx
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 9214165c8..60ff1a9be 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -127,23 +127,23 @@
     <Content Include="Settings\Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Common\Views\Models\DisplayTemplates\BodyAspect.ascx" />
-    <Content Include="Common\Views\Models\EditorTemplates\BodyAspect.ascx" />
     <Content Include="Settings\Views\Admin\EditorTemplates\SettingsIndexViewModel.ascx" />
     <Content Include="XmlRpc\Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Common\Views\Models\EditorTemplates\OwnerEditorViewModel.ascx" />
     <Content Include="Common\Views\Web.config" />
     <Content Include="Themes\Package.txt" />
     <Content Include="Themes\Views\Admin\Index.aspx" />
-    <Content Include="Themes\Views\Models\EditorTemplates\ThemeSiteSettingsRecord.ascx" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Common\Views\Shared\DisplayTemplates\BodyAspect.ascx" />
+    <Content Include="Common\Views\Shared\EditorTemplates\BodyAspect.ascx" />
+    <Content Include="Common\Views\Shared\EditorTemplates\OwnerEditorViewModel.ascx" />
     <Content Include="Themes\Styles\site.css" />
     <Content Include="Themes\Theme.txt" />
     <Content Include="Themes\Views\Admin\Install.aspx" />
     <Content Include="Themes\Views\Shared\document.aspx" />
+    <Content Include="Themes\Views\Shared\EditorTemplates\ThemeSiteSettingsRecord.ascx" />
     <Content Include="Themes\Views\Shared\layout.ascx" />
     <Content Include="Themes\Views\Shared\user.ascx" />
     <Content Include="Themes\Views\Shared\menu.ascx" />
diff --git a/src/Orchard.Web/Core/Themes/Views/Models/EditorTemplates/ThemeSiteSettingsRecord.ascx b/src/Orchard.Web/Core/Themes/Views/Shared/EditorTemplates/ThemeSiteSettingsRecord.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Themes/Views/Models/EditorTemplates/ThemeSiteSettingsRecord.ascx
rename to src/Orchard.Web/Core/Themes/Views/Shared/EditorTemplates/ThemeSiteSettingsRecord.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
index 75679dae4..daf973269 100644
--- a/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj
@@ -89,9 +89,9 @@
     <Content Include="Views\Admin\Edit.aspx" />
     <Content Include="Views\Admin\Index.aspx" />
     <Content Include="Views\Admin\Create.aspx" />
-    <Content Include="Views\Models\DisplayTemplates\HasComments.ascx" />
-    <Content Include="Views\Models\EditorTemplates\CommentSettingsRecord.ascx" />
-    <Content Include="Views\Models\EditorTemplates\HasComments.ascx" />
+    <Content Include="Views\Shared\DisplayTemplates\HasComments.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\CommentSettingsRecord.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\HasComments.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/DisplayTemplates/HasComments.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Comments/Views/Models/DisplayTemplates/HasComments.ascx
rename to src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/DisplayTemplates/HasComments.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/CommentSettingsRecord.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/EditorTemplates/CommentSettingsRecord.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/CommentSettingsRecord.ascx
rename to src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/EditorTemplates/CommentSettingsRecord.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/EditorTemplates/HasComments.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx
rename to src/Orchard.Web/Packages/Orchard.Comments/Views/Shared/EditorTemplates/HasComments.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj
index 58862f194..ef60428f8 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Orchard.DevTools.csproj
@@ -75,8 +75,8 @@
     <Content Include="Views\Content\Details.aspx" />
     <Content Include="Views\Content\Index.aspx" />
     <Content Include="Views\Home\Index.aspx" />
-    <Content Include="Views\Models\DisplayTemplates\ShowDebugLink.ascx" />
-    <Content Include="Views\Models\EditorTemplates\ShowDebugLink.ascx" />
+    <Content Include="Views\Shared\DisplayTemplates\ShowDebugLink.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\ShowDebugLink.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/DisplayTemplates/ShowDebugLink.ascx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Shared/DisplayTemplates/ShowDebugLink.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/DisplayTemplates/ShowDebugLink.ascx
rename to src/Orchard.Web/Packages/Orchard.DevTools/Views/Shared/DisplayTemplates/ShowDebugLink.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Shared/EditorTemplates/ShowDebugLink.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx
rename to src/Orchard.Web/Packages/Orchard.DevTools/Views/Shared/EditorTemplates/ShowDebugLink.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Packages/Orchard.Media/Orchard.Media.csproj
index 002b9e084..de15efa8e 100644
--- a/src/Orchard.Web/Packages/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Media/Orchard.Media.csproj
@@ -96,7 +96,7 @@
     <Content Include="Views\Admin\EditMedia.aspx" />
     <Content Include="Views\Admin\EditProperties.aspx" />
     <Content Include="Views\Admin\Index.aspx" />
-    <Content Include="Views\Models\EditorTemplates\MediaSettingsRecord.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\MediaSettingsRecord.ascx" />
     <Content Include="Web.config" />
     <Content Include="Content\Site.css" />
     <Content Include="Views\Web.config" />
diff --git a/src/Orchard.Web/Packages/Orchard.Media/Views/Models/EditorTemplates/MediaSettingsRecord.ascx b/src/Orchard.Web/Packages/Orchard.Media/Views/Shared/EditorTemplates/MediaSettingsRecord.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Media/Views/Models/EditorTemplates/MediaSettingsRecord.ascx
rename to src/Orchard.Web/Packages/Orchard.Media/Views/Shared/EditorTemplates/MediaSettingsRecord.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj
index 12d629dfd..4ed72ca00 100644
--- a/src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj
@@ -82,7 +82,7 @@
     <Content Include="Views\Admin\Create.aspx" />
     <Content Include="Views\Admin\Edit.aspx" />
     <Content Include="Views\Admin\Index.aspx" />
-    <Content Include="Views\Models\EditorTemplates\UserRolesViewModel.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\UserRolesViewModel.ascx" />
     <Content Include="Web.config" />
     <Content Include="Content\Site.css" />
     <Content Include="Views\Web.config" />
diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Views/Models/EditorTemplates/UserRolesViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Roles/Views/Shared/EditorTemplates/UserRolesViewModel.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Roles/Views/Models/EditorTemplates/UserRolesViewModel.ascx
rename to src/Orchard.Web/Packages/Orchard.Roles/Views/Shared/EditorTemplates/UserRolesViewModel.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Orchard.Sandbox.csproj b/src/Orchard.Web/Packages/Orchard.Sandbox/Orchard.Sandbox.csproj
index d6408563a..ce8b695c7 100644
--- a/src/Orchard.Web/Packages/Orchard.Sandbox/Orchard.Sandbox.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Orchard.Sandbox.csproj
@@ -75,15 +75,15 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Package.txt" />
-    <Content Include="Views\Models\DisplayTemplates\ContentItemTitle.ascx" />
-    <Content Include="Views\Models\DisplayTemplates\SandboxPageSummary.ascx" />
-    <Content Include="Views\Models\DisplayTemplates\SandboxPage.ascx" />
-    <Content Include="Views\Models\EditorTemplates\SandboxPage.ascx" />
-    <Content Include="Views\Models\EditorTemplates\SandboxSettingsRecord.ascx" />
     <Content Include="Views\Page\Edit.aspx" />
     <Content Include="Views\Page\Create.aspx" />
     <Content Include="Views\Page\Show.aspx" />
     <Content Include="Views\Page\Index.aspx" />
+    <Content Include="Views\Shared\DisplayTemplates\ContentItemTitle.ascx" />
+    <Content Include="Views\Shared\DisplayTemplates\SandboxPage.ascx" />
+    <Content Include="Views\Shared\DisplayTemplates\SandboxPageSummary.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\SandboxPage.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\SandboxSettingsRecord.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/ContentItemTitle.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/DisplayTemplates/ContentItemTitle.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/ContentItemTitle.ascx
rename to src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/DisplayTemplates/ContentItemTitle.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPage.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/DisplayTemplates/SandboxPage.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPage.ascx
rename to src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/DisplayTemplates/SandboxPage.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPageSummary.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/DisplayTemplates/SandboxPageSummary.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPageSummary.ascx
rename to src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/DisplayTemplates/SandboxPageSummary.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxPage.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/EditorTemplates/SandboxPage.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxPage.ascx
rename to src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/EditorTemplates/SandboxPage.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxSettingsRecord.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/EditorTemplates/SandboxSettingsRecord.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxSettingsRecord.ascx
rename to src/Orchard.Web/Packages/Orchard.Sandbox/Views/Shared/EditorTemplates/SandboxSettingsRecord.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
index f279f5c92..c1c36c0a1 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
@@ -87,10 +87,10 @@
     <Content Include="Views\Admin\Search.aspx" />
     <Content Include="Views\Home\Index.aspx" />
     <Content Include="Views\Home\Search.aspx" />
-    <Content Include="Views\Models\DisplayTemplates\HasTagsList.ascx" />
-    <Content Include="Views\Models\DisplayTemplates\HasTags.ascx" />
-    <Content Include="Views\Models\EditorTemplates\HasTags.ascx" />
-    <Content Include="Views\Models\EditorTemplates\TagSettingsRecord.ascx" />
+    <Content Include="Views\Shared\DisplayTemplates\HasTags.ascx" />
+    <Content Include="Views\Shared\DisplayTemplates\HasTagsList.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\HasTags.ascx" />
+    <Content Include="Views\Shared\EditorTemplates\TagSettingsRecord.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/DisplayTemplates/HasTags.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTags.ascx
rename to src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/DisplayTemplates/HasTags.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTagsList.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/DisplayTemplates/HasTagsList.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Tags/Views/Models/DisplayTemplates/HasTagsList.ascx
rename to src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/DisplayTemplates/HasTagsList.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/EditorTemplates/HasTags.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx
rename to src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/EditorTemplates/HasTags.ascx
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/TagSettingsRecord.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/EditorTemplates/TagSettingsRecord.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/TagSettingsRecord.ascx
rename to src/Orchard.Web/Packages/Orchard.Tags/Views/Shared/EditorTemplates/TagSettingsRecord.ascx
diff --git a/src/Orchard.Web/Packages/TinyMce/TinyMce.csproj b/src/Orchard.Web/Packages/TinyMce/TinyMce.csproj
index 07d356f55..b8dad5b11 100644
--- a/src/Orchard.Web/Packages/TinyMce/TinyMce.csproj
+++ b/src/Orchard.Web/Packages/TinyMce/TinyMce.csproj
@@ -120,12 +120,12 @@
     <Content Include="Scripts\utils\form_utils.js" />
     <Content Include="Scripts\utils\mctabs.js" />
     <Content Include="Scripts\utils\validate.js" />
-    <Content Include="Views\Models\EditorTemplates\TinyMceTextEditor.ascx" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Views\Shared\EditorTemplates\TinyMceTextEditor.ascx" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Packages/TinyMce/Views/Models/EditorTemplates/TinyMceTextEditor.ascx b/src/Orchard.Web/Packages/TinyMce/Views/Shared/EditorTemplates/TinyMceTextEditor.ascx
similarity index 100%
rename from src/Orchard.Web/Packages/TinyMce/Views/Models/EditorTemplates/TinyMceTextEditor.ascx
rename to src/Orchard.Web/Packages/TinyMce/Views/Shared/EditorTemplates/TinyMceTextEditor.ascx
diff --git a/src/Orchard/Models/Driver/ContentItemTemplates.cs b/src/Orchard/Models/Driver/ContentItemTemplates.cs
index 3c0fc83ae..b684794ac 100644
--- a/src/Orchard/Models/Driver/ContentItemTemplates.cs
+++ b/src/Orchard/Models/Driver/ContentItemTemplates.cs
@@ -64,7 +64,7 @@ namespace Orchard.Models.Driver {
                 _updater(context, (ItemEditorModel<TContent>)context.EditorModel);
             else
                 _updater(context, new ItemEditorModel<TContent>(context.EditorModel));
-            context.EditorModel.TemplateName = _templateName;
+            context.EditorModel.TemplateName = _templateName + "/Detail";
             context.EditorModel.Prefix = _prefix;
         }
 
diff --git a/src/Orchard/UI/ContentCapture/ContentCaptureFilter.cs b/src/Orchard/UI/ContentCapture/ContentCaptureFilter.cs
index 08cc93332..a7244d57b 100644
--- a/src/Orchard/UI/ContentCapture/ContentCaptureFilter.cs
+++ b/src/Orchard/UI/ContentCapture/ContentCaptureFilter.cs
@@ -7,15 +7,15 @@ namespace Orchard.UI.ContentCapture {
         private readonly IContentCapture _contentCapture;
 
         public ContentCaptureFilter(IContentCapture contentCapture) {
-            _contentCapture = contentCapture;
+            //_contentCapture = contentCapture;
         }
 
         public void OnResultExecuting(ResultExecutingContext filterContext) {
-            if (filterContext.Result is ViewResult) {
-                _contentCapture.CaptureStream = filterContext.HttpContext.Response.Filter;
-                filterContext.HttpContext.Response.Filter = _contentCapture as Stream;
-                filterContext.HttpContext.Response.Buffer = false;
-            }
+            //if (filterContext.Result is ViewResult) {
+            //    _contentCapture.CaptureStream = filterContext.HttpContext.Response.Filter;
+            //    filterContext.HttpContext.Response.Filter = _contentCapture as Stream;
+            //    filterContext.HttpContext.Response.Buffer = false;
+            //}
         }
 
         public void OnResultExecuted(ResultExecutedContext filterContext) {