diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js
deleted file mode 100644
index 12cc426d5..000000000
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/blueprintLogCtrl.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (C) Relevance Lab Private Limited- All Rights Reserved
- * Unauthorized copying of this file, via any medium is strictly prohibited
- * Proprietary and confidential
- * Written by Relevance UI Team,
- * Aug 2015
- */
-
-(function (angular) {
-	"use strict";
-	angular.module('dashboard.bots')
-		.controller('blueprintLogCtrl', ['$q', '$scope', 'workzoneServices', '$timeout', 'orchestrationSetting', 'toastr', function ($q, $scope, workzoneServices, $timeout, orchestrationSetting, toastr) {
-			console.log(items);
-			var _instance = items.cpInstance;
-			$scope.instanceName = _instance.name;
-			var _actionItem = items.actionHistoryData;
-			var helper = {
-				lastTimeStamp: '',
-				getlastTimeStamp: function(logObj) {
-					if (logObj instanceof Array && logObj.length) {
-						return logObj[logObj.length - 1].timestamp;
-					}
-				},
-				logsPolling: function() {
-					$scope.timerObject = $interval(function() {
-						workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id)
-							.then(function(response) {
-								if (response.data.length) {
-									helper.lastTimeStamp = helper.getlastTimeStamp(response);
-									$scope.logListDelta.push.apply($scope.logListDelta, response.data);
-								}
-							});
-					}, instanceSetting.logCheckTimer * 100);
-				},
-				stopPolling: function() {
-					$interval.cancel($scope.timerObject);
-				}
-			};
-
-			angular.extend($scope, {
-				logListInitial: [],
-				logListDelta: [],
-				cancel: function() {
-					helper.stopPolling();
-					$modalInstance.dismiss('cancel');
-				},
-				timerObject: undefined
-			});
-
-			workzoneServices.getActionHistoryLogs(_instance._id,_actionItem._id).then(function(response) {
-				helper.lastTimeStamp = helper.getlastTimeStamp(response.data);
-				$scope.logListInitial = response.data;
-				helper.logsPolling();
-			});
-
-			$scope.$on('$destroy', function() {
-				$interval.cancel($scope.timerObject);
-			});
-		}
-	]);
-})(angular);
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 626a60390..b27d6eb34 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -620,6 +620,9 @@
                     $scope.initscript();
                     break;
                 case 'instance_launch':
+                case 'aws_cf':
+                case 'docker':
+                case 'azure_launch':
                     $scope.ischefTaskHistoryPageLoading = false;
                     $scope.isjenkinsTaskHistoryPageLoading = false;
                     $scope.isscriptTaskHistoryPageLoading = false;
@@ -680,21 +683,7 @@
                 $modalInstance.dismiss('cancel');
             };
         }
-    ]).controller('botHistoryLogsCtrl',['$scope', 'items', '$modalInstance', '$modal', function ($scope, items, $modalInstance, $modal) {
-        $scope.parentItemDetail=items;
-        var botHistLogsCtrl={};
-        botHistLogsCtrl.taskLogType=items.taskType;
-        botHistLogsCtrl.cancelAll=function(){
-            $scope.$broadcast ('closeWindow');
-            $modalInstance.dismiss('cancel');
-            return  $scope.close;
-        };
-        return botHistLogsCtrl;
-
-        $scope.cancel= function() {
-            $modalInstance.dismiss('cancel');
-        };
-    }]).controller('confirmBotRunCtrl', ['$scope', '$modal', '$modalInstance', 'items', 'genericServices','toastr', function ($scope, $modal, $modalInstance, items, genSevs, toastr) {
+    ]).controller('confirmBotRunCtrl', ['$scope', '$modal', '$modalInstance', 'items', 'genericServices','toastr', '$rootScope', function ($scope, $modal, $modalInstance, items, genSevs, toastr, $rootScope) {
             $scope.botId = items.botId;
             $scope.isJobRunExecuting = false;
 
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html b/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html
deleted file mode 100644
index 5865ca3fe..000000000
--- a/client/cat3/src/partials/sections/dashboard/bots/view/blueprintLog.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id='chefLogPage' class="col-lg-12 col-md-12 col-sm-12 col-xs-12" ng-controller="blueprintLogCtrl as ctrlBp">
-    <fieldset>
-        <div class="chef-logs-wrapper">
-            <loading size="large" name="isInstanceListLoading" type="block" align="center"></loading>
-            <div ng-show="!isInstanceListLoading">
-                
-            </div>
-        </div>
-    </fieldset>
-</div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html
index c7951a779..8a6fc9461 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botExecutionLogs.html
@@ -19,9 +19,6 @@ <h4 class="modal-title">
                 <div ng-switch-when="script">
                     <div ng-include="'src/partials/sections/dashboard/bots/view/chefLog.html'" ></div>
                 </div>
-                <div ng-switch-when="instance_launch">
-                    <div ng-include="'src/partials/sections/dashboard/workzone/instance/popups/instanceLogs.html'"></div>
-                </div>
             </div>
         </fieldset>
     </div>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html
index 112fa3fde..6d38934e3 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/botHistoryLogs.html
@@ -22,6 +22,15 @@ <h4 class="modal-title">
                 <div ng-switch-when="instance_launch">
                     <div ng-include="'src/partials/sections/dashboard/bots/view/chefLog.html'" ></div>
                 </div>
+                <div ng-switch-when="aws_cf">
+                    <div ng-include="'src/partials/sections/dashboard/bots/view/chefLog.html'" ></div>
+                </div>
+                <div ng-switch-when="docker">
+                    <div ng-include="'src/partials/sections/dashboard/bots/view/chefLog.html'" ></div>
+                </div>
+                <div ng-switch-when="azure_launch">
+                    <div ng-include="'src/partials/sections/dashboard/bots/view/chefLog.html'" ></div>
+                </div>
             </div>
         </fieldset>
     </div>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html
index 9a0942fd8..2106a5dc3 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/editParams.html
@@ -40,7 +40,7 @@ <h4 style="margin-top: 0px;">Edit Parameters:</h4>
 			                </td>
 			                <td style="text-align: left">
 			                	<input type="text" class="cookbook-edit-text" ng-model="value.default" ng-if="!value.choice.length" />
-                                <select ng-if="value.choice.length" class="cookbook-edit-text" ng-options="choice for choice in value.choice" ng-model="value.default"></select>
+                                <select ng-if="value.choice.length" class="cookbook-edit-text pull-left" ng-options="choice for choice in value.choice" ng-model="value.default"></select>
 			                </td>
 			            </tr>
 					</tbody>
@@ -66,7 +66,7 @@ <h4 style="margin-top: 0px;">Edit Parameters:</h4>
 			                </td>
 			                <td ng-init="jenparams[params.name]=params.defaultValue[0]">
 			                	<input ng-if="params.parameterName !== 'Choice'" type="text" ng-model="jenparams[params.name]" class="form-control" ng-value="params.defaultValue[0]">
-			                	<select  ng-if="params.parameterName === 'Choice'" ng-model="jenparams[params.name]" class="cookbook-edit-text">
+			                	<select  ng-if="params.parameterName === 'Choice'" ng-model="jenparams[params.name]" class="cookbook-edit-text pull-left">
 			                        <option ng-repeat="val in params.defaultValue" value="{{val}}">{{val}}</option>
 			                    </select>
 			                </td>