diff --git a/Projects/Algorithmic-Trading/Schemas/App-Schema/algorithmic-trading-project.json b/Projects/Algorithmic-Trading/Schemas/App-Schema/algorithmic-trading-project.json
index 9a8e89cd4..53e974e6d 100644
--- a/Projects/Algorithmic-Trading/Schemas/App-Schema/algorithmic-trading-project.json
+++ b/Projects/Algorithmic-Trading/Schemas/App-Schema/algorithmic-trading-project.json
@@ -18,6 +18,22 @@
             "actionFunction": "payload.executeAction",
             "actionProject": "Foundations"
         },
+        {
+            "action": "Add UI Object",
+            "label": "Add Trading Engine",
+            "relatedUiObject": "Trading Engine",
+            "relatedUiObjectProject": "Algorithmic-Trading",
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
+        },
+        {
+            "action": "Add UI Object",
+            "label": "Add Trading System",
+            "relatedUiObject": "Trading System",
+            "relatedUiObjectProject": "Algorithmic-Trading",
+            "actionFunction": "payload.executeAction",
+            "actionProject": "Foundations"
+        },
         {
             "action": "Delete UI Object",
             "askConfirmation": true,
diff --git a/Projects/Algorithmic-Trading/Schemas/App-Schema/trading-engine.json b/Projects/Algorithmic-Trading/Schemas/App-Schema/trading-engine.json
index 528279a1a..517079e17 100644
--- a/Projects/Algorithmic-Trading/Schemas/App-Schema/trading-engine.json
+++ b/Projects/Algorithmic-Trading/Schemas/App-Schema/trading-engine.json
@@ -27,21 +27,21 @@
             "name": "tradingCurrent",
             "type": "node",
             "childType": "Trading Current",
-            "autoAdd": true,
+            "autoAdd": false,
             "project": "Foundations"
         },
         {
             "name": "tradingLast",
             "type": "node",
             "childType": "Trading Last",
-            "autoAdd": true,
+            "autoAdd": false,
             "project": "Foundations"
         },
         {
             "name": "exchangeOrders",
             "type": "node",
             "childType": "Exchange Orders",
-            "autoAdd": true,
+            "autoAdd": false,
             "project": "Foundations"
         }
     ]
diff --git a/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js b/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
index ed280a4e0..802ac1ab0 100644
--- a/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
+++ b/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
@@ -756,7 +756,11 @@ function newFoundationsFunctionLibraryUiObjectsFromNodes() {
                 if (property.type === 'node') {
                     if (property.name !== previousPropertyName) {
                         if (node[property.name] === undefined) {
-                            addUIObject(node, property.childType, rootNodes)
+                            let currenAngleToParent = node.payload.floatingObject.angleToParent  
+                            node.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_180
+                            let uiObject = addUIObject(node, property.childType, rootNodes, property.project)
+                            node.payload.floatingObject.angleToParent = currenAngleToParent
+                            //uiObject.payload.floatingObject.angleToParent = currenAngleToParent
                             previousPropertyName = property.name
                         }
                     }