diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index 25a9d986aa..7fb83da0c9 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -30,7 +30,7 @@
                 scope.availableTemplates = scope.node.allowedTemplates.items;
 
                 // get document type details
-                scope.documentType = scope.node.docTypeValue[0];
+                scope.documentType = scope.node.documentType;
 
                 loadAuditTrail();
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
index 23331a6ce0..d0194ac009 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
@@ -5,7 +5,6 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Web.Models.ContentEditing
 {
-   
     /// <summary>
     /// A model representing a content item to be displayed in the back office
     /// </summary>    
@@ -30,10 +29,10 @@ namespace Umbraco.Web.Models.ContentEditing
         public string TemplateAlias { get; set; }
 
         [DataMember(Name = "allowedTemplates")]
-        public object AllowedTemplates { get; set; }
+        public IDictionary<string, string> AllowedTemplates { get; set; }
 
-        [DataMember(Name = "docTypeValue")]
-        public object DocTypeValue { get; set; }
+        [DataMember(Name = "documentType")]
+        public ContentTypeBasic DocumentType { get; set; }
 
         [DataMember(Name = "urls")]
         public string[] Urls { get; set; }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
index 330823be96..9741a2cff4 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -14,6 +14,7 @@ using Umbraco.Web.Trees;
 using Umbraco.Web.Routing;
 using umbraco.BusinessLogic.Actions;
 using Umbraco.Core.PropertyEditors;
+using Content = Umbraco.Core.Models.Content;
 
 namespace Umbraco.Web.Models.Mapping
 {
@@ -42,7 +43,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(display => display.Urls,
                     expression => expression.MapFrom(content =>
                         UmbracoContext.Current == null
-                            ? new[] { "Cannot generate urls without a current Umbraco Context" }
+                            ? new[] {"Cannot generate urls without a current Umbraco Context"}
                             : content.GetContentUrls(UmbracoContext.Current)))
                 .ForMember(display => display.Properties, expression => expression.Ignore())
                 .ForMember(display => display.AllowPreview, expression => expression.Ignore())
@@ -50,6 +51,11 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(display => display.Notifications, expression => expression.Ignore())
                 .ForMember(display => display.Errors, expression => expression.Ignore())
                 .ForMember(display => display.Alias, expression => expression.Ignore())
+                .ForMember(display => display.DocumentType, expression => expression.ResolveUsing<ContentTypeBasicResolver>())
+                .ForMember(display => display.AllowedTemplates, expression =>
+                    expression.MapFrom(content => content.ContentType.AllowedTemplates
+                        .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false)
+                        .ToDictionary(t => t.Alias, t => t.Name)))
                 .ForMember(display => display.Tabs, expression => expression.ResolveUsing(new TabsAndPropertiesResolver(applicationContext.Services.TextService)))
                 .ForMember(display => display.AllowedActions, expression => expression.ResolveUsing(
                     new ActionButtonsResolver(new Lazy<IUserService>(() => applicationContext.Services.UserService))))
@@ -105,78 +111,36 @@ namespace Umbraco.Web.Models.Mapping
                 var url = urlHelper.GetUmbracoApiService<ContentTreeController>(controller => controller.GetTreeNode(display.Id.ToString(), null));
                 display.TreeNodeUrl = url;
             }
-
-            //fill in the template config to be passed to the template drop down.
-            var templateItemConfig = new Dictionary<string, string> { { "", localizedText.Localize("general/choose") } };
-            foreach (var t in content.ContentType.AllowedTemplates
-                .Where(t => t.Alias.IsNullOrWhiteSpace() == false && t.Name.IsNullOrWhiteSpace() == false))
-            {
-                templateItemConfig.Add(t.Alias, t.Name);
-            }
-
-
+            
             if (content.ContentType.IsContainer)
             {
                 TabsAndPropertiesResolver.AddListView(display, "content", dataTypeService, localizedText);
-            }
-
-            //TODO: This would be much nicer with the IUmbracoContextAccessor so we don't use singletons
-            //If this is a web request and there's a user signed in and the 
-            // user has access to the settings section, we will 
-            if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
-                && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
-            {
-                var currentDocumentType = contentTypeService.GetContentType(display.ContentTypeAlias);
-                var currentDocumentTypeName = currentDocumentType == null ? string.Empty : localizedText.UmbracoDictionaryTranslate(currentDocumentType.Name);
+            }            
 
-                var currentDocumentTypeId = currentDocumentType == null ? string.Empty : currentDocumentType.Id.ToString(CultureInfo.InvariantCulture);
-                //TODO: Hard coding this is not good
-                var docTypeLink = string.Format("#/settings/documenttypes/edit/{0}", currentDocumentTypeId);
-
-                var templateProperty = new ContentPropertyDisplay
-                {
-                    Alias = string.Format("{0}template",
-                        Constants.PropertyEditors.InternalGenericPropertiesPrefix),
-                    Label = localizedText.Localize("template/template"),
-                    Value = display.TemplateAlias,
-                    View =
-                        "dropdown", //TODO: Hard coding until we make a real dropdown property editor to lookup
-                    Config = new Dictionary<string, object>
-                    {
-                        {"items", templateItemConfig}
-                    }
-                };
-
-                //Replace the doc type property
-                var docTypeProperty = new ContentPropertyDisplay
-                {
-                    Alias = string.Format("{0}doctype",
-                        Constants.PropertyEditors.InternalGenericPropertiesPrefix),
-                    Label = localizedText.Localize("content/documentType"),
-                    Value = localizedText.UmbracoDictionaryTranslate(display.ContentTypeName),
-                    View = PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias)
-                        .ValueEditor.View
-                };
-                docTypeProperty.Value = new List<object>
-                {
-                    new
-                    {
-                        linkText = currentDocumentTypeName,
-                        url = docTypeLink,
-                        target = "_self",
-                        icon = "icon-item-arrangement"
-                    }
-                };
-                //TODO: Hard coding this because the templatepicker doesn't necessarily need to be a resolvable (real) property editor
-                docTypeProperty.View = "urllist";
-
-                //Moving template and docType properties to the root node (issue U4-10311)
-                display.AllowedTemplates = templateProperty.Config;
-                display.DocTypeValue = docTypeProperty.Value;
-            }
-
             TabsAndPropertiesResolver.MapGenericProperties(content, display, localizedText);
         }
+
+        /// <summary>
+        /// Resolves a <see cref="ContentTypeBasic"/> from the <see cref="IContent"/> item and checks if the current user
+        /// has access to see this data
+        /// </summary>
+        private class ContentTypeBasicResolver : ValueResolver<IContent, ContentTypeBasic>
+        {
+            protected override ContentTypeBasic ResolveCore(IContent source)
+            {
+                //TODO: This would be much nicer with the IUmbracoContextAccessor so we don't use singletons
+                //If this is a web request and there's a user signed in and the 
+                // user has access to the settings section, we will 
+                if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
+                    && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
+                {
+                    var contentTypeBasic = Mapper.Map<ContentTypeBasic>(source.ContentType);
+                    return contentTypeBasic;
+                }
+                //no access
+                return null;
+            }
+        }
 
         /// <summary>
         /// Creates the list of action buttons allowed for this user - Publish, Send to publish, save, unpublish returned as the button's 'letter'