diff --git a/src/Orchard.Web/Core/Contents/Styles/admin.css b/src/Orchard.Web/Core/Contents/Styles/admin.css
index e2c9d7ad2..5a898fa4e 100644
--- a/src/Orchard.Web/Core/Contents/Styles/admin.css
+++ b/src/Orchard.Web/Core/Contents/Styles/admin.css
@@ -11,4 +11,7 @@
 .manage-part .manage {
     font-size:1.4em;
     margin-top:-2.4em;
+}
+.manage-part .manage.minor {
+    margin-top:-1.7em;
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx
index 95afcda57..214c22b7c 100644
--- a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx
+++ b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Part.ascx
@@ -3,7 +3,6 @@
     <fieldset class="manage-part">
         <h3><%:Model.PartDefinition.Name %></h3>
         <div class="manage">
-            <%:Html.ActionLink(T("Edit").Text, "EditPart", new { area = "Contents", id = Model.PartDefinition.Name }) %><%: T(" | ")%>
         <%--// these inline forms can't be here. should probably have some JavaScript in here to build up the forms and add the "remove" link.
             // get the antiforgery token from the edit type form and mark up the part in a semantic way so I can get some info from the DOM --%>
             <%:Html.Link("[remove]", "#forshowonlyandnotintendedtowork") %>
@@ -13,10 +12,11 @@
         <% } %> --%>
         </div>
         <%:Html.EditorFor(m => m.Settings, "Settings", "") %><%
-    if (Model.PartDefinition.Settings.Any()) { %>
-        <h4><%:T("Tenant-wide settings") %></h4>
-        <%:Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") %><%
+    if (Model.PartDefinition.Settings.Any() || Model.PartDefinition.Fields.Any()) { %>
+        <h4><%:T("Global configuration") %></h4>
+        <div class="manage minor"><%:Html.ActionLink(T("Edit").Text, "EditPart", new { area = "Contents", id = Model.PartDefinition.Name }) %></div>
+        <%:Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") %>
+        <%:Html.EditorFor(m => m.PartDefinition.Fields, "Part.Fields") %><%
     } %>
-        <%:Html.EditorFor(m => m.PartDefinition.Fields, "Part.Fields") %>
         <%:Html.Hidden("PartDefinition.Name", Model.PartDefinition.Name) %>
     </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 19d122b0d..6cf84f249 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -510,7 +510,6 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
 .manage {
     float:right;
     margin:0 0 10px 8px;
-    overflow:hidden;
 }
 .actions {
     clear:right;