diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
index 1d7d299973..a95d12a315 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
@@ -142,14 +142,9 @@ angular.module("umbraco.directives")
 
             //watch for path changes
             scope.$watch("path", function (newVal, oldVal) {
-
-              if(!scope.tree){
+              if(!scope.tree || newVal){
                   loadTree(); 
               }
-              if (newVal && newVal !== oldVal) {
-                  //only reload the tree data and Dom if the newval is different from the old one
-                  loadTree();
-              }
             });
 
             //watch for active tree changes
@@ -157,9 +152,7 @@ angular.module("umbraco.directives")
 
               if(!scope.tree){
                   loadTree(); 
-              }
-
-              if (newVal && newVal !== oldVal) {
+              }else if (newVal && newVal !== oldVal) {
                   //only reload the tree data and Dom if the newval is different from the old one
                   loadTree();
               }
diff --git a/src/Umbraco.Web.UI.Client/src/less/fonts.less b/src/Umbraco.Web.UI.Client/src/less/fonts.less
index 0e74341b3e..2d76687794 100644
--- a/src/Umbraco.Web.UI.Client/src/less/fonts.less
+++ b/src/Umbraco.Web.UI.Client/src/less/fonts.less
@@ -28,18 +28,4 @@
     font-style: normal;
 }
 
-.umb-abstract {
-    display: block;
-    margin-top: 0px;
-    margin-bottom: 15px;
-    font-size: 14px;
-    color: #b3b3b3
-}
 
-h5{
-  text-transform: uppercase;
-  color: #b3b3b3;
-  font-weight: bold;
-  font-size: 13px;
-  margin-top: 15px;
-}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index ba4ab2b498..dc67ac1d3a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -18,27 +18,23 @@
 	overflow: auto;
 }
 
-/* STYLES FOR SPECIFIC EDITOR COMPONENTS - for all property editors and other reusable editing components*/
+.umb-abstract {
+    display: block;
+    margin-top: 0px;
+    margin-bottom: 15px;
+    font-size: 14px;
+    color: #b3b3b3
+}
 
-/* content picker */
-.umb-contentpicker-popover .search-holder {
-    padding: 10px;
+h5{
+  text-transform: uppercase;
+  color: #b3b3b3;
+  font-weight: bold;
+  font-size: 13px;
+  margin-top: 15px;
 }
 
 
-/* CODEMIRROR DATATYPE */
-div.umb-codeeditor {
-    border: 1px solid #e8e8e8;
-}
-div.umb-codeeditor .umb-el-wrap {
-    padding: 0px;
-}
-div.umb-codeeditor .umb-btn-toolbar {
-    padding: 0px;
-    margin: 0px;
-    border-bottom: #e8e8e8 1px solid;
-    background: #f7f7f7
-}
 
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index b0f03c9a67..dcb134bd85 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -29,6 +29,24 @@
 }
 .umb-contentpicker li a:hover .hover-show{display: inline-block;}
 
+.umb-contentpicker-popover .search-holder {
+    padding: 10px;
+}
+
+/* CODEMIRROR DATATYPE */
+div.umb-codeeditor {
+    border: 1px solid #e8e8e8;
+}
+div.umb-codeeditor .umb-el-wrap {
+    padding: 0px;
+}
+div.umb-codeeditor .umb-btn-toolbar {
+    padding: 0px;
+    margin: 0px;
+    border-bottom: #e8e8e8 1px solid;
+    background: #f7f7f7
+}
+
 
 //
 // RTE
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index f75422a67b..7591222b9d 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -594,7 +594,6 @@
     <Compile Include="Umbraco\TreeInit.aspx.designer.cs">
       <DependentUpon>treeInit.aspx</DependentUpon>
     </Compile>
-    <Content Include="App_Plugins\MyPackage\PropertyEditors\Views\CustomJson.html" />
     <Content Include="Umbraco\create.aspx" />
     <Content Include="Umbraco_Client\IconPicker\iconpicker.js" />
     <Content Include="App_Plugins\MyPackage\PropertyEditors\Views\CsvEditor.html" />