diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
new file mode 100644
index 0000000000..7fdd2c4c25
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
@@ -0,0 +1,254 @@
+
+//TODO: WE NEED TO CONVERT ALL OF THESE METHODS TO PROXY TO OUR APPLICATION SINCE MANY CUSTOM APPS USE THIS!
+
+Umbraco.Sys.registerNamespace("Umbraco.Application");
+
+(function($) {
+    Umbraco.Application.ClientManager = function() {
+
+        /**
+         * @ngdoc function
+         * @name getRootScope
+         * @methodOf UmbClientMgr
+         * @function
+         *
+         * @description
+         * Returns the root angular scope
+         */
+        function getRootScope() {
+            return angular.element(document.getElementById("umbracoMainPageBody")).scope();
+        }
+        
+        /**
+         * @ngdoc function
+         * @name getRootInjector
+         * @methodOf UmbClientMgr
+         * @function
+         *
+         * @description
+         * Returns the root angular injector
+         */
+        function getRootInjector() {
+            return angular.element(document.getElementById("umbracoMainPageBody")).injector();
+        }
+
+
+        return {
+            _isDirty: false,
+            _isDebug: false,
+            _mainTree: null,
+            _appActions: null,
+            _historyMgr: null,
+            _rootPath: "/umbraco", //this is the default
+            _modal: new Array(), //track all modal window objects (they get stacked)
+
+            historyManager: function() {
+                if (!this._historyMgr) {
+                    this._historyMgr = new Umbraco.Controls.HistoryManager();
+                }
+                return this._historyMgr;
+            },
+
+            setUmbracoPath: function(strPath) {
+                /// <summary>
+                /// sets the Umbraco root path folder
+                /// </summary>
+                this._debug("setUmbracoPath: " + strPath);
+                this._rootPath = strPath;
+            },
+
+            mainWindow: function() {
+                /// <summary>
+                /// Returns a reference to the main frame of the application
+                /// </summary>
+                return top;
+            },
+            mainTree: function() {
+                /// <summary>
+                /// Returns a reference to the main UmbracoTree API object.
+                /// Sometimes an Umbraco page will need to be opened without being contained in the iFrame from the main window
+                /// so this method is will construct a false tree to be returned if this is the case as to avoid errors.
+                /// </summary>
+                /// <returns type="Umbraco.Controls.UmbracoTree" />
+
+                if (this._mainTree == null) {
+                    if (this.mainWindow().jQuery == null
+                        || this.mainWindow().jQuery(".umbTree").length == 0
+                        || this.mainWindow().jQuery(".umbTree").UmbracoTreeAPI() == null) {
+                        //creates a false tree with all the public tree params set to a false method.
+                        var tmpTree = {};
+                        var treeProps = ["init", "setRecycleBinNodeId", "clearTreeCache", "toggleEditMode", "refreshTree", "rebuildTree", "saveTreeState", "syncTree", "childNodeCreated", "moveNode", "copyNode", "findNode", "selectNode", "reloadActionNode", "getActionNode", "setActiveTreeType", "getNodeDef"];
+                        for (var p in treeProps) {
+                            tmpTree[treeProps[p]] = function() { return false; };
+                        }
+                        this._mainTree = tmpTree;
+                    }
+                    else {
+                        this._mainTree = this.mainWindow().jQuery(".umbTree").UmbracoTreeAPI();
+                    }
+                }
+                return this._mainTree;
+            },
+            appActions: function() {
+                /// <summary>
+                /// Returns a reference to the application actions object
+                /// </summary>
+
+                //if the main window has no actions, we'll create some
+                if (this._appActions == null) {
+                    if (typeof this.mainWindow().appActions == 'undefined') {
+                        this._appActions = new Umbraco.Application.Actions();
+                    }
+                    else this._appActions = this.mainWindow().appActions;
+                }
+                return this._appActions;
+            },
+            uiKeys: function() {
+                /// <summary>
+                /// Returns a reference to the main windows uiKeys object for globalization
+                /// </summary>
+
+                //TODO: If there is no main window, we need to go retrieve the appActions from the server!
+                return this.mainWindow().uiKeys;
+            },
+            //    windowMgr: function() 
+            //        return null;
+            //    },
+            contentFrameAndSection: function(app, rightFrameUrl) {
+                //this.appActions().shiftApp(app, this.uiKeys()['sections_' + app]);
+                var self = this;
+                self.mainWindow().UmbClientMgr.historyManager().addHistory(app, true);
+                window.setTimeout(function() {
+                    self.mainWindow().UmbClientMgr.contentFrame(rightFrameUrl);
+                }, 200);
+            },
+
+            /**
+             * @ngdoc function
+             * @name contentFrame
+             * @methodOf UmbClientMgr
+             * @function
+             *
+             * @description
+             * This will tell our angular app to create and load in an iframe at the specified location
+             * @param strLocation {String} The URL to load the iframe in
+             */
+            contentFrame: function (strLocation) {
+                
+                if (!strLocation || strLocation == "") {
+                    //SD: NOTE: We used to return the content iframe object but now I'm not sure we should do that ?!
+                    return null;
+                }
+
+                this._debug("contentFrame: " + strLocation);
+
+                //get our angular navigation service
+                var injector = getRootInjector();
+                var navService = injector.get("navigationService");
+
+                //if the path doesn't start with "/" or with the root path then 
+                //prepend the root path
+                if (!strLocation.startsWith("/")) {
+                    strLocation = this._rootPath + "/" + strLocation;
+                }
+                else if (strLocation.length >= this._rootPath.length
+                    && strLocation.substr(0, this._rootPath.length) != this._rootPath) {
+                    strLocation = this._rootPath + "/" + strLocation;
+                }
+
+                navService.loadLegacyIFrame(strLocation);
+
+                //if (strLocation == null || strLocation == "") {
+                //    if (typeof this.mainWindow().right != "undefined") {
+                //        return this.mainWindow().right;
+                //    }
+                //    else {
+                //        return this.mainWindow(); //return the current window if the content frame doesn't exist in the current context
+                //    }
+                //}
+                //else {
+                //    //if the path doesn't start with "/" or with the root path then 
+                //    //prepend the root path
+                //    if (strLocation.substr(0, 1) != "/") {
+                //        strLocation = this._rootPath + "/" + strLocation;
+                //    }
+                //    else if (strLocation.length >= this._rootPath.length
+                //        && strLocation.substr(0, this._rootPath.length) != this._rootPath) {
+                //        strLocation = this._rootPath + "/" + strLocation;
+                //    }
+
+                //    this._debug("contentFrame: parsed location: " + strLocation);
+                //    var self = this;
+                //    window.setTimeout(function() {
+                //        if (typeof self.mainWindow().right != "undefined") {
+                //            self.mainWindow().right.location.href = strLocation;
+                //        }
+                //        else {
+                //            self.mainWindow().location.href = strLocation; //set the current windows location if the right frame doesn't exist int he current context
+                //        }
+                //    }, 200);
+                //}
+            },
+            openModalWindow: function(url, name, showHeader, width, height, top, leftOffset, closeTriggers, onCloseCallback) {
+                //need to create the modal on the top window if the top window has a client manager, if not, create it on the current window                
+
+                //if this is the top window, or if the top window doesn't have a client manager, create the modal in this manager
+                if (window == this.mainWindow() || !this.mainWindow().UmbClientMgr) {
+                    var m = new Umbraco.Controls.ModalWindow();
+                    this._modal.push(m);
+                    m.open(url, name, showHeader, width, height, top, leftOffset, closeTriggers, onCloseCallback);
+                }
+                else {
+                    //if the main window has a client manager, then call the main window's open modal method whilst keeping the context of it's manager.
+                    if (this.mainWindow().UmbClientMgr) {
+                        this.mainWindow().UmbClientMgr.openModalWindow.apply(this.mainWindow().UmbClientMgr,
+                            [url, name, showHeader, width, height, top, leftOffset, closeTriggers, onCloseCallback]);
+                    }
+                    else {
+                        return; //exit recurse.
+                    }
+                }
+            },
+            closeModalWindow: function(rVal) {
+                /// <summary>
+                /// will close the latest open modal window.
+                /// if an rVal is passed in, then this will be sent to the onCloseCallback method if it was specified.
+                /// </summary>
+                if (this._modal != null && this._modal.length > 0) {
+                    this._modal.pop().close(rVal);
+                }
+                else {
+                    //this will recursively try to close a modal window until the parent window has a modal object or the window is the top and has the modal object
+                    var mgr = null;
+                    if (window.parent == null || window.parent == window) {
+                        //we are at the root window, check if we can close the modal window from here
+                        if (window.UmbClientMgr != null && window.UmbClientMgr._modal != null && window.UmbClientMgr._modal.length > 0) {
+                            mgr = window.UmbClientMgr;
+                        }
+                        else {
+                            return; //exit recursion.
+                        }
+                    }
+                    else if (typeof window.parent.UmbClientMgr != "undefined") {
+                        mgr = window.parent.UmbClientMgr;
+                    }
+                    mgr.closeModalWindow.call(mgr, rVal);
+                }
+            },
+            _debug: function(strMsg) {
+                if (this._isDebug) {
+                    Sys.Debug.trace("UmbClientMgr: " + strMsg);
+                }
+            },
+            get_isDirty: function() {
+                return this._isDirty;
+            },
+            set_isDirty: function(value) {
+                this._isDirty = value;
+            }
+        };
+    };
+})(jQuery);
+
+//define alias for use throughout application
+var UmbClientMgr = new Umbraco.Application.ClientManager();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
index e32304cd9b..282eb05ff7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
@@ -1,5 +1,5 @@
 angular.module("umbraco.directives")
-.directive('umbTreeItem', function($compile, $http, $templateCache, $interpolate, $log, treeService) {
+.directive('umbTreeItem', function($compile, $http, $templateCache, $interpolate, $log, $location, treeService) {
   return {
     restrict: 'E',
     replace: true,
@@ -14,7 +14,7 @@ angular.module("umbraco.directives")
         '<ins ng-hide="node.hasChildren" style="background:none;width:18px;"></ins>' +        
         '<ins ng-show="node.hasChildren" ng-class="{\'icon-caret-right\': !node.expanded, \'icon-caret-down\': node.expanded}" ng-click="load(node)"></ins>' +
        '<i class="{{node | umbTreeIconClass:\'icon umb-tree-icon sprTree\'}}" style="{{node | umbTreeIconStyle}}"></i>' +
-       '<a ng-click="select(this, node, $event)" ng-href="#{{node.view}}">{{node.name}}</a>' +
+       '<a ng-click="select(this, node, $event)" >{{node.name}}</a>' +
        '<i class="umb-options" ng-click="options(this, node, $event)"><i></i><i></i><i></i></i>' +
        '</div>'+
        '</li>',
@@ -25,8 +25,46 @@ angular.module("umbraco.directives")
           scope.$emit("treeOptionsClick", {element: e, node: n, event: ev});
         };
 
+        /**
+         * @ngdoc function
+         * @name select
+         * @methodOf umbraco.directives.umbTreeItem
+         * @function
+         *
+         * @description
+         * Handles the click event of a tree node
+
+         * @param n {object} The tree node object associated with the click
+         */
         scope.select = function(e,n,ev){
-          scope.$emit("treeNodeSelect", {element: e, node: n, event: ev});
+
+            //here we need to check for some legacy tree code
+            if (n.jsClickCallback && n.jsClickCallback != "") {
+                //this is a legacy tree node!                
+                var js;
+                if (n.jsClickCallback.startsWith("javascript:")) {
+                    js = n.jsClickCallback.substr("javascript:".length);
+                }
+                else {
+                    js = n.jsClickCallback;
+                }
+                try {
+                    var func = eval(js);
+                    //this is normally not necessary since the eval above should execute the method and will return nothing.
+                    if (func != null && (typeof func === "function")) {
+                        func.call();
+                    }
+                }
+                catch(e) {
+                    $log.error("Error evaluating js callback from legacy tree node: " + e);
+                }
+            }
+            else {
+                //not legacy, lets just set the route value
+                $location.path(n.view);
+            }
+
+            scope.$emit("treeNodeSelect", { element: e, node: n, event: ev });
         };
 
         scope.load = function (node) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 08fd919ccd..66bdfd76db 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -1,55 +1,55 @@
 angular.module('umbraco.services')
-.factory('navigationService', function ($rootScope, $routeParams, $log, dialogService, treeService) {
+.factory('navigationService', function ($rootScope, $routeParams, $log, $location, dialogService, treeService) {
 
-	var _currentSection = $routeParams.section;
-	var _currentId = $routeParams.id;
-	var _currentNode;
-	var _ui = {};
+	var currentSection = $routeParams.section;
+	var currentId = $routeParams.id;
+	var currentNode;
+	var ui = {};
 
-	function _setMode(mode){
+	function setMode(mode){
 		switch(mode)
 		{
 			case 'tree':
-			_ui.showNavigation = true;
-			_ui.showContextMenu = false;
-			_ui.showContextMenuDialog = false;
-			_ui.stickyNavigation = false;
+			ui.showNavigation = true;
+			ui.showContextMenu = false;
+			ui.showContextMenuDialog = false;
+			ui.stickyNavigation = false;
 
 			$("#search-form input").focus();
 			break;
 			case 'menu':
-			_ui.showNavigation = true;
-			_ui.showContextMenu = true;
-			_ui.showContextMenuDialog = false;
-			_ui.stickyNavigation = true;
+			ui.showNavigation = true;
+			ui.showContextMenu = true;
+			ui.showContextMenuDialog = false;
+			ui.stickyNavigation = true;
 			break;
 			case 'dialog':
-			_ui.stickyNavigation = true;
-			_ui.showNavigation = true;
-			_ui.showContextMenu = false;
-			_ui.showContextMenuDialog = true;
+			ui.stickyNavigation = true;
+			ui.showNavigation = true;
+			ui.showContextMenu = false;
+			ui.showContextMenuDialog = true;
 			break;
 			case 'search':
-			_ui.stickyNavigation = false;
-			_ui.showNavigation = true;
-			_ui.showContextMenu = false;
-			_ui.showSearchResults = true;
-			_ui.showContextMenuDialog = false;
+			ui.stickyNavigation = false;
+			ui.showNavigation = true;
+			ui.showContextMenu = false;
+			ui.showSearchResults = true;
+			ui.showContextMenuDialog = false;
 			break;      
 			default:
-			_ui.showNavigation = false;
-			_ui.showContextMenu = false;
-			_ui.showContextMenuDialog = false;
-			_ui.showSearchResults = false;
-			_ui.stickyNavigation = false;
+			ui.showNavigation = false;
+			ui.showContextMenu = false;
+			ui.showContextMenuDialog = false;
+			ui.showSearchResults = false;
+			ui.stickyNavigation = false;
 			break;
 		}
 	}
 
 	return {
-		currentNode: _currentNode,
+		currentNode: currentNode,
 		mode: "default",
-		ui: _ui,
+		ui: ui,
 
 		sections: function(){
 			return [
@@ -61,9 +61,23 @@ angular.module('umbraco.services')
 				];		
 		},
 
+	    /**
+         * @ngdoc function
+         * @name loadLegacyIFrame
+         * @methodOf navigationService
+         * @function
+         *
+         * @description
+         * Shows the legacy iframe and loads in the content based on the source url
+         * @param source {String} The URL to load into the iframe
+         */
+		loadLegacyIFrame: function (source) {
+            $location.path("/framed/" + encodeURIComponent(source));
+        },
+
 		changeSection: function(sectionAlias){
 			if(this.ui.stickyNavigation){
-				_setMode("default-opensection");
+				setMode("default-opensection");
 				this.ui.currentSection = selectedSection;
 				this.showTree(selectedSection);
 			}
@@ -73,7 +87,7 @@ angular.module('umbraco.services')
 			if(!this.ui.stickyNavigation && sectionAlias !== this.ui.currentTree){
 				$log.log("show tree" + sectionAlias);
 				this.ui.currentTree = sectionAlias;
-				_setMode("tree");
+				setMode("tree");
 			}
 		},
 
@@ -81,7 +95,7 @@ angular.module('umbraco.services')
 			if(!this.ui.stickyNavigation){
 				$log.log("hide tree");
 				this.ui.currentTree = "";
-				_setMode("default-hidesectiontree");
+				setMode("default-hidesectiontree");
 			}
 		},
 
@@ -101,9 +115,10 @@ angular.module('umbraco.services')
 								action: act,
 								section: this.ui.currentTree
 							});
-			}else{
-				_setMode("menu");
-				_ui.actions = treeService.getActions({node: args.node, section: this.ui.currentTree});
+			}
+			else {
+				setMode("menu");
+				ui.actions = treeService.getActions({node: args.node, section: this.ui.currentTree});
 				
 
 				this.ui.currentNode = args.node;
@@ -112,17 +127,17 @@ angular.module('umbraco.services')
 		},
 
 		hideMenu: function () {
-			_selectedId = $routeParams.id;
+			var selectedId = $routeParams.id;
 			this.ui.currentNode = undefined;
 			this.ui.actions = [];
-			_setMode("tree");
+			setMode("tree");
 		},
 
 		showDialog: function (args) {
-			_setMode("dialog");
+			setMode("dialog");
 
-			var _scope = args.scope || $rootScope.$new();
-			_scope.currentNode = args.node;
+			var scope = args.scope || $rootScope.$new();
+			scope.currentNode = args.node;
 
 			//this.currentNode = item;
 			this.ui.dialogTitle = args.action.name;
@@ -131,7 +146,7 @@ angular.module('umbraco.services')
 			var d = dialogService.append(
 						{
 							container: $("#dialog div.umb-panel-body"),
-							scope: _scope,
+							scope: scope,
 							template: templateUrl
 						});
 		},
@@ -142,11 +157,11 @@ angular.module('umbraco.services')
 		},
 
 		showSearch: function() {
-			_setMode("search");
+			setMode("search");
 		},
 
 		hideSearch: function() {
-			_setMode("default-hidesearch");
+			setMode("default-hidesearch");
 		},
 
 		hideNavigation: function(){
@@ -154,7 +169,7 @@ angular.module('umbraco.services')
 			this.ui.actions = [];
 			this.ui.currentNode = undefined;
 
-			_setMode("default");
+			setMode("default");
 		}
 	};
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index b502499ec8..65099406ac 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -43,6 +43,7 @@
 .umb-tree a {
 	vertical-align: middle;
 	display: inline-block;
+    cursor:pointer;
 }
 
 .umb-tree a:hover {
diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
index 92ff159370..8b6d809ba4 100644
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ b/src/Umbraco.Web.UI.Client/src/routes.js
@@ -3,6 +3,15 @@ app.config(function ($routeProvider) {
         .when('/:section', {
             templateUrl: "views/common/dashboard.html"
         })
+        .when('/framed/:url', {
+            //This occurs when we need to launch some content in an iframe
+            templateUrl: function (rp) {
+                if (!rp.url)
+                    throw "A framed resource must have a url route parameter";
+
+                return 'views/common/legacy.html';
+            }
+        })
         .when('/:section/:method', {
             templateUrl: function(rp) {
                 if (!rp.method)
@@ -12,13 +21,13 @@ app.config(function ($routeProvider) {
             }
         })
         .when('/:section/:method/:id', {
-            templateUrl: function(rp) {
-                if (!rp.method) 
+            templateUrl: function (rp) {
+                if (!rp.method)
                     return "views/common/dashboard.html";
-                
+
                 return 'views/' + rp.section + '/' + rp.method + '.html';
             }
-        })
+        })        
         .otherwise({ redirectTo: '/content' });
     }).config(function ($locationProvider) {
     //$locationProvider.html5Mode(false).hashPrefix('!'); //turn html5 mode off
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js
index de1ef5afef..a5da3970b6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/legacy.controller.js
@@ -1,4 +1,19 @@
-angular.module("umbraco").controller("Umbraco.Common.LegacyController", 
-	function($scope, $routeParams){
-		$scope.legacyPath = decodeURI($routeParams.p);
-	});
\ No newline at end of file
+/**
+ * @ngdoc controller
+ * @name LegacyController
+ * @function
+ * 
+ * @description
+ * A controller to control the legacy iframe injection
+ * 
+ * @param myParam {object} Enter param description here
+*/
+function LegacyController($scope, $routeParams, $element) {
+    //set the legacy path
+    $scope.legacyPath = decodeURIComponent($routeParams.url);
+    
+    //$scope.$on('$routeChangeSuccess', function () {
+    //    var asdf = $element;
+    //});
+}
+angular.module("umbraco").controller('LegacyController', LegacyController);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/legacy.html b/src/Umbraco.Web.UI.Client/src/views/common/legacy.html
index 8e61774783..10ac1a378b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/legacy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/legacy.html
@@ -1 +1,3 @@
-<iframe ng-controller="Umbraco.Common.LegacyController" style="width: 100%; height: 100%;" src="{{legacyPath}}"></iframe>
\ No newline at end of file
+<div ng-controller="LegacyController"  id="legacyContainer" style="width: 100%; height: 100%;overflow: hidden;">
+    <iframe ng-src="{{legacyPath}}"></iframe>
+</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 6c1ff881cf..87bd6c9da4 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="13" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="14" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index c254e530f3..521b682b76 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -40,10 +40,10 @@
             color: #fa787e;
         }
 
-            .validation-summary span
-            {
-                font-style: italic;
-            }
+        .validation-summary span
+        {
+            font-style: italic;
+        }
     </style>
 </head>
 <body ng-controller="MainController" id="umbracoMainPageBody">
@@ -65,7 +65,12 @@
     
     @*Currently this needs to be loaded before anything*@
     <script src="@Url.Action("ServerVariables", "BackOffice")" type="text/javascript"></script>
-    <script type="text/javascript" src="lib/yepnope/yepnope.min.js"></script>    
+
+    @*Now we need to load in some legacy stuff*@
+    <script src="@Url.Action("LegacyTreeJs", "BackOffice")" type="text/javascript"></script>    
+    
+    @*And finally we can load in our angular app*@
+    <script type="text/javascript" src="lib/yepnope/yepnope.min.js"></script>
     <script type="text/javascript" src="@Url.Action("Application", "BackOffice")"></script>
     
 </body>
diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoClientManager.js b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoClientManager.js
index e3bc82b260..799803aa88 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoClientManager.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Application/UmbracoClientManager.js
@@ -94,13 +94,13 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
             //    windowMgr: function() 
             //        return null;
             //    },
-            contentFrameAndSection: function(app, rightFrameUrl){
+            contentFrameAndSection: function(app, rightFrameUrl) {
                 //this.appActions().shiftApp(app, this.uiKeys()['sections_' + app]);
                 var self = this;
-                self.mainWindow().UmbClientMgr.historyManager().addHistory(app,true);
-                window.setTimeout(function(){
+                self.mainWindow().UmbClientMgr.historyManager().addHistory(app, true);
+                window.setTimeout(function() {
                     self.mainWindow().UmbClientMgr.contentFrame(rightFrameUrl);
-                },200);
+                }, 200);
             },
             contentFrame: function(strLocation) {
                 /// <summary>
@@ -131,14 +131,14 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
 
                     this._debug("contentFrame: parsed location: " + strLocation);
                     var self = this;
-                    window.setTimeout(function(){
+                    window.setTimeout(function() {
                         if (typeof self.mainWindow().right != "undefined") {
                             self.mainWindow().right.location.href = strLocation;
                         }
                         else {
                             self.mainWindow().location.href = strLocation; //set the current windows location if the right frame doesn't exist int he current context
                         }
-                    },200);
+                    }, 200);
                 }
             },
             openModalWindow: function(url, name, showHeader, width, height, top, leftOffset, closeTriggers, onCloseCallback) {
@@ -198,8 +198,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
             set_isDirty: function(value) {
                 this._isDirty = value;
             }
-        }
-    }
+        };
+    };
 })(jQuery);
 
 //define alias for use throughout application
diff --git a/src/Umbraco.Web.UI/umbraco_client/Panel/javascript.js b/src/Umbraco.Web.UI/umbraco_client/Panel/javascript.js
index 1c172a243c..aca9e28529 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Panel/javascript.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Panel/javascript.js
@@ -1,49 +1,9 @@
+//OBSOLETE! THIS IS LEGACY CODE AND WILL BE REMOVED IN FUTURE VERSIONS!
+
 function resizePanel(PanelName, hasMenu, redoOnResize) {
-    var clientHeight = jQuery(window).height();
-    var clientWidth = jQuery(window).width();
-
-    if (top.document.location == document.location)
-        resizePanelTo(PanelName, hasMenu, clientWidth - 12, clientHeight - 20);
-    else
-        resizePanelTo(PanelName, hasMenu, clientWidth, clientHeight);
-
-    if (redoOnResize) {
-        jQuery(window).resize(function() {
-            resizePanel(PanelName, hasMenu, false);
-        });
-    }
+    //DO NOTHING
 }
 
-
 function resizePanelTo(PanelName, hasMenu, pWidth, pHeight) {
-
-    var panel = jQuery("#" + PanelName);
-    var panelContent = jQuery("#" + PanelName + "_content");
-
-    panelWidth = pWidth;
-    contentHeight = pHeight - 46;
-
-    if (hasMenu) contentHeight = contentHeight - 34;
-
-    panel.width(panelWidth);
-
-    if (pHeight > 0)
-        panel.height(pHeight);
-
-    if (panelContent != null) {
-        if (panelWidth > 0)
-            panelContent.width(panelWidth - 6);
-        if (contentHeight > 0)
-            panelContent.height(contentHeight);
-    }
-
-    if (hasMenu && panelWidth > 0) {
-        var scrollwidth = panelWidth - 35;
-        jQuery("#" + PanelName + "_menu").width(scrollwidth);
-        jQuery("#" + PanelName + "_menu_slh").width(scrollwidth);
-        jQuery("#" + PanelName + "_menubackground").width(panelWidth - 2);
-    }
-
-    // set cookies
-    jQuery.cookie('UMB_PANEL', '' + pWidth + 'x' + pHeight);
+    //DO NOTHING
 }
diff --git a/src/Umbraco.Web.UI/umbraco_client/ui/default.css b/src/Umbraco.Web.UI/umbraco_client/ui/default.css
index 9cd58e021c..226306bf67 100644
--- a/src/Umbraco.Web.UI/umbraco_client/ui/default.css
+++ b/src/Umbraco.Web.UI/umbraco_client/ui/default.css
@@ -7,6 +7,14 @@
 body *{outline: none;}
 
 
+/* STYLES FOR Legacy iframe content */
+
+html > body > form > div.panel{
+    width:100%;
+    height:100%;
+}
+
+
 /*CREATE DIALOG */				
 .createDescription 
 {
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 2ce7d62a06..40e416fcdb 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -1,12 +1,20 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Text;
 using System.Web.Mvc;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Trees;
 using Umbraco.Web.UI.JavaScript;
+using umbraco.cms.presentation.Trees;
+using umbraco.controls.Tree;
+using umbraco.interfaces;
+using Action = umbraco.BusinessLogic.Actions.Action;
 
 namespace Umbraco.Web.Editors
 {
@@ -59,5 +67,19 @@ namespace Umbraco.Web.Editors
             return JavaScript(ServerVariablesParser.Parse(d));
         }
 
+        /// <summary>
+        /// Returns the JavaScript blocks for any legacy trees declared
+        /// </summary>
+        /// <returns></returns>
+        public JavaScriptResult LegacyTreeJs()
+        {            
+            var javascript = new StringBuilder();
+            javascript.AppendLine(LegacyTreeJavascript.GetLegacyTreeJavascript());
+            javascript.AppendLine(LegacyTreeJavascript.GetLegacyIActionJavascript());
+            return JavaScript(javascript.ToString());
+        }
+
+        
+
     }
 }
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs b/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
index 7cf06f1b75..a04de3ce4e 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
@@ -84,7 +84,7 @@ namespace Umbraco.Web.Trees
             var bTree = treeDef.CreateInstance();
             var treeParams = new LegacyTreeParams(formCollection);
             bTree.SetTreeParameters(treeParams);
-            return new Attempt<TreeNode>(true, LegacyTreeDataAdapter.ConvertFromLegacy(bTree.RootNode, urlHelper));
+            return new Attempt<TreeNode>(true, LegacyTreeDataConverter.ConvertFromLegacy(bTree.RootNode, urlHelper));
         }
 
         private static Attempt<TreeDefinition> TryGetLegacyTreeDef(this ApplicationTree appTree)
@@ -123,7 +123,7 @@ namespace Umbraco.Web.Trees
             bTree.SetTreeParameters(treeParams);
             bTree.Render(ref xTree);
 
-            return new Attempt<TreeNodeCollection>(true, LegacyTreeDataAdapter.ConvertFromLegacy(xTree, urlHelper));
+            return new Attempt<TreeNodeCollection>(true, LegacyTreeDataConverter.ConvertFromLegacy(xTree, urlHelper));
         }
 
     }
diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataAdapter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
similarity index 79%
rename from src/Umbraco.Web/Trees/LegacyTreeDataAdapter.cs
rename to src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
index 17fe27d40f..af12749def 100644
--- a/src/Umbraco.Web/Trees/LegacyTreeDataAdapter.cs
+++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
@@ -1,72 +1,82 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Http.Routing;
-using Umbraco.Core;
-using umbraco.BusinessLogic.Actions;
-using umbraco.cms.presentation.Trees;
-using umbraco.interfaces;
-
-namespace Umbraco.Web.Trees
-{
-    /// <summary>
-    /// Converts the legacy tree data to the new format
-    /// </summary>
-    internal class LegacyTreeDataAdapter
-    {
-
-        internal static TreeNode ConvertFromLegacy(XmlTreeNode xmlTreeNode, UrlHelper urlHelper)
-        {
-            //  /umbraco/tree.aspx?rnd=d0d0ff11a1c347dabfaa0fc75effcc2a&id=1046&treeType=content&contextMenu=false&isDialog=false
-
-            //we need to convert the node source to our legacy tree controller
-            var source = urlHelper.GetUmbracoApiService<LegacyTreeApiController>("GetNodes");
-            //append the query strings
-            var query = xmlTreeNode.Source.IsNullOrWhiteSpace()
-                ? new string[] { }
-                : xmlTreeNode.Source.Split(new[] { '?' }, StringSplitOptions.RemoveEmptyEntries);
-            source += query.Length > 1 ? query[1].EnsureStartsWith('?') : "";
-
-            //TODO: Might need to add stuff to additional attributes
-            
-            var node = new TreeNode(xmlTreeNode.NodeID, source)
-            {
-                HasChildren = xmlTreeNode.HasChildren,
-                Icon = xmlTreeNode.Icon,
-                Title = xmlTreeNode.Text                
-            };
-            var menuItems = xmlTreeNode.Menu.ToArray();
-            var numAdded = 0;
-            foreach (var t in menuItems)
-            {
-                if (t is ContextMenuSeperator && numAdded > 0)
-                {
-                    //if it is a seperator, then update the previous menu item that we've added to be flagged
-                    //with a seperator
-                    node.Menu.ElementAt(numAdded - 1).Seperator = true;
-                }
-                else
-                {
-                    node.AddMenuItem(t);
-                    numAdded++;   
-                }
-            }
-
-            return node;
-        }
-
-        internal static TreeNodeCollection ConvertFromLegacy(XmlTree xmlTree, UrlHelper urlHelper)
-        {
-            //TODO: Once we get the editor URL stuff working we'll need to figure out how to convert 
-            // that over to use the old school ui.xml stuff for these old trees and however the old menu items worked.
-
-            var collection = new TreeNodeCollection();
-            foreach (var x in xmlTree.treeCollection)
-            {                                
-                collection.Add(ConvertFromLegacy(x, urlHelper));
-            }
-            return collection;
-        }
-
-    }
+using System;
+using System.Linq;
+using System.Web.Http.Routing;
+using Umbraco.Core;
+using umbraco.BusinessLogic.Actions;
+using umbraco.cms.presentation.Trees;
+using umbraco.controls.Tree;
+using umbraco.interfaces;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// Converts the legacy tree data to the new format
+    /// </summary>
+    internal class LegacyTreeDataConverter
+    {
+
+        internal static TreeNode ConvertFromLegacy(XmlTreeNode xmlTreeNode, UrlHelper urlHelper)
+        {
+            //  /umbraco/tree.aspx?rnd=d0d0ff11a1c347dabfaa0fc75effcc2a&id=1046&treeType=content&contextMenu=false&isDialog=false
+
+            //we need to convert the node source to our legacy tree controller
+            var source = urlHelper.GetUmbracoApiService<LegacyTreeApiController>("GetNodes");
+            //append the query strings
+            var query = xmlTreeNode.Source.IsNullOrWhiteSpace()
+                ? new string[] { }
+                : xmlTreeNode.Source.Split(new[] { '?' }, StringSplitOptions.RemoveEmptyEntries);
+            source += query.Length > 1 ? query[1].EnsureStartsWith('?') : "";
+
+            //TODO: Might need to add stuff to additional attributes
+            
+            var node = new TreeNode(xmlTreeNode.NodeID, source)
+            {
+                HasChildren = xmlTreeNode.HasChildren,
+                Icon = xmlTreeNode.Icon,
+                Title = xmlTreeNode.Text                
+            };
+
+            //This is a special case scenario, we know that content/media works based on the normal Belle routing/editing so we'll ensure we don't
+            // pass in the legacy JS handler so we do it the new way, for all other trees (Currently, this is a WIP), we'll render
+            // the legacy js callback,.
+            var knownNonLegacyNodeTypes = new[] {"content", "contentRecycleBin", "mediaRecyleBin", "media"};
+            if (knownNonLegacyNodeTypes.InvariantContains(xmlTreeNode.NodeType) == false)
+            {
+                node.OnClickCallback = xmlTreeNode.Action;
+            }
+
+            var menuItems = xmlTreeNode.Menu.ToArray();
+            var numAdded = 0;
+            foreach (var t in menuItems)
+            {
+                if (t is ContextMenuSeperator && numAdded > 0)
+                {
+                    //if it is a seperator, then update the previous menu item that we've added to be flagged
+                    //with a seperator
+                    node.Menu.ElementAt(numAdded - 1).Seperator = true;
+                }
+                else
+                {
+                    node.AddMenuItem(t);
+                    numAdded++;   
+                }
+            }
+
+            return node;
+        }
+
+        internal static TreeNodeCollection ConvertFromLegacy(XmlTree xmlTree, UrlHelper urlHelper)
+        {
+            //TODO: Once we get the editor URL stuff working we'll need to figure out how to convert 
+            // that over to use the old school ui.xml stuff for these old trees and however the old menu items worked.
+
+            var collection = new TreeNodeCollection();
+            foreach (var x in xmlTree.treeCollection)
+            {                                
+                collection.Add(ConvertFromLegacy(x, urlHelper));
+            }
+            return collection;
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs b/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs
new file mode 100644
index 0000000000..96a44a624a
--- /dev/null
+++ b/src/Umbraco.Web/Trees/LegacyTreeJavascript.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using umbraco.cms.presentation.Trees;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// A class used to render the legacy JS requirements for trees and IActions.
+    /// </summary>
+    internal static class LegacyTreeJavascript
+    {
+        /// <summary>
+        /// If any legacy tree requires any JS rendering then we will compile a JS output of the combination.
+        /// </summary>
+        /// <returns></returns>
+        public static string GetLegacyTreeJavascript()
+        {
+            //find all tree defs that exists for the current application regardless of if they are active
+            List<TreeDefinition> appTreeDefs = TreeDefinitionCollection.Instance;
+            //Create the BaseTree's based on the tree definitions found
+            var legacyTrees = appTreeDefs.Select(treeDef => treeDef.CreateInstance()).ToList();
+            var javascript = new StringBuilder();
+            foreach (var bTree in legacyTrees)
+            {
+                bTree.RenderJS(ref javascript);
+            }
+            return javascript.ToString();
+        }
+
+        /// <summary>
+        /// Returns a string with javascript proxy methods for IActions that are using old javascript
+        /// </summary>
+        /// <returns></returns>
+        public static string GetLegacyIActionJavascript()
+        {
+            var js = new StringBuilder();
+            foreach (var a in ActionsResolver.Current.Actions.ToList())
+            {
+                // NH: Added a try/catch block to this as an error in a 3rd party action can crash the whole menu initialization
+                try
+                {
+                    if (string.IsNullOrEmpty(a.Alias) == false && (string.IsNullOrEmpty(a.JsFunctionName) == false || string.IsNullOrEmpty(a.JsSource) == false))
+                    {
+                        // if the action is using invalid javascript we need to do something about this
+                        if (global::umbraco.BusinessLogic.Actions.Action.ValidateActionJs(a) == false)
+                        {
+                            js.AppendLine("function IActionProxy_" + a.Alias.ToSafeAlias() + "() {");
+                            js.AppendLine(global::umbraco.BusinessLogic.Actions.Action.ConvertLegacyJs(a.JsFunctionName));
+                            js.AppendLine("}");
+                        }
+                    }
+                }
+                catch (Exception ee)
+                {
+                    LogHelper.Error(typeof(LegacyTreeJavascript), "Error initializing tree action", ee);
+                }
+            }
+
+            if (js.Length != 0)
+            {
+                js.Insert(0, "// This javascript is autogenerated by Umbraco to ensure legacy compatiblity with old context menu items\n\n");
+            }
+
+            return js.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Trees/TestTreeApiController.cs b/src/Umbraco.Web/Trees/TestTreeApiController.cs
index fb693c038c..50db9750ed 100644
--- a/src/Umbraco.Web/Trees/TestTreeApiController.cs
+++ b/src/Umbraco.Web/Trees/TestTreeApiController.cs
@@ -4,25 +4,25 @@ using umbraco.businesslogic;
 
 namespace Umbraco.Web.Trees
 {
-    [Tree("test", "test", "Test Tree")]
-    public class TestTreeApiController : TreeApiController
-    {
-        protected override TreeNodeCollection GetTreeData(string id, FormDataCollection queryStrings)
-        {
-            var collection = new TreeNodeCollection
-                {
-                    CreateTreeNode("1", queryStrings, "Node 1", ""),
-                    CreateTreeNode("2", queryStrings, "Node 2", ""),
-                    CreateTreeNode("3", queryStrings, "Node 3", ""),
-                    CreateTreeNode("4", queryStrings, "Node 4", ""),
-                };
-            collection[0].AdditionalData.Add("TestKey", "TestVal");
-            return collection;
-        }
+    //[Tree("test", "test", "Test Tree")]
+    //public class TestTreeApiController : TreeApiController
+    //{
+    //    protected override TreeNodeCollection GetTreeData(string id, FormDataCollection queryStrings)
+    //    {
+    //        var collection = new TreeNodeCollection
+    //            {
+    //                CreateTreeNode("1", queryStrings, "Node 1", ""),
+    //                CreateTreeNode("2", queryStrings, "Node 2", ""),
+    //                CreateTreeNode("3", queryStrings, "Node 3", ""),
+    //                CreateTreeNode("4", queryStrings, "Node 4", ""),
+    //            };
+    //        collection[0].AdditionalData.Add("TestKey", "TestVal");
+    //        return collection;
+    //    }
 
-        //protected override string RootNodeId
-        //{
-        //    get { return (-1).ToString(CultureInfo.InvariantCulture); }
-        //}
-    }
+    //    //protected override string RootNodeId
+    //    //{
+    //    //    get { return (-1).ToString(CultureInfo.InvariantCulture); }
+    //    //}
+    //}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Trees/TreeApiController.cs b/src/Umbraco.Web/Trees/TreeApiController.cs
index ad246367a0..157d400eb2 100644
--- a/src/Umbraco.Web/Trees/TreeApiController.cs
+++ b/src/Umbraco.Web/Trees/TreeApiController.cs
@@ -108,12 +108,13 @@ namespace Umbraco.Web.Trees
                 {
                     HasChildren = true,
 
-                    //THIS IS TEMPORARY UNTIL WE FIGURE OUT HOW WE ARE LOADING STUFF (I.E. VIEW NAMES, ACTION NAMES, DUNNO)
-                    EditorUrl = queryStrings.HasKey(TreeQueryStringParameters.OnNodeClick) //has a node click handler?
-                                    ? queryStrings.Get(TreeQueryStringParameters.OnNodeClick) //return node click handler
-                                    : isDialog //is in dialog mode without a click handler ?
-                                          ? "#" //return empty string, otherwise, return an editor URL:
-                                          : "mydashboard", 
+                    ////THIS IS TEMPORARY UNTIL WE FIGURE OUT HOW WE ARE LOADING STUFF (I.E. VIEW NAMES, ACTION NAMES, DUNNO)
+                    //EditorUrl = queryStrings.HasKey(TreeQueryStringParameters.OnNodeClick) //has a node click handler?
+                    //                ? queryStrings.Get(TreeQueryStringParameters.OnNodeClick) //return node click handler
+                    //                : isDialog //is in dialog mode without a click handler ?
+                    //                      ? "#" //return empty string, otherwise, return an editor URL:
+                    //                      : "mydashboard", 
+
                     Title = RootNodeDisplayName
                 };
 
@@ -182,126 +183,126 @@ namespace Umbraco.Web.Trees
 
         #region Create TreeNode methods
 
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="editorUrl"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            //var node = new TreeNode(id, BackOfficeRequestContext.RegisteredComponents.MenuItems, jsonUrl) { Title = title, EditorUrl = editorUrl };
-            var node = new TreeNode(id, jsonUrl) { Title = title, EditorUrl = editorUrl };
-            return node;
-        }
+        ///// <summary>
+        ///// Helper method to create tree nodes and automatically generate the json url
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <param name="queryStrings"></param>
+        ///// <param name="title"></param>
+        ///// <param name="editorUrl"></param>
+        ///// <returns></returns>
+        //public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl)
+        //{
+        //    var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+        //    //var node = new TreeNode(id, BackOfficeRequestContext.RegisteredComponents.MenuItems, jsonUrl) { Title = title, EditorUrl = editorUrl };
+        //    var node = new TreeNode(id, jsonUrl) { Title = title, EditorUrl = editorUrl };
+        //    return node;
+        //}
 
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="editorUrl"></param>
-        /// <param name="action"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            //var node = new TreeNode(id, BackOfficeRequestContext.RegisteredComponents.MenuItems, jsonUrl) { Title = title, EditorUrl = editorUrl };
-            var node = new TreeNode(id, jsonUrl) { Title = title, EditorUrl = editorUrl };
-            return node;
-        }
+        ///// <summary>
+        ///// Helper method to create tree nodes and automatically generate the json url
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <param name="queryStrings"></param>
+        ///// <param name="title"></param>
+        ///// <param name="editorUrl"></param>
+        ///// <param name="action"></param>
+        ///// <returns></returns>
+        //public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action)
+        //{
+        //    var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+        //    //var node = new TreeNode(id, BackOfficeRequestContext.RegisteredComponents.MenuItems, jsonUrl) { Title = title, EditorUrl = editorUrl };
+        //    var node = new TreeNode(id, jsonUrl) { Title = title, EditorUrl = editorUrl };
+        //    return node;
+        //}
 
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="editorUrl"></param>
-        /// <param name="action"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action, string icon)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            //var node = new TreeNode(id, BackOfficeRequestContext.RegisteredComponents.MenuItems, jsonUrl) { Title = title, EditorUrl = editorUrl };
-            var node = new TreeNode(id, jsonUrl) { Title = title, EditorUrl = editorUrl };
-            return node;
-        }
+        ///// <summary>
+        ///// Helper method to create tree nodes and automatically generate the json url
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <param name="queryStrings"></param>
+        ///// <param name="title"></param>
+        ///// <param name="editorUrl"></param>
+        ///// <param name="action"></param>
+        ///// <param name="icon"></param>
+        ///// <returns></returns>
+        //public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action, string icon)
+        //{
+        //    var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+        //    //var node = new TreeNode(id, BackOfficeRequestContext.RegisteredComponents.MenuItems, jsonUrl) { Title = title, EditorUrl = editorUrl };
+        //    var node = new TreeNode(id, jsonUrl) { Title = title, EditorUrl = editorUrl };
+        //    return node;
+        //}
 
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="editorUrl"></param>
-        /// <param name="action"></param>
-        /// <param name="hasChildren"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action, bool hasChildren)
-        {
-            var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl, action);
-            treeNode.HasChildren = hasChildren;
-            return treeNode;
-        }
+        ///// <summary>
+        ///// Helper method to create tree nodes and automatically generate the json url
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <param name="queryStrings"></param>
+        ///// <param name="title"></param>
+        ///// <param name="editorUrl"></param>
+        ///// <param name="action"></param>
+        ///// <param name="hasChildren"></param>
+        ///// <returns></returns>
+        //public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action, bool hasChildren)
+        //{
+        //    var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl, action);
+        //    treeNode.HasChildren = hasChildren;
+        //    return treeNode;
+        //}
 
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="editorUrl"></param>
-        /// <param name="action"></param>
-        /// <param name="hasChildren"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action, bool hasChildren, string icon)
-        {
-            var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl, action);
-            treeNode.HasChildren = hasChildren;
-            treeNode.Icon = icon;
-            return treeNode;
-        }
+        ///// <summary>
+        ///// Helper method to create tree nodes and automatically generate the json url
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <param name="queryStrings"></param>
+        ///// <param name="title"></param>
+        ///// <param name="editorUrl"></param>
+        ///// <param name="action"></param>
+        ///// <param name="hasChildren"></param>
+        ///// <param name="icon"></param>
+        ///// <returns></returns>
+        //public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, string action, bool hasChildren, string icon)
+        //{
+        //    var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl, action);
+        //    treeNode.HasChildren = hasChildren;
+        //    treeNode.Icon = icon;
+        //    return treeNode;
+        //}
 
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="editorUrl"></param>
-        /// <param name="hasChildren"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, bool hasChildren)
-        {
-            var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl);
-            treeNode.HasChildren = hasChildren;
-            return treeNode;
-        }
+        ///// <summary>
+        ///// Helper method to create tree nodes and automatically generate the json url
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <param name="queryStrings"></param>
+        ///// <param name="title"></param>
+        ///// <param name="editorUrl"></param>
+        ///// <param name="hasChildren"></param>
+        ///// <returns></returns>
+        //public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, bool hasChildren)
+        //{
+        //    var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl);
+        //    treeNode.HasChildren = hasChildren;
+        //    return treeNode;
+        //}
 
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="editorUrl"></param>
-        /// <param name="hasChildren"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, bool hasChildren, string icon)
-        {
-            var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl);
-            treeNode.HasChildren = hasChildren;
-            treeNode.Icon = icon;
-            return treeNode;
-        } 
+        ///// <summary>
+        ///// Helper method to create tree nodes and automatically generate the json url
+        ///// </summary>
+        ///// <param name="id"></param>
+        ///// <param name="queryStrings"></param>
+        ///// <param name="title"></param>
+        ///// <param name="editorUrl"></param>
+        ///// <param name="hasChildren"></param>
+        ///// <param name="icon"></param>
+        ///// <returns></returns>
+        //public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string editorUrl, bool hasChildren, string icon)
+        //{
+        //    var treeNode = CreateTreeNode(id, queryStrings, title, editorUrl);
+        //    treeNode.HasChildren = hasChildren;
+        //    treeNode.Icon = icon;
+        //    return treeNode;
+        //} 
 
         #endregion
 
diff --git a/src/Umbraco.Web/Trees/TreeNode.cs b/src/Umbraco.Web/Trees/TreeNode.cs
index 17b4d9aa26..b821c727dd 100644
--- a/src/Umbraco.Web/Trees/TreeNode.cs
+++ b/src/Umbraco.Web/Trees/TreeNode.cs
@@ -91,11 +91,26 @@ namespace Umbraco.Web.Trees
             }
         }
 
+        ///// <summary>
+        ///// The URL path for the editor for this model
+        ///// </summary>
+        ///// <remarks>
+        ///// If this is set then the UI will attempt to load the result of this URL into an IFrame
+        ///// for the editor.
+        ///// 
+        ///// Generally for use with Legacy trees
+        ///// </remarks>
+        //[DataMember(Name = "editorUrl")]
+        //internal string EditorUrl { get; set; }
+
         /// <summary>
-        /// The URL path for the editor for this model
+        /// A JS method/codeblock to be called when the tree node is clicked
         /// </summary>
-        [DataMember(Name = "editorUrl")]
-        public string EditorUrl { get; set; }
+        /// <remarks>
+        /// This should only be used for legacy trees
+        /// </remarks>
+        [DataMember(Name = "jsClickCallback")]
+        internal string OnClickCallback { get; set; }
 
         /// <summary>
         /// The JSON url to load the nodes children
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs b/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
index a05d274474..5ddd6dc22d 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Umbraco.Core.IO;
 using Umbraco.Core.Manifest;
 
 namespace Umbraco.Web.UI.JavaScript
@@ -40,7 +41,9 @@ namespace Umbraco.Web.UI.JavaScript
                 ManifestParser.MergeJArrays(umbracoInit, m.JavaScriptInitialize);
             }
 
-            return ParseMain(umbracoInit.ToString());
+            return ParseMain(
+                umbracoInit.ToString(),
+                IOHelper.ResolveUrl(SystemDirectories.Umbraco));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index 4fe8a4fdd2..7fd423feb0 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -5,6 +5,8 @@
     'lib/bootstrap/js/bootstrap.js',
     'lib/underscore/underscore.js',
     'lib/umbraco/Extensions.js',
+    'lib/umbraco/NamespaceManager.js',
+    'lib/umbraco/LegacyUmbClientMgr.js',
 
     'js/app.js',
 
diff --git a/src/Umbraco.Web/UI/JavaScript/Main.js b/src/Umbraco.Web/UI/JavaScript/Main.js
index 3dcd791733..98aa9b88b7 100644
--- a/src/Umbraco.Web/UI/JavaScript/Main.js
+++ b/src/Umbraco.Web/UI/JavaScript/Main.js
@@ -3,6 +3,10 @@ yepnope({
     load: "##JsInitialize##",
 
     complete: function () {
+        
+        //we need to set the legacy UmbClientMgr path
+        UmbClientMgr.setUmbracoPath('"##UmbracoPath##"');
+
         jQuery(document).ready(function () {
             angular.bootstrap(document, ['umbraco']);
         });
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7c01c6a9d1..6bef467ed0 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -321,7 +321,8 @@
     <Compile Include="PropertyEditors\TrueFalsePropertyEditor.cs" />
     <Compile Include="Trees\LegacyTreeApiController.cs" />
     <Compile Include="Trees\ISearchableTree.cs" />
-    <Compile Include="Trees\LegacyTreeDataAdapter.cs" />
+    <Compile Include="Trees\LegacyTreeDataConverter.cs" />
+    <Compile Include="Trees\LegacyTreeJavascript.cs" />
     <Compile Include="Trees\LegacyTreeParams.cs" />
     <Compile Include="Trees\MenuItem.cs" />
     <Compile Include="Trees\SearchResultItem.cs" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
index fd1b180005..6ac15e4b1a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
@@ -5,6 +5,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.Script.Serialization;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Trees;
 using umbraco.interfaces;
 using System.Text.RegularExpressions;
 using umbraco.BusinessLogic.Actions;
@@ -314,35 +315,7 @@ namespace umbraco.controls.Tree
         /// <returns></returns>
         public string GetLegacyIActionJavascript()
         {
-            StringBuilder js = new StringBuilder();
-			foreach (IAction a in global::umbraco.BusinessLogic.Actions.Action.GetAll())
-			{
-				// NH: Added a try/catch block to this as an error in a 3rd party action can crash the whole menu initialization
-				try
-				{
-					if (!string.IsNullOrEmpty(a.Alias) && (!string.IsNullOrEmpty(a.JsFunctionName) || !string.IsNullOrEmpty(a.JsSource)))
-					{
-						// if the action is using invalid javascript we need to do something about this
-						if (!umbraco.BusinessLogic.Actions.Action.ValidateActionJs(a))
-						{
-							js.AppendLine("function IActionProxy_" + umbraco.cms.helpers.Casing.SafeAlias(a.Alias) + "() {");
-							js.AppendLine(umbraco.BusinessLogic.Actions.Action.ConvertLegacyJs(a.JsFunctionName)); // .Replace("openModal", "UmbClientMgr.openModalWindow"));
-							js.AppendLine("}");
-						}
-					}
-				}
-				catch (Exception ee)
-				{
-					LogHelper.Error<TreeControl>("Error initializing tree action", ee);
-				}
-			}
-
-	        if (js.Length != 0)
-            {
-                js.Insert(0, "// This javascript is autogenerated by Umbraco to ensure legacy compatiblity with old context menu items\n\n");
-            }
-
-            return js.ToString();
+            return LegacyTreeJavascript.GetLegacyIActionJavascript();
         }
 
         /// <summary>
diff --git a/src/umbraco.controls/Panel.cs b/src/umbraco.controls/Panel.cs
index 9f93b0a028..284d39a47f 100644
--- a/src/umbraco.controls/Panel.cs
+++ b/src/umbraco.controls/Panel.cs
@@ -124,7 +124,12 @@ namespace umbraco.uicontrols
                 {
                     writer.WriteLine("Number of child controls : " + this.Controls.Count);
                 }
-                writer.WriteLine("<div id=\"" + this.ClientID + "\" class=\"panel\" style=\"height:" + this.Height.Value + "px;width:" + this.Width.Value + "px;\">");
+
+                //SD:NOTE: Removed any height / width changes because in Belle we don't want these set and there are not auto calculations. 
+                // when these are there the styles get all mucked up for legacy stuff
+                //writer.WriteLine("<div id=\"" + this.ClientID + "\" class=\"panel\" style=\"height:" + this.Height.Value + "px;width:" + this.Width.Value + "px;\">");
+                
+                writer.WriteLine("<div id=\"" + this.ClientID + "\" class=\"panel\" >");
                 writer.WriteLine("<div class=\"boxhead\">");
                 writer.WriteLine("<h2 id=\"" + this.ClientID + "Label\">" + this.Text + "</h2>");
                 writer.WriteLine("</div>");
@@ -143,7 +148,11 @@ namespace umbraco.uicontrols
                 if (this.hasMenu)
                     upHeight = upHeight - 34;
 
-                writer.WriteLine("<div id=\"" + this.ClientID + "_content\" class=\"content\" style=\"width: auto; height:" + (upHeight) + "px;\">");
+                //SD:NOTE: Removed any height / width changes because in Belle we don't want these set and there are not auto calculations. 
+                // when these are there the styles get all mucked up for legacy stuff
+                //writer.WriteLine("<div id=\"" + this.ClientID + "_content\" class=\"content\" style=\"width: auto; height:" + (upHeight) + "px;\">");
+
+                writer.WriteLine("<div id=\"" + this.ClientID + "_content\" class=\"content\" style=\"width: auto;\">");
 
                 string styleString = "";