diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index 22b7fe8225..418f3db340 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -692,11 +692,11 @@ namespace Umbraco.Core.Services
             }
 
             Func<string, Sql> createSql = url => new Sql().Select("*")
-                .From<PropertyDataDto>()
-                .InnerJoin<PropertyTypeDto>()
-                .On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
-                .Where<PropertyDataDto>(x => x.VarChar == url);
+                                                  .From<PropertyDataDto>()
+                                                  .InnerJoin<PropertyTypeDto>()
+                                                  .On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
+                                                  .Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
+                                                  .Where<PropertyDataDto>(x => x.VarChar == url);
 
             var sql = createSql(umbracoFileValue);
 
@@ -901,10 +901,10 @@ namespace Umbraco.Core.Services
 
                 var repository = RepositoryFactory.CreateMediaRepository(uow);
 
-                //set the creator id if it's new
-                if (media.HasIdentity == false)
-                {
-                    media.CreatorId = userId;
+                // set creator for new media
+                if (media.Id == 0)
+                {
+                    media.CreatorId = userId;
                 }
 
                 repository.AddOrUpdate(media);
@@ -1054,7 +1054,7 @@ namespace Umbraco.Core.Services
         /// <param name="userId">Optional id of the user deleting the media</param>
         public void DeleteMediaOfType(int mediaTypeId, int userId = 0)
         {
-            DeleteMediaOfTypes(new[] { mediaTypeId }, userId);
+            DeleteMediaOfTypes(new[] {mediaTypeId}, userId);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
index b4cc2eb2fd..db4f3676e5 100644
--- a/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewMacrosTreeController.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Web.Trees
     /// <summary>
     /// Tree for displaying partial view macros in the developer app
     /// </summary>
-    [Tree(Constants.Applications.Developer, "partialViewMacros", "Partial View Macro Files", sortOrder: 6)]
+    [Tree(Constants.Applications.Developer, "partialViewMacros", null, sortOrder: 6)]
 	public class PartialViewMacrosTreeController : FileSystemTreeController
     {
         protected override IFileSystem2 FileSystem
diff --git a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
index 264b44ad73..480cb789d8 100644
--- a/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
+++ b/src/Umbraco.Web/Trees/PartialViewsTreeController.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Web.Trees
     /// <summary>
     /// Tree for displaying partial views in the settings app
     /// </summary>
-    [Tree(Constants.Applications.Settings, "partialViews", "Partial Views", sortOrder: 2)]
+    [Tree(Constants.Applications.Settings, "partialViews", null, sortOrder: 2)]
 	public class PartialViewsTreeController : FileSystemTreeController
     {
 		protected override IFileSystem2 FileSystem
diff --git a/src/Umbraco.Web/Trees/ScriptTreeController.cs b/src/Umbraco.Web/Trees/ScriptTreeController.cs
index 616106a625..2e4c25c656 100644
--- a/src/Umbraco.Web/Trees/ScriptTreeController.cs
+++ b/src/Umbraco.Web/Trees/ScriptTreeController.cs
@@ -4,7 +4,7 @@ using Umbraco.Web.Models.Trees;
 
 namespace Umbraco.Web.Trees
 {
-    [Tree(Constants.Applications.Settings, "scripts", "Scripts", sortOrder: 4)]
+    [Tree(Constants.Applications.Settings, "scripts", null, sortOrder: 4)]
     public class ScriptTreeController : FileSystemTreeController
     {
         protected override IFileSystem2 FileSystem