diff --git a/AABrowserAPI/UserAuthentication.js b/AABrowserAPI/UserAuthentication.js
index 0b9c58138..49bd93ad9 100644
--- a/AABrowserAPI/UserAuthentication.js
+++ b/AABrowserAPI/UserAuthentication.js
@@ -22,7 +22,7 @@
     function authenticateUser(pSessionToken, callBackFunction) {
 
         let userProfile = {
-            userName: "Guest",
+            userName: "",
             devTeams: [],
             storagePermissions: []
         };
diff --git a/Files/FileCloud.js b/Files/FileCloud.js
index eb35104be..c5a64de75 100644
--- a/Files/FileCloud.js
+++ b/Files/FileCloud.js
@@ -131,11 +131,7 @@ function newFileCloud() {
 
             let containerName;
 
-            if (pBot.codeName !== "AATom") {
-                containerName = pDevTeam.codeName.toLowerCase();
-            } else {
-                containerName = 'data';
-            }
+            containerName = pDevTeam.codeName.toLowerCase();
 
             blobService.getBlobToText(containerName, filePath + "/" + fileName, onFileReceived);
 
diff --git a/TopSpace/CurrentBot.js b/TopSpace/CurrentBot.js
index 237bb0126..0c425c2fa 100644
--- a/TopSpace/CurrentBot.js
+++ b/TopSpace/CurrentBot.js
@@ -21,7 +21,7 @@ function newCurrentBot() {
     container.isDraggeable = false;
     container.isClickeable = true;
 
-    const NOT_FOUND = "You have no Bots";
+    const NOT_FOUND = "";
 
     let sharedStatus;
 
diff --git a/TopSpace/CurrentProcess.js b/TopSpace/CurrentProcess.js
index e543e2619..735cf43e5 100644
--- a/TopSpace/CurrentProcess.js
+++ b/TopSpace/CurrentProcess.js
@@ -21,7 +21,7 @@ function newCurrentProcess() {
     container.isDraggeable = false;
     container.isClickeable = true;
 
-    const NOT_FOUND = "No Process Found";
+    const NOT_FOUND = "";
 
     let sharedStatus;
 
diff --git a/TopSpace/CurrentStartMode.js b/TopSpace/CurrentStartMode.js
index 731da5c8f..798b72511 100644
--- a/TopSpace/CurrentStartMode.js
+++ b/TopSpace/CurrentStartMode.js
@@ -36,6 +36,8 @@ function newCurrentStartMode() {
 
     function onClick() {
 
+        if (window.CURRENT_BOT === "") { return; }
+
         switch (window.CURRENT_START_MODE) {
 
             case "Backtest": {
@@ -74,6 +76,8 @@ function newCurrentStartMode() {
 
     function draw() {
 
+        if (window.CURRENT_BOT === "") { return;}
+
         thisObject.container.frame.draw(false, false);
 
         let fontSize = 12;
diff --git a/TopSpace/DevTeam.js b/TopSpace/DevTeam.js
index fec528132..70a7d090a 100644
--- a/TopSpace/DevTeam.js
+++ b/TopSpace/DevTeam.js
@@ -21,7 +21,7 @@ function newDevTeam() {
     container.isDraggeable = false;
     container.isClickeable = true;
 
-    const NOT_FOUND = "Not a devTeam Member";
+    const NOT_FOUND = "";
 
     let sharedStatus;
     let label = ""
diff --git a/TopSpace/PlayStopButton.js b/TopSpace/PlayStopButton.js
index 3d3e18c1c..fff39a34a 100644
--- a/TopSpace/PlayStopButton.js
+++ b/TopSpace/PlayStopButton.js
@@ -59,6 +59,8 @@ function newPlayStopButton() {
 
     function onClick() {
 
+        if (window.CURRENT_BOT === "") { return; }
+
         switch (showing) {
 
             case "Play": {
@@ -120,6 +122,8 @@ function newPlayStopButton() {
 
     function draw() {
 
+        if (window.CURRENT_BOT === "") { return; }
+
         thisObject.container.frame.draw(false, false);
 
         if (canDraw === false) { return; }