diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index 02c48efba..fb24c6175 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -97,10 +97,12 @@
     <Content Include="Views\DisplayTemplates\Field.ascx" />
     <Content Include="Views\DisplayTemplates\Fields.ascx" />
     <Content Include="Views\DisplayTemplates\Settings.ascx" />
+    <Content Include="Views\EditorTemplates\TypePartField.ascx" />
+    <Content Include="Views\EditorTemplates\TypePartFields.ascx" />
     <Content Include="Views\EditorTemplates\Field.ascx" />
     <Content Include="Views\EditorTemplates\Fields.ascx" />
-    <Content Include="Views\EditorTemplates\Part.ascx" />
-    <Content Include="Views\EditorTemplates\Parts.ascx" />
+    <Content Include="Views\EditorTemplates\TypePart.ascx" />
+    <Content Include="Views\EditorTemplates\TypeParts.ascx" />
     <Content Include="Views\EditorTemplates\Settings.ascx" />
     <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
index ba113a16e..77b276b9c 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
@@ -1,13 +1,19 @@
-.contents #main h2 {
-    margin:1.5em 0 .5em;
+.orchard-contenttypes #main h2 {
+    margin:1.5em 0 0;
 }
 .manage.add-to-type {
-    margin-top:-4em;
+    margin-top:-3.1em;
 }
 
 .manage-part h3,
 .manage-field h3 {
     border-bottom:1px solid #EAEAEA;
+    padding-top:0;
+}
+.manage-part h3,
+.manage-part .manage-field,
+.manage-part .settings {
+    padding-left:20px;
 }
 .manage-part .manage,
 .manage-field .manage {
@@ -15,12 +21,23 @@
     margin-top:-2.4em;
 }
 .manage-part .manage.minor {
-    margin-top:-1.7em;
+    margin:0 0 -1.2em;
 }
 .manage-part label,
 .manage-field label {
     font-weight:normal;
 }
+.manage-part fieldset {
+    margin:1.5em 0 0;
+    padding:0;
+}
+.manage-field .settings {
+    margin:-1.5em 0 0 1em;
+    padding-left:0;
+}
+.manage-part .settings fieldset {
+    padding-left:0;
+}
 
 /* should pull this back into the base admin theme css, w/out the .manage-part of course */
 .manage-part dl {
@@ -28,8 +45,16 @@
     overflow:auto;
     padding:6px 0 0;
 }
-.manage-part dt {
-    font-weight:bold;
+.manage-part dt,
+.manage-part dd {
+    display:inline;
+}
+.manage-part dt::after {
+    content:":";
+}
+.manage-part dd {
+    font-style:italic;
+    padding-left:.5em;
 }
 .manage-part dl dl {
     font-size:1em;
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
index f9cd5f5f2..47443d377 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
@@ -19,7 +19,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
     Html.RenderTemplates(Model.Templates); %>
     <h2><%:T("Parts") %></h2>
     <div class="manage add-to-type"><%: Html.ActionLink(T("Add").Text, "AddPartsTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" })%></div><%:
-    Html.EditorFor(m => m.Parts, "Parts", "") %>
+    Html.EditorFor(m => m.Parts, "TypeParts", "") %>
     <h2><%:T("Fields") %></h2>
     <div class="manage add-to-type"><%: Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" }) %></div><%:
     Html.EditorFor(m => m.Fields, "Fields", "") %>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx
index 47687cbe1..a539ce5b1 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx
@@ -2,7 +2,7 @@
 <%@ import Namespace="Orchard.ContentManagement.MetaData.Models" %>
 <%
 if (Model.Any()) { %>
-    <dl><%
+    <dl class="settings"><%
         foreach (var setting in Model) { %>
         <dt><%:setting.Key %></dt>
         <dd><%:setting.Value %></dd><%
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.ascx
similarity index 68%
rename from src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
rename to src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.ascx
index 6743e1adf..d2382be7d 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.ascx
@@ -4,10 +4,13 @@
         <div class="manage">
             <%:Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" })%><%--// <- some experimentation--%>
         </div><%
+        if (Model.Templates.Any()) { %>
+        <div class="settings"><%
         Html.RenderTemplates(Model.Templates); %>
-        <h4><%:T("Global configuration") %></h4>
-        <div class="manage minor"><%:Html.ActionLink(T("Edit").Text, "EditPart", new { area = "Orchard.ContentTypes", id = Model.PartDefinition.Name }) %></div>
+        </div><%
+        } %>
+        <div class="manage minor"><%:Html.ActionLink(T("Edit global part config").Text, "EditPart", new { area = "Orchard.ContentTypes", id = Model.PartDefinition.Name })%></div>
         <%:Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition")
-        %><%:Html.EditorFor(m => m.PartDefinition.Fields, "Fields", "PartDefinition")
+        %><%:Html.EditorFor(m => m.PartDefinition.Fields, "TypePartFields", "PartDefinition")
         %><%:Html.Hidden("PartDefinition.Name", Model.PartDefinition.Name) %>
     </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.ascx
new file mode 100644
index 000000000..f7f933c7d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.ascx
@@ -0,0 +1,10 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>" %>
+    <fieldset class="manage-field">
+        <h4><%:Model.Name %> <span>(<%:Model.FieldDefinition.Name %>)</span></h4><%
+        if (Model.Templates.Any()) { %>
+        <div class="settings"><%
+        Html.RenderTemplates(Model.Templates); %>
+        </div><%
+        } %>
+        <%:Html.HiddenFor(m => m.Name) %><%:Html.HiddenFor(m => m.FieldDefinition.Name) %>
+    </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.ascx
new file mode 100644
index 000000000..5c270aa45
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.ascx
@@ -0,0 +1,10 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %>
+<%
+if (Model.Any()) {
+    var fi = 0;
+    foreach (var field in Model) {
+        var f = field;
+        var htmlFieldName = string.Format("Fields[{0}]", fi++); %>
+        <%:Html.EditorFor(m => f, "TypePartField", htmlFieldName) %><%
+    }
+} %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.ascx
similarity index 82%
rename from src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
rename to src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.ascx
index 8f6e4b0ff..cc41743b0 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.ascx
@@ -6,7 +6,7 @@ if (Model.Any()) { %>
         foreach (var part in Model) {
             var p = part;
             var htmlFieldName = string.Format("Parts[{0}]", pi++); %>
-            <%:Html.EditorFor(m => p, "Part", htmlFieldName) %><%
+            <%:Html.EditorFor(m => p, "TypePart", htmlFieldName) %><%
         } %>
     </fieldset><%
 } %>
\ No newline at end of file