diff --git a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js
index af78b8559..ac8b7efc0 100644
--- a/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js
+++ b/Projects/Foundations/UI/Function-Libraries/ActionSwitch.js
@@ -101,7 +101,12 @@ function newFoundationsActionSwitch() {
                 break
             case 'Add UI Object':
                 {
-                    UI.projects.foundations.functionLibraries.uiObjectsFromNodes.addUIObject(action.node, action.relatedNodeType, action.rootNodes, action.project)
+                    UI.projects.foundations.functionLibraries.uiObjectsFromNodes.addUIObject(
+                        action.node,
+                        action.relatedNodeType,
+                        action.rootNodes,
+                        action.relatedNodeProject
+                    )
                 }
                 break
             case 'Add Missing Children':
@@ -610,14 +615,14 @@ function newFoundationsActionSwitch() {
                 }
                 break
             case 'Save node to be moved':
-            {
-                UI.projects.foundations.spaces.floatingSpace.saveFloatingObjectToBeMoved()
-            }
+                {
+                    UI.projects.foundations.spaces.floatingSpace.saveFloatingObjectToBeMoved()
+                }
                 break
             case 'Snap saved node to position':
-            {
-                UI.projects.foundations.spaces.floatingSpace.moveFloatingObject(action.node.payload.position)
-            }
+                {
+                    UI.projects.foundations.spaces.floatingSpace.moveFloatingObject(action.node.payload.position)
+                }
                 break
         }
     }
diff --git a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js
index 9f4a3e5d8..abb7b2cc1 100644
--- a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js
+++ b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js
@@ -112,7 +112,7 @@ function newCircularMenuItem() {
         iconPhysics()
 
         if (thisObject.icon === undefined) {
-            console.log('[ERROR] newCircularMenuItem -> initialize -> err = Icon not found, Action: "' + thisObject.action + '", relatedUiObject: "' + thisObject.relatedUiObject +'", label: "' + thisObject.label + '"')
+            console.log('[ERROR] newCircularMenuItem -> initialize -> err = Icon not found, Action: "' + thisObject.action + '", relatedUiObject: "' + thisObject.relatedUiObject + '", label: "' + thisObject.label + '"')
         }
 
         selfMouseOverEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('onMouseOver', onMouseOver)
@@ -379,7 +379,21 @@ function newCircularMenuItem() {
                 }
 
                 /* Execute the action and wait for callbacks to update our statuus. */
-                thisObject.actionFunction({ node: thisObject.payload.node, name: thisObject.action, project: thisObject.actionProject, relatedNodeType: thisObject.relatedUiObject, callBackFunction: onPrimaryCallBack })
+                let relatedNodeProject = thisObject.actionProject
+                if (thisObject.relatedUiObjectProject !== undefined) {
+                    relatedNodeProject = thisObject.relatedUiObjectProject
+                } 
+
+                thisObject.actionFunction(
+                    {
+                        node: thisObject.payload.node,
+                        name: thisObject.action,
+                        project: thisObject.actionProject,
+                        relatedNodeType: thisObject.relatedUiObject,
+                        relatedNodeProject: relatedNodeProject,
+                        callBackFunction: onPrimaryCallBack
+                    }
+                )
                 return
             }
             if (temporaryStatus === STATUS_PRIMARY_WORK_DONE && thisObject.secondaryAction !== undefined) {
@@ -502,7 +516,7 @@ function newCircularMenuItem() {
         if (thisObject.icon === undefined) {
             thisObject.icon = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName('Foundations', 'missing-image')
         }
-        
+
         if (thisObject.icon !== undefined) {
             if (thisObject.icon.canDrawIcon === true && thisObject.currentRadius > 1 && thisObject.isDeployed === true) {
                 browserCanvasContext.drawImage(thisObject.icon, menuPosition.x - iconSize, menuPosition.y - iconSize, iconSize * 2, iconSize * 2)
diff --git a/Projects/Social-Bots/Icons/Announcement/twitter-bot.png b/Projects/Social-Bots/Icons/Announcement/twitter-bot.png
new file mode 100644
index 000000000..c41449c12
Binary files /dev/null and b/Projects/Social-Bots/Icons/Announcement/twitter-bot.png differ
diff --git a/Projects/Social-Bots/Schemas/App-Schema/announcement.json b/Projects/Social-Bots/Schemas/App-Schema/announcement.json
index 6f6639ae4..e308e50a5 100644
--- a/Projects/Social-Bots/Schemas/App-Schema/announcement.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/announcement.json
@@ -18,6 +18,7 @@
             "propertyToCheckFor": "announcementFormula",
             "label": "Add Announcement Formula",
             "relatedUiObject": "Announcement Formula",
+            "relatedUiObjectProject": "Social-Bots",
             "actionFunction": "payload.executeAction",
             "actionProject": "Foundations"
         },
@@ -27,6 +28,7 @@
             "propertyToCheckFor": "announcementCondition",
             "label": "Add Announcement Condition",
             "relatedUiObject": "Announcement Condition",
+            "relatedUiObjectProject": "Social-Bots",
             "actionFunction": "payload.executeAction",
             "actionProject": "Foundations"
         },
diff --git a/Projects/Social-Bots/Schemas/App-Schema/social-bots.json b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json
index e5fb9417d..ecb7f1c91 100644
--- a/Projects/Social-Bots/Schemas/App-Schema/social-bots.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/social-bots.json
@@ -6,28 +6,32 @@
             "label": "Add Telegram Bot",
             "relatedUiObject": "Telegram Bot",
             "actionFunction": "payload.executeAction",
-            "actionProject": "Foundations"
+            "actionProject": "Foundations",
+            "relatedUiObjectProject": "Social-Bots"
         },
         {
             "action": "Add UI Object",
             "label": "Add Discord Bot",
             "relatedUiObject": "Discord Bot",
             "actionFunction": "payload.executeAction",
-            "actionProject": "Foundations"
+            "actionProject": "Foundations",
+            "relatedUiObjectProject": "Social-Bots"
         },
         {
             "action": "Add UI Object",
             "label": "Add Slack Bot",
             "relatedUiObject": "Slack Bot",
             "actionFunction": "payload.executeAction",
-            "actionProject": "Foundations"
+            "actionProject": "Foundations",
+            "relatedUiObjectProject": "Social-Bots"
         },
         {
             "action": "Add UI Object",
             "label": "Add Twitter Bot",
             "relatedUiObject": "Twitter Bot",
             "actionFunction": "payload.executeAction",
-            "actionProject": "Foundations"
+            "actionProject": "Foundations",
+            "relatedUiObjectProject": "Social-Bots"
         },
         {
             "action": "Delete UI Object",
@@ -68,7 +72,7 @@
             "project": "Social-Bots"
         },
         {
-            "name": "twitterkBots",
+            "name": "twitterBots",
             "type": "array",
             "childType": "Twitter Bot",
             "autoAdd": true,
diff --git a/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json
index 805a7d143..51c4345d5 100644
--- a/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/telegram-bot.json
@@ -17,7 +17,8 @@
             "label": "Add Social Bot Command",
             "relatedUiObject": "Social Bot Command",
             "actionFunction": "payload.executeAction",
-            "actionProject": "Foundations"
+            "actionProject": "Foundations",
+            "relatedUiObjectProject": "Social-Bots"
         },
         {
             "action": "Send Telegram Test Message",
diff --git a/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json
index f81257b0a..c5f07af3b 100644
--- a/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json
+++ b/Projects/Social-Bots/Schemas/App-Schema/twitter-bot.json
@@ -17,7 +17,8 @@
             "label": "Add Social Bot Command",
             "relatedUiObject": "Social Bot Command",
             "actionFunction": "payload.executeAction",
-            "actionProject": "Foundations"
+            "actionProject": "Foundations",
+            "relatedUiObjectProject": "Social-Bots"
         },
         {
             "action": "Send Twitter Test Message",