diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 02148806ca..5f61325876 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -626,9 +626,9 @@
     <None Include="Config\404handlers.Release.config">
       <DependentUpon>404handlers.config</DependentUpon>
     </None>
-    <Content Include="Config\appSettings.Release.config">
+    <None Include="Config\appSettings.Release.config">
       <SubType>Designer</SubType>
-    </Content>
+    </None>
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -639,7 +639,7 @@
     <None Include="Config\BaseRestExtensions.Release.config">
       <DependentUpon>BaseRestExtensions.config</DependentUpon>
     </None>
-    <Content Include="Config\connectionStrings.Release.config" />
+    <None Include="Config\connectionStrings.Release.config" />
     <None Include="Config\log4net.Release.config">
       <DependentUpon>log4net.config</DependentUpon>
     </None>
diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
index 3d7bca0afd..742b1f36c4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
@@ -130,7 +130,7 @@
       <create assembly="umbraco" type="MediaTypeTasks" />
       <delete assembly="umbraco" type="MediaTypeTasks" />
     </tasks>
-  </nodeType>  
+  </nodeType>
   <nodeType alias="initmember">
     <header>member</header>
     <usercontrol>/create/member.ascx</usercontrol>
@@ -236,36 +236,34 @@
       <delete assembly="umbraco" type="cacheTasks" />
     </tasks>
   </nodeType>
-    <nodeType alias="initpython">
-        <header>Scripting file</header>
-        <usercontrol>/create/DLRScripting.ascx</usercontrol>
-        <tasks>
-            <create assembly="umbraco" type="PythonTasks" />
-        </tasks>
-    </nodeType>
-    <nodeType alias="python">
-        <header>Macro</header>
-        <usercontrol>/create/DLRScripting.ascx</usercontrol>
-        <tasks>
-            <delete assembly="umbraco" type="PythonTasks" />
-        </tasks>
-    </nodeType>
-
-    <nodeType alias="initdlrscripting">
-        <header>Scripting file</header>
-        <usercontrol>/create/DLRScripting.ascx</usercontrol>
-        <tasks>
-            <create assembly="umbraco" type="DLRScriptingTasks" />
-        </tasks>
-    </nodeType>
-
-    <nodeType alias="dlrscripting">
-        <header>Macro</header>
-        <usercontrol>/create/DLRScripting.ascx</usercontrol>
-        <tasks>
-            <delete assembly="umbraco" type="DLRScriptingTasks" />
-        </tasks>
-    </nodeType>
+  <nodeType alias="initpython">
+    <header>Scripting file</header>
+    <usercontrol>/create/DLRScripting.ascx</usercontrol>
+    <tasks>
+      <create assembly="umbraco" type="PythonTasks" />
+    </tasks>
+  </nodeType>
+  <nodeType alias="python">
+    <header>Macro</header>
+    <usercontrol>/create/DLRScripting.ascx</usercontrol>
+    <tasks>
+      <delete assembly="umbraco" type="PythonTasks" />
+    </tasks>
+  </nodeType>
+  <nodeType alias="initdlrscripting">
+    <header>Scripting file</header>
+    <usercontrol>/create/DLRScripting.ascx</usercontrol>
+    <tasks>
+      <create assembly="umbraco" type="DLRScriptingTasks" />
+    </tasks>
+  </nodeType>
+  <nodeType alias="dlrscripting">
+    <header>Macro</header>
+    <usercontrol>/create/DLRScripting.ascx</usercontrol>
+    <tasks>
+      <delete assembly="umbraco" type="DLRScriptingTasks" />
+    </tasks>
+  </nodeType>
   <nodeType alias="initscripts">
     <header>Script file</header>
     <usercontrol>/create/script.ascx</usercontrol>
@@ -324,22 +322,20 @@
       <delete assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
     </tasks>
   </nodeType>
-	
-	<nodeType alias="partialViews">
-		<header>Macro</header>
-		<usercontrol>/create/simple.ascx</usercontrol>
-		<tasks>
-			<create assembly="umbraco" type="PartialViewTasks" />
-			<delete assembly="umbraco" type="PartialViewTasks" />
-		</tasks>
-	</nodeType>
-	<nodeType alias="partialViewMacros">
-		<header>Macro</header>
-		<usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
-		<tasks>
-			<create assembly="umbraco" type="MacroPartialViewTasks" />
-			<delete assembly="umbraco" type="MacroPartialViewTasks" />
-		</tasks>
-	</nodeType>
-	
-</createUI>
\ No newline at end of file
+  <nodeType alias="partialViews">
+    <header>Macro</header>
+    <usercontrol>/Create/PartialView.ascx</usercontrol>
+    <tasks>
+      <create assembly="umbraco" type="PartialViewTasks" />
+      <delete assembly="umbraco" type="PartialViewTasks" />
+    </tasks>
+  </nodeType>
+  <nodeType alias="partialViewMacros">
+    <header>Macro</header>
+    <usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
+    <tasks>
+      <create assembly="umbraco" type="PartialViewMacroTasks" />
+      <delete assembly="umbraco" type="PartialViewMacroTasks" />
+    </tasks>
+  </nodeType>
+</createUI>
diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
index e96b9928d2..d1934d069b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
@@ -338,28 +338,4 @@
       <delete assembly="umbraco" type="PartialViewMacroTasks" />
     </tasks>
   </nodeType>
-  <nodeType alias="forms">
-    <header>Forms</header>
-    <usercontrol>/plugins/umbracocontour/createform.ascx</usercontrol>
-    <tasks>
-      <create assembly="Umbraco.Forms.UI" type="Tasks.FormTasks" />
-      <delete assembly="Umbraco.Forms.UI" type="Tasks.FormTasks" />
-    </tasks>
-  </nodeType>
-  <nodeType alias="formdatasources">
-    <header>Datasources</header>
-    <usercontrol>/create/simple.ascx</usercontrol>
-    <tasks>
-      <create assembly="Umbraco.Forms.UI" type="Tasks.DataSourceTasks" />
-      <delete assembly="Umbraco.Forms.UI" type="Tasks.DataSourceTasks" />
-    </tasks>
-  </nodeType>
-  <nodeType alias="formprevaluesource">
-    <header>Prevalue source</header>
-    <usercontrol>/create/simple.ascx</usercontrol>
-    <tasks>
-      <create assembly="Umbraco.Forms.UI" type="Tasks.PrevalueSourceTasks" />
-      <delete assembly="Umbraco.Forms.UI" type="Tasks.PrevalueSourceTasks" />
-    </tasks>
-  </nodeType>
 </createUI>
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 64f79b5355..8c4cc2cdcb 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Editors
                 case UmbracoEntityTypes.Member:
                     searcher = Constants.Examine.InternalMemberSearcher;
                     type = "member";
-                    fields = new[] { "id", "email", "login","name", "nodename"};
+                    fields = new[] { "id", "email", "loginName","nodeName"};
                     break;
                 case UmbracoEntityTypes.Media:
                     type = "media";